Merge branch 'fix-boost173' into next

2025-10-31 15:23:04 +00:00 · 2020-05-18 23:51:54 +02:00
parent a73e08c017 76c8239045
commit 0e5202632f
52 changed files with 287 additions and 6 deletions
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -30,6 +30,7 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades <carles.fernandez@cttc
 - Make use of `std::span` if the compiler supports it, and use gsl-lite as a
  fallback. The latter has been updated to version
  [0.37.0](https://github.com/gsl-lite/gsl-lite/releases/tag/0.37.0).
+- Fixes building against Boost 1.73 in old compilers (_e.g._, GCC 4.x).

 ### Improvements in Reliability:

--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -77,6 +77,13 @@ if(Boost_VERSION_STRING VERSION_LESS 1.58.0)
    target_compile_definitions(pvt_gr_blocks PRIVATE -DOLD_BOOST=1)
 endif()

+if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+    target_compile_definitions(pvt_gr_blocks
+        PRIVATE
+            -DBOOST_173_OR_GREATER=1
+    )
+endif()
+
 # Check if we have std::put_time (Workaround for gcc < 5.0)
 include(CheckCXXSourceCompiles)
 check_cxx_source_compiles("
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
@@ -193,8 +193,12 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels,
    this->set_msg_handler(pmt::mp("telemetry"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_telemetry(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&rtklib_pvt_gs::msg_handler_telemetry, this, boost::placeholders::_1));
 #else
        boost::bind(&rtklib_pvt_gs::msg_handler_telemetry, this, _1));
+#endif
 #endif
    // initialize kml_printer
    std::string kml_dump_filename;
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -62,6 +62,13 @@ else()
    )
 endif()

+if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+    target_compile_definitions(channel_libs
+        PRIVATE
+            -DBOOST_173_OR_GREATER=1
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
    if(CLANG_TIDY_EXE)
        set_target_properties(channel_libs
--- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc
+++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc
@@ -43,8 +43,12 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr<ChannelFsm> cha
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, _1));
+#endif
 #endif

    d_channel_fsm = std::move(channel_fsm);
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -68,6 +68,13 @@ else()
    )
 endif()

+if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+    target_compile_definitions(obs_gr_blocks
+        PRIVATE
+            -DBOOST_173_OR_GREATER=1
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
    if(CLANG_TIDY_EXE)
        set_target_properties(obs_gr_blocks
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
@@ -75,8 +75,12 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block(
    this->set_msg_handler(pmt::mp("pvt_to_observables"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_pvt_to_observables(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&hybrid_observables_gs::msg_handler_pvt_to_observables, this, boost::placeholders::_1));
 #else
        boost::bind(&hybrid_observables_gs::msg_handler_pvt_to_observables, this, _1));
+#endif
 #endif
    // Send Channel status to gnss_flowgraph
    this->message_port_register_out(pmt::mp("status"));
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -130,6 +130,13 @@ else()
    )
 endif()

+if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+    target_compile_definitions(tracking_gr_blocks
+        PRIVATE
+            -DBOOST_173_OR_GREATER=1
+    )
+endif()
+
 if(has_span)
    target_compile_definitions(tracking_gr_blocks
        PUBLIC -DHAS_STD_SPAN=1
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -100,8 +100,12 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
        pmt::mp("telemetry_to_trk"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_telemetry_to_trk(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&dll_pll_veml_tracking::msg_handler_telemetry_to_trk, this, boost::placeholders::_1));
 #else
        boost::bind(&dll_pll_veml_tracking::msg_handler_telemetry_to_trk, this, _1));
+#endif
 #endif

    // initialize internal vars
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
@@ -90,8 +90,12 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
    this->set_msg_handler(pmt::mp("telemetry_to_trk"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_telemetry_to_trk(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&dll_pll_veml_tracking_fpga::msg_handler_telemetry_to_trk, this, boost::placeholders::_1));
 #else
        boost::bind(&dll_pll_veml_tracking_fpga::msg_handler_telemetry_to_trk, this, _1));
+#endif
 #endif
    // initialize internal vars
    d_dll_filt_history.set_capacity(1000);
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -114,8 +114,12 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc
    this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, boost::placeholders::_1));
 #else
        boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, _1));
+#endif
 #endif
    this->message_port_register_out(pmt::mp("events"));
    this->message_port_register_in(pmt::mp("telemetry_to_trk"));
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -111,8 +111,12 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc::glonass_l1_ca_dll_pll_c_aid_tracking_sc
    this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, boost::placeholders::_1));
 #else
        boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, _1));
+#endif
 #endif
    this->message_port_register_out(pmt::mp("events"));
    this->message_port_register_in(pmt::mp("telemetry_to_trk"));
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -44,6 +44,11 @@
 #include <utility>
 #include <vector>

+#if HAS_GENERIC_LAMBDA
+#else
+#include <boost/bind.hpp>
+#endif
+
 #define CN0_ESTIMATION_SAMPLES 10


@@ -106,8 +111,12 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc
    this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, boost::placeholders::_1));
 #else
        boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, _1));
+#endif
 #endif
    this->message_port_register_out(pmt::mp("events"));
    this->message_port_register_in(pmt::mp("telemetry_to_trk"));
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
@@ -43,6 +43,11 @@
 #include <utility>
 #include <vector>

+#if HAS_GENERIC_LAMBDA
+#else
+#include <boost/bind.hpp>
+#endif
+
 #define CN0_ESTIMATION_SAMPLES 10


@@ -104,8 +109,12 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc::glonass_l2_ca_dll_pll_c_aid_tracking_sc
    this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, boost::placeholders::_1));
 #else
        boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, _1));
+#endif
 #endif
    this->message_port_register_out(pmt::mp("events"));
    this->message_port_register_in(pmt::mp("telemetry_to_trk"));
--- a/src/core/libs/CMakeLists.txt
+++ b/src/core/libs/CMakeLists.txt
@@ -86,6 +86,13 @@ else()
    )
 endif()

+if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+    target_compile_definitions(core_libs
+        PRIVATE
+            -DBOOST_173_OR_GREATER=1
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
    if(CLANG_TIDY_EXE)
        set_target_properties(core_libs
--- a/src/core/libs/channel_status_msg_receiver.cc
+++ b/src/core/libs/channel_status_msg_receiver.cc
@@ -20,13 +20,17 @@

 #include "channel_status_msg_receiver.h"
 #include <boost/any.hpp>
-#include <boost/bind.hpp>
 #include <glog/logging.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
 #include <cstdint>
 #include <utility>

+#if HAS_GENERIC_LAMBDA
+#else
+#include <boost/bind.hpp>
+#endif
+

 channel_status_msg_receiver_sptr channel_status_msg_receiver_make()
 {
@@ -40,8 +44,12 @@ channel_status_msg_receiver::channel_status_msg_receiver() : gr::block("channel_
    this->set_msg_handler(pmt::mp("status"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&channel_status_msg_receiver::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&channel_status_msg_receiver::msg_handler_events, this, _1));
+#endif
 #endif
    d_pvt_status.RX_time = -1;  // to indicate that the PVT is not available
 }
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -556,6 +556,12 @@ if(ENABLE_UNIT_TESTING)
                -DHAS_GENERIC_LAMBDA=0
        )
    endif()
+    if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+        target_compile_definitions(run_tests
+            PRIVATE
+                -DBOOST_173_OR_GREATER=1
+        )
+    endif()
 endif()

 if(ENABLE_FPGA)
@@ -942,7 +948,12 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
                -DHAS_GENERIC_LAMBDA=0
        )
    endif()
-
+    if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+        target_compile_definitions(acq_test
+            PRIVATE
+                -DBOOST_173_OR_GREATER=1
+        )
+    endif()
    set_property(TEST acq_test PROPERTY TIMEOUT 30)
 endif()

@@ -1008,6 +1019,12 @@ if(NOT ENABLE_PACKAGING AND NOT ENABLE_FPGA)
                -DHAS_GENERIC_LAMBDA=0
        )
    endif()
+    if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+        target_compile_definitions(trk_test
+            PRIVATE
+                -DBOOST_173_OR_GREATER=1
+        )
+    endif()

    add_test(trk_test trk_test)

--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
@@ -160,8 +160,12 @@ AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc
@@ -113,8 +113,12 @@ BeidouB1iPcpsAcquisitionTest_msg_rx::BeidouB1iPcpsAcquisitionTest_msg_rx() : gr:
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc
@@ -113,8 +113,12 @@ BeidouB3iPcpsAcquisitionTest_msg_rx::BeidouB3iPcpsAcquisitionTest_msg_rx() : gr:
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
@@ -106,8 +106,12 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguo
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
@@ -104,8 +104,12 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcqu
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
@@ -113,8 +113,12 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisit
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -125,8 +125,12 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionT
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
@@ -107,8 +107,12 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguous
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
@@ -109,8 +109,12 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -104,8 +104,12 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbig
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -100,8 +100,12 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisition
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
@@ -106,8 +106,12 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC201
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
@@ -99,8 +99,12 @@ GlonassL1CaPcpsAcquisitionTest_msg_rx::GlonassL1CaPcpsAcquisitionTest_msg_rx() :
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc
@@ -104,8 +104,12 @@ GlonassL2CaPcpsAcquisitionTest_msg_rx::GlonassL2CaPcpsAcquisitionTest_msg_rx(con
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
@@ -107,8 +107,12 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_ms
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -123,8 +123,12 @@ GpsL1CaPcpsAcquisitionTest_msg_rx::GpsL1CaPcpsAcquisitionTest_msg_rx() : gr::blo
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
@@ -102,8 +102,12 @@ GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsOpenClAcquisitionGSo
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
@@ -107,8 +107,12 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisit
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
@@ -104,8 +104,12 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC201
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
@@ -115,8 +115,12 @@ GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() : gr::block
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
@@ -54,6 +54,13 @@ else()
    )
 endif()

+if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+    target_compile_definitions(signal_processing_testing_lib
+        PRIVATE
+            -DBOOST_173_OR_GREATER=1
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
    if(CLANG_TIDY_EXE)
        set_target_properties(signal_processing_testing_lib
--- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc
@@ -57,8 +57,12 @@ Acquisition_msg_rx::Acquisition_msg_rx() : gr::block("Acquisition_msg_rx", gr::i
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&Acquisition_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&Acquisition_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
@@ -97,8 +97,10 @@ using HybridObservablesTest_msg_rx_sptr = std::shared_ptr<HybridObservablesTest_
 using HybridObservablesTest_msg_rx_sptr = boost::shared_ptr<HybridObservablesTest_msg_rx>;
 #endif

+
 HybridObservablesTest_msg_rx_sptr HybridObservablesTest_msg_rx_make();

+
 class HybridObservablesTest_msg_rx : public gr::block
 {
 private:
@@ -111,11 +113,13 @@ public:
    ~HybridObservablesTest_msg_rx();  //!< Default destructor
 };

+
 HybridObservablesTest_msg_rx_sptr HybridObservablesTest_msg_rx_make()
 {
    return HybridObservablesTest_msg_rx_sptr(new HybridObservablesTest_msg_rx());
 }

+
 void HybridObservablesTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
    try
@@ -130,18 +134,24 @@ void HybridObservablesTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
        }
 }

+
 HybridObservablesTest_msg_rx::HybridObservablesTest_msg_rx() : gr::block("HybridObservablesTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
 {
    this->message_port_register_in(pmt::mp("events"));
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&HybridObservablesTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&HybridObservablesTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }

+
 HybridObservablesTest_msg_rx::~HybridObservablesTest_msg_rx() = default;


@@ -150,10 +160,13 @@ HybridObservablesTest_msg_rx::~HybridObservablesTest_msg_rx() = default;
 // ######## GNURADIO BLOCK MESSAGE RECEVER FOR TLM MESSAGES #########
 class HybridObservablesTest_tlm_msg_rx;

+
 using HybridObservablesTest_tlm_msg_rx_sptr = std::shared_ptr<HybridObservablesTest_tlm_msg_rx>;

+
 HybridObservablesTest_tlm_msg_rx_sptr HybridObservablesTest_tlm_msg_rx_make();

+
 class HybridObservablesTest_tlm_msg_rx : public gr::block
 {
 private:
@@ -194,8 +207,12 @@ HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
@@ -206,7 +223,6 @@ HybridObservablesTest_tlm_msg_rx::~HybridObservablesTest_tlm_msg_rx() = default;

 // ###########################################################

-
 class HybridObservablesTest : public ::testing::Test
 {
 public:
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
@@ -109,11 +109,13 @@ public:
    ~HybridObservablesTest_msg_rx_Fpga();  //!< Default destructor
 };

+
 HybridObservablesTest_msg_rx_Fpga_sptr HybridObservablesTest_msg_rx_Fpga_make()
 {
    return HybridObservablesTest_msg_rx_Fpga_sptr(new HybridObservablesTest_msg_rx_Fpga());
 }

+
 void HybridObservablesTest_msg_rx_Fpga::msg_handler_events(pmt::pmt_t msg)
 {
    try
@@ -128,27 +130,36 @@ void HybridObservablesTest_msg_rx_Fpga::msg_handler_events(pmt::pmt_t msg)
        }
 }

+
 HybridObservablesTest_msg_rx_Fpga::HybridObservablesTest_msg_rx_Fpga() : gr::block("HybridObservablesTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
 {
    this->message_port_register_in(pmt::mp("events"));
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }

+
 HybridObservablesTest_msg_rx_Fpga::~HybridObservablesTest_msg_rx_Fpga() = default;


 class HybridObservablesTest_tlm_msg_rx_Fpga;

+
 using HybridObservablesTest_tlm_msg_rx_Fpga_sptr = std::shared_ptr<HybridObservablesTest_tlm_msg_rx_Fpga>;

+
 HybridObservablesTest_tlm_msg_rx_Fpga_sptr HybridObservablesTest_tlm_msg_rx_Fpga_make();

+
 class HybridObservablesTest_tlm_msg_rx_Fpga : public gr::block
 {
 private:
@@ -161,11 +172,13 @@ public:
    ~HybridObservablesTest_tlm_msg_rx_Fpga();  //!< Default destructor
 };

+
 HybridObservablesTest_tlm_msg_rx_Fpga_sptr HybridObservablesTest_tlm_msg_rx_Fpga_make()
 {
    return HybridObservablesTest_tlm_msg_rx_Fpga_sptr(new HybridObservablesTest_tlm_msg_rx_Fpga());
 }

+
 void HybridObservablesTest_tlm_msg_rx_Fpga::msg_handler_events(pmt::pmt_t msg)
 {
    try
@@ -180,15 +193,18 @@ void HybridObservablesTest_tlm_msg_rx_Fpga::msg_handler_events(pmt::pmt_t msg)
        }
 }

+
 HybridObservablesTest_tlm_msg_rx_Fpga::HybridObservablesTest_tlm_msg_rx_Fpga() : gr::block("HybridObservablesTest_tlm_msg_rx_Fpga", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
 {
    this->message_port_register_in(pmt::mp("events"));
-    this->set_msg_handler(pmt::mp("events"), boost::bind(&HybridObservablesTest_tlm_msg_rx_Fpga::msg_handler_events, this, _1));
+    this->set_msg_handler(pmt::mp("events"), boost::bind(&HybridObservablesTest_tlm_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1));
    rx_message = 0;
 }

+
 HybridObservablesTest_tlm_msg_rx_Fpga::~HybridObservablesTest_tlm_msg_rx_Fpga() = default;

+
 class HybridObservablesTestFpga : public ::testing::Test
 {
 public:
@@ -281,6 +297,7 @@ public:
    static constexpr float DMA_SIGNAL_SCALING_FACTOR = 8.0;
 };

+
 int HybridObservablesTestFpga::configure_generator()
 {
    // Configure signal generator
@@ -326,6 +343,7 @@ int HybridObservablesTestFpga::generate_signal()
    return 0;
 }

+
 struct DMA_handler_args_obs_test
 {
    std::string file;
@@ -335,11 +353,13 @@ struct DMA_handler_args_obs_test
    float scaling_factor;
 };

+
 struct acquisition_handler_args_obs_test
 {
    std::shared_ptr<AcquisitionInterface> acquisition;
 };

+
 void* handler_acquisition_obs_test(void* arguments)
 {
    // the acquisition is a blocking function so we have to
@@ -349,6 +369,7 @@ void* handler_acquisition_obs_test(void* arguments)
    return nullptr;
 }

+
 void* handler_DMA_obs_test(void* arguments)
 {
    const int MAX_INPUT_SAMPLES_TOTAL = 16384;
@@ -2091,7 +2112,6 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults)
                }
        }

-
    // read measured values
    Observables_Dump_Reader estimated_observables(tracking_ch_vec.size());
    ASSERT_NO_THROW({
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
@@ -109,8 +109,12 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
@@ -166,7 +170,7 @@ GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::GpsL1CADllPllTelemetryDecoderTest_
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
 #else
-        boost::bind(&GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_events, this, _1));
+        boost::bind(&GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
@@ -88,8 +88,12 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx::GlonassL1CaDllPllCAidTrackingTest_msg_
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
@@ -95,8 +95,12 @@ GlonassL1CaDllPllTrackingTest_msg_rx::GlonassL1CaDllPllTrackingTest_msg_rx() : g
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
@@ -125,8 +125,12 @@ GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx() : gr::block
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
@@ -212,8 +212,12 @@ GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() : g
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
@@ -126,8 +126,12 @@ GpsL1CAKfTrackingTest_msg_rx::GpsL1CAKfTrackingTest_msg_rx() : gr::block("GpsL1C
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc
@@ -102,8 +102,12 @@ GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() : gr::block("
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
@@ -141,8 +141,12 @@ TrackingPullInTest_msg_rx::TrackingPullInTest_msg_rx() : gr::block("TrackingPull
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&TrackingPullInTest_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&TrackingPullInTest_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
@@ -139,8 +139,12 @@ TrackingPullInTest_msg_rx_Fpga::TrackingPullInTest_msg_rx_Fpga() : gr::block("Tr
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -91,6 +91,13 @@ else()
    )
 endif()

+if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
+    target_compile_definitions(front-end-cal
+        PRIVATE
+            -DBOOST_173_OR_GREATER=1
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
    if(CLANG_TIDY_EXE)
        set_target_properties(front-end-cal
--- a/src/utils/front-end-cal/main.cc
+++ b/src/utils/front-end-cal/main.cc
@@ -149,8 +149,12 @@ FrontEndCal_msg_rx::FrontEndCal_msg_rx() : gr::block("FrontEndCal_msg_rx", gr::i
    this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
+#else
+#if BOOST_173_OR_GREATER
+        boost::bind(&FrontEndCal_msg_rx::msg_handler_events, this, boost::placeholders::_1));
 #else
        boost::bind(&FrontEndCal_msg_rx::msg_handler_events, this, _1));
+#endif
 #endif
    rx_message = 0;
 }