aboutsummaryrefslogtreecommitdiffstats
path: root/host/examples
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/examples
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/examples')
-rw-r--r--host/examples/network_relay.cpp5
-rw-r--r--host/examples/rfnoc_rx_to_file.cpp5
-rw-r--r--host/examples/test_clock_synch.cpp3
-rw-r--r--host/examples/test_messages.cpp2
-rw-r--r--host/examples/txrx_loopback_to_file.cpp3
5 files changed, 11 insertions, 7 deletions
diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp
index 6de268aa9..15c6de4ef 100644
--- a/host/examples/network_relay.cpp
+++ b/host/examples/network_relay.cpp
@@ -15,6 +15,7 @@
#include <chrono>
#include <csignal>
#include <cstdlib>
+#include <functional>
#include <iostream>
#include <thread>
#include <vector>
@@ -101,10 +102,10 @@ public:
boost::unique_lock<boost::mutex> lock(
spawn_mutex); // lock in preparation to wait for threads to spawn
(void)_thread_group.create_thread(
- boost::bind(&udp_relay_type::server_thread, this));
+ std::bind(&udp_relay_type::server_thread, this));
wait_for_thread.wait(lock); // wait for thread to spin up
(void)_thread_group.create_thread(
- boost::bind(&udp_relay_type::client_thread, this));
+ std::bind(&udp_relay_type::client_thread, this));
wait_for_thread.wait(lock); // wait for thread to spin up
std::cout << " done!" << std::endl << std::endl;
}
diff --git a/host/examples/rfnoc_rx_to_file.cpp b/host/examples/rfnoc_rx_to_file.cpp
index 2211831aa..2d648c10d 100644
--- a/host/examples/rfnoc_rx_to_file.cpp
+++ b/host/examples/rfnoc_rx_to_file.cpp
@@ -21,6 +21,7 @@
#include <complex>
#include <csignal>
#include <fstream>
+#include <functional>
#include <iostream>
#include <thread>
@@ -419,10 +420,10 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
if (not vm.count("skip-lo")) {
// TODO
// check_locked_sensor(usrp->get_rx_sensor_names(0), "lo_locked",
- // boost::bind(&uhd::usrp::multi_usrp::get_rx_sensor, usrp, _1, radio_id),
+ // std::bind(&uhd::usrp::multi_usrp::get_rx_sensor, usrp, _1, radio_id),
// setup_time); if (ref == "external")
// check_locked_sensor(usrp->get_mboard_sensor_names(0), "ref_locked",
- // boost::bind(&uhd::usrp::multi_usrp::get_mboard_sensor, usrp, _1, radio_id),
+ // std::bind(&uhd::usrp::multi_usrp::get_mboard_sensor, usrp, _1, radio_id),
// setup_time);
}
diff --git a/host/examples/test_clock_synch.cpp b/host/examples/test_clock_synch.cpp
index 8556063d7..2acccabdc 100644
--- a/host/examples/test_clock_synch.cpp
+++ b/host/examples/test_clock_synch.cpp
@@ -15,6 +15,7 @@
#include <boost/format.hpp>
#include <boost/program_options.hpp>
#include <chrono>
+#include <functional>
#include <iostream>
#include <thread>
@@ -118,7 +119,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
boost::thread_group thread_group;
clock_time = clock->get_time();
for (size_t j = 0; j < usrp->get_num_mboards(); j++) {
- thread_group.create_thread(boost::bind(&get_usrp_time, usrp, j, &usrp_times));
+ thread_group.create_thread(std::bind(&get_usrp_time, usrp, j, &usrp_times));
}
// Wait for threads to complete
thread_group.join_all();
diff --git a/host/examples/test_messages.cpp b/host/examples/test_messages.cpp
index fe2293840..637f086f0 100644
--- a/host/examples/test_messages.cpp
+++ b/host/examples/test_messages.cpp
@@ -13,7 +13,7 @@
#include <uhd/utils/static.hpp>
#include <uhd/utils/thread.hpp>
#include <boost/assign/list_of.hpp>
-#include <boost/bind.hpp>
+#include <functional>
#include <boost/format.hpp>
#include <boost/program_options.hpp>
#include <complex>
diff --git a/host/examples/txrx_loopback_to_file.cpp b/host/examples/txrx_loopback_to_file.cpp
index 6199ca429..4c059577c 100644
--- a/host/examples/txrx_loopback_to_file.cpp
+++ b/host/examples/txrx_loopback_to_file.cpp
@@ -20,6 +20,7 @@
#include <boost/thread/thread.hpp>
#include <csignal>
#include <fstream>
+#include <functional>
#include <iostream>
namespace po = boost::program_options;
@@ -526,7 +527,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
// start transmit worker thread
boost::thread_group transmit_thread;
- transmit_thread.create_thread(boost::bind(
+ transmit_thread.create_thread(std::bind(
&transmit_worker, buff, wave_table, tx_stream, md, step, index, num_channels));
// recv to file