From d3a16b702230534f7265613a73204bdb051a458e Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Wed, 16 Oct 2019 16:21:19 -0700 Subject: uhd: Replace all occurrences of boost::bind with std::bind Note: Replacing everything with a lambda would be even better, but that can't be easily scripted so we'll do this as a first step to reduce the Boost footprint. This also removes occurences of #include , and makes sure all usages of std::bind have an #include . clang-format wasn't always applied to minimize the changeset in this commit, however, it was applied to the blocks of #includes. Due to conflicts with other Boost libraries, the placeholders _1, _2, etc. could not be directly used, but had to be explicitly called out (as std::placeholders::_1, etc.). This makes the use of std::bind even uglier, which serves as another reminder that using std::bind (and even more so, boost::bind) should be avoided. nirio/rpc/rpc_client.cpp still contains a reference to boost::bind. It was not possible to remove it by simply doing a search and replace, so it will be removed in a separate commit. --- host/tests/gain_group_test.cpp | 14 +++++++------- host/tests/property_test.cpp | 21 +++++++++++---------- host/tests/sph_recv_test.cpp | 4 ++-- host/tests/sph_send_test.cpp | 2 +- 4 files changed, 21 insertions(+), 20 deletions(-) (limited to 'host/tests') diff --git a/host/tests/gain_group_test.cpp b/host/tests/gain_group_test.cpp index 2608f292d..9680fa2a0 100644 --- a/host/tests/gain_group_test.cpp +++ b/host/tests/gain_group_test.cpp @@ -6,9 +6,9 @@ // #include -#include #include #include +#include #include #define rint(x) boost::math::iround(x) @@ -75,14 +75,14 @@ static gain_group::sptr get_gain_group(size_t pri1 = 0, size_t pri2 = 0) gain_group::sptr gg(gain_group::make()); // load gain group with function sets - gain_fcns.get_range = boost::bind(&gain_element1::get_range, &g1); - gain_fcns.get_value = boost::bind(&gain_element1::get_value, &g1); - gain_fcns.set_value = boost::bind(&gain_element1::set_value, &g1, _1); + gain_fcns.get_range = std::bind(&gain_element1::get_range, &g1); + gain_fcns.get_value = std::bind(&gain_element1::get_value, &g1); + gain_fcns.set_value = std::bind(&gain_element1::set_value, &g1, std::placeholders::_1); gg->register_fcns("g1", gain_fcns, pri1); - gain_fcns.get_range = boost::bind(&gain_element2::get_range, &g2); - gain_fcns.get_value = boost::bind(&gain_element2::get_value, &g2); - gain_fcns.set_value = boost::bind(&gain_element2::set_value, &g2, _1); + gain_fcns.get_range = std::bind(&gain_element2::get_range, &g2); + gain_fcns.get_value = std::bind(&gain_element2::get_value, &g2); + gain_fcns.set_value = std::bind(&gain_element2::set_value, &g2, std::placeholders::_1); gg->register_fcns("g2", gain_fcns, pri2); return gg; diff --git a/host/tests/property_test.cpp b/host/tests/property_test.cpp index 732e3ca84..ac5d489ae 100644 --- a/host/tests/property_test.cpp +++ b/host/tests/property_test.cpp @@ -7,11 +7,12 @@ // #include -#include #include #include +#include #include + struct coercer_type { int doit(int x) @@ -69,7 +70,7 @@ BOOST_AUTO_TEST_CASE(test_prop_with_desired_subscriber) uhd::property& prop = tree->create("/"); setter_type setter; - prop.add_desired_subscriber(boost::bind(&setter_type::doit, &setter, _1)); + prop.add_desired_subscriber(std::bind(&setter_type::doit, &setter, std::placeholders::_1)); prop.set(42); BOOST_CHECK_EQUAL(prop.get_desired(), 42); @@ -88,7 +89,7 @@ BOOST_AUTO_TEST_CASE(test_prop_with_coerced_subscriber) uhd::property& prop = tree->create("/"); setter_type setter; - prop.add_coerced_subscriber(boost::bind(&setter_type::doit, &setter, _1)); + prop.add_coerced_subscriber(std::bind(&setter_type::doit, &setter, std::placeholders::_1)); prop.set(42); BOOST_CHECK_EQUAL(prop.get_desired(), 42); @@ -107,8 +108,8 @@ BOOST_AUTO_TEST_CASE(test_prop_manual_coercion) uhd::property& prop = tree->create("/", uhd::property_tree::MANUAL_COERCE); setter_type dsetter, csetter; - prop.add_desired_subscriber(boost::bind(&setter_type::doit, &dsetter, _1)); - prop.add_coerced_subscriber(boost::bind(&setter_type::doit, &csetter, _1)); + prop.add_desired_subscriber(std::bind(&setter_type::doit, &dsetter, std::placeholders::_1)); + prop.add_coerced_subscriber(std::bind(&setter_type::doit, &csetter, std::placeholders::_1)); BOOST_CHECK_EQUAL(dsetter._x, 0); BOOST_CHECK_EQUAL(csetter._x, 0); @@ -132,7 +133,7 @@ BOOST_AUTO_TEST_CASE(test_prop_with_publisher) BOOST_CHECK(prop.empty()); getter_type getter; - prop.set_publisher(boost::bind(&getter_type::doit, &getter)); + prop.set_publisher(std::bind(&getter_type::doit, &getter)); BOOST_CHECK(not prop.empty()); getter._x = 42; @@ -150,10 +151,10 @@ BOOST_AUTO_TEST_CASE(test_prop_with_publisher_and_subscriber) uhd::property& prop = tree->create("/"); getter_type getter; - prop.set_publisher(boost::bind(&getter_type::doit, &getter)); + prop.set_publisher(std::bind(&getter_type::doit, &getter)); setter_type setter; - prop.add_coerced_subscriber(boost::bind(&setter_type::doit, &setter, _1)); + prop.add_coerced_subscriber(std::bind(&setter_type::doit, &setter, std::placeholders::_1)); getter._x = 42; prop.set(0); @@ -172,10 +173,10 @@ BOOST_AUTO_TEST_CASE(test_prop_with_coercion) uhd::property& prop = tree->create("/"); setter_type setter; - prop.add_coerced_subscriber(boost::bind(&setter_type::doit, &setter, _1)); + prop.add_coerced_subscriber(std::bind(&setter_type::doit, &setter, std::placeholders::_1)); coercer_type coercer; - prop.set_coercer(boost::bind(&coercer_type::doit, &coercer, _1)); + prop.set_coercer(std::bind(&coercer_type::doit, &coercer, std::placeholders::_1)); prop.set(42); BOOST_CHECK_EQUAL(prop.get(), 40); diff --git a/host/tests/sph_recv_test.cpp b/host/tests/sph_recv_test.cpp index 5685028d6..88718b956 100644 --- a/host/tests/sph_recv_test.cpp +++ b/host/tests/sph_recv_test.cpp @@ -7,10 +7,10 @@ #include "../common/mock_zero_copy.hpp" #include "../lib/transport/super_recv_packet_handler.hpp" -#include #include #include #include +#include #include #include @@ -263,7 +263,7 @@ BOOST_AUTO_TEST_CASE(test_sph_recv_one_channel_inline_message) // create an overflow handler overflow_handler_type overflow_handler; handler.set_overflow_handler( - 0, boost::bind(&overflow_handler_type::handle, &overflow_handler)); + 0, std::bind(&overflow_handler_type::handle, &overflow_handler)); // check the received packets size_t num_accum_samps = 0; diff --git a/host/tests/sph_send_test.cpp b/host/tests/sph_send_test.cpp index 6de4c9ffa..282d01da4 100644 --- a/host/tests/sph_send_test.cpp +++ b/host/tests/sph_send_test.cpp @@ -7,7 +7,7 @@ #include "../common/mock_zero_copy.hpp" #include "../lib/transport/super_send_packet_handler.hpp" -#include +#include #include #include #include -- cgit v1.2.3