diff options
author | Martin Braun <martin.braun@ettus.com> | 2019-10-16 16:21:19 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 12:21:32 -0800 |
commit | d3a16b702230534f7265613a73204bdb051a458e (patch) | |
tree | 5cd9ace71b187aa2c5d8deb5904b14db28dc7c70 /host/tests/gain_group_test.cpp | |
parent | dc698b990d368dfb8641b68dbe32a90079b7bd90 (diff) | |
download | uhd-d3a16b702230534f7265613a73204bdb051a458e.tar.gz uhd-d3a16b702230534f7265613a73204bdb051a458e.tar.bz2 uhd-d3a16b702230534f7265613a73204bdb051a458e.zip |
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 <boost/bind.hpp>, and makes
sure all usages of std::bind have an #include <functional>. 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.
Diffstat (limited to 'host/tests/gain_group_test.cpp')
-rw-r--r-- | host/tests/gain_group_test.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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 <uhd/utils/gain_group.hpp> -#include <boost/bind.hpp> #include <boost/math/special_functions/round.hpp> #include <boost/test/unit_test.hpp> +#include <functional> #include <iostream> #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; |