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/lib/experts | |
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/lib/experts')
-rw-r--r-- | host/lib/experts/expert_container.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/experts/expert_container.cpp b/host/lib/experts/expert_container.cpp index 3a1e54ae4..895ab1d41 100644 --- a/host/lib/experts/expert_container.cpp +++ b/host/lib/experts/expert_container.cpp @@ -8,15 +8,14 @@ #include <uhd/exception.hpp> #include <uhd/utils/log.hpp> #include <uhdlib/experts/expert_container.hpp> -#include <boost/bind.hpp> #include <boost/format.hpp> -#include <functional> #include <boost/graph/adjacency_list.hpp> #include <boost/graph/depth_first_search.hpp> #include <boost/graph/graph_traits.hpp> #include <boost/graph/topological_sort.hpp> #include <boost/thread.hpp> #include <boost/thread/mutex.hpp> +#include <functional> #include <memory> #ifdef UHD_EXPERT_LOGGING @@ -25,6 +24,7 @@ #define EX_LOG(depth, str) #endif + namespace uhd { namespace experts { typedef boost::adjacency_list< @@ -298,11 +298,11 @@ protected: //Add resolve callbacks if (resolve_mode == AUTO_RESOLVE_ON_WRITE or resolve_mode == AUTO_RESOLVE_ON_READ_WRITE) { EX_LOG(2, str(boost::format("added write callback"))); - data_node->set_write_callback(boost::bind(&expert_container_impl::resolve_from, this, _1)); + data_node->set_write_callback(std::bind(&expert_container_impl::resolve_from, this, std::placeholders::_1)); } if (resolve_mode == AUTO_RESOLVE_ON_READ or resolve_mode == AUTO_RESOLVE_ON_READ_WRITE) { EX_LOG(2, str(boost::format("added read callback"))); - data_node->set_read_callback(boost::bind(&expert_container_impl::resolve_to, this, _1)); + data_node->set_read_callback(std::bind(&expert_container_impl::resolve_to, this, std::placeholders::_1)); } } catch (...) { clear(); |