mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

Fix for Boost >= 1.73 in old compilers

Browse Source
This commit is contained in:
Carles Fernandez 2020-05-18 22:50:34 +02:00
parent 1077970962
commit f731a7c0f1
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
51 changed files with 269 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
View File

@ -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("

4
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
View File

@ -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;

7
src/algorithms/channel/libs/CMakeLists.txt
View File

@ -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

4
src/algorithms/channel/libs/channel_msg_receiver_cc.cc
View File

@ -44,7 +44,11 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr<ChannelFsm> 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);

7
src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
View File

@ -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

4
src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
View File

@ -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"));

7
src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
View File

@ -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

4
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
View File

@ -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

4
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
View File

@ -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);

4
src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
View File

@ -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"));

4
src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
View File

@ -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"));

4
src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
View File

@ -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"));

4
src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
View File

@ -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"));

7
src/core/libs/CMakeLists.txt
View File

@ -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

4
src/core/libs/channel_status_msg_receiver.cc
View File

@ -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
}

19
src/tests/CMakeLists.txt
View File

@ -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)

4
src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
View File

@ -161,7 +161,11 @@ AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(Concurrent_Queue<int>& 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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
View File

@ -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;
}

7
src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
View File

@ -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

4
src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc
View File

@ -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;
}

18
src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
View File

@ -97,8 +97,10 @@ using HybridObservablesTest_msg_rx_sptr = std::shared_ptr<HybridObservablesTest_
using HybridObservablesTest_msg_rx_sptr = boost::shared_ptr<HybridObservablesTest_msg_rx>;
#endif
HybridObservablesTest_msg_rx_sptr HybridObservablesTest_msg_rx_make();
class HybridObservablesTest_msg_rx : public gr::block
{
private:
@ -111,11 +113,13 @@ public:
~HybridObservablesTest_msg_rx(); //!< Default destructor
};
HybridObservablesTest_msg_rx_sptr HybridObservablesTest_msg_rx_make()
{
return HybridObservablesTest_msg_rx_sptr(new HybridObservablesTest_msg_rx());
}
void HybridObservablesTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
{
try
@ -130,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>;
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:

22
src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
View File

@ -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>;
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<AcquisitionInterface> acquisition;
};
void* handler_acquisition_obs_test(void* arguments)
{
// the acquisition is a blocking function so we have to
@ -349,6 +369,7 @@ void* handler_acquisition_obs_test(void* arguments)
return nullptr;
}
void* handler_DMA_obs_test(void* arguments)
{
const int MAX_INPUT_SAMPLES_TOTAL = 16384;
@ -2091,7 +2112,6 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults)
}
}
// read measured values
Observables_Dump_Reader estimated_observables(tracking_ch_vec.size());
ASSERT_NO_THROW({

4
src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
View File

@ -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;
}

4
src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
View File

@ -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;
}

7
src/utils/front-end-cal/CMakeLists.txt
View File

@ -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

4
src/utils/front-end-cal/main.cc
View File

@ -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;
}