1From 13caaf001061db3c01082c4574a5e326c4969ab6 Mon Sep 17 00:00:00 2001 2From: Martin Braun <martin.braun@ettus.com> 3Date: Thu, 16 Jul 2020 13:07:34 +0200 4Subject: [PATCH] boost: Include bind.hpp where used, add 5 BOOST_BIND_GLOBAL_PLACEHOLDERS 6 7Consists of two changes: 8- Grepped for files that use boost::bind, but don't include 9 boost/bind.hpp. Changed all of those to include bind.hpp 10- Add BOOST_BIND_GLOBAL_PLACEHOLDERS so that Boost doesn't complain 11 about using bind placeholders in the global namespace. 12 13Background: boost/bind.hpp is a convenience header that pulls the Boost 14bind placeholders into the global namespace, but that's deprecated 15behaviour. For UHD 3.15, we'll keep the deprecated behaviour (modern UHD 16no longer uses Boost.Bind), so this fixes build failures with modern 17Boost, and related warnings. 18 19Patch retrieved from 20https://github.com/EttusResearch/uhd/commit/13caaf001061db3c01082c4574a5e326c4969ab6 21 22Signed-off-by: Martin Braun <martin.braun@ettus.com> 23Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> 24--- 25 host/cmake/Modules/UHDBoost.cmake | 3 +++ 26 host/examples/network_relay.cpp | 1 + 27 host/examples/rfnoc_rx_to_file.cpp | 1 + 28 host/examples/test_clock_synch.cpp | 1 + 29 host/examples/txrx_loopback_to_file.cpp | 1 + 30 host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp | 1 + 31 host/lib/rfnoc/legacy_compat.cpp | 1 + 32 host/lib/transport/xport_benchmarker.cpp | 1 + 33 host/lib/usrp/b100/b100_impl.cpp | 1 + 34 host/lib/usrp/b200/b200_iface.cpp | 1 + 35 host/lib/usrp/b200/b200_impl.cpp | 1 + 36 host/lib/usrp/cores/rx_dsp_core_3000.cpp | 1 + 37 host/lib/usrp/cores/tx_dsp_core_3000.cpp | 1 + 38 host/lib/usrp/dboard/db_cbx.cpp | 1 + 39 host/lib/usrp/dboard/db_dbsrx.cpp | 1 + 40 host/lib/usrp/dboard/db_dbsrx2.cpp | 1 + 41 host/lib/usrp/dboard/db_sbx_common.cpp | 1 + 42 host/lib/usrp/dboard/db_sbx_version3.cpp | 1 + 43 host/lib/usrp/dboard/db_sbx_version4.cpp | 1 + 44 host/lib/usrp/dboard/db_tvrx.cpp | 1 + 45 host/lib/usrp/dboard/db_tvrx2.cpp | 1 + 46 host/lib/usrp/dboard/db_twinrx.cpp | 1 + 47 host/lib/usrp/dboard/db_ubx.cpp | 1 + 48 host/lib/usrp/dboard/db_wbx_common.cpp | 1 + 49 host/lib/usrp/dboard/db_wbx_simple.cpp | 1 + 50 host/lib/usrp/dboard/db_wbx_version2.cpp | 1 + 51 host/lib/usrp/dboard/db_wbx_version3.cpp | 1 + 52 host/lib/usrp/dboard/db_wbx_version4.cpp | 1 + 53 host/lib/usrp/dboard/db_xcvr2450.cpp | 1 + 54 host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp | 1 + 55 host/lib/usrp/multi_usrp.cpp | 1 + 56 host/lib/usrp/n230/n230_resource_manager.cpp | 1 + 57 host/lib/usrp/n230/n230_uart.cpp | 1 + 58 host/lib/usrp/usrp1/soft_time_ctrl.cpp | 1 + 59 host/lib/usrp/usrp1/usrp1_impl.cpp | 1 + 60 host/lib/usrp/x300/x300_radio_ctrl_impl.cpp | 1 + 61 host/lib/usrp_clock/octoclock/octoclock_impl.cpp | 1 + 62 host/lib/utils/ihex.cpp | 1 + 63 host/lib/utils/tasks.cpp | 1 + 64 host/utils/uhd_cal_rx_iq_balance.cpp | 1 + 65 host/utils/uhd_cal_tx_dc_offset.cpp | 1 + 66 host/utils/uhd_cal_tx_iq_balance.cpp | 1 + 67 42 files changed, 44 insertions(+) 68 69diff --git a/host/cmake/Modules/UHDBoost.cmake b/host/cmake/Modules/UHDBoost.cmake 70index 5ebb4acef..e3ee42b50 100644 71--- a/host/cmake/Modules/UHDBoost.cmake 72+++ b/host/cmake/Modules/UHDBoost.cmake 73@@ -259,6 +259,9 @@ else() 74 # disable Boost's use of std::experimental::string_view 75 # works for Boost 1.67.0 and newer & doesn't hurt older 76 add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW) 77+ # UHD 3.15 still uses global placeholders (_1, _2, ...) from Boost which 78+ # need to be enabled explicitly for some Boost versions 79+ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) 80 81 # Boost 1.70.0's find cmake scripts don't always set the expected 82 # return variables. Replicate the commit that fixes that issue here: 83diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp 84index bf2ac9255..9a9f56eb5 100644 85--- a/host/examples/network_relay.cpp 86+++ b/host/examples/network_relay.cpp 87@@ -8,6 +8,7 @@ 88 #include <uhd/utils/safe_main.hpp> 89 #include <uhd/utils/thread.hpp> 90 #include <boost/asio.hpp> 91+#include <boost/bind.hpp> 92 #include <boost/format.hpp> 93 #include <boost/program_options.hpp> 94 #include <boost/thread/condition_variable.hpp> 95diff --git a/host/examples/rfnoc_rx_to_file.cpp b/host/examples/rfnoc_rx_to_file.cpp 96index 5bb9985ae..cbd35cbe8 100644 97--- a/host/examples/rfnoc_rx_to_file.cpp 98+++ b/host/examples/rfnoc_rx_to_file.cpp 99@@ -23,6 +23,7 @@ 100 #include <uhd/types/tune_request.hpp> 101 #include <uhd/utils/safe_main.hpp> 102 #include <uhd/utils/thread.hpp> 103+#include <boost/bind.hpp> 104 #include <boost/format.hpp> 105 #include <boost/program_options.hpp> 106 #include <chrono> 107diff --git a/host/examples/test_clock_synch.cpp b/host/examples/test_clock_synch.cpp 108index 8556063d7..ec071f7c7 100644 109--- a/host/examples/test_clock_synch.cpp 110+++ b/host/examples/test_clock_synch.cpp 111@@ -12,6 +12,7 @@ 112 #include <uhd/usrp_clock/multi_usrp_clock.hpp> 113 #include <uhd/utils/safe_main.hpp> 114 #include <uhd/utils/thread.hpp> 115+#include <boost/bind.hpp> 116 #include <boost/format.hpp> 117 #include <boost/program_options.hpp> 118 #include <chrono> 119diff --git a/host/examples/txrx_loopback_to_file.cpp b/host/examples/txrx_loopback_to_file.cpp 120index 271d249f6..a2f0427c9 100644 121--- a/host/examples/txrx_loopback_to_file.cpp 122+++ b/host/examples/txrx_loopback_to_file.cpp 123@@ -13,6 +13,7 @@ 124 #include <uhd/utils/static.hpp> 125 #include <uhd/utils/thread.hpp> 126 #include <boost/algorithm/string.hpp> 127+#include <boost/bind.hpp> 128 #include <boost/filesystem.hpp> 129 #include <boost/format.hpp> 130 #include <boost/math/special_functions/round.hpp> 131diff --git a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp 132index a80e2ef53..b78635002 100644 133--- a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp 134+++ b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp 135@@ -11,6 +11,7 @@ 136 #include <uhd/utils/log.hpp> 137 #include <uhdlib/rfnoc/wb_iface_adapter.hpp> 138 #include <uhdlib/usrp/cores/dma_fifo_core_3000.hpp> 139+#include <boost/bind.hpp> 140 #include <boost/format.hpp> 141 #include <boost/make_shared.hpp> 142 #include <boost/thread/mutex.hpp> 143diff --git a/host/lib/rfnoc/legacy_compat.cpp b/host/lib/rfnoc/legacy_compat.cpp 144index 91de361df..f93fe871a 100644 145--- a/host/lib/rfnoc/legacy_compat.cpp 146+++ b/host/lib/rfnoc/legacy_compat.cpp 147@@ -19,6 +19,7 @@ 148 #include <uhd/usrp/subdev_spec.hpp> 149 #include <uhd/utils/log.hpp> 150 #include <uhdlib/rfnoc/legacy_compat.hpp> 151+#include <boost/bind.hpp> 152 #include <boost/make_shared.hpp> 153 #include <set> 154 155diff --git a/host/lib/transport/xport_benchmarker.cpp b/host/lib/transport/xport_benchmarker.cpp 156index 67582ff2c..7abd4c5fd 100644 157--- a/host/lib/transport/xport_benchmarker.cpp 158+++ b/host/lib/transport/xport_benchmarker.cpp 159@@ -6,6 +6,7 @@ 160 // 161 162 #include "xport_benchmarker.hpp" 163+#include <boost/bind.hpp> 164 #include <chrono> 165 #include <thread> 166 167diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp 168index cd4319803..08006ae32 100644 169--- a/host/lib/usrp/b100/b100_impl.cpp 170+++ b/host/lib/usrp/b100/b100_impl.cpp 171@@ -15,6 +15,7 @@ 172 #include <uhd/utils/paths.hpp> 173 #include <uhd/utils/safe_call.hpp> 174 #include <uhdlib/usrp/common/apply_corrections.hpp> 175+#include <boost/bind.hpp> 176 #include <boost/format.hpp> 177 #include <cstdio> 178 #include <iostream> 179diff --git a/host/lib/usrp/b200/b200_iface.cpp b/host/lib/usrp/b200/b200_iface.cpp 180index 082be071c..cdf88f69b 100644 181--- a/host/lib/usrp/b200/b200_iface.cpp 182+++ b/host/lib/usrp/b200/b200_iface.cpp 183@@ -12,6 +12,7 @@ 184 #include <uhd/exception.hpp> 185 #include <uhdlib/utils/ihex.hpp> 186 187+#include <boost/bind.hpp> 188 #include <boost/functional/hash.hpp> 189 #include <boost/lexical_cast.hpp> 190 #include <boost/format.hpp> 191diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp 192index 1be8c263b..c0f8ee1ac 100644 193--- a/host/lib/usrp/b200/b200_impl.cpp 194+++ b/host/lib/usrp/b200/b200_impl.cpp 195@@ -17,6 +17,7 @@ 196 #include <uhd/utils/safe_call.hpp> 197 #include <uhd/usrp/dboard_eeprom.hpp> 198 #include <boost/format.hpp> 199+#include <boost/bind.hpp> 200 #include <boost/filesystem.hpp> 201 #include <boost/lexical_cast.hpp> 202 #include <boost/functional/hash.hpp> 203diff --git a/host/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp 204index 46fce3f69..ff7caf105 100644 205--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp 206+++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp 207@@ -13,6 +13,7 @@ 208 #include <uhdlib/usrp/cores/dsp_core_utils.hpp> 209 #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp> 210 #include <boost/assign/list_of.hpp> 211+#include <boost/bind.hpp> 212 #include <boost/math/special_functions/round.hpp> 213 #include <boost/thread/thread.hpp> //thread sleep 214 #include <algorithm> 215diff --git a/host/lib/usrp/cores/tx_dsp_core_3000.cpp b/host/lib/usrp/cores/tx_dsp_core_3000.cpp 216index be7593841..b76a74b1c 100644 217--- a/host/lib/usrp/cores/tx_dsp_core_3000.cpp 218+++ b/host/lib/usrp/cores/tx_dsp_core_3000.cpp 219@@ -12,6 +12,7 @@ 220 #include <uhdlib/usrp/cores/dsp_core_utils.hpp> 221 #include <uhdlib/usrp/cores/tx_dsp_core_3000.hpp> 222 #include <boost/assign/list_of.hpp> 223+#include <boost/bind.hpp> 224 #include <boost/math/special_functions/round.hpp> 225 #include <boost/thread/thread.hpp> //sleep 226 #include <algorithm> 227diff --git a/host/lib/usrp/dboard/db_cbx.cpp b/host/lib/usrp/dboard/db_cbx.cpp 228index dd0640d00..f5c7f2399 100644 229--- a/host/lib/usrp/dboard/db_cbx.cpp 230+++ b/host/lib/usrp/dboard/db_cbx.cpp 231@@ -7,6 +7,7 @@ 232 233 #include "db_sbx_common.hpp" 234 #include <boost/algorithm/string.hpp> 235+#include <boost/bind.hpp> 236 #include <boost/math/special_functions/round.hpp> 237 238 using namespace uhd; 239diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp 240index 587158470..dc82b60f9 100644 241--- a/host/lib/usrp/dboard/db_dbsrx.cpp 242+++ b/host/lib/usrp/dboard/db_dbsrx.cpp 243@@ -21,6 +21,7 @@ 244 #include <uhd/usrp/dboard_base.hpp> 245 #include <uhd/usrp/dboard_manager.hpp> 246 #include <boost/assign/list_of.hpp> 247+#include <boost/bind.hpp> 248 #include <boost/format.hpp> 249 #include <boost/math/special_functions/round.hpp> 250 #include <utility> 251diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp 252index e2505dfd7..da4da4148 100644 253--- a/host/lib/usrp/dboard/db_dbsrx2.cpp 254+++ b/host/lib/usrp/dboard/db_dbsrx2.cpp 255@@ -18,6 +18,7 @@ 256 #include <uhd/usrp/dboard_base.hpp> 257 #include <uhd/usrp/dboard_manager.hpp> 258 #include <boost/assign/list_of.hpp> 259+#include <boost/bind.hpp> 260 #include <boost/format.hpp> 261 #include <boost/thread.hpp> 262 #include <boost/math/special_functions/round.hpp> 263diff --git a/host/lib/usrp/dboard/db_sbx_common.cpp b/host/lib/usrp/dboard/db_sbx_common.cpp 264index b6eaedc3d..95aff96b4 100644 265--- a/host/lib/usrp/dboard/db_sbx_common.cpp 266+++ b/host/lib/usrp/dboard/db_sbx_common.cpp 267@@ -6,6 +6,7 @@ 268 // 269 270 #include "db_sbx_common.hpp" 271+#include <boost/bind.hpp> 272 273 using namespace uhd; 274 using namespace uhd::usrp; 275diff --git a/host/lib/usrp/dboard/db_sbx_version3.cpp b/host/lib/usrp/dboard/db_sbx_version3.cpp 276index 369315b2e..fb829cf34 100644 277--- a/host/lib/usrp/dboard/db_sbx_version3.cpp 278+++ b/host/lib/usrp/dboard/db_sbx_version3.cpp 279@@ -9,6 +9,7 @@ 280 #include "db_sbx_common.hpp" 281 #include <uhd/types/tune_request.hpp> 282 #include <boost/algorithm/string.hpp> 283+#include <boost/bind.hpp> 284 285 using namespace uhd; 286 using namespace uhd::usrp; 287diff --git a/host/lib/usrp/dboard/db_sbx_version4.cpp b/host/lib/usrp/dboard/db_sbx_version4.cpp 288index d1c76287b..e1adebf99 100644 289--- a/host/lib/usrp/dboard/db_sbx_version4.cpp 290+++ b/host/lib/usrp/dboard/db_sbx_version4.cpp 291@@ -9,6 +9,7 @@ 292 #include "db_sbx_common.hpp" 293 #include <uhd/types/tune_request.hpp> 294 #include <boost/algorithm/string.hpp> 295+#include <boost/bind.hpp> 296 297 using namespace uhd; 298 using namespace uhd::usrp; 299diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp 300index 8bf377c4d..5fbbf5bee 100644 301--- a/host/lib/usrp/dboard/db_tvrx.cpp 302+++ b/host/lib/usrp/dboard/db_tvrx.cpp 303@@ -28,6 +28,7 @@ 304 #include <uhd/usrp/dboard_base.hpp> 305 #include <uhd/usrp/dboard_manager.hpp> 306 #include <boost/assign/list_of.hpp> 307+#include <boost/bind.hpp> 308 #include <boost/format.hpp> 309 #include <boost/thread.hpp> 310 #include <boost/array.hpp> 311diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp 312index 5dba83551..e1623487d 100644 313--- a/host/lib/usrp/dboard/db_tvrx2.cpp 314+++ b/host/lib/usrp/dboard/db_tvrx2.cpp 315@@ -55,6 +55,7 @@ 316 #include <uhd/usrp/dboard_manager.hpp> 317 #include <boost/assign/list_of.hpp> 318 #include <boost/format.hpp> 319+#include <boost/bind.hpp> 320 #include <boost/array.hpp> 321 #include <boost/math/special_functions/round.hpp> 322 #include <utility> 323diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp 324index de1cd3f33..aa9da8adf 100644 325--- a/host/lib/usrp/dboard/db_twinrx.cpp 326+++ b/host/lib/usrp/dboard/db_twinrx.cpp 327@@ -19,6 +19,7 @@ 328 #include <uhd/utils/log.hpp> 329 #include <uhd/utils/static.hpp> 330 #include "dboard_ctor_args.hpp" 331+#include <boost/bind.hpp> 332 #include <boost/make_shared.hpp> 333 #include <boost/thread.hpp> 334 #include <boost/thread/mutex.hpp> 335diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp 336index 305a69c52..e78f9db75 100644 337--- a/host/lib/usrp/dboard/db_ubx.cpp 338+++ b/host/lib/usrp/dboard/db_ubx.cpp 339@@ -20,6 +20,7 @@ 340 #include <uhd/utils/safe_call.hpp> 341 #include <uhdlib/usrp/common/max287x.hpp> 342 343+#include <boost/bind.hpp> 344 #include <boost/shared_ptr.hpp> 345 #include <boost/math/special_functions/round.hpp> 346 #include <boost/algorithm/string.hpp> 347diff --git a/host/lib/usrp/dboard/db_wbx_common.cpp b/host/lib/usrp/dboard/db_wbx_common.cpp 348index 41f323d19..fd7b2481a 100644 349--- a/host/lib/usrp/dboard/db_wbx_common.cpp 350+++ b/host/lib/usrp/dboard/db_wbx_common.cpp 351@@ -12,6 +12,7 @@ 352 #include <uhd/utils/assert_has.hpp> 353 #include <uhd/utils/algorithm.hpp> 354 #include <uhd/utils/log.hpp> 355+#include <boost/bind.hpp> 356 357 using namespace uhd; 358 using namespace uhd::usrp; 359diff --git a/host/lib/usrp/dboard/db_wbx_simple.cpp b/host/lib/usrp/dboard/db_wbx_simple.cpp 360index 390c5c47a..e3a5667c7 100644 361--- a/host/lib/usrp/dboard/db_wbx_simple.cpp 362+++ b/host/lib/usrp/dboard/db_wbx_simple.cpp 363@@ -17,6 +17,7 @@ 364 #include <uhd/utils/assert_has.hpp> 365 #include <uhd/usrp/dboard_manager.hpp> 366 #include <boost/assign/list_of.hpp> 367+#include <boost/bind.hpp> 368 369 using namespace uhd; 370 using namespace uhd::usrp; 371diff --git a/host/lib/usrp/dboard/db_wbx_version2.cpp b/host/lib/usrp/dboard/db_wbx_version2.cpp 372index 775ee4467..f1bf7dacc 100644 373--- a/host/lib/usrp/dboard/db_wbx_version2.cpp 374+++ b/host/lib/usrp/dboard/db_wbx_version2.cpp 375@@ -16,6 +16,7 @@ 376 377 #include <uhd/usrp/dboard_base.hpp> 378 #include <boost/assign/list_of.hpp> 379+#include <boost/bind.hpp> 380 #include <boost/format.hpp> 381 #include <boost/math/special_functions/round.hpp> 382 #include <boost/algorithm/string.hpp> 383diff --git a/host/lib/usrp/dboard/db_wbx_version3.cpp b/host/lib/usrp/dboard/db_wbx_version3.cpp 384index 41979f8ef..b755d09a2 100644 385--- a/host/lib/usrp/dboard/db_wbx_version3.cpp 386+++ b/host/lib/usrp/dboard/db_wbx_version3.cpp 387@@ -15,6 +15,7 @@ 388 389 #include <uhd/usrp/dboard_base.hpp> 390 #include <boost/assign/list_of.hpp> 391+#include <boost/bind.hpp> 392 #include <boost/format.hpp> 393 #include <boost/math/special_functions/round.hpp> 394 #include <boost/algorithm/string.hpp> 395diff --git a/host/lib/usrp/dboard/db_wbx_version4.cpp b/host/lib/usrp/dboard/db_wbx_version4.cpp 396index 8b3d13b37..f2976d3a7 100644 397--- a/host/lib/usrp/dboard/db_wbx_version4.cpp 398+++ b/host/lib/usrp/dboard/db_wbx_version4.cpp 399@@ -15,6 +15,7 @@ 400 401 #include <uhd/usrp/dboard_base.hpp> 402 #include <boost/assign/list_of.hpp> 403+#include <boost/bind.hpp> 404 #include <boost/format.hpp> 405 #include <boost/math/special_functions/round.hpp> 406 #include <boost/algorithm/string.hpp> 407diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp 408index 9e1c9f2b0..8f95dbb1c 100644 409--- a/host/lib/usrp/dboard/db_xcvr2450.cpp 410+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp 411@@ -49,6 +49,7 @@ 412 #include <uhd/usrp/dboard_base.hpp> 413 #include <uhd/usrp/dboard_manager.hpp> 414 #include <boost/assign/list_of.hpp> 415+#include <boost/bind.hpp> 416 #include <boost/format.hpp> 417 #include <boost/math/special_functions/round.hpp> 418 #include <utility> 419diff --git a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp 420index 73851656b..717fa144f 100644 421--- a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp 422+++ b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp 423@@ -11,6 +11,7 @@ 424 #include <uhd/rfnoc/node_ctrl_base.hpp> 425 #include <uhd/types/ranges.hpp> 426 #include <boost/algorithm/string.hpp> 427+#include <boost/bind.hpp> 428 #include <boost/make_shared.hpp> 429 #include <boost/date_time/posix_time/posix_time_io.hpp> 430 #include <boost/format.hpp> 431diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp 432index 49ffec698..13cb03cf9 100644 433--- a/host/lib/usrp/multi_usrp.cpp 434+++ b/host/lib/usrp/multi_usrp.cpp 435@@ -21,6 +21,7 @@ 436 #include <uhdlib/usrp/gpio_defs.hpp> 437 #include <uhdlib/rfnoc/legacy_compat.hpp> 438 #include <boost/assign/list_of.hpp> 439+#include <boost/bind.hpp> 440 #include <boost/format.hpp> 441 #include <boost/algorithm/string.hpp> 442 #include <algorithm> 443diff --git a/host/lib/usrp/n230/n230_resource_manager.cpp b/host/lib/usrp/n230/n230_resource_manager.cpp 444index 22f8ddedb..df3c9fb15 100644 445--- a/host/lib/usrp/n230/n230_resource_manager.cpp 446+++ b/host/lib/usrp/n230/n230_resource_manager.cpp 447@@ -14,6 +14,7 @@ 448 #include <uhd/utils/log.hpp> 449 #include <uhd/utils/platform.hpp> 450 #include <uhd/utils/paths.hpp> 451+#include <boost/bind.hpp> 452 #include <boost/format.hpp> 453 #include <boost/functional/hash.hpp> 454 #include <boost/make_shared.hpp> 455diff --git a/host/lib/usrp/n230/n230_uart.cpp b/host/lib/usrp/n230/n230_uart.cpp 456index 8689335c8..26fafde94 100644 457--- a/host/lib/usrp/n230/n230_uart.cpp 458+++ b/host/lib/usrp/n230/n230_uart.cpp 459@@ -13,6 +13,7 @@ 460 #include <uhd/utils/log.hpp> 461 #include <uhd/types/time_spec.hpp> 462 #include <uhd/exception.hpp> 463+#include <boost/bind.hpp> 464 465 using namespace uhd; 466 using namespace uhd::transport; 467diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp 468index 7f39caf8a..9a84ee188 100644 469--- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp 470+++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp 471@@ -8,6 +8,7 @@ 472 #include "soft_time_ctrl.hpp" 473 #include <uhdlib/utils/system_time.hpp> 474 #include <uhd/utils/tasks.hpp> 475+#include <boost/bind.hpp> 476 #include <boost/make_shared.hpp> 477 #include <boost/thread/condition_variable.hpp> 478 #include <boost/date_time/posix_time/posix_time.hpp> 479diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp 480index 2134f8182..1e83ce3fc 100644 481--- a/host/lib/usrp/usrp1/usrp1_impl.cpp 482+++ b/host/lib/usrp/usrp1/usrp1_impl.cpp 483@@ -14,6 +14,7 @@ 484 #include <uhd/exception.hpp> 485 #include <uhd/utils/static.hpp> 486 #include <uhd/utils/paths.hpp> 487+#include <boost/bind.hpp> 488 #include <boost/format.hpp> 489 #include <boost/filesystem.hpp> 490 #include <boost/lexical_cast.hpp> 491diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp 492index 8d967ae15..de36379ea 100644 493--- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp 494+++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp 495@@ -17,6 +17,7 @@ 496 #include <uhdlib/usrp/common/apply_corrections.hpp> 497 #include <uhdlib/usrp/cores/gpio_atr_3000.hpp> 498 #include <boost/algorithm/string.hpp> 499+#include <boost/bind.hpp> 500 #include <boost/date_time/posix_time/posix_time_io.hpp> 501 #include <boost/make_shared.hpp> 502 #include <chrono> 503diff --git a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp 504index f3cf3f4ea..4c11788d2 100644 505--- a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp 506+++ b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp 507@@ -9,6 +9,7 @@ 508 509 #include <boost/asio.hpp> 510 #include <boost/assign.hpp> 511+#include <boost/bind.hpp> 512 #include <stdint.h> 513 #include <boost/filesystem.hpp> 514 #include <boost/format.hpp> 515diff --git a/host/lib/utils/ihex.cpp b/host/lib/utils/ihex.cpp 516index 6bb0ba9d4..7fb605627 100644 517--- a/host/lib/utils/ihex.cpp 518+++ b/host/lib/utils/ihex.cpp 519@@ -7,6 +7,7 @@ 520 521 #include <uhd/exception.hpp> 522 #include <uhdlib/utils/ihex.hpp> 523+#include <boost/bind.hpp> 524 #include <boost/format.hpp> 525 #include <boost/make_shared.hpp> 526 #include <sstream> 527diff --git a/host/lib/utils/tasks.cpp b/host/lib/utils/tasks.cpp 528index 888a5a8f1..e5195fcf1 100644 529--- a/host/lib/utils/tasks.cpp 530+++ b/host/lib/utils/tasks.cpp 531@@ -10,6 +10,7 @@ 532 #include <uhd/utils/thread.hpp> 533 #include <uhd/utils/log.hpp> 534 #include <uhd/exception.hpp> 535+#include <boost/bind.hpp> 536 #include <boost/thread/thread.hpp> 537 #include <boost/thread/barrier.hpp> 538 #include <exception> 539diff --git a/host/utils/uhd_cal_rx_iq_balance.cpp b/host/utils/uhd_cal_rx_iq_balance.cpp 540index c68c96173..3f5fa1788 100644 541--- a/host/utils/uhd_cal_rx_iq_balance.cpp 542+++ b/host/utils/uhd_cal_rx_iq_balance.cpp 543@@ -11,6 +11,7 @@ 544 #include <uhd/utils/paths.hpp> 545 #include <uhd/utils/safe_main.hpp> 546 #include <uhd/utils/thread.hpp> 547+#include <boost/bind.hpp> 548 #include <boost/format.hpp> 549 #include <boost/math/special_functions/round.hpp> 550 #include <boost/program_options.hpp> 551diff --git a/host/utils/uhd_cal_tx_dc_offset.cpp b/host/utils/uhd_cal_tx_dc_offset.cpp 552index f47b5e913..2cb65d3f5 100644 553--- a/host/utils/uhd_cal_tx_dc_offset.cpp 554+++ b/host/utils/uhd_cal_tx_dc_offset.cpp 555@@ -11,6 +11,7 @@ 556 #include <uhd/utils/paths.hpp> 557 #include <uhd/utils/safe_main.hpp> 558 #include <uhd/utils/thread.hpp> 559+#include <boost/bind.hpp> 560 #include <boost/format.hpp> 561 #include <boost/math/special_functions/round.hpp> 562 #include <boost/program_options.hpp> 563diff --git a/host/utils/uhd_cal_tx_iq_balance.cpp b/host/utils/uhd_cal_tx_iq_balance.cpp 564index 2e7229fd3..ace93462e 100644 565--- a/host/utils/uhd_cal_tx_iq_balance.cpp 566+++ b/host/utils/uhd_cal_tx_iq_balance.cpp 567@@ -8,6 +8,7 @@ 568 #include "usrp_cal_utils.hpp" 569 #include <uhd/utils/safe_main.hpp> 570 #include <uhd/utils/thread.hpp> 571+#include <boost/bind.hpp> 572 #include <boost/math/special_functions/round.hpp> 573 #include <boost/program_options.hpp> 574 #include <boost/thread/thread.hpp> 575-- 5762.26.2 577 578