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/usrp/dboard/db_twinrx.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/lib/usrp/dboard/db_twinrx.cpp')
-rw-r--r-- | host/lib/usrp/dboard/db_twinrx.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp index 5a8fefeb7..9f9efd158 100644 --- a/host/lib/usrp/dboard/db_twinrx.cpp +++ b/host/lib/usrp/dboard/db_twinrx.cpp @@ -5,12 +5,11 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#include "twinrx/twinrx_experts.hpp" +#include "dboard_ctor_args.hpp" #include "twinrx/twinrx_ctrl.hpp" -#include "twinrx/twinrx_io.hpp" +#include "twinrx/twinrx_experts.hpp" #include "twinrx/twinrx_ids.hpp" - -#include <uhdlib/experts/expert_factory.hpp> +#include "twinrx/twinrx_io.hpp" #include <uhd/types/device_addr.hpp> #include <uhd/types/ranges.hpp> #include <uhd/types/sensors.hpp> @@ -18,10 +17,10 @@ #include <uhd/usrp/dboard_manager.hpp> #include <uhd/utils/log.hpp> #include <uhd/utils/static.hpp> -#include "dboard_ctor_args.hpp" -#include <memory> +#include <uhdlib/experts/expert_factory.hpp> #include <boost/thread.hpp> #include <boost/thread/mutex.hpp> +#include <memory> //#include <fstream> //Needed for _expert->to_dot() below using namespace uhd; @@ -153,8 +152,9 @@ public: false, AUTO_RESOLVE_ON_WRITE); //Readback - get_rx_subtree()->create<sensor_value_t>("sensors/lo_locked") - .set_publisher(boost::bind(&twinrx_rcvr_fe::get_lo_locked, this)); + get_rx_subtree() + ->create<sensor_value_t>("sensors/lo_locked") + .set_publisher([this]() { return this->get_lo_locked(); }); //--------------------------------------------------------- // Add internal channel-specific data nodes to expert |