mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes for old GCC

This commit is contained in:
Carles Fernandez 2020-04-26 12:28:24 +02:00
parent 6de4d28ab1
commit c27622a738
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
11 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr<ChannelFsm> cha
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"),
#if HAS_GENERIC_LAMBDA
[this](auto&& PH1) { msg_handler_events(PH1); });
[this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
#else
boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, _1));
#endif

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

@ -74,7 +74,7 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block(
this->message_port_register_in(pmt::mp("pvt_to_observables"));
this->set_msg_handler(pmt::mp("pvt_to_observables"),
#if HAS_GENERIC_LAMBDA
[this](auto &&PH1) { msg_handler_pvt_to_observables(PH1); });
[this](pmt::pmt_t &&PH1) { msg_handler_pvt_to_observables(PH1); });
#else
boost::bind(&hybrid_observables_gs::msg_handler_pvt_to_observables, this, _1));
#endif

14
src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
View File

@ -135,12 +135,8 @@ rtl_tcp_signal_source_c::rtl_tcp_signal_source_c(const std::string &address,
// 6. Start reading
boost::asio::async_read(socket_, boost::asio::buffer(data_),
#if HAS_GENERIC_LAMBDA
[this](auto &&PH1, auto &&PH2) { handle_read(PH1, PH2); });
#else
boost::bind(&rtl_tcp_signal_source_c::handle_read,
this, _1, _2));
#endif
boost::bind(&rtl_tcp_signal_source_c::handle_read, this, _1, _2)); // NOLINT(modernize-avoid-bind)
boost::thread(
#if HAS_GENERIC_LAMBDA
[ObjectPtr = &io_context_] { ObjectPtr->run(); });
@ -320,11 +316,7 @@ void rtl_tcp_signal_source_c::handle_read(const boost::system::error_code &ec,
// Read some more
boost::asio::async_read(socket_,
boost::asio::buffer(data_),
#if HAS_GENERIC_LAMBDA
[this](auto &&PH1, auto &&PH2) { handle_read(PH1, PH2); });
#else
boost::bind(&rtl_tcp_signal_source_c::handle_read, this, _1, _2));
#endif
boost::bind(&rtl_tcp_signal_source_c::handle_read, this, _1, _2)); // NOLINT(modernize-avoid-bind)
}
}

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

@ -100,7 +100,7 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
this->set_msg_handler(
pmt::mp("telemetry_to_trk"),
#if HAS_GENERIC_LAMBDA
[this](auto &&PH1) { msg_handler_telemetry_to_trk(PH1); });
[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));
#endif

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

@ -90,7 +90,7 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
this->message_port_register_in(pmt::mp("telemetry_to_trk"));
this->set_msg_handler(pmt::mp("telemetry_to_trk"),
#if HAS_GENERIC_LAMBDA
[this](auto &&PH1) { msg_handler_telemetry_to_trk(PH1); });
[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));
#endif

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

@ -113,7 +113,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc
this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
#if HAS_GENERIC_LAMBDA
[this](auto &&PH1) { msg_handler_preamble_index(PH1); });
[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));
#endif

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

@ -110,7 +110,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc::glonass_l1_ca_dll_pll_c_aid_tracking_sc
this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
#if HAS_GENERIC_LAMBDA
[this](auto &&PH1) { msg_handler_preamble_index(PH1); });
[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));
#endif

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

@ -105,7 +105,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc
this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
#if HAS_GENERIC_LAMBDA
[this](auto &&PH1) { msg_handler_preamble_index(PH1); });
[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));
#endif

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

@ -103,7 +103,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc::glonass_l2_ca_dll_pll_c_aid_tracking_sc
this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
#if HAS_GENERIC_LAMBDA
[this](auto &&PH1) { msg_handler_preamble_index(PH1); });
[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));
#endif

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

@ -39,7 +39,7 @@ channel_status_msg_receiver::channel_status_msg_receiver() : gr::block("channel_
this->message_port_register_in(pmt::mp("status"));
this->set_msg_handler(pmt::mp("status"),
#if HAS_GENERIC_LAMBDA
[this](auto&& PH1) { msg_handler_events(PH1); });
[this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
#else
boost::bind(&channel_status_msg_receiver::msg_handler_events, this, _1));
#endif

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

@ -56,7 +56,7 @@ Acquisition_msg_rx::Acquisition_msg_rx() : gr::block("Acquisition_msg_rx", gr::i
this->message_port_register_in(pmt::mp("events"));
this->set_msg_handler(pmt::mp("events"),
#if HAS_GENERIC_LAMBDA
[this](auto&& PH1) { msg_handler_events(PH1); });
[this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
#else
boost::bind(&Acquisition_msg_rx::msg_handler_events, this, _1));
#endif