Skip to content

Commit

Permalink
boost: Include bind.hpp where used, add BOOST_BIND_GLOBAL_PLACEHOLDERS
Browse files Browse the repository at this point in the history
Consists of two changes:
- Grepped for files that use boost::bind, but don't include
  boost/bind.hpp. Changed all of those to include bind.hpp
- Add BOOST_BIND_GLOBAL_PLACEHOLDERS so that Boost doesn't complain
  about using bind placeholders in the global namespace.

Background: boost/bind.hpp is a convenience header that pulls the Boost
bind placeholders into the global namespace, but that's deprecated
behaviour. For UHD 3.15, we'll keep the deprecated behaviour (modern UHD
no longer uses Boost.Bind), so this fixes build failures with modern
Boost, and related warnings.
  • Loading branch information
mbr0wn authored and michael-west committed Jul 16, 2020
1 parent bd00790 commit 13caaf0
Show file tree
Hide file tree
Showing 42 changed files with 44 additions and 0 deletions.
3 changes: 3 additions & 0 deletions host/cmake/Modules/UHDBoost.cmake
Expand Up @@ -259,6 +259,9 @@ else()
# disable Boost's use of std::experimental::string_view
# works for Boost 1.67.0 and newer & doesn't hurt older
add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
# UHD 3.15 still uses global placeholders (_1, _2, ...) from Boost which
# need to be enabled explicitly for some Boost versions
add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)

# Boost 1.70.0's find cmake scripts don't always set the expected
# return variables. Replicate the commit that fixes that issue here:
Expand Down
1 change: 1 addition & 0 deletions host/examples/network_relay.cpp
Expand Up @@ -8,6 +8,7 @@
#include <uhd/utils/safe_main.hpp>
#include <uhd/utils/thread.hpp>
#include <boost/asio.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/program_options.hpp>
#include <boost/thread/condition_variable.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/examples/rfnoc_rx_to_file.cpp
Expand Up @@ -23,6 +23,7 @@
#include <uhd/types/tune_request.hpp>
#include <uhd/utils/safe_main.hpp>
#include <uhd/utils/thread.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/program_options.hpp>
#include <chrono>
Expand Down
1 change: 1 addition & 0 deletions host/examples/test_clock_synch.cpp
Expand Up @@ -12,6 +12,7 @@
#include <uhd/usrp_clock/multi_usrp_clock.hpp>
#include <uhd/utils/safe_main.hpp>
#include <uhd/utils/thread.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/program_options.hpp>
#include <chrono>
Expand Down
1 change: 1 addition & 0 deletions host/examples/txrx_loopback_to_file.cpp
Expand Up @@ -13,6 +13,7 @@
#include <uhd/utils/static.hpp>
#include <uhd/utils/thread.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>
#include <boost/filesystem.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp
Expand Up @@ -11,6 +11,7 @@
#include <uhd/utils/log.hpp>
#include <uhdlib/rfnoc/wb_iface_adapter.hpp>
#include <uhdlib/usrp/cores/dma_fifo_core_3000.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/make_shared.hpp>
#include <boost/thread/mutex.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/rfnoc/legacy_compat.cpp
Expand Up @@ -19,6 +19,7 @@
#include <uhd/usrp/subdev_spec.hpp>
#include <uhd/utils/log.hpp>
#include <uhdlib/rfnoc/legacy_compat.hpp>
#include <boost/bind.hpp>
#include <boost/make_shared.hpp>
#include <set>

Expand Down
1 change: 1 addition & 0 deletions host/lib/transport/xport_benchmarker.cpp
Expand Up @@ -6,6 +6,7 @@
//

#include "xport_benchmarker.hpp"
#include <boost/bind.hpp>
#include <chrono>
#include <thread>

Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/b100/b100_impl.cpp
Expand Up @@ -15,6 +15,7 @@
#include <uhd/utils/safe_call.hpp>
#include <uhd/utils/static.hpp>
#include <uhdlib/usrp/common/apply_corrections.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <chrono>
#include <cstdio>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/b200/b200_iface.cpp
Expand Up @@ -12,6 +12,7 @@
#include <uhdlib/utils/ihex.hpp>
#include <libusb.h>
#include <stdint.h>
#include <boost/bind.hpp>
#include <boost/filesystem.hpp>
#include <boost/format.hpp>
#include <boost/functional/hash.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/b200/b200_impl.cpp
Expand Up @@ -17,6 +17,7 @@
#include <uhd/utils/paths.hpp>
#include <uhd/utils/safe_call.hpp>
#include <uhd/utils/static.hpp>
#include <boost/bind.hpp>
#include <boost/filesystem.hpp>
#include <boost/format.hpp>
#include <boost/functional/hash.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/cores/rx_dsp_core_3000.cpp
Expand Up @@ -13,6 +13,7 @@
#include <uhdlib/usrp/cores/dsp_core_utils.hpp>
#include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/math/special_functions/round.hpp>
#include <boost/thread/thread.hpp> //thread sleep
#include <algorithm>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/cores/tx_dsp_core_3000.cpp
Expand Up @@ -12,6 +12,7 @@
#include <uhdlib/usrp/cores/dsp_core_utils.hpp>
#include <uhdlib/usrp/cores/tx_dsp_core_3000.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/math/special_functions/round.hpp>
#include <boost/thread/thread.hpp> //sleep
#include <algorithm>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_cbx.cpp
Expand Up @@ -7,6 +7,7 @@

#include "db_sbx_common.hpp"
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>
#include <boost/math/special_functions/round.hpp>

using namespace uhd;
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_dbsrx.cpp
Expand Up @@ -20,6 +20,7 @@
#include <uhd/utils/log.hpp>
#include <uhd/utils/static.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>
#include <chrono>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_dbsrx2.cpp
Expand Up @@ -18,6 +18,7 @@
#include <uhd/utils/log.hpp>
#include <uhd/utils/static.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>
#include <boost/thread.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_sbx_common.cpp
Expand Up @@ -6,6 +6,7 @@
//

#include "db_sbx_common.hpp"
#include <boost/bind.hpp>

using namespace uhd;
using namespace uhd::usrp;
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_sbx_version3.cpp
Expand Up @@ -9,6 +9,7 @@
#include "db_sbx_common.hpp"
#include <uhd/types/tune_request.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>

using namespace uhd;
using namespace uhd::usrp;
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_sbx_version4.cpp
Expand Up @@ -9,6 +9,7 @@
#include "db_sbx_common.hpp"
#include <uhd/types/tune_request.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>

using namespace uhd;
using namespace uhd::usrp;
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_tvrx.cpp
Expand Up @@ -29,6 +29,7 @@
#include <tuner_4937di5_regs.hpp>
#include <boost/array.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>
#include <boost/thread.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_tvrx2.cpp
Expand Up @@ -55,6 +55,7 @@
#include <uhd/usrp/dboard_manager.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/format.hpp>
#include <boost/bind.hpp>
#include <boost/array.hpp>
#include <boost/math/special_functions/round.hpp>
#include <utility>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_twinrx.cpp
Expand Up @@ -18,6 +18,7 @@
#include <uhd/utils/log.hpp>
#include <uhd/utils/static.hpp>
#include <uhdlib/experts/expert_factory.hpp>
#include <boost/bind.hpp>
#include <boost/make_shared.hpp>
#include <boost/thread.hpp>
#include <boost/thread/mutex.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_ubx.cpp
Expand Up @@ -20,6 +20,7 @@
#include <uhd/utils/static.hpp>
#include <uhdlib/usrp/common/max287x.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>
#include <boost/math/special_functions/round.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread/mutex.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_wbx_common.cpp
Expand Up @@ -12,6 +12,7 @@
#include <uhd/utils/algorithm.hpp>
#include <uhd/utils/assert_has.hpp>
#include <uhd/utils/log.hpp>
#include <boost/bind.hpp>

using namespace uhd;
using namespace uhd::usrp;
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_wbx_simple.cpp
Expand Up @@ -18,6 +18,7 @@
#include <uhd/utils/assert_has.hpp>
#include <uhd/utils/static.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>

using namespace uhd;
using namespace uhd::usrp;
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_wbx_version2.cpp
Expand Up @@ -16,6 +16,7 @@
#include <uhd/utils/log.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>

Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_wbx_version3.cpp
Expand Up @@ -15,6 +15,7 @@
#include <uhd/utils/log.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>

Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_wbx_version4.cpp
Expand Up @@ -15,6 +15,7 @@
#include <uhd/utils/log.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>

Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/db_xcvr2450.cpp
Expand Up @@ -51,6 +51,7 @@
#include <uhd/utils/safe_call.hpp>
#include <uhd/utils/static.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>
#include <chrono>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp
Expand Up @@ -10,6 +10,7 @@
#include <uhd/utils/log.hpp>
#include <uhd/utils/math.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
#include <boost/format.hpp>
#include <boost/make_shared.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/multi_usrp.cpp
Expand Up @@ -22,6 +22,7 @@
#include <uhdlib/usrp/gpio_defs.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <algorithm>
#include <bitset>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/n230/n230_resource_manager.cpp
Expand Up @@ -15,6 +15,7 @@
#include <uhd/utils/log.hpp>
#include <uhd/utils/paths.hpp>
#include <uhd/utils/platform.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/functional/hash.hpp>
#include <boost/make_shared.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/n230/n230_uart.cpp
Expand Up @@ -12,6 +12,7 @@
#include <uhd/types/time_spec.hpp>
#include <uhd/utils/byteswap.hpp>
#include <uhd/utils/log.hpp>
#include <boost/bind.hpp>

using namespace uhd;
using namespace uhd::transport;
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/usrp1/soft_time_ctrl.cpp
Expand Up @@ -8,6 +8,7 @@
#include "soft_time_ctrl.hpp"
#include <uhd/utils/tasks.hpp>
#include <uhdlib/utils/system_time.hpp>
#include <boost/bind.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/make_shared.hpp>
#include <boost/thread/condition_variable.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/usrp1/usrp1_impl.cpp
Expand Up @@ -13,6 +13,7 @@
#include <uhd/utils/paths.hpp>
#include <uhd/utils/safe_call.hpp>
#include <uhd/utils/static.hpp>
#include <boost/bind.hpp>
#include <boost/filesystem.hpp>
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp/x300/x300_radio_ctrl_impl.cpp
Expand Up @@ -17,6 +17,7 @@
#include <uhdlib/usrp/common/apply_corrections.hpp>
#include <uhdlib/usrp/cores/gpio_atr_3000.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
#include <boost/make_shared.hpp>
#include <bitset>
Expand Down
1 change: 1 addition & 0 deletions host/lib/usrp_clock/octoclock/octoclock_impl.cpp
Expand Up @@ -22,6 +22,7 @@
#include <stdint.h>
#include <boost/asio.hpp>
#include <boost/assign.hpp>
#include <boost/bind.hpp>
#include <boost/filesystem.hpp>
#include <boost/format.hpp>

Expand Down
1 change: 1 addition & 0 deletions host/lib/utils/ihex.cpp
Expand Up @@ -7,6 +7,7 @@

#include <uhd/exception.hpp>
#include <uhdlib/utils/ihex.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/make_shared.hpp>
#include <fstream>
Expand Down
1 change: 1 addition & 0 deletions host/lib/utils/tasks.cpp
Expand Up @@ -10,6 +10,7 @@
#include <uhd/utils/msg_task.hpp>
#include <uhd/utils/tasks.hpp>
#include <uhd/utils/thread.hpp>
#include <boost/bind.hpp>
#include <boost/thread/barrier.hpp>
#include <boost/thread/thread.hpp>
#include <atomic>
Expand Down
1 change: 1 addition & 0 deletions host/utils/uhd_cal_rx_iq_balance.cpp
Expand Up @@ -11,6 +11,7 @@
#include <uhd/utils/paths.hpp>
#include <uhd/utils/safe_main.hpp>
#include <uhd/utils/thread.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>
#include <boost/program_options.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/utils/uhd_cal_tx_dc_offset.cpp
Expand Up @@ -11,6 +11,7 @@
#include <uhd/utils/paths.hpp>
#include <uhd/utils/safe_main.hpp>
#include <uhd/utils/thread.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/math/special_functions/round.hpp>
#include <boost/program_options.hpp>
Expand Down
1 change: 1 addition & 0 deletions host/utils/uhd_cal_tx_iq_balance.cpp
Expand Up @@ -8,6 +8,7 @@
#include "usrp_cal_utils.hpp"
#include <uhd/utils/safe_main.hpp>
#include <uhd/utils/thread.hpp>
#include <boost/bind.hpp>
#include <boost/math/special_functions/round.hpp>
#include <boost/program_options.hpp>
#include <boost/thread/thread.hpp>
Expand Down

0 comments on commit 13caaf0

Please sign in to comment.