From d5e5e5725d8faea3b0e9dd657836e7bba1dd4c0e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 30 Jun 2019 00:01:54 +0200 Subject: [PATCH] Apply fixes by clang-tidy --- src/algorithms/PVT/libs/rtcm.cc | 22 ++++---- .../adapters/beidou_b3i_pcps_acquisition.cc | 5 +- .../gps_l1_ca_pcps_opencl_acquisition.cc | 5 +- .../libs/galileo_e1_signal_processing.cc | 2 +- .../adapters/custom_udp_signal_source.cc | 4 +- .../gr_complex_ip_packet_source.cc | 15 ++++-- .../adapters/beidou_b3i_dll_pll_tracking.cc | 10 +++- src/core/receiver/control_thread.cc | 16 +++--- src/core/receiver/gnss_flowgraph.cc | 50 +++++++++++-------- .../gps_l1_ca_pcps_acquisition_test.cc | 4 +- .../adapter/adapter_test.cc | 2 +- .../filter/fir_filter_test.cc | 2 +- .../filter/notch_filter_lite_test.cc | 2 +- .../filter/notch_filter_test.cc | 2 +- .../filter/pulse_blanking_filter_test.cc | 2 +- .../tracking/cubature_filter_test.cc | 4 +- .../galileo_e1_dll_pll_veml_tracking_test.cc | 2 +- .../tracking/unscented_filter_test.cc | 4 +- src/utils/front-end-cal/main.cc | 2 +- 19 files changed, 91 insertions(+), 64 deletions(-) diff --git a/src/algorithms/PVT/libs/rtcm.cc b/src/algorithms/PVT/libs/rtcm.cc index e514d733a..0cad7ec65 100644 --- a/src/algorithms/PVT/libs/rtcm.cc +++ b/src/algorithms/PVT/libs/rtcm.cc @@ -2419,7 +2419,7 @@ std::string Rtcm::get_MSM_1_content_sat_data(const std::mapsecond.PRN); - observables_vector.push_back(*gnss_synchro_iter); + observables_vector.emplace_back(*gnss_synchro_iter); } } @@ -2448,7 +2448,7 @@ std::string Rtcm::get_MSM_1_content_signal_data(const std::map > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); @@ -2556,7 +2556,7 @@ std::string Rtcm::get_MSM_2_content_signal_data(const Gps_Ephemeris& ephNAV, map_iter != observables.cend(); map_iter++) { - observables_vector.push_back(*map_iter); + observables_vector.emplace_back(*map_iter); } std::vector > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); @@ -2670,7 +2670,7 @@ std::string Rtcm::get_MSM_3_content_signal_data(const Gps_Ephemeris& ephNAV, map_iter != observables.cend(); map_iter++) { - observables_vector.push_back(*map_iter); + observables_vector.emplace_back(*map_iter); } std::vector > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); @@ -2786,7 +2786,7 @@ std::string Rtcm::get_MSM_4_content_sat_data(const std::mapsecond.PRN); - observables_vector.push_back(*gnss_synchro_iter); + observables_vector.emplace_back(*gnss_synchro_iter); } } @@ -2827,7 +2827,7 @@ std::string Rtcm::get_MSM_4_content_signal_data(const Gps_Ephemeris& ephNAV, map_iter != observables.cend(); map_iter++) { - observables_vector.push_back(*map_iter); + observables_vector.emplace_back(*map_iter); } std::vector > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); @@ -2947,7 +2947,7 @@ std::string Rtcm::get_MSM_5_content_sat_data(const std::mapsecond.PRN); - observables_vector.push_back(*gnss_synchro_iter); + observables_vector.emplace_back(*gnss_synchro_iter); } } @@ -2993,7 +2993,7 @@ std::string Rtcm::get_MSM_5_content_signal_data(const Gps_Ephemeris& ephNAV, map_iter != observables.cend(); map_iter++) { - observables_vector.push_back(*map_iter); + observables_vector.emplace_back(*map_iter); } std::vector > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); @@ -3114,7 +3114,7 @@ std::string Rtcm::get_MSM_6_content_signal_data(const Gps_Ephemeris& ephNAV, map_iter != observables.cend(); map_iter++) { - observables_vector.push_back(*map_iter); + observables_vector.emplace_back(*map_iter); } std::vector > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); @@ -3234,7 +3234,7 @@ std::string Rtcm::get_MSM_7_content_signal_data(const Gps_Ephemeris& ephNAV, map_iter != observables.cend(); map_iter++) { - observables_vector.push_back(*map_iter); + observables_vector.emplace_back(*map_iter); } std::vector > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); @@ -3685,7 +3685,7 @@ uint32_t Rtcm::msm_extended_lock_time_indicator(uint32_t lock_time_period_s) if( 16777216 <= lock_time_period_s && lock_time_period_s < 33554432 ) return (640 + (lock_time_period_s - 16777216) / 524288 ); if( 33554432 <= lock_time_period_s && lock_time_period_s < 67108864 ) return (672 + (lock_time_period_s - 33554432) / 1048576); if( 67108864 <= lock_time_period_s ) return (704 ); - return 1023; // will never happen + return 1023; // will never happen } // clang-format on diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc index b6bf5f7ed..6c86d08f1 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc @@ -66,7 +66,10 @@ BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition( blocking_ = configuration_->property(role + ".blocking", true); acq_parameters.blocking = blocking_; doppler_max_ = configuration_->property(role + ".doppler_max", 5000); - if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max; + if (FLAGS_doppler_max != 0) + { + doppler_max_ = FLAGS_doppler_max; + } acq_parameters.doppler_max = doppler_max_; sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1); acq_parameters.sampled_ms = sampled_ms_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc index f96a29632..f5d193d13 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc @@ -60,7 +60,10 @@ GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition( fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); dump_ = configuration_->property(role + ".dump", false); doppler_max_ = configuration->property(role + ".doppler_max", 5000); - if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max; + if (FLAGS_doppler_max != 0) + { + doppler_max_ = FLAGS_doppler_max; + } sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1); bit_transition_flag_ = configuration_->property("Acquisition.bit_transition_flag", false); diff --git a/src/algorithms/libs/galileo_e1_signal_processing.cc b/src/algorithms/libs/galileo_e1_signal_processing.cc index 085fe8e78..1bf97f3b2 100644 --- a/src/algorithms/libs/galileo_e1_signal_processing.cc +++ b/src/algorithms/libs/galileo_e1_signal_processing.cc @@ -217,7 +217,7 @@ void galileo_e1_code_gen_float_sampled(gsl::span _dest, const std::array< { for (unsigned k = 0; k < _samplesPerCode; k++) { - _signal_E1C_secondary_span[i * _samplesPerCode + k] = _signal_E1_span_aux[k] * (GALILEO_E1_C_SECONDARY_CODE.at(i) == '0' ? 1.0f : -1.0f); + _signal_E1C_secondary_span[i * _samplesPerCode + k] = _signal_E1_span_aux[k] * (GALILEO_E1_C_SECONDARY_CODE.at(i) == '0' ? 1.0F : -1.0F); } } diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc index d030863ff..024966d0e 100644 --- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc @@ -81,7 +81,7 @@ CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configurati { for (int n = 0; n < channels_in_udp_; n++) { - null_sinks_.push_back(gr::blocks::null_sink::make(sizeof(gr_complex))); + null_sinks_.emplace_back(gr::blocks::null_sink::make(sizeof(gr_complex))); } } else @@ -95,7 +95,7 @@ CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configurati for (int n = 0; n < channels_in_udp_; n++) { DLOG(INFO) << "Dumping output into file " << (dump_filename_ + "c_h" + std::to_string(n) + ".bin"); - file_sink_.push_back(gr::blocks::file_sink::make(item_size_, (dump_filename_ + "_ch" + std::to_string(n) + ".bin").c_str())); + file_sink_.emplace_back(gr::blocks::file_sink::make(item_size_, (dump_filename_ + "_ch" + std::to_string(n) + ".bin").c_str())); } } if (in_stream_ > 0) 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 8085e9e81..ac52e0236 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 @@ -290,7 +290,10 @@ void Gr_Complex_Ip_Packet_Source::pcap_callback(__attribute__((unused)) u_char * // write all in a single memcpy memcpy(&fifo_buff[fifo_write_ptr], &udp_payload[0], payload_length_bytes); // size in bytes fifo_write_ptr += payload_length_bytes; - if (fifo_write_ptr == FIFO_SIZE) fifo_write_ptr = 0; + if (fifo_write_ptr == FIFO_SIZE) + { + fifo_write_ptr = 0; + } fifo_items += payload_length_bytes; } else @@ -378,7 +381,10 @@ void Gr_Complex_Ip_Packet_Source::demux_samples(gr_vector_void_star output_items std::cout << "Unknown wire sample type\n"; exit(0); } - if (fifo_read_ptr == FIFO_SIZE) fifo_read_ptr = 0; + if (fifo_read_ptr == FIFO_SIZE) + { + fifo_read_ptr = 0; + } } } @@ -389,7 +395,10 @@ int Gr_Complex_Ip_Packet_Source::work(int noutput_items, { // send samples to next GNU Radio block boost::mutex::scoped_lock lock(d_mutex); // hold mutex for duration of this function - if (fifo_items == 0) return 0; + if (fifo_items == 0) + { + return 0; + } if (output_items.size() > static_cast(d_n_baseband_channels)) { diff --git a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc index 306a0efb5..fb998ab81 100644 --- a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc @@ -59,14 +59,20 @@ BeidouB3iDllPllTracking::BeidouB3iDllPllTracking( bool dump = configuration->property(role + ".dump", false); trk_param.dump = dump; float pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0); - if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast(FLAGS_pll_bw_hz); + if (FLAGS_pll_bw_hz != 0.0) + { + pll_bw_hz = static_cast(FLAGS_pll_bw_hz); + } trk_param.pll_bw_hz = pll_bw_hz; float pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 20.0); trk_param.pll_bw_narrow_hz = pll_bw_narrow_hz; float dll_bw_narrow_hz = configuration->property(role + ".dll_bw_narrow_hz", 2.0); trk_param.dll_bw_narrow_hz = dll_bw_narrow_hz; float dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0); - if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast(FLAGS_dll_bw_hz); + if (FLAGS_dll_bw_hz != 0.0) + { + dll_bw_hz = static_cast(FLAGS_dll_bw_hz); + } trk_param.dll_bw_hz = dll_bw_hz; int dll_filter_order = configuration->property(role + ".dll_filter_order", 2); diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index e92646586..384d6f041 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -933,8 +933,8 @@ std::vector> ControlThread::get_visible_sats(time if (El > 0) { std::cout << "Using GPS Ephemeris: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl; - available_satellites.push_back(std::pair(floor(El), - (Gnss_Satellite(std::string("GPS"), it.second.i_satellite_PRN)))); + available_satellites.emplace_back(floor(El), + (Gnss_Satellite(std::string("GPS"), it.second.i_satellite_PRN))); visible_gps.push_back(it.second.i_satellite_PRN); } } @@ -956,8 +956,8 @@ std::vector> ControlThread::get_visible_sats(time if (El > 0) { std::cout << "Using Galileo Ephemeris: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl; - available_satellites.push_back(std::pair(floor(El), - (Gnss_Satellite(std::string("Galileo"), it.second.i_satellite_PRN)))); + available_satellites.emplace_back(floor(El), + (Gnss_Satellite(std::string("Galileo"), it.second.i_satellite_PRN))); visible_gal.push_back(it.second.i_satellite_PRN); } } @@ -984,8 +984,8 @@ std::vector> ControlThread::get_visible_sats(time if (it2 == visible_gps.end()) { std::cout << "Using GPS Almanac: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl; - available_satellites.push_back(std::pair(floor(El), - (Gnss_Satellite(std::string("GPS"), it.second.i_satellite_PRN)))); + available_satellites.emplace_back(floor(El), + (Gnss_Satellite(std::string("GPS"), it.second.i_satellite_PRN))); } } } @@ -1012,8 +1012,8 @@ std::vector> ControlThread::get_visible_sats(time if (it2 == visible_gal.end()) { std::cout << "Using Galileo Almanac: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl; - available_satellites.push_back(std::pair(floor(El), - (Gnss_Satellite(std::string("Galileo"), it.second.i_satellite_PRN)))); + available_satellites.emplace_back(floor(El), + (Gnss_Satellite(std::string("Galileo"), it.second.i_satellite_PRN))); } } } diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 1de87bc17..51e805957 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -1854,9 +1854,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_gps_prn.cend(); available_gnss_prn_iter++) { - available_GPS_1C_signals_.push_back(Gnss_Signal( + available_GPS_1C_signals_.emplace_back( Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter), - std::string("1C"))); + std::string("1C")); } } @@ -1867,9 +1867,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_gps_prn.cend(); available_gnss_prn_iter++) { - available_GPS_2S_signals_.push_back(Gnss_Signal( + available_GPS_2S_signals_.emplace_back( Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter), - std::string("2S"))); + std::string("2S")); } } @@ -1880,9 +1880,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_gps_prn.cend(); available_gnss_prn_iter++) { - available_GPS_L5_signals_.push_back(Gnss_Signal( + available_GPS_L5_signals_.emplace_back( Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter), - std::string("L5"))); + std::string("L5")); } } @@ -1893,9 +1893,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_sbas_prn.cend(); available_gnss_prn_iter++) { - available_SBAS_1C_signals_.push_back(Gnss_Signal( + available_SBAS_1C_signals_.emplace_back( Gnss_Satellite(std::string("SBAS"), *available_gnss_prn_iter), - std::string("1C"))); + std::string("1C")); } } @@ -1906,9 +1906,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_galileo_prn.cend(); available_gnss_prn_iter++) { - available_GAL_1B_signals_.push_back(Gnss_Signal( + available_GAL_1B_signals_.emplace_back( Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter), - std::string("1B"))); + std::string("1B")); } } @@ -1919,9 +1919,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_galileo_prn.cend(); available_gnss_prn_iter++) { - available_GAL_5X_signals_.push_back(Gnss_Signal( + available_GAL_5X_signals_.emplace_back( Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter), - std::string("5X"))); + std::string("5X")); } } @@ -1932,9 +1932,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_glonass_prn.cend(); available_gnss_prn_iter++) { - available_GLO_1G_signals_.push_back(Gnss_Signal( + available_GLO_1G_signals_.emplace_back( Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter), - std::string("1G"))); + std::string("1G")); } } @@ -1945,9 +1945,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_glonass_prn.cend(); available_gnss_prn_iter++) { - available_GLO_2G_signals_.push_back(Gnss_Signal( + available_GLO_2G_signals_.emplace_back( Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter), - std::string("2G"))); + std::string("2G")); } } @@ -1960,9 +1960,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_beidou_prn.cend(); available_gnss_prn_iter++) { - available_BDS_B1_signals_.push_back(Gnss_Signal( + available_BDS_B1_signals_.emplace_back( Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter), - std::string("B1"))); + std::string("B1")); } } @@ -1975,9 +1975,9 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter != available_beidou_prn.cend(); available_gnss_prn_iter++) { - available_BDS_B3_signals_.push_back(Gnss_Signal( + available_BDS_B3_signals_.emplace_back( Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter), - std::string("B3"))); + std::string("B3")); } } } @@ -2243,7 +2243,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal { for (unsigned int ch = 0; ch < channels_count_; ch++) { - if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G")) untracked_satellite = false; + if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G")) + { + untracked_satellite = false; + } } if (untracked_satellite) { @@ -2268,7 +2271,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal { for (unsigned int ch = 0; ch < channels_count_; ch++) { - if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G")) untracked_satellite = false; + if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G")) + { + untracked_satellite = false; + } } if (untracked_satellite) { 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 01f424eb8..0ec417ee0 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 @@ -88,7 +88,7 @@ private: public: int rx_message; - ~GpsL1CaPcpsAcquisitionTest_msg_rx(); //!< Default destructor + ~GpsL1CaPcpsAcquisitionTest_msg_rx() override; //!< Default destructor }; @@ -139,7 +139,7 @@ protected: doppler_step = 100; } - ~GpsL1CaPcpsAcquisitionTest() = default; + ~GpsL1CaPcpsAcquisitionTest() override = default; void init(); void plot_grid(); diff --git a/src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc b/src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc index 89f2cd338..7c0677825 100644 --- a/src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc @@ -51,7 +51,7 @@ class DataTypeAdapter : public ::testing::Test { public: DataTypeAdapter(); - ~DataTypeAdapter(); + ~DataTypeAdapter() override; int run_byte_to_short_block(); int run_ibyte_to_cbyte_block(); int run_ibyte_to_complex_block(); diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc index 42fb1496a..03d055fac 100644 --- a/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc @@ -63,7 +63,7 @@ protected: item_size = sizeof(gr_complex); config = std::make_shared(); } - ~FirFilterTest() = default; + ~FirFilterTest() override = default; void init(); void configure_cbyte_cbyte(); diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc index a77e9d853..69c1dddf9 100644 --- a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc @@ -62,7 +62,7 @@ protected: config = std::make_shared(); nsamples = FLAGS_notch_filter_lite_test_nsamples; } - ~NotchFilterLiteTest() = default; + ~NotchFilterLiteTest() override = default; void init(); void configure_gr_complex_gr_complex(); diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc index 943ac2fe2..8fb783b5f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc @@ -62,7 +62,7 @@ protected: config = std::make_shared(); nsamples = FLAGS_notch_filter_test_nsamples; } - ~NotchFilterTest() = default; + ~NotchFilterTest() override = default; void init(); void configure_gr_complex_gr_complex(); diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc index 83a63d551..d31b971fb 100644 --- a/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc @@ -62,7 +62,7 @@ protected: config = std::make_shared(); nsamples = FLAGS_pb_filter_test_nsamples; } - ~PulseBlankingFilterTest() = default; + ~PulseBlankingFilterTest() override = default; void init(); void configure_gr_complex_gr_complex(); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc index 0833b12be..a0d42aeb2 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc @@ -40,7 +40,7 @@ class TransitionModel : public ModelFunction { public: explicit TransitionModel(const arma::mat& kf_F) { coeff_mat = kf_F; }; - virtual arma::vec operator()(const arma::vec& input) { return coeff_mat * input; }; + arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; }; private: arma::mat coeff_mat; @@ -50,7 +50,7 @@ class MeasurementModel : public ModelFunction { public: explicit MeasurementModel(const arma::mat& kf_H) { coeff_mat = kf_H; }; - virtual arma::vec operator()(const arma::vec& input) { return coeff_mat * input; }; + arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; }; private: arma::mat coeff_mat; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc index 897257b93..469ec2c27 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc @@ -64,7 +64,7 @@ protected: gnss_synchro = Gnss_Synchro(); } - ~GalileoE1DllPllVemlTrackingInternalTest() = default; + ~GalileoE1DllPllVemlTrackingInternalTest() override = default; void init(); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc index bc9e5315d..61ae638d0 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc @@ -40,7 +40,7 @@ class TransitionModelUKF : public ModelFunction { public: explicit TransitionModelUKF(const arma::mat& kf_F) { coeff_mat = kf_F; }; - virtual arma::vec operator()(const arma::vec& input) { return coeff_mat * input; }; + arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; }; private: arma::mat coeff_mat; @@ -50,7 +50,7 @@ class MeasurementModelUKF : public ModelFunction { public: explicit MeasurementModelUKF(const arma::mat& kf_H) { coeff_mat = kf_H; }; - virtual arma::vec operator()(const arma::vec& input) { return coeff_mat * input; }; + arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; }; private: arma::mat coeff_mat; diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc index 83b664362..54723dfc5 100644 --- a/src/utils/front-end-cal/main.cc +++ b/src/utils/front-end-cal/main.cc @@ -122,7 +122,7 @@ private: public: int rx_message; - ~FrontEndCal_msg_rx(); //!< Default destructor + ~FrontEndCal_msg_rx() override; //!< Default destructor };