aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/b100/io_impl.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/b100/io_impl.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/b100/io_impl.cpp')
-rw-r--r--host/lib/usrp/b100/io_impl.cpp24
1 files changed, 11 insertions, 13 deletions
diff --git a/host/lib/usrp/b100/io_impl.cpp b/host/lib/usrp/b100/io_impl.cpp
index d3de1cca1..c50327271 100644
--- a/host/lib/usrp/b100/io_impl.cpp
+++ b/host/lib/usrp/b100/io_impl.cpp
@@ -5,16 +5,14 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
+#include "../../transport/super_recv_packet_handler.hpp"
+#include "../../transport/super_send_packet_handler.hpp"
#include "b100_impl.hpp"
#include <uhd/utils/log.hpp>
#include <uhdlib/usrp/common/validate_subdev_spec.hpp>
-#include "../../transport/super_recv_packet_handler.hpp"
-#include "../../transport/super_send_packet_handler.hpp"
-
-#include <boost/bind.hpp>
#include <boost/format.hpp>
-#include <boost/bind.hpp>
#include <boost/thread.hpp>
+#include <functional>
#include <memory>
using namespace uhd;
@@ -149,14 +147,14 @@ rx_streamer::sptr b100_impl::get_rx_stream(const uhd::stream_args_t &args_){
_rx_dsps[dsp]->set_nsamps_per_packet(spp); //seems to be a good place to set this
_rx_dsps[dsp]->setup(args);
_recv_demuxer->realloc_sid(B100_RX_SID_BASE + dsp);
- my_streamer->set_xport_chan_get_buff(chan_i, boost::bind(
- &recv_packet_demuxer_3000::get_recv_buff, _recv_demuxer, B100_RX_SID_BASE + dsp, _1
+ my_streamer->set_xport_chan_get_buff(chan_i, std::bind(
+ &recv_packet_demuxer_3000::get_recv_buff, _recv_demuxer, B100_RX_SID_BASE + dsp, std::placeholders::_1
), true /*flush*/);
- my_streamer->set_overflow_handler(chan_i, boost::bind(
+ my_streamer->set_overflow_handler(chan_i, std::bind(
&rx_dsp_core_200::handle_overflow, _rx_dsps[dsp]
));
- my_streamer->set_issue_stream_cmd(chan_i, boost::bind(
- &rx_dsp_core_200::issue_stream_command, _rx_dsps[dsp], _1));
+ my_streamer->set_issue_stream_cmd(chan_i, std::bind(
+ &rx_dsp_core_200::issue_stream_command, _rx_dsps[dsp], std::placeholders::_1));
_rx_streamers[dsp] = my_streamer; //store weak pointer
}
@@ -207,10 +205,10 @@ tx_streamer::sptr b100_impl::get_tx_stream(const uhd::stream_args_t &args_){
const size_t dsp = args.channels[chan_i];
UHD_ASSERT_THROW(dsp == 0); //always 0
_tx_dsp->setup(args);
- my_streamer->set_xport_chan_get_buff(chan_i, boost::bind(
- &zero_copy_if::get_send_buff, _data_transport, _1
+ my_streamer->set_xport_chan_get_buff(chan_i, std::bind(
+ &zero_copy_if::get_send_buff, _data_transport, std::placeholders::_1
));
- my_streamer->set_async_receiver(boost::bind(&fifo_ctrl_excelsior::pop_async_msg, _fifo_ctrl, _1, _2));
+ my_streamer->set_async_receiver(std::bind(&fifo_ctrl_excelsior::pop_async_msg, _fifo_ctrl, std::placeholders::_1, std::placeholders::_2));
_tx_streamers[dsp] = my_streamer; //store weak pointer
}