aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/multi_usrp.cpp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-10-16 16:21:19 -0700
committerMartin Braun <martin.braun@ettus.com>2019-11-26 12:21:32 -0800
commitd3a16b702230534f7265613a73204bdb051a458e (patch)
tree5cd9ace71b187aa2c5d8deb5904b14db28dc7c70 /host/lib/usrp/multi_usrp.cpp
parentdc698b990d368dfb8641b68dbe32a90079b7bd90 (diff)
downloaduhd-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/lib/usrp/multi_usrp.cpp')
-rw-r--r--host/lib/usrp/multi_usrp.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp
index 4c6372fd5..6dad00787 100644
--- a/host/lib/usrp/multi_usrp.cpp
+++ b/host/lib/usrp/multi_usrp.cpp
@@ -6,29 +6,30 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include <uhd/convert.hpp>
+#include <uhd/exception.hpp>
#include <uhd/property_tree.hpp>
#include <uhd/types/eeprom.hpp>
-#include <uhd/usrp/multi_usrp.hpp>
+#include <uhd/usrp/dboard_eeprom.hpp>
+#include <uhd/usrp/dboard_id.hpp>
#include <uhd/usrp/gpio_defs.hpp>
-#include <uhd/exception.hpp>
+#include <uhd/usrp/mboard_eeprom.hpp>
+#include <uhd/usrp/multi_usrp.hpp>
+#include <uhd/utils/gain_group.hpp>
#include <uhd/utils/log.hpp>
#include <uhd/utils/math.hpp>
-#include <uhd/utils/gain_group.hpp>
-#include <uhd/usrp/dboard_id.hpp>
-#include <uhd/usrp/mboard_eeprom.hpp>
-#include <uhd/usrp/dboard_eeprom.hpp>
-#include <uhd/convert.hpp>
#include <uhd/utils/soft_register.hpp>
-#include <uhdlib/usrp/gpio_defs.hpp>
#include <uhdlib/rfnoc/rfnoc_device.hpp>
+#include <uhdlib/usrp/gpio_defs.hpp>
+#include <boost/algorithm/string.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/format.hpp>
-#include <boost/algorithm/string.hpp>
-#include <memory>
#include <algorithm>
-#include <cmath>
#include <bitset>
#include <chrono>
+#include <cmath>
+#include <functional>
+#include <memory>
#include <thread>
namespace uhd { namespace rfnoc {
@@ -40,7 +41,6 @@ uhd::usrp::multi_usrp::sptr make_rfnoc_device(
}} /* namespace uhd::rfnoc */
-
using namespace uhd;
using namespace uhd::usrp;
@@ -226,9 +226,9 @@ static meta_range_t get_gain_range(property_tree::sptr subtree){
static gain_fcns_t make_gain_fcns_from_subtree(property_tree::sptr subtree){
gain_fcns_t gain_fcns;
- gain_fcns.get_range = boost::bind(&get_gain_range, subtree);
- gain_fcns.get_value = boost::bind(&get_gain_value, subtree);
- gain_fcns.set_value = boost::bind(&set_gain_value, subtree, _1);
+ gain_fcns.get_range = std::bind(&get_gain_range, subtree);
+ gain_fcns.get_value = std::bind(&get_gain_value, subtree);
+ gain_fcns.set_value = std::bind(&set_gain_value, subtree, std::placeholders::_1);
return gain_fcns;
}