From b408a2ef29ded4fe720f341019abd6e8fd901b15 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 18 May 2020 18:58:39 +0200 Subject: [PATCH 1/5] Fix for Boost 1.73: qualify placeholders with their full namespace --- src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 2 +- src/algorithms/channel/libs/channel_msg_receiver_cc.cc | 2 +- .../observables/gnuradio_blocks/hybrid_observables_gs.cc | 2 +- .../tracking/gnuradio_blocks/dll_pll_veml_tracking.cc | 2 +- .../gnuradio_blocks/dll_pll_veml_tracking_fpga.cc | 2 +- .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc | 2 +- .../glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc | 2 +- .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc | 7 ++++++- .../glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc | 7 ++++++- src/core/libs/channel_status_msg_receiver.cc | 8 ++++++-- .../acquisition/acq_performance_test.cc | 2 +- .../acquisition/beidou_b1i_pcps_acquisition_test.cc | 2 +- .../acquisition/beidou_b3i_pcps_acquisition_test.cc | 2 +- ...leo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 2 +- ...galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 2 +- .../galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc | 2 +- .../galileo_e1_pcps_ambiguous_acquisition_test.cc | 2 +- ..._e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 2 +- ..._pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc | 2 +- ...eo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc | 2 +- ...alileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 2 +- .../glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc | 2 +- .../acquisition/glonass_l1_ca_pcps_acquisition_test.cc | 2 +- .../acquisition/glonass_l2_ca_pcps_acquisition_test.cc | 2 +- .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 2 +- .../acquisition/gps_l1_ca_pcps_acquisition_test.cc | 2 +- .../gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc | 2 +- .../gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 2 +- .../gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 2 +- .../acquisition/gps_l2_m_pcps_acquisition_test.cc | 2 +- .../signal-processing-blocks/libs/acquisition_msg_rx.cc | 2 +- .../observables/hybrid_observables_test.cc | 4 ++-- .../observables/hybrid_observables_test_fpga.cc | 4 ++-- .../telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc | 4 ++-- .../tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc | 2 +- .../tracking/glonass_l1_ca_dll_pll_tracking_test.cc | 2 +- .../tracking/gps_l1_ca_dll_pll_tracking_test.cc | 2 +- .../tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc | 2 +- .../tracking/gps_l1_ca_kf_tracking_test.cc | 2 +- .../tracking/gps_l2_m_dll_pll_tracking_test.cc | 2 +- .../tracking/tracking_pull-in_test.cc | 2 +- .../tracking/tracking_pull-in_test_fpga.cc | 2 +- src/utils/front-end-cal/main.cc | 2 +- 43 files changed, 61 insertions(+), 47 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index 651bba54c..72b72050f 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -194,7 +194,7 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels, #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_telemetry(PH1); }); #else - boost::bind(&rtklib_pvt_gs::msg_handler_telemetry, this, _1)); + boost::bind(&rtklib_pvt_gs::msg_handler_telemetry, this, boost::placeholders::_1)); #endif // initialize kml_printer std::string kml_dump_filename; diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index 859db4f1c..55076ac23 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -44,7 +44,7 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr cha #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, _1)); + boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, boost::placeholders::_1)); #endif d_channel_fsm = std::move(channel_fsm); diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index b97e15cc6..73d7842b0 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -76,7 +76,7 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block( #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_pvt_to_observables(PH1); }); #else - boost::bind(&hybrid_observables_gs::msg_handler_pvt_to_observables, this, _1)); + boost::bind(&hybrid_observables_gs::msg_handler_pvt_to_observables, this, boost::placeholders::_1)); #endif // Send Channel status to gnss_flowgraph this->message_port_register_out(pmt::mp("status")); diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index 0c316ca69..8163267e8 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -101,7 +101,7 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_telemetry_to_trk(PH1); }); #else - boost::bind(&dll_pll_veml_tracking::msg_handler_telemetry_to_trk, this, _1)); + boost::bind(&dll_pll_veml_tracking::msg_handler_telemetry_to_trk, this, boost::placeholders::_1)); #endif // initialize internal vars diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index 12f43e109..bbc4414e7 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc @@ -91,7 +91,7 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga & #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_telemetry_to_trk(PH1); }); #else - boost::bind(&dll_pll_veml_tracking_fpga::msg_handler_telemetry_to_trk, this, _1)); + boost::bind(&dll_pll_veml_tracking_fpga::msg_handler_telemetry_to_trk, this, boost::placeholders::_1)); #endif // initialize internal vars d_dll_filt_history.set_capacity(1000); diff --git 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 index 4e1d41aaa..9b5d84802 100644 --- 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 @@ -115,7 +115,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); }); #else - boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, _1)); + boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, boost::placeholders::_1)); #endif this->message_port_register_out(pmt::mp("events")); this->message_port_register_in(pmt::mp("telemetry_to_trk")); diff --git 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 index 1095b2a75..ac9efed8e 100644 --- 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 @@ -112,7 +112,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc::glonass_l1_ca_dll_pll_c_aid_tracking_sc #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); }); #else - boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, _1)); + boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, boost::placeholders::_1)); #endif this->message_port_register_out(pmt::mp("events")); this->message_port_register_in(pmt::mp("telemetry_to_trk")); diff --git 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 index 89bf850be..59bb2627d 100644 --- 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 #include +#if HAS_GENERIC_LAMBDA +#else +#include +#endif + #define CN0_ESTIMATION_SAMPLES 10 @@ -107,7 +112,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); }); #else - boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, _1)); + boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, boost::placeholders::_1)); #endif this->message_port_register_out(pmt::mp("events")); this->message_port_register_in(pmt::mp("telemetry_to_trk")); diff --git 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 index e12ecf3ec..c640680f3 100644 --- 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 #include +#if HAS_GENERIC_LAMBDA +#else +#include +#endif + #define CN0_ESTIMATION_SAMPLES 10 @@ -105,7 +110,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc::glonass_l2_ca_dll_pll_c_aid_tracking_sc #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); }); #else - boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, _1)); + boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, boost::placeholders::_1)); #endif this->message_port_register_out(pmt::mp("events")); this->message_port_register_in(pmt::mp("telemetry_to_trk")); diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc index db275750f..8328dc5ff 100644 --- 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 -#include #include #include #include #include #include +#if HAS_GENERIC_LAMBDA +#else +#include +#endif + channel_status_msg_receiver_sptr channel_status_msg_receiver_make() { @@ -41,7 +45,7 @@ channel_status_msg_receiver::channel_status_msg_receiver() : gr::block("channel_ #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&channel_status_msg_receiver::msg_handler_events, this, _1)); + boost::bind(&channel_status_msg_receiver::msg_handler_events, this, boost::placeholders::_1)); #endif d_pvt_status.RX_time = -1; // to indicate that the PVT is not available } diff --git 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 index cd270acad..03de9f9d2 100644 --- 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 @@ -161,7 +161,7 @@ AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(Concurrent_Queue& queue) : gr::block #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index eec214726..c3f8e041d 100644 --- 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 @@ -114,7 +114,7 @@ BeidouB1iPcpsAcquisitionTest_msg_rx::BeidouB1iPcpsAcquisitionTest_msg_rx() : gr: #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); #else - boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&BeidouB1iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 6461b99de..b2dcf9743 100644 --- 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 @@ -114,7 +114,7 @@ BeidouB3iPcpsAcquisitionTest_msg_rx::BeidouB3iPcpsAcquisitionTest_msg_rx() : gr: #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); #else - boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&BeidouB3iPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index c34c6a287..74270618f 100644 --- 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 @@ -107,7 +107,7 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguo #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 6ffc0acf0..37a7dfc86 100644 --- 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 @@ -105,7 +105,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcqu #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 77ec83f5b..e3e226b11 100644 --- 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 @@ -114,7 +114,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisit #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index ebcc7479d..b80198e9f 100644 --- 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 @@ -126,7 +126,7 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionT #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 1c5e6d679..fb38e6dc8 100644 --- 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 @@ -108,7 +108,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguous #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index af918931d..669a99cf4 100644 --- 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 @@ -110,7 +110,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 514361045..242100f6b 100644 --- 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 @@ -105,7 +105,7 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbig #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 701c4fcf1..9be9ce34e 100644 --- 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 @@ -101,7 +101,7 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisition #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 22b09d6f0..04e2bb733 100644 --- 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 @@ -107,7 +107,7 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC201 #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 179b56507..f6a6c0026 100644 --- 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 @@ -100,7 +100,7 @@ GlonassL1CaPcpsAcquisitionTest_msg_rx::GlonassL1CaPcpsAcquisitionTest_msg_rx() : #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 445b5ac9b..67b00f9b8 100644 --- 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 @@ -105,7 +105,7 @@ GlonassL2CaPcpsAcquisitionTest_msg_rx::GlonassL2CaPcpsAcquisitionTest_msg_rx(con #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL2CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 5dfaaa5ac..f82ab5601 100644 --- 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 @@ -108,7 +108,7 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_ms #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 127ba73a6..afd9885bc 100644 --- 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 @@ -124,7 +124,7 @@ GpsL1CaPcpsAcquisitionTest_msg_rx::GpsL1CaPcpsAcquisitionTest_msg_rx() : gr::blo #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 1b2b4d242..bead85eb7 100644 --- 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 @@ -103,7 +103,7 @@ GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsOpenClAcquisitionGSo #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 76f70abfd..47f143533 100644 --- 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 @@ -108,7 +108,7 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisit #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index bd93809c4..c08659451 100644 --- 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 @@ -105,7 +105,7 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC201 #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 58add2717..761bec211 100644 --- 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 @@ -116,7 +116,7 @@ GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() : gr::block #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index cadc0f2d2..b827701f2 100644 --- 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 @@ -58,7 +58,7 @@ Acquisition_msg_rx::Acquisition_msg_rx() : gr::block("Acquisition_msg_rx", gr::i #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&Acquisition_msg_rx::msg_handler_events, this, _1)); + boost::bind(&Acquisition_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 0a6b3c0a2..667e2631f 100644 --- 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 @@ -137,7 +137,7 @@ HybridObservablesTest_msg_rx::HybridObservablesTest_msg_rx() : gr::block("Hybrid #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&HybridObservablesTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&HybridObservablesTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } @@ -195,7 +195,7 @@ HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_events, this, _1)); + boost::bind(&HybridObservablesTest_tlm_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 9295668e6..22fc7196b 100644 --- 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 @@ -135,7 +135,7 @@ HybridObservablesTest_msg_rx_Fpga::HybridObservablesTest_msg_rx_Fpga() : gr::blo #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_events, this, _1)); + boost::bind(&HybridObservablesTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } @@ -183,7 +183,7 @@ 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; } diff --git 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 index 2f1e18b05..32ba85589 100644 --- 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 @@ -110,7 +110,7 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_ #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } @@ -166,7 +166,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; } diff --git 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 index 4ad2d9d1e..db87bcaca 100644 --- 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 @@ -89,7 +89,7 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx::GlonassL1CaDllPllCAidTrackingTest_msg_ #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 285dd40ef..52705265a 100644 --- 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 @@ -96,7 +96,7 @@ GlonassL1CaDllPllTrackingTest_msg_rx::GlonassL1CaDllPllTrackingTest_msg_rx() : g #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 9700b08fd..466b3e51d 100644 --- 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 @@ -126,7 +126,7 @@ GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx() : gr::block #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 61bd51ae8..56b0f14bf 100644 --- 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 @@ -213,7 +213,7 @@ GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() : g #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t &&PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index c6ddf8ff8..8a1038019 100644 --- 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 @@ -127,7 +127,7 @@ GpsL1CAKfTrackingTest_msg_rx::GpsL1CAKfTrackingTest_msg_rx() : gr::block("GpsL1C #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL1CAKfTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 9c950eed5..1a0d41f61 100644 --- 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 @@ -103,7 +103,7 @@ GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() : gr::block(" #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index b4bfcd237..e5c61bbb5 100644 --- 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 @@ -142,7 +142,7 @@ TrackingPullInTest_msg_rx::TrackingPullInTest_msg_rx() : gr::block("TrackingPull #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&TrackingPullInTest_msg_rx::msg_handler_events, this, _1)); + boost::bind(&TrackingPullInTest_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git 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 index 106b5ac99..cb504b816 100644 --- 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 @@ -140,7 +140,7 @@ TrackingPullInTest_msg_rx_Fpga::TrackingPullInTest_msg_rx_Fpga() : gr::block("Tr #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_events, this, _1)); + boost::bind(&TrackingPullInTest_msg_rx_Fpga::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 208e88084..5998ead85 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -150,7 +150,7 @@ FrontEndCal_msg_rx::FrontEndCal_msg_rx() : gr::block("FrontEndCal_msg_rx", gr::i #if HAS_GENERIC_LAMBDA [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); }); #else - boost::bind(&FrontEndCal_msg_rx::msg_handler_events, this, _1)); + boost::bind(&FrontEndCal_msg_rx::msg_handler_events, this, boost::placeholders::_1)); #endif rx_message = 0; } From 832c2558c6f73b03bc05b0d58473a2fcc4b00c71 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 18 May 2020 19:55:44 +0200 Subject: [PATCH 2/5] Fix for Boost < 1.60 --- src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 1 + src/algorithms/channel/libs/channel_msg_receiver_cc.cc | 1 + .../observables/gnuradio_blocks/hybrid_observables_gs.cc | 1 + .../signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc | 1 + .../signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc | 1 + src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc | 1 + .../tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc | 1 + .../gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc | 1 + .../gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc | 1 + .../gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc | 1 + .../gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc | 1 + src/core/libs/channel_status_msg_receiver.cc | 1 + .../signal-processing-blocks/acquisition/acq_performance_test.cc | 1 + .../acquisition/beidou_b1i_pcps_acquisition_test.cc | 1 + .../acquisition/beidou_b3i_pcps_acquisition_test.cc | 1 + .../galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 1 + .../galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 1 + .../galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc | 1 + .../acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc | 1 + ...galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 1 + ...ileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc | 1 + .../galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc | 1 + .../galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 1 + .../acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc | 1 + .../acquisition/glonass_l1_ca_pcps_acquisition_test.cc | 1 + .../acquisition/glonass_l2_ca_pcps_acquisition_test.cc | 1 + .../acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 1 + .../acquisition/gps_l1_ca_pcps_acquisition_test.cc | 1 + .../gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc | 1 + .../gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 1 + .../acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 1 + .../acquisition/gps_l2_m_pcps_acquisition_test.cc | 1 + .../signal-processing-blocks/libs/acquisition_msg_rx.cc | 1 + .../observables/hybrid_observables_test.cc | 1 + .../observables/hybrid_observables_test_fpga.cc | 1 + .../telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc | 1 + .../tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc | 1 + .../tracking/glonass_l1_ca_dll_pll_tracking_test.cc | 1 + .../tracking/gps_l1_ca_dll_pll_tracking_test.cc | 1 + .../tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc | 1 + .../tracking/gps_l1_ca_kf_tracking_test.cc | 1 + .../tracking/gps_l2_m_dll_pll_tracking_test.cc | 1 + .../signal-processing-blocks/tracking/tracking_pull-in_test.cc | 1 + .../tracking/tracking_pull-in_test_fpga.cc | 1 + src/utils/front-end-cal/main.cc | 1 + 45 files changed, 45 insertions(+) diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index 72b72050f..b85ac0061 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -77,6 +77,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #if HAS_STD_FILESYSTEM diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index 55076ac23..0340e7376 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -29,6 +29,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr channel_fsm, bool repeat) diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index 73d7842b0..2308b5566 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -38,6 +38,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #if HAS_STD_FILESYSTEM diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc index b37350d15..0403ab4f9 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc @@ -27,6 +27,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif const int FIFO_SIZE = 1472000; diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc index 9b97034dd..a8d50e94a 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc @@ -22,6 +22,7 @@ #include "rtl_tcp_signal_source_c.h" #include "rtl_tcp_commands.h" #include +#include #include #include #include diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index 8163267e8..b22974afc 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -62,6 +62,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #if HAS_STD_FILESYSTEM diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index bbc4414e7..69473748d 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc @@ -53,6 +53,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #if HAS_STD_FILESYSTEM diff --git 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 index 9b5d84802..9684566bd 100644 --- 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 @@ -50,6 +50,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #define CN0_ESTIMATION_SAMPLES 10 diff --git 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 index ac9efed8e..0dfd5c27e 100644 --- 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 @@ -48,6 +48,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif diff --git 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 index 59bb2627d..8045cec41 100644 --- 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 @@ -47,6 +47,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #define CN0_ESTIMATION_SAMPLES 10 diff --git 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 index c640680f3..e2388beec 100644 --- 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 @@ -46,6 +46,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #define CN0_ESTIMATION_SAMPLES 10 diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc index 8328dc5ff..c1c0d0f19 100644 --- a/src/core/libs/channel_status_msg_receiver.cc +++ b/src/core/libs/channel_status_msg_receiver.cc @@ -29,6 +29,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif diff --git 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 index 03de9f9d2..c4806dc4c 100644 --- 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 @@ -53,6 +53,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #if HAS_STD_FILESYSTEM diff --git 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 index c3f8e041d..704f7f768 100644 --- 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 @@ -45,6 +45,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 diff --git 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 index b2dcf9743..400aea270 100644 --- 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 @@ -45,6 +45,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 diff --git 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 index 74270618f..9cd28f05a 100644 --- 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 @@ -41,6 +41,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 37a7dfc86..ab83d6f9b 100644 --- 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 @@ -39,6 +39,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index e3e226b11..5bc61c840 100644 --- 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 @@ -49,6 +49,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index b80198e9f..2ebaba189 100644 --- 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 @@ -46,6 +46,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 diff --git 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 index fb38e6dc8..2e8afb2fa 100644 --- 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 @@ -42,6 +42,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 669a99cf4..ee9b043d0 100644 --- 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 @@ -44,6 +44,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 242100f6b..02864f2e0 100644 --- 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 @@ -43,6 +43,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 9be9ce34e..3e07cc075 100644 --- 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 @@ -39,6 +39,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 04e2bb733..4d1b0a978 100644 --- 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 @@ -45,6 +45,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index f6a6c0026..9ceccc3d2 100644 --- 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 @@ -40,6 +40,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 67b00f9b8..303a1dbf5 100644 --- 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 @@ -43,6 +43,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index f82ab5601..92702c647 100644 --- 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 @@ -45,6 +45,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index afd9885bc..de3f3c754 100644 --- 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 @@ -43,6 +43,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 diff --git 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 index bead85eb7..c635dd287 100644 --- 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 @@ -41,6 +41,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 47f143533..9f888fe99 100644 --- 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 @@ -42,6 +42,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index c08659451..f10efcf0c 100644 --- 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 @@ -43,6 +43,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 761bec211..aa39597e3 100644 --- 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 @@ -45,6 +45,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 diff --git 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 index b827701f2..1c39d6ccf 100644 --- 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 @@ -27,6 +27,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif Acquisition_msg_rx_sptr Acquisition_msg_rx_make() diff --git 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 index 667e2631f..727eb3ab3 100644 --- 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 @@ -75,6 +75,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 22fc7196b..1776e3b8d 100644 --- 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 @@ -75,6 +75,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 32ba85589..b9ea0c326 100644 --- 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 @@ -53,6 +53,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #if GNURADIO_USES_STD_POINTERS #include diff --git 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 index db87bcaca..eddf0a0ae 100644 --- 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 @@ -38,6 +38,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif // ######## GNURADIO BLOCK MESSAGE RECEVER ######### diff --git 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 index 52705265a..75c0db1e3 100644 --- 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 @@ -39,6 +39,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 466b3e51d..7225aaaf6 100644 --- 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 @@ -46,6 +46,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 diff --git 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 index 56b0f14bf..3aa6b160a 100644 --- 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 @@ -51,6 +51,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 8a1038019..efe07d78a 100644 --- 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 @@ -45,6 +45,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 diff --git 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 index 1a0d41f61..8c78439c2 100644 --- 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 @@ -39,6 +39,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index e5c61bbb5..128ec4359 100644 --- 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 @@ -61,6 +61,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 diff --git 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 index cb504b816..0fba369b3 100644 --- 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 @@ -60,6 +60,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #ifdef GR_GREATER_38 diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 5998ead85..380d7c376 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -72,6 +72,7 @@ #if HAS_GENERIC_LAMBDA #else #include +#include #endif #if HAS_STD_FILESYSTEM From 1077970962924cee77befa02f8c93f0b059b654b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 18 May 2020 21:36:22 +0200 Subject: [PATCH 3/5] Revert "Fix for Boost < 1.60" This reverts commit 832c2558c6f73b03bc05b0d58473a2fcc4b00c71. --- src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 1 - src/algorithms/channel/libs/channel_msg_receiver_cc.cc | 1 - .../observables/gnuradio_blocks/hybrid_observables_gs.cc | 1 - .../signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc | 1 - .../signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc | 1 - src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc | 1 - .../tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc | 1 - .../gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc | 1 - .../gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc | 1 - .../gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc | 1 - .../gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc | 1 - src/core/libs/channel_status_msg_receiver.cc | 1 - .../signal-processing-blocks/acquisition/acq_performance_test.cc | 1 - .../acquisition/beidou_b1i_pcps_acquisition_test.cc | 1 - .../acquisition/beidou_b3i_pcps_acquisition_test.cc | 1 - .../galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 1 - .../galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 1 - .../galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc | 1 - .../acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc | 1 - ...galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 1 - ...ileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc | 1 - .../galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc | 1 - .../galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 1 - .../acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc | 1 - .../acquisition/glonass_l1_ca_pcps_acquisition_test.cc | 1 - .../acquisition/glonass_l2_ca_pcps_acquisition_test.cc | 1 - .../acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 1 - .../acquisition/gps_l1_ca_pcps_acquisition_test.cc | 1 - .../gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc | 1 - .../gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 1 - .../acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 1 - .../acquisition/gps_l2_m_pcps_acquisition_test.cc | 1 - .../signal-processing-blocks/libs/acquisition_msg_rx.cc | 1 - .../observables/hybrid_observables_test.cc | 1 - .../observables/hybrid_observables_test_fpga.cc | 1 - .../telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc | 1 - .../tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc | 1 - .../tracking/glonass_l1_ca_dll_pll_tracking_test.cc | 1 - .../tracking/gps_l1_ca_dll_pll_tracking_test.cc | 1 - .../tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc | 1 - .../tracking/gps_l1_ca_kf_tracking_test.cc | 1 - .../tracking/gps_l2_m_dll_pll_tracking_test.cc | 1 - .../signal-processing-blocks/tracking/tracking_pull-in_test.cc | 1 - .../tracking/tracking_pull-in_test_fpga.cc | 1 - src/utils/front-end-cal/main.cc | 1 - 45 files changed, 45 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index b85ac0061..72b72050f 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -77,7 +77,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #if HAS_STD_FILESYSTEM diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index 0340e7376..55076ac23 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -29,7 +29,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr channel_fsm, bool repeat) diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index 2308b5566..73d7842b0 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -38,7 +38,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #if HAS_STD_FILESYSTEM diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc index 0403ab4f9..b37350d15 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc @@ -27,7 +27,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif const int FIFO_SIZE = 1472000; diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc index a8d50e94a..9b97034dd 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc @@ -22,7 +22,6 @@ #include "rtl_tcp_signal_source_c.h" #include "rtl_tcp_commands.h" #include -#include #include #include #include diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index b22974afc..8163267e8 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -62,7 +62,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #if HAS_STD_FILESYSTEM diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index 69473748d..bbc4414e7 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc @@ -53,7 +53,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #if HAS_STD_FILESYSTEM diff --git 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 index 9684566bd..9b5d84802 100644 --- 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 @@ -50,7 +50,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #define CN0_ESTIMATION_SAMPLES 10 diff --git 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 index 0dfd5c27e..ac9efed8e 100644 --- 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 @@ -48,7 +48,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif diff --git 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 index 8045cec41..59bb2627d 100644 --- 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 @@ -47,7 +47,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #define CN0_ESTIMATION_SAMPLES 10 diff --git 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 index e2388beec..c640680f3 100644 --- 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 @@ -46,7 +46,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #define CN0_ESTIMATION_SAMPLES 10 diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc index c1c0d0f19..8328dc5ff 100644 --- a/src/core/libs/channel_status_msg_receiver.cc +++ b/src/core/libs/channel_status_msg_receiver.cc @@ -29,7 +29,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif diff --git 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 index c4806dc4c..03de9f9d2 100644 --- 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 @@ -53,7 +53,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #if HAS_STD_FILESYSTEM diff --git 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 index 704f7f768..c3f8e041d 100644 --- 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 @@ -45,7 +45,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 diff --git 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 index 400aea270..b2dcf9743 100644 --- 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 @@ -45,7 +45,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 diff --git 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 index 9cd28f05a..74270618f 100644 --- 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 @@ -41,7 +41,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index ab83d6f9b..37a7dfc86 100644 --- 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 @@ -39,7 +39,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 5bc61c840..e3e226b11 100644 --- 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 @@ -49,7 +49,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 2ebaba189..b80198e9f 100644 --- 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 @@ -46,7 +46,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 diff --git 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 index 2e8afb2fa..fb38e6dc8 100644 --- 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 @@ -42,7 +42,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index ee9b043d0..669a99cf4 100644 --- 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 @@ -44,7 +44,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 02864f2e0..242100f6b 100644 --- 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 @@ -43,7 +43,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 3e07cc075..9be9ce34e 100644 --- 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 @@ -39,7 +39,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 4d1b0a978..04e2bb733 100644 --- 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 @@ -45,7 +45,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 9ceccc3d2..f6a6c0026 100644 --- 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 @@ -40,7 +40,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 303a1dbf5..67b00f9b8 100644 --- 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 @@ -43,7 +43,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 92702c647..f82ab5601 100644 --- 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 @@ -45,7 +45,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index de3f3c754..afd9885bc 100644 --- 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 @@ -43,7 +43,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 diff --git 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 index c635dd287..bead85eb7 100644 --- 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 @@ -41,7 +41,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 9f888fe99..47f143533 100644 --- 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 @@ -42,7 +42,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index f10efcf0c..c08659451 100644 --- 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 @@ -43,7 +43,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index aa39597e3..761bec211 100644 --- 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 @@ -45,7 +45,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 diff --git 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 index 1c39d6ccf..b827701f2 100644 --- 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 @@ -27,7 +27,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif Acquisition_msg_rx_sptr Acquisition_msg_rx_make() diff --git 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 index 727eb3ab3..667e2631f 100644 --- 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 @@ -75,7 +75,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 1776e3b8d..22fc7196b 100644 --- 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 @@ -75,7 +75,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index b9ea0c326..32ba85589 100644 --- 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 @@ -53,7 +53,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #if GNURADIO_USES_STD_POINTERS #include diff --git 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 index eddf0a0ae..db87bcaca 100644 --- 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 @@ -38,7 +38,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif // ######## GNURADIO BLOCK MESSAGE RECEVER ######### diff --git 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 index 75c0db1e3..52705265a 100644 --- 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 @@ -39,7 +39,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 7225aaaf6..466b3e51d 100644 --- 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 @@ -46,7 +46,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 diff --git 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 index 3aa6b160a..56b0f14bf 100644 --- 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 @@ -51,7 +51,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index efe07d78a..8a1038019 100644 --- 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 @@ -45,7 +45,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 diff --git 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 index 8c78439c2..1a0d41f61 100644 --- 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 @@ -39,7 +39,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 #include diff --git 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 index 128ec4359..e5c61bbb5 100644 --- 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 @@ -61,7 +61,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 diff --git 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 index 0fba369b3..cb504b816 100644 --- 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 @@ -60,7 +60,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #ifdef GR_GREATER_38 diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 380d7c376..5998ead85 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -72,7 +72,6 @@ #if HAS_GENERIC_LAMBDA #else #include -#include #endif #if HAS_STD_FILESYSTEM From f731a7c0f143885d51d48289145b1be6398276a5 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 18 May 2020 22:50:34 +0200 Subject: [PATCH 4/5] Fix for Boost >= 1.73 in old compilers --- .../PVT/gnuradio_blocks/CMakeLists.txt | 7 ++++++ .../PVT/gnuradio_blocks/rtklib_pvt_gs.cc | 4 ++++ src/algorithms/channel/libs/CMakeLists.txt | 7 ++++++ .../channel/libs/channel_msg_receiver_cc.cc | 4 ++++ .../gnuradio_blocks/CMakeLists.txt | 7 ++++++ .../gnuradio_blocks/hybrid_observables_gs.cc | 4 ++++ .../tracking/gnuradio_blocks/CMakeLists.txt | 7 ++++++ .../gnuradio_blocks/dll_pll_veml_tracking.cc | 4 ++++ .../dll_pll_veml_tracking_fpga.cc | 4 ++++ ...glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc | 4 ++++ ...glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc | 4 ++++ ...glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc | 4 ++++ ...glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc | 4 ++++ src/core/libs/CMakeLists.txt | 7 ++++++ src/core/libs/channel_status_msg_receiver.cc | 4 ++++ src/tests/CMakeLists.txt | 19 +++++++++++++++- .../acquisition/acq_performance_test.cc | 4 ++++ .../beidou_b1i_pcps_acquisition_test.cc | 4 ++++ .../beidou_b3i_pcps_acquisition_test.cc | 4 ++++ ...8ms_ambiguous_acquisition_gsoc2013_test.cc | 4 ++++ ...cps_ambiguous_acquisition_gsoc2013_test.cc | 4 ++++ ...e1_pcps_ambiguous_acquisition_gsoc_test.cc | 4 ++++ ...ileo_e1_pcps_ambiguous_acquisition_test.cc | 4 ++++ ...wsr_ambiguous_acquisition_gsoc2013_test.cc | 4 ++++ ...ync_ambiguous_acquisition_gsoc2014_test.cc | 4 ++++ ...ong_ambiguous_acquisition_gsoc2013_test.cc | 4 ++++ ...cps_acquisition_gsoc2014_gensource_test.cc | 4 ++++ ...ss_l1_ca_pcps_acquisition_gsoc2017_test.cc | 4 ++++ .../glonass_l1_ca_pcps_acquisition_test.cc | 4 ++++ .../glonass_l2_ca_pcps_acquisition_test.cc | 4 ++++ ...ps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 4 ++++ .../gps_l1_ca_pcps_acquisition_test.cc | 4 ++++ ...a_pcps_opencl_acquisition_gsoc2013_test.cc | 4 ++++ ...cps_quicksync_acquisition_gsoc2014_test.cc | 4 ++++ ..._ca_pcps_tong_acquisition_gsoc2013_test.cc | 4 ++++ .../gps_l2_m_pcps_acquisition_test.cc | 4 ++++ .../libs/CMakeLists.txt | 7 ++++++ .../libs/acquisition_msg_rx.cc | 4 ++++ .../observables/hybrid_observables_test.cc | 18 ++++++++++++++- .../hybrid_observables_test_fpga.cc | 22 ++++++++++++++++++- .../gps_l1_ca_telemetry_decoder_test.cc | 4 ++++ ...onass_l1_ca_dll_pll_c_aid_tracking_test.cc | 4 ++++ .../glonass_l1_ca_dll_pll_tracking_test.cc | 4 ++++ .../gps_l1_ca_dll_pll_tracking_test.cc | 4 ++++ .../gps_l1_ca_dll_pll_tracking_test_fpga.cc | 4 ++++ .../tracking/gps_l1_ca_kf_tracking_test.cc | 4 ++++ .../gps_l2_m_dll_pll_tracking_test.cc | 4 ++++ .../tracking/tracking_pull-in_test.cc | 4 ++++ .../tracking/tracking_pull-in_test_fpga.cc | 4 ++++ src/utils/front-end-cal/CMakeLists.txt | 7 ++++++ src/utils/front-end-cal/main.cc | 4 ++++ 51 files changed, 269 insertions(+), 3 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt index 9b20e490d..220115e86 100644 --- 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(" diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc index 72b72050f..f3f68f251 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc @@ -194,7 +194,11 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels, #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; diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt index 8adf4ee08..0c81f0f43 100644 --- 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 diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index 55076ac23..a7dcfbeae 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -44,7 +44,11 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr cha #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); diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt index c14d39069..82f6c536a 100644 --- 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 diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc index 73d7842b0..9eb58fef1 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc @@ -76,7 +76,11 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block( #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")); diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index 3480757c3..4db2b3f6a 100644 --- 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 diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index 8163267e8..b543ae979 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -101,7 +101,11 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl #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 diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc index bbc4414e7..cc6cf931d 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc @@ -91,7 +91,11 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga & #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); diff --git 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 index 9b5d84802..824cb74ba 100644 --- 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 @@ -115,7 +115,11 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc #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")); diff --git 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 index ac9efed8e..752bee325 100644 --- 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 @@ -112,7 +112,11 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc::glonass_l1_ca_dll_pll_c_aid_tracking_sc #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")); diff --git 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 index 59bb2627d..781683187 100644 --- 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 @@ -112,7 +112,11 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc #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")); diff --git 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 index c640680f3..58373d6e4 100644 --- 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 @@ -110,7 +110,11 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc::glonass_l2_ca_dll_pll_c_aid_tracking_sc #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")); diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt index fec647a75..3df13834a 100644 --- 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 diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc index 8328dc5ff..5b126adcc 100644 --- a/src/core/libs/channel_status_msg_receiver.cc +++ b/src/core/libs/channel_status_msg_receiver.cc @@ -45,7 +45,11 @@ channel_status_msg_receiver::channel_status_msg_receiver() : gr::block("channel_ #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 } diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 090638310..ef197ed28 100644 --- 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) diff --git 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 index 03de9f9d2..b5a8b04e4 100644 --- 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 @@ -161,7 +161,11 @@ AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(Concurrent_Queue& queue) : gr::block #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; } diff --git 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 index c3f8e041d..7528cd185 100644 --- 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 @@ -114,7 +114,11 @@ BeidouB1iPcpsAcquisitionTest_msg_rx::BeidouB1iPcpsAcquisitionTest_msg_rx() : gr: #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; } diff --git 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 index b2dcf9743..3d2ac0ac9 100644 --- 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 @@ -114,7 +114,11 @@ BeidouB3iPcpsAcquisitionTest_msg_rx::BeidouB3iPcpsAcquisitionTest_msg_rx() : gr: #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; } diff --git 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 index 74270618f..6a712178e 100644 --- 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 @@ -107,7 +107,11 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguo #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; } diff --git 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 index 37a7dfc86..89ba3476e 100644 --- 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 @@ -105,7 +105,11 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcqu #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; } diff --git 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 index e3e226b11..774616f0d 100644 --- 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 @@ -114,7 +114,11 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisit #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; } diff --git 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 index b80198e9f..0d2e1b0ed 100644 --- 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 @@ -126,7 +126,11 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionT #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; } diff --git 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 index fb38e6dc8..f9c704aca 100644 --- 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 @@ -108,7 +108,11 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguous #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; } diff --git 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 index 669a99cf4..88ef538e5 100644 --- 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 @@ -110,7 +110,11 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic #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; } diff --git 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 index 242100f6b..94d48aae7 100644 --- 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 @@ -105,7 +105,11 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbig #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; } diff --git 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 index 9be9ce34e..b59d37f78 100644 --- 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 @@ -101,7 +101,11 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisition #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; } diff --git 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 index 04e2bb733..6d25bc460 100644 --- 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 @@ -107,7 +107,11 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC201 #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; } diff --git 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 index f6a6c0026..59a81297d 100644 --- 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 @@ -100,7 +100,11 @@ GlonassL1CaPcpsAcquisitionTest_msg_rx::GlonassL1CaPcpsAcquisitionTest_msg_rx() : #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; } diff --git 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 index 67b00f9b8..949418857 100644 --- 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 @@ -105,7 +105,11 @@ GlonassL2CaPcpsAcquisitionTest_msg_rx::GlonassL2CaPcpsAcquisitionTest_msg_rx(con #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; } diff --git 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 index f82ab5601..bd817dcff 100644 --- 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 @@ -108,7 +108,11 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_ms #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; } diff --git 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 index afd9885bc..8db0e87af 100644 --- 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 @@ -124,7 +124,11 @@ GpsL1CaPcpsAcquisitionTest_msg_rx::GpsL1CaPcpsAcquisitionTest_msg_rx() : gr::blo #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; } diff --git 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 index bead85eb7..ae6a5060d 100644 --- 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 @@ -103,7 +103,11 @@ GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsOpenClAcquisitionGSo #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; } diff --git 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 index 47f143533..68953fe13 100644 --- 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 @@ -108,7 +108,11 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisit #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; } diff --git 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 index c08659451..5b6bb9e38 100644 --- 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 @@ -105,7 +105,11 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC201 #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; } diff --git 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 index 761bec211..c4c2a7951 100644 --- 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 @@ -116,7 +116,11 @@ GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() : gr::block #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; } diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt index 72c32a8d3..ecac00f2b 100644 --- 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 diff --git 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 index b827701f2..0d143a34a 100644 --- 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 @@ -58,7 +58,11 @@ Acquisition_msg_rx::Acquisition_msg_rx() : gr::block("Acquisition_msg_rx", gr::i #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; } diff --git 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 index 667e2631f..931d5c21c 100644 --- 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; #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,6 +134,7 @@ 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")); @@ -137,11 +142,16 @@ HybridObservablesTest_msg_rx::HybridObservablesTest_msg_rx() : gr::block("Hybrid #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_sptr HybridObservablesTest_tlm_msg_rx_make(); + class HybridObservablesTest_tlm_msg_rx : public gr::block { private: @@ -195,7 +208,11 @@ HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block #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: diff --git 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 index 22fc7196b..60f686a9e 100644 --- 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,6 +130,7 @@ 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")); @@ -135,20 +138,28 @@ HybridObservablesTest_msg_rx_Fpga::HybridObservablesTest_msg_rx_Fpga() : gr::blo #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_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,6 +193,7 @@ 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")); @@ -187,8 +201,10 @@ HybridObservablesTest_tlm_msg_rx_Fpga::HybridObservablesTest_tlm_msg_rx_Fpga() : 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 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({ diff --git 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 index 32ba85589..65b2856a9 100644 --- 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 @@ -110,7 +110,11 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_ #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; } diff --git 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 index db87bcaca..e7d71d6a7 100644 --- 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 @@ -89,7 +89,11 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx::GlonassL1CaDllPllCAidTrackingTest_msg_ #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; } diff --git 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 index 52705265a..62e67f10f 100644 --- 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 @@ -96,7 +96,11 @@ GlonassL1CaDllPllTrackingTest_msg_rx::GlonassL1CaDllPllTrackingTest_msg_rx() : g #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; } diff --git 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 index 466b3e51d..2ef143e75 100644 --- 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 @@ -126,7 +126,11 @@ GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx() : gr::block #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; } diff --git 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 index 56b0f14bf..e3c880966 100644 --- 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 @@ -213,7 +213,11 @@ GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() : g #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; } diff --git 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 index 8a1038019..eef1afe19 100644 --- 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 @@ -127,7 +127,11 @@ GpsL1CAKfTrackingTest_msg_rx::GpsL1CAKfTrackingTest_msg_rx() : gr::block("GpsL1C #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; } diff --git 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 index 1a0d41f61..7ce9ba42a 100644 --- 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 @@ -103,7 +103,11 @@ GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() : gr::block(" #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; } diff --git 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 index e5c61bbb5..484e2b890 100644 --- 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 @@ -142,7 +142,11 @@ TrackingPullInTest_msg_rx::TrackingPullInTest_msg_rx() : gr::block("TrackingPull #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; } diff --git 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 index cb504b816..ef93fd2a3 100644 --- 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 @@ -140,7 +140,11 @@ TrackingPullInTest_msg_rx_Fpga::TrackingPullInTest_msg_rx_Fpga() : gr::block("Tr #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; } diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index 14d2ce987..70c817959 100644 --- 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 diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 5998ead85..0749eae53 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -150,7 +150,11 @@ FrontEndCal_msg_rx::FrontEndCal_msg_rx() : gr::block("FrontEndCal_msg_rx", gr::i #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; } From 76c8239045830502a314ff1250f207d893ada576 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 18 May 2020 23:50:19 +0200 Subject: [PATCH 5/5] Update changelog --- docs/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.md b/docs/changelog.md index 65a62caee..84b38704b 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -30,6 +30,7 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades