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/lib/utils/gain_group.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'host/lib/utils/gain_group.cpp') diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp index cda10a881..32f14d062 100644 --- a/host/lib/utils/gain_group.cpp +++ b/host/lib/utils/gain_group.cpp @@ -10,8 +10,8 @@ #include #include #include -#include #include +#include #include using namespace uhd; @@ -130,7 +130,7 @@ public: } std::sort(indexes_step_size_dec.begin(), indexes_step_size_dec.end(), - boost::bind(&compare_by_step_size, _1, _2, all_fcns)); + std::bind(&compare_by_step_size, std::placeholders::_1, std::placeholders::_2, all_fcns)); UHD_ASSERT_THROW(all_fcns.at(indexes_step_size_dec.front()).get_range().step() >= all_fcns.at(indexes_step_size_dec.back()).get_range().step()); -- cgit v1.2.3