aboutsummaryrefslogtreecommitdiffstats
path: root/host/utils
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/utils
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/utils')
-rw-r--r--host/utils/uhd_cal_rx_iq_balance.cpp3
-rw-r--r--host/utils/uhd_cal_tx_dc_offset.cpp3
-rw-r--r--host/utils/uhd_cal_tx_iq_balance.cpp3
3 files changed, 6 insertions, 3 deletions
diff --git a/host/utils/uhd_cal_rx_iq_balance.cpp b/host/utils/uhd_cal_rx_iq_balance.cpp
index 1d8bdf6ee..ff074acef 100644
--- a/host/utils/uhd_cal_rx_iq_balance.cpp
+++ b/host/utils/uhd_cal_rx_iq_balance.cpp
@@ -20,6 +20,7 @@
#include <complex>
#include <cstdlib>
#include <ctime>
+#include <functional>
#include <iostream>
#include <thread>
@@ -142,7 +143,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
// create a transmitter thread
boost::thread_group threads;
- threads.create_thread(boost::bind(&tx_thread, usrp, tx_stream, tx_wave_ampl));
+ threads.create_thread(std::bind(&tx_thread, usrp, tx_stream, tx_wave_ampl));
// re-usable buffer for samples
std::vector<samp_type> buff;
diff --git a/host/utils/uhd_cal_tx_dc_offset.cpp b/host/utils/uhd_cal_tx_dc_offset.cpp
index 4ae305696..5a1e23d50 100644
--- a/host/utils/uhd_cal_tx_dc_offset.cpp
+++ b/host/utils/uhd_cal_tx_dc_offset.cpp
@@ -20,6 +20,7 @@
#include <ctime>
#include <iostream>
#include <thread>
+#include <functional>
namespace po = boost::program_options;
@@ -149,7 +150,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
// create a transmitter thread
boost::thread_group threads;
threads.create_thread(
- boost::bind(&tx_thread, usrp, tx_stream, tx_wave_freq, tx_wave_ampl));
+ std::bind(&tx_thread, usrp, tx_stream, tx_wave_freq, tx_wave_ampl));
// re-usable buffer for samples
std::vector<samp_type> buff;
diff --git a/host/utils/uhd_cal_tx_iq_balance.cpp b/host/utils/uhd_cal_tx_iq_balance.cpp
index 233f23862..b0a09b49c 100644
--- a/host/utils/uhd_cal_tx_iq_balance.cpp
+++ b/host/utils/uhd_cal_tx_iq_balance.cpp
@@ -17,6 +17,7 @@
#include <ctime>
#include <iostream>
#include <thread>
+#include <functional>
namespace po = boost::program_options;
@@ -146,7 +147,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[])
// create a transmitter thread
boost::thread_group threads;
threads.create_thread(
- boost::bind(&tx_thread, usrp, tx_stream, tx_wave_freq, tx_wave_ampl));
+ std::bind(&tx_thread, usrp, tx_stream, tx_wave_freq, tx_wave_ampl));
// re-usable buffer for samples
std::vector<samp_type> buff;