mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-21 01:24:52 +00:00
Code Issues Releases Wiki Activity

Fix for Boost 1.73: qualify placeholders with their full namespace

Browse Source
This commit is contained in:
Carles Fernandez
2020-05-18 18:58:39 +02:00
parent a73e08c017
commit b408a2ef29
43 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -44,7 +44,7 @@ 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
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);

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

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

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

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

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

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

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

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

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

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

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

@@ -44,6 +44,11 @@
#include <utility>
#include <vector>
#if HAS_GENERIC_LAMBDA
#else
#include <boost/bind.hpp>
#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"));

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

@@ -43,6 +43,11 @@
#include <utility>
#include <vector>
#if HAS_GENERIC_LAMBDA
#else
#include <boost/bind.hpp>
#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"));