From be86771edeaf9643f5abfcf7fa831a6235fb76a2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 21 Jul 2019 19:32:52 +0200 Subject: [PATCH] Move default destructor to header file, so compiler can make a better job --- .../adapters/beidou_b1i_pcps_acquisition.cc | 5 +- .../adapters/beidou_b1i_pcps_acquisition.h | 2 +- .../adapters/beidou_b3i_pcps_acquisition.cc | 3 - .../adapters/beidou_b3i_pcps_acquisition.h | 2 +- ...lileo_e1_pcps_8ms_ambiguous_acquisition.cc | 3 - ...alileo_e1_pcps_8ms_ambiguous_acquisition.h | 2 +- .../galileo_e1_pcps_ambiguous_acquisition.cc | 3 - .../galileo_e1_pcps_ambiguous_acquisition.h | 2 +- ...ileo_e1_pcps_ambiguous_acquisition_fpga.cc | 3 - ...lileo_e1_pcps_ambiguous_acquisition_fpga.h | 2 +- ...eo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 3 - ...leo_e1_pcps_cccwsr_ambiguous_acquisition.h | 2 +- ...e1_pcps_quicksync_ambiguous_acquisition.cc | 3 - ..._e1_pcps_quicksync_ambiguous_acquisition.h | 2 +- ...ileo_e1_pcps_tong_ambiguous_acquisition.cc | 3 - ...lileo_e1_pcps_tong_ambiguous_acquisition.h | 2 +- ...ileo_e5a_noncoherent_iq_acquisition_caf.cc | 3 - ...lileo_e5a_noncoherent_iq_acquisition_caf.h | 2 +- .../adapters/galileo_e5a_pcps_acquisition.cc | 3 - .../adapters/galileo_e5a_pcps_acquisition.h | 2 +- .../galileo_e5a_pcps_acquisition_fpga.cc | 3 - .../galileo_e5a_pcps_acquisition_fpga.h | 2 +- .../glonass_l1_ca_pcps_acquisition.cc | 3 - .../adapters/glonass_l1_ca_pcps_acquisition.h | 2 +- .../glonass_l2_ca_pcps_acquisition.cc | 3 - .../adapters/glonass_l2_ca_pcps_acquisition.h | 2 +- .../adapters/gps_l1_ca_pcps_acquisition.cc | 3 - .../adapters/gps_l1_ca_pcps_acquisition.h | 2 +- ...gps_l1_ca_pcps_acquisition_fine_doppler.cc | 3 - .../gps_l1_ca_pcps_acquisition_fine_doppler.h | 2 +- .../gps_l1_ca_pcps_acquisition_fpga.cc | 3 - .../gps_l1_ca_pcps_acquisition_fpga.h | 2 +- .../gps_l1_ca_pcps_assisted_acquisition.cc | 3 - .../gps_l1_ca_pcps_assisted_acquisition.h | 2 +- .../gps_l1_ca_pcps_opencl_acquisition.cc | 3 - .../gps_l1_ca_pcps_opencl_acquisition.h | 2 +- .../gps_l1_ca_pcps_quicksync_acquisition.cc | 3 - .../gps_l1_ca_pcps_quicksync_acquisition.h | 2 +- .../gps_l1_ca_pcps_tong_acquisition.cc | 3 - .../gps_l1_ca_pcps_tong_acquisition.h | 2 +- .../adapters/gps_l2_m_pcps_acquisition.cc | 3 - .../adapters/gps_l2_m_pcps_acquisition.h | 2 +- .../gps_l2_m_pcps_acquisition_fpga.cc | 3 - .../adapters/gps_l2_m_pcps_acquisition_fpga.h | 2 +- .../adapters/gps_l5i_pcps_acquisition.cc | 3 - .../adapters/gps_l5i_pcps_acquisition.h | 2 +- .../adapters/gps_l5i_pcps_acquisition_fpga.cc | 3 - .../adapters/gps_l5i_pcps_acquisition_fpga.h | 2 +- .../gnuradio_blocks/pcps_acquisition.cc | 3 - .../gnuradio_blocks/pcps_acquisition.h | 2 +- .../gnuradio_blocks/pcps_acquisition_fpga.cc | 3 - .../gnuradio_blocks/pcps_acquisition_fpga.h | 2 +- .../acquisition/libs/fpga_acquisition.cc | 3 - .../acquisition/libs/fpga_acquisition.h | 2 +- src/algorithms/channel/adapters/channel.cc | 3 - src/algorithms/channel/adapters/channel.h | 2 +- .../channel/libs/channel_msg_receiver_cc.cc | 3 - .../channel/libs/channel_msg_receiver_cc.h | 2 +- .../adapters/array_signal_conditioner.cc | 4 - .../adapters/array_signal_conditioner.h | 4 +- .../adapters/signal_conditioner.cc | 4 - .../conditioner/adapters/signal_conditioner.h | 4 +- .../adapters/byte_to_short.cc | 3 - .../adapters/byte_to_short.h | 2 +- .../adapters/ibyte_to_cbyte.cc | 3 - .../adapters/ibyte_to_cbyte.h | 2 +- .../adapters/ibyte_to_complex.cc | 3 - .../adapters/ibyte_to_complex.h | 2 +- .../adapters/ibyte_to_cshort.cc | 3 - .../adapters/ibyte_to_cshort.h | 2 +- .../adapters/ishort_to_complex.cc | 3 - .../adapters/ishort_to_complex.h | 2 +- .../adapters/ishort_to_cshort.cc | 3 - .../adapters/ishort_to_cshort.h | 2 +- .../adapters/beamformer_filter.cc | 3 - .../input_filter/adapters/beamformer_filter.h | 4 +- .../input_filter/adapters/fir_filter.cc | 3 - .../input_filter/adapters/fir_filter.h | 2 +- .../adapters/freq_xlating_fir_filter.cc | 5 +- .../adapters/freq_xlating_fir_filter.h | 2 +- .../input_filter/adapters/notch_filter.cc | 3 - .../input_filter/adapters/notch_filter.h | 4 +- .../adapters/notch_filter_lite.cc | 3 - .../input_filter/adapters/notch_filter_lite.h | 4 +- .../adapters/pulse_blanking_filter.cc | 3 - .../adapters/pulse_blanking_filter.h | 2 +- src/algorithms/libs/pass_through.cc | 3 - src/algorithms/libs/pass_through.h | 2 +- .../adapters/hybrid_observables.cc | 3 - .../observables/adapters/hybrid_observables.h | 2 +- .../adapters/direct_resampler_conditioner.cc | 3 - .../adapters/direct_resampler_conditioner.h | 2 +- .../adapters/mmse_resampler_conditioner.cc | 3 - .../adapters/mmse_resampler_conditioner.h | 2 +- .../direct_resampler_conditioner_cb.cc | 3 - .../direct_resampler_conditioner_cb.h | 2 +- .../direct_resampler_conditioner_cc.cc | 3 - .../direct_resampler_conditioner_cc.h | 2 +- .../direct_resampler_conditioner_cs.cc | 3 - .../direct_resampler_conditioner_cs.h | 2 +- .../adapters/signal_generator.cc | 3 - .../adapters/signal_generator.h | 2 +- .../adapters/custom_udp_signal_source.cc | 3 - .../adapters/custom_udp_signal_source.h | 2 +- .../adapters/file_signal_source.cc | 3 - .../adapters/file_signal_source.h | 2 +- .../adapters/flexiband_signal_source.cc | 3 - .../adapters/flexiband_signal_source.h | 2 +- .../adapters/gn3s_signal_source.cc | 5 - .../adapters/gn3s_signal_source.h | 2 +- .../adapters/labsat_signal_source.cc | 3 - .../adapters/labsat_signal_source.h | 2 +- .../multichannel_file_signal_source.cc | 3 - .../multichannel_file_signal_source.h | 2 +- .../adapters/nsr_file_signal_source.cc | 3 - .../adapters/nsr_file_signal_source.h | 2 +- .../adapters/osmosdr_signal_source.cc | 3 - .../adapters/osmosdr_signal_source.h | 2 +- .../adapters/plutosdr_signal_source.cc | 3 - .../adapters/plutosdr_signal_source.h | 2 +- .../adapters/raw_array_signal_source.cc | 3 - .../adapters/raw_array_signal_source.h | 2 +- .../adapters/rtl_tcp_signal_source.cc | 9 +- .../adapters/rtl_tcp_signal_source.h | 2 +- .../adapters/spir_file_signal_source.cc | 3 - .../adapters/spir_file_signal_source.h | 2 +- .../spir_gss6450_file_signal_source.cc | 3 - .../spir_gss6450_file_signal_source.h | 2 +- .../two_bit_cpx_file_signal_source.cc | 9 +- .../adapters/two_bit_cpx_file_signal_source.h | 2 +- .../two_bit_packed_file_signal_source.cc | 9 +- .../two_bit_packed_file_signal_source.h | 2 +- .../adapters/uhd_signal_source.cc | 3 - .../adapters/uhd_signal_source.h | 2 +- .../gnuradio_blocks/unpack_2bit_samples.cc | 3 - .../gnuradio_blocks/unpack_2bit_samples.h | 2 +- .../unpack_byte_2bit_cpx_samples.cc | 3 - .../unpack_byte_2bit_cpx_samples.h | 2 +- .../unpack_byte_2bit_samples.cc | 3 - .../unpack_byte_2bit_samples.h | 2 +- .../unpack_byte_4bit_samples.cc | 3 - .../unpack_byte_4bit_samples.h | 2 +- .../unpack_intspir_1bit_samples.cc | 3 - .../unpack_intspir_1bit_samples.h | 2 +- .../unpack_spir_gss6450_samples.cc | 3 - .../unpack_spir_gss6450_samples.h | 2 +- .../adapters/beidou_b1i_telemetry_decoder.cc | 3 - .../adapters/beidou_b1i_telemetry_decoder.h | 2 +- .../adapters/beidou_b3i_telemetry_decoder.cc | 5 +- .../adapters/beidou_b3i_telemetry_decoder.h | 2 +- .../adapters/galileo_e1b_telemetry_decoder.cc | 3 - .../adapters/galileo_e1b_telemetry_decoder.h | 2 +- .../adapters/galileo_e5a_telemetry_decoder.cc | 3 - .../adapters/galileo_e5a_telemetry_decoder.h | 2 +- .../glonass_l1_ca_telemetry_decoder.cc | 3 - .../glonass_l1_ca_telemetry_decoder.h | 2 +- .../glonass_l2_ca_telemetry_decoder.cc | 3 - .../glonass_l2_ca_telemetry_decoder.h | 2 +- .../adapters/gps_l1_ca_telemetry_decoder.cc | 3 - .../adapters/gps_l1_ca_telemetry_decoder.h | 2 +- .../adapters/gps_l2c_telemetry_decoder.cc | 3 - .../adapters/gps_l2c_telemetry_decoder.h | 2 +- .../adapters/gps_l5_telemetry_decoder.cc | 3 - .../adapters/gps_l5_telemetry_decoder.h | 2 +- .../adapters/sbas_l1_telemetry_decoder.cc | 3 - .../adapters/sbas_l1_telemetry_decoder.h | 2 +- .../adapters/beidou_b1i_dll_pll_tracking.cc | 4 +- .../adapters/beidou_b1i_dll_pll_tracking.h | 2 +- .../adapters/beidou_b3i_dll_pll_tracking.cc | 3 - .../adapters/beidou_b3i_dll_pll_tracking.h | 2 +- .../galileo_e1_dll_pll_veml_tracking.cc | 3 - .../galileo_e1_dll_pll_veml_tracking.h | 2 +- .../galileo_e1_tcp_connector_tracking.cc | 7 +- .../galileo_e1_tcp_connector_tracking.h | 2 +- .../adapters/galileo_e5a_dll_pll_tracking.cc | 3 - .../adapters/galileo_e5a_dll_pll_tracking.h | 2 +- .../glonass_l1_ca_dll_pll_c_aid_tracking.cc | 3 - .../glonass_l1_ca_dll_pll_c_aid_tracking.h | 2 +- .../glonass_l1_ca_dll_pll_tracking.cc | 3 - .../adapters/glonass_l1_ca_dll_pll_tracking.h | 2 +- .../glonass_l2_ca_dll_pll_c_aid_tracking.cc | 3 - .../glonass_l2_ca_dll_pll_c_aid_tracking.h | 2 +- .../glonass_l2_ca_dll_pll_tracking.cc | 3 - .../adapters/glonass_l2_ca_dll_pll_tracking.h | 2 +- .../adapters/gps_l1_ca_dll_pll_tracking.cc | 3 - .../adapters/gps_l1_ca_dll_pll_tracking.h | 2 +- .../adapters/gps_l1_ca_kf_tracking.cc | 3 - .../tracking/adapters/gps_l1_ca_kf_tracking.h | 2 +- .../gps_l1_ca_tcp_connector_tracking.cc | 7 +- .../gps_l1_ca_tcp_connector_tracking.h | 5 +- .../adapters/gps_l2_m_dll_pll_tracking.cc | 4 +- .../adapters/gps_l2_m_dll_pll_tracking.h | 3 +- .../adapters/gps_l5_dll_pll_tracking.cc | 3 - .../adapters/gps_l5_dll_pll_tracking.h | 2 +- .../tracking/libs/bayesian_estimation.cc | 12 +- .../tracking/libs/bayesian_estimation.h | 8 +- .../tracking/libs/nonlinear_tracking.cc | 7 -- .../tracking/libs/nonlinear_tracking.h | 4 +- .../tracking/libs/tcp_communication.cc | 3 - .../tracking/libs/tcp_communication.h | 2 +- .../tracking/libs/tcp_packet_data.cc | 2 - .../tracking/libs/tcp_packet_data.h | 2 +- .../tracking/libs/tracking_2nd_DLL_filter.cc | 5 +- .../tracking/libs/tracking_2nd_DLL_filter.h | 2 +- .../tracking/libs/tracking_2nd_PLL_filter.cc | 3 - .../tracking/libs/tracking_2nd_PLL_filter.h | 2 +- .../tracking/libs/tracking_FLL_PLL_filter.cc | 3 - .../tracking/libs/tracking_FLL_PLL_filter.h | 2 +- src/core/libs/channel_status_msg_receiver.cc | 3 - src/core/libs/channel_status_msg_receiver.h | 2 +- src/core/libs/gnss_sdr_sample_counter.cc | 3 - src/core/libs/gnss_sdr_sample_counter.h | 2 +- src/core/libs/gnss_sdr_supl_client.cc | 3 - src/core/libs/gnss_sdr_supl_client.h | 2 +- src/core/libs/gnss_sdr_time_counter.cc | 3 - src/core/libs/gnss_sdr_time_counter.h | 2 +- src/core/libs/string_converter.cc | 6 - src/core/libs/string_converter.h | 4 +- src/core/monitor/gnss_synchro_monitor.cc | 3 - src/core/monitor/gnss_synchro_monitor.h | 2 +- src/core/receiver/gnss_block_factory.cc | 94 +++++++------- src/core/receiver/gnss_block_factory.h | 4 +- src/core/receiver/tcp_cmd_interface.cc | 3 - src/core/receiver/tcp_cmd_interface.h | 2 +- src/utils/front-end-cal/front_end_cal.cc | 3 - src/utils/front-end-cal/front_end_cal.h | 117 +++++++++--------- 226 files changed, 259 insertions(+), 593 deletions(-) diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc index 27dad02cd..d3d73b2ca 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc @@ -133,10 +133,7 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition( { LOG(ERROR) << "This implementation does not provide an output stream"; } -} - - -BeidouB1iPcpsAcquisition::~BeidouB1iPcpsAcquisition() = default; +}; void BeidouB1iPcpsAcquisition::stop_acquisition() diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h index 0c2e611e2..5136a9d50 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h @@ -60,7 +60,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams); - virtual ~BeidouB1iPcpsAcquisition(); + ~BeidouB1iPcpsAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc index bdeede24e..2fbf4a5a7 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc @@ -134,9 +134,6 @@ BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition( } -BeidouB3iPcpsAcquisition::~BeidouB3iPcpsAcquisition() = default; - - void BeidouB3iPcpsAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h index c57f28127..2ea6b3284 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h @@ -59,7 +59,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams); - virtual ~BeidouB3iPcpsAcquisition(); + ~BeidouB3iPcpsAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc index 2e3042277..992da896a 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc @@ -123,9 +123,6 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition( } -GalileoE1Pcps8msAmbiguousAcquisition::~GalileoE1Pcps8msAmbiguousAcquisition() = default; - - void GalileoE1Pcps8msAmbiguousAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h index a3be14fce..2371c0793 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE1Pcps8msAmbiguousAcquisition(); + ~GalileoE1Pcps8msAmbiguousAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc index 2d31a2c84..bf97d2df3 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc @@ -167,9 +167,6 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( } -GalileoE1PcpsAmbiguousAcquisition::~GalileoE1PcpsAmbiguousAcquisition() = default; - - void GalileoE1PcpsAmbiguousAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h index 92c25724b..79b2a1f41 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h @@ -58,7 +58,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE1PcpsAmbiguousAcquisition(); + ~GalileoE1PcpsAmbiguousAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc index e1021b6b7..d434178ab 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc @@ -194,9 +194,6 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga( } -GalileoE1PcpsAmbiguousAcquisitionFpga::~GalileoE1PcpsAmbiguousAcquisitionFpga() = default; - - void GalileoE1PcpsAmbiguousAcquisitionFpga::stop_acquisition() { // this command causes the SW to reset the HW. diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h index a92b65e31..07478f380 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h @@ -56,7 +56,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE1PcpsAmbiguousAcquisitionFpga(); + ~GalileoE1PcpsAmbiguousAcquisitionFpga() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc index f16c6e5da..f10fda049 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc @@ -123,9 +123,6 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition } -GalileoE1PcpsCccwsrAmbiguousAcquisition::~GalileoE1PcpsCccwsrAmbiguousAcquisition() = default; - - void GalileoE1PcpsCccwsrAmbiguousAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h index eac80983c..005424a75 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE1PcpsCccwsrAmbiguousAcquisition(); + ~GalileoE1PcpsCccwsrAmbiguousAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc index c7c86857b..8070ec7ef 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc @@ -157,9 +157,6 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui } -GalileoE1PcpsQuickSyncAmbiguousAcquisition::~GalileoE1PcpsQuickSyncAmbiguousAcquisition() = default; - - void GalileoE1PcpsQuickSyncAmbiguousAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h index ecbac95b6..c6ad70ede 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE1PcpsQuickSyncAmbiguousAcquisition(); + ~GalileoE1PcpsQuickSyncAmbiguousAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc index d81aa4bbd..906750662 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc @@ -127,9 +127,6 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition( } -GalileoE1PcpsTongAmbiguousAcquisition::~GalileoE1PcpsTongAmbiguousAcquisition() = default; - - void GalileoE1PcpsTongAmbiguousAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h index 402383fcb..33ad8fc22 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE1PcpsTongAmbiguousAcquisition(); + ~GalileoE1PcpsTongAmbiguousAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc index e02e6b97f..49f87268b 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc @@ -132,9 +132,6 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf( } -GalileoE5aNoncoherentIQAcquisitionCaf::~GalileoE5aNoncoherentIQAcquisitionCaf() = default; - - void GalileoE5aNoncoherentIQAcquisitionCaf::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h index 7064c0aa9..c76dd090b 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE5aNoncoherentIQAcquisitionCaf(); + ~GalileoE5aNoncoherentIQAcquisitionCaf() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc index 442c78e08..ace2fc968 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc @@ -165,9 +165,6 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con } -GalileoE5aPcpsAcquisition::~GalileoE5aPcpsAcquisition() = default; - - void GalileoE5aPcpsAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h index f6b694a67..8db725c84 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h @@ -49,7 +49,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE5aPcpsAcquisition(); + ~GalileoE5aPcpsAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc index a0bd49ba0..e2a2a21f4 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc @@ -197,9 +197,6 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf } -GalileoE5aPcpsAcquisitionFpga::~GalileoE5aPcpsAcquisitionFpga() = default; - - void GalileoE5aPcpsAcquisitionFpga::stop_acquisition() { // this command causes the SW to reset the HW. diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h index 37e0bf9dd..da9f1e1c3 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h @@ -59,7 +59,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE5aPcpsAcquisitionFpga(); + ~GalileoE5aPcpsAcquisitionFpga() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc index bdac10535..39a7b773e 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc @@ -138,9 +138,6 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition( } -GlonassL1CaPcpsAcquisition::~GlonassL1CaPcpsAcquisition() = default; - - void GlonassL1CaPcpsAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h index 1768c3bb4..fd790653e 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h @@ -57,7 +57,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GlonassL1CaPcpsAcquisition(); + ~GlonassL1CaPcpsAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc index 2210eebbf..b8c8f2858 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc @@ -137,9 +137,6 @@ GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition( } -GlonassL2CaPcpsAcquisition::~GlonassL2CaPcpsAcquisition() = default; - - void GlonassL2CaPcpsAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h index efe36e7ea..861903453 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h @@ -56,7 +56,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GlonassL2CaPcpsAcquisition(); + ~GlonassL2CaPcpsAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc index 9c50bb3c1..9325e8aba 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc @@ -161,9 +161,6 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( } -GpsL1CaPcpsAcquisition::~GpsL1CaPcpsAcquisition() = default; - - void GpsL1CaPcpsAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h index bef0202bc..2f1142142 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h @@ -62,7 +62,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaPcpsAcquisition(); + ~GpsL1CaPcpsAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc index 1c67657b8..dd71190a5 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc @@ -109,9 +109,6 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler( } -GpsL1CaPcpsAcquisitionFineDoppler::~GpsL1CaPcpsAcquisitionFineDoppler() = default; - - void GpsL1CaPcpsAcquisitionFineDoppler::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h index 80fc080b6..5230d3b1c 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaPcpsAcquisitionFineDoppler(); + ~GpsL1CaPcpsAcquisitionFineDoppler() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc index 7216d09d5..998da32a0 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc @@ -175,9 +175,6 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga( } -GpsL1CaPcpsAcquisitionFpga::~GpsL1CaPcpsAcquisitionFpga() = default; - - void GpsL1CaPcpsAcquisitionFpga::stop_acquisition() { // this command causes the SW to reset the HW. diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h index 39b8d2e1f..6b2471636 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h @@ -60,7 +60,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaPcpsAcquisitionFpga(); + ~GpsL1CaPcpsAcquisitionFpga() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc index 592648bd6..b45fe8a70 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc @@ -101,9 +101,6 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition( } -GpsL1CaPcpsAssistedAcquisition::~GpsL1CaPcpsAssistedAcquisition() = default; - - void GpsL1CaPcpsAssistedAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h index 9b38e6608..7c79f2343 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaPcpsAssistedAcquisition(); + ~GpsL1CaPcpsAssistedAcquisition() = default; inline std::string role() override { 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 de5832cf1..4072cd795 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 @@ -121,9 +121,6 @@ GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition( } -GpsL1CaPcpsOpenClAcquisition::~GpsL1CaPcpsOpenClAcquisition() = default; - - void GpsL1CaPcpsOpenClAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index c70d77a54..637c4b22c 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaPcpsOpenClAcquisition(); + ~GpsL1CaPcpsOpenClAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc index 251216eab..aaa2594f8 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc @@ -150,9 +150,6 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition( } -GpsL1CaPcpsQuickSyncAcquisition::~GpsL1CaPcpsQuickSyncAcquisition() = default; - - void GpsL1CaPcpsQuickSyncAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h index 7f5390782..a5aca4f6d 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h @@ -56,7 +56,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaPcpsQuickSyncAcquisition(); + ~GpsL1CaPcpsQuickSyncAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc index c670cc0bb..62bdbc045 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc @@ -112,9 +112,6 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition( } -GpsL1CaPcpsTongAcquisition::~GpsL1CaPcpsTongAcquisition() = default; - - void GpsL1CaPcpsTongAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h index 7193e5466..4e69f8e36 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaPcpsTongAcquisition(); + ~GpsL1CaPcpsTongAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc index d424bdb5f..d5f0a1dee 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc @@ -165,9 +165,6 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( } -GpsL2MPcpsAcquisition::~GpsL2MPcpsAcquisition() = default; - - void GpsL2MPcpsAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h index 25a792d69..6a9b63cfc 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h @@ -59,7 +59,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL2MPcpsAcquisition(); + ~GpsL2MPcpsAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc index 17d98fc25..c51cadcc8 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc @@ -164,9 +164,6 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga( } -GpsL2MPcpsAcquisitionFpga::~GpsL2MPcpsAcquisitionFpga() = default; - - void GpsL2MPcpsAcquisitionFpga::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h index 9507abffd..d560f04d3 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h @@ -58,7 +58,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL2MPcpsAcquisitionFpga(); + ~GpsL2MPcpsAcquisitionFpga() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc index 8b0a6e793..ffc881d85 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc @@ -160,9 +160,6 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition( } -GpsL5iPcpsAcquisition::~GpsL5iPcpsAcquisition() = default; - - void GpsL5iPcpsAcquisition::stop_acquisition() { } diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h index 17a1b634c..8d404a6b4 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h @@ -59,7 +59,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL5iPcpsAcquisition(); + ~GpsL5iPcpsAcquisition() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc index 30bd9d407..fbafae22c 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc @@ -178,9 +178,6 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga( } -GpsL5iPcpsAcquisitionFpga::~GpsL5iPcpsAcquisitionFpga() = default; - - void GpsL5iPcpsAcquisitionFpga::stop_acquisition() { // this command causes the SW to reset the HW. diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h index 1d5c8e922..ce9a2485e 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h @@ -59,7 +59,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL5iPcpsAcquisitionFpga(); + ~GpsL5iPcpsAcquisitionFpga() = default; inline std::string role() override { diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc index c4b42360f..217665fd1 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc @@ -206,9 +206,6 @@ pcps_acquisition::pcps_acquisition(const Acq_Conf& conf_) : gr::block("pcps_acqu } -pcps_acquisition::~pcps_acquisition() = default; - - void pcps_acquisition::set_resampler_latency(uint32_t latency_samples) { gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h index cfdf5c103..2d12f192b 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h @@ -90,7 +90,7 @@ pcps_acquisition_sptr pcps_make_acquisition(const Acq_Conf& conf_); class pcps_acquisition : public gr::block { public: - ~pcps_acquisition(); + ~pcps_acquisition() = default; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc index 2d9929063..c721a924a 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc @@ -84,9 +84,6 @@ pcps_acquisition_fpga::pcps_acquisition_fpga(pcpsconf_fpga_t conf_) } -pcps_acquisition_fpga::~pcps_acquisition_fpga() = default; - - void pcps_acquisition_fpga::set_local_code() { acquisition_fpga->set_local_code(d_gnss_synchro->PRN); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h index ad9d66af1..b2933c7f5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.h @@ -89,7 +89,7 @@ pcps_acquisition_fpga_sptr pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_); class pcps_acquisition_fpga { public: - ~pcps_acquisition_fpga(); + ~pcps_acquisition_fpga() = default; /*! * \brief Set acquisition/tracking common Gnss_Synchro object pointer diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.cc b/src/algorithms/acquisition/libs/fpga_acquisition.cc index 16d5534de..7e74b7d01 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.cc +++ b/src/algorithms/acquisition/libs/fpga_acquisition.cc @@ -108,9 +108,6 @@ Fpga_Acquisition::Fpga_Acquisition(std::string device_name, } -Fpga_Acquisition::~Fpga_Acquisition() = default; - - bool Fpga_Acquisition::set_local_code(uint32_t PRN) { // select the code with the chosen PRN diff --git a/src/algorithms/acquisition/libs/fpga_acquisition.h b/src/algorithms/acquisition/libs/fpga_acquisition.h index dd28f4314..0e8b1926d 100644 --- a/src/algorithms/acquisition/libs/fpga_acquisition.h +++ b/src/algorithms/acquisition/libs/fpga_acquisition.h @@ -56,7 +56,7 @@ public: uint32_t *all_fft_codes, uint32_t excludelimit); - ~Fpga_Acquisition(); + ~Fpga_Acquisition() = default; bool set_local_code(uint32_t PRN); diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc index 2cea8e915..717627527 100644 --- a/src/algorithms/channel/adapters/channel.cc +++ b/src/algorithms/channel/adapters/channel.cc @@ -118,9 +118,6 @@ Channel::Channel(ConfigurationInterface* configuration, uint32_t channel, std::s } -Channel::~Channel() = default; - - void Channel::connect(gr::top_block_sptr top_block) { if (!flag_enable_fpga) diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h index 9e4048a2d..289e5528d 100644 --- a/src/algorithms/channel/adapters/channel.h +++ b/src/algorithms/channel/adapters/channel.h @@ -69,7 +69,7 @@ public: std::shared_ptr trk, std::shared_ptr nav, std::string role, std::string implementation, std::shared_ptr> queue); - virtual ~Channel(); //!< Virtual destructor + ~Channel() = default; //!< Destructor void connect(gr::top_block_sptr top_block) override; //!< connects the tracking block to the top_block and to the telemetry void disconnect(gr::top_block_sptr top_block) override; diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc index c7cc8846f..9daa85086 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc @@ -55,9 +55,6 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr cha } -channel_msg_receiver_cc::~channel_msg_receiver_cc() = default; - - void channel_msg_receiver_cc::msg_handler_events(pmt::pmt_t msg) { bool result = false; diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.h b/src/algorithms/channel/libs/channel_msg_receiver_cc.h index 8b38e10ab..11e41e783 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.h +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.h @@ -48,7 +48,7 @@ channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr channel_fsm, bool repeat); diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc index d82535e6c..0570029f9 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc @@ -54,10 +54,6 @@ ArraySignalConditioner::ArraySignalConditioner(ConfigurationInterface *configura } -// Destructor -ArraySignalConditioner::~ArraySignalConditioner() = default; - - void ArraySignalConditioner::connect(gr::top_block_sptr top_block) { // note: the array signal conditioner do not have data type adapter, and must use the array input filter (multichannel) diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.h b/src/algorithms/conditioner/adapters/array_signal_conditioner.h index b8f43de03..a686df724 100644 --- a/src/algorithms/conditioner/adapters/array_signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.h @@ -55,8 +55,8 @@ public: std::shared_ptr data_type_adapt, std::shared_ptr in_filt, std::shared_ptr res, std::string role, std::string implementation); - //! Virtual destructor - virtual ~ArraySignalConditioner(); + //! Destructor + ~ArraySignalConditioner() = default; void connect(gr::top_block_sptr top_block) override; void disconnect(gr::top_block_sptr top_block) override; diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.cc b/src/algorithms/conditioner/adapters/signal_conditioner.cc index 72b6ab404..81232b497 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.cc +++ b/src/algorithms/conditioner/adapters/signal_conditioner.cc @@ -54,10 +54,6 @@ SignalConditioner::SignalConditioner(ConfigurationInterface *configuration, } -// Destructor -SignalConditioner::~SignalConditioner() = default; - - void SignalConditioner::connect(gr::top_block_sptr top_block) { if (connected_) diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h index 455c6e287..93cc867f7 100644 --- a/src/algorithms/conditioner/adapters/signal_conditioner.h +++ b/src/algorithms/conditioner/adapters/signal_conditioner.h @@ -52,8 +52,8 @@ public: std::shared_ptr data_type_adapt, std::shared_ptr in_filt, std::shared_ptr res, std::string role, std::string implementation); - //! Virtual destructor - virtual ~SignalConditioner(); + //! Destructor + ~SignalConditioner() = default; void connect(gr::top_block_sptr top_block) override; void disconnect(gr::top_block_sptr top_block) override; diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc index 778d42d09..715f33721 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc @@ -71,9 +71,6 @@ ByteToShort::ByteToShort(ConfigurationInterface* configuration, std::string role } -ByteToShort::~ByteToShort() = default; - - void ByteToShort::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.h b/src/algorithms/data_type_adapter/adapters/byte_to_short.h index 9b90f1d3b..ab20856f1 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.h +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.h @@ -49,7 +49,7 @@ public: std::string role, unsigned int in_streams, unsigned int out_streams); - virtual ~ByteToShort(); + ~ByteToShort() = default; inline std::string role() override { diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc index bc044be04..2549f343d 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc @@ -76,9 +76,6 @@ IbyteToCbyte::IbyteToCbyte(ConfigurationInterface* configuration, const std::str } -IbyteToCbyte::~IbyteToCbyte() = default; - - void IbyteToCbyte::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h index 3fb202a1a..243866b31 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h @@ -51,7 +51,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams); - virtual ~IbyteToCbyte(); + ~IbyteToCbyte() = default; inline std::string role() override { diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc index e32c4adca..9ffe86d2f 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc @@ -74,9 +74,6 @@ IbyteToComplex::IbyteToComplex(ConfigurationInterface* configuration, const std: } -IbyteToComplex::~IbyteToComplex() = default; - - void IbyteToComplex::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h index 9271689bc..8302a2fdd 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h @@ -51,7 +51,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams); - virtual ~IbyteToComplex(); + ~IbyteToComplex() = default; inline std::string role() override { diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc index 89aa9f7e8..5f1e44cb3 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc @@ -76,9 +76,6 @@ IbyteToCshort::IbyteToCshort(ConfigurationInterface* configuration, const std::s } -IbyteToCshort::~IbyteToCshort() = default; - - void IbyteToCshort::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h index 9e7c5b74b..028ba777b 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h @@ -51,7 +51,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams); - virtual ~IbyteToCshort(); + ~IbyteToCshort() = default; inline std::string role() override { diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc index 8f9d564b1..457e0fc32 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc @@ -74,9 +74,6 @@ IshortToComplex::IshortToComplex(ConfigurationInterface* configuration, const st } -IshortToComplex::~IshortToComplex() = default; - - void IshortToComplex::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h index 73d1133a8..a12fdf8fe 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h @@ -50,7 +50,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams); - virtual ~IshortToComplex(); + ~IshortToComplex() = default; inline std::string role() override { diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc index 0af4407c5..67dba11bd 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc @@ -76,9 +76,6 @@ IshortToCshort::IshortToCshort(ConfigurationInterface* configuration, const std: } -IshortToCshort::~IshortToCshort() = default; - - void IshortToCshort::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h index 925065a1d..d067f2625 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h @@ -51,7 +51,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams); - virtual ~IshortToCshort(); + ~IshortToCshort() = default; inline std::string role() override { diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.cc b/src/algorithms/input_filter/adapters/beamformer_filter.cc index 52f46ca6b..b2632c971 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.cc +++ b/src/algorithms/input_filter/adapters/beamformer_filter.cc @@ -77,9 +77,6 @@ BeamformerFilter::BeamformerFilter( } -BeamformerFilter::~BeamformerFilter() = default; - - void BeamformerFilter::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.h b/src/algorithms/input_filter/adapters/beamformer_filter.h index 89df25223..86403e5ba 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.h +++ b/src/algorithms/input_filter/adapters/beamformer_filter.h @@ -50,7 +50,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream); - virtual ~BeamformerFilter(); + ~BeamformerFilter() = default; inline std::string role() override { @@ -86,4 +86,4 @@ private: gr::block_sptr file_sink_; }; -#endif /*GNSS_SDR_BEAMFORMER_FILTER_H_*/ +#endif /* GNSS_SDR_BEAMFORMER_FILTER_H_ */ diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc index 9529bcb6c..83790a049 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.cc +++ b/src/algorithms/input_filter/adapters/fir_filter.cc @@ -140,9 +140,6 @@ FirFilter::FirFilter(ConfigurationInterface* configuration, std::string role, } -FirFilter::~FirFilter() = default; - - void FirFilter::connect(gr::top_block_sptr top_block) { if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex")) diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h index 85626f2cc..c76bbe2b4 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.h +++ b/src/algorithms/input_filter/adapters/fir_filter.h @@ -73,7 +73,7 @@ public: unsigned int out_streams); //! Destructor - virtual ~FirFilter(); + ~FirFilter() = default; inline std::string role() override { diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc index f6e062ab8..2f4be2663 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -121,7 +121,7 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration } size_t item_size; - LOG(INFO) << "Created freq_xlating_fir_filter with " << taps_.size()<<" taps"; + LOG(INFO) << "Created freq_xlating_fir_filter with " << taps_.size() << " taps"; if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex")) { item_size = sizeof(gr_complex); //output @@ -195,9 +195,6 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(ConfigurationInterface* configuration } -FreqXlatingFirFilter::~FreqXlatingFirFilter() = default; - - void FreqXlatingFirFilter::connect(gr::top_block_sptr top_block) { if ((taps_item_type_ == "float") && (input_item_type_ == "gr_complex") && (output_item_type_ == "gr_complex")) diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h index fad4f89cd..9d8ec4f03 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h @@ -71,7 +71,7 @@ public: std::string role, unsigned int in_streams, unsigned int out_streams); - virtual ~FreqXlatingFirFilter(); + ~FreqXlatingFirFilter() = default; inline std::string role() override { diff --git a/src/algorithms/input_filter/adapters/notch_filter.cc b/src/algorithms/input_filter/adapters/notch_filter.cc index 98bb16b7e..76844359d 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.cc +++ b/src/algorithms/input_filter/adapters/notch_filter.cc @@ -90,9 +90,6 @@ NotchFilter::NotchFilter(ConfigurationInterface* configuration, const std::strin } -NotchFilter::~NotchFilter() = default; - - void NotchFilter::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/input_filter/adapters/notch_filter.h b/src/algorithms/input_filter/adapters/notch_filter.h index c0e1f9510..ae9c4be74 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.h +++ b/src/algorithms/input_filter/adapters/notch_filter.h @@ -48,7 +48,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams); - virtual ~NotchFilter(); + ~NotchFilter() = default; std::string role() { return role_; @@ -79,4 +79,4 @@ private: notch_sptr notch_filter_; }; -#endif //GNSS_SDR_NOTCH_FILTER_H_ +#endif // GNSS_SDR_NOTCH_FILTER_H_ diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.cc b/src/algorithms/input_filter/adapters/notch_filter_lite.cc index 6ebf5cb05..a8feac37e 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.cc +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.cc @@ -98,9 +98,6 @@ NotchFilterLite::NotchFilterLite(ConfigurationInterface* configuration, const st } -NotchFilterLite::~NotchFilterLite() = default; - - void NotchFilterLite::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.h b/src/algorithms/input_filter/adapters/notch_filter_lite.h index d8352706d..0053f5e09 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.h +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.h @@ -48,7 +48,7 @@ public: const std::string& role, unsigned int in_streams, unsigned int out_streams); - virtual ~NotchFilterLite(); + ~NotchFilterLite() = default; std::string role() { return role_; @@ -79,4 +79,4 @@ private: notch_lite_sptr notch_filter_lite_; }; -#endif //GNSS_SDR_NOTCH_FILTER_LITE_H_ +#endif // GNSS_SDR_NOTCH_FILTER_LITE_H_ diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc index 67b86c817..806dc3978 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc @@ -105,9 +105,6 @@ PulseBlankingFilter::PulseBlankingFilter(ConfigurationInterface* configuration, } -PulseBlankingFilter::~PulseBlankingFilter() = default; - - void PulseBlankingFilter::connect(gr::top_block_sptr top_block) { if (input_item_type_ == "gr_complex") diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h index 87f8c4994..a9c04c5af 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h @@ -51,7 +51,7 @@ public: std::string role, unsigned int in_streams, unsigned int out_streams); - virtual ~PulseBlankingFilter(); + ~PulseBlankingFilter() = default; inline std::string role() override { diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc index 549740b84..8ca0127e1 100644 --- a/src/algorithms/libs/pass_through.cc +++ b/src/algorithms/libs/pass_through.cc @@ -129,9 +129,6 @@ Pass_Through::Pass_Through(ConfigurationInterface* configuration, const std::str } -Pass_Through::~Pass_Through() = default; - - void Pass_Through::connect(gr::top_block_sptr top_block) { if (top_block) diff --git a/src/algorithms/libs/pass_through.h b/src/algorithms/libs/pass_through.h index ec8046862..d15091dc9 100644 --- a/src/algorithms/libs/pass_through.h +++ b/src/algorithms/libs/pass_through.h @@ -56,7 +56,7 @@ public: unsigned int in_stream, unsigned int out_stream); - virtual ~Pass_Through(); + ~Pass_Through() = default; inline std::string role() override { diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index e038e47ff..6842ff9ea 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -50,9 +50,6 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration, } -HybridObservables::~HybridObservables() = default; - - void HybridObservables::connect(gr::top_block_sptr top_block) { if (top_block) diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h index 7e2d6c674..1ae5adf2a 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.h +++ b/src/algorithms/observables/adapters/hybrid_observables.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~HybridObservables(); + ~HybridObservables() = default; inline std::string role() override { diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc index 37e60b6fa..a6c3f2a4b 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc @@ -113,9 +113,6 @@ DirectResamplerConditioner::DirectResamplerConditioner( } -DirectResamplerConditioner::~DirectResamplerConditioner() = default; - - void DirectResamplerConditioner::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h index 300ce297f..642e4da9b 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h @@ -50,7 +50,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream); - virtual ~DirectResamplerConditioner(); + ~DirectResamplerConditioner() = default; inline std::string role() override { diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc index 4639f1a78..e51859d96 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc @@ -105,9 +105,6 @@ MmseResamplerConditioner::MmseResamplerConditioner( } -MmseResamplerConditioner::~MmseResamplerConditioner() = default; - - void MmseResamplerConditioner::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h index 641975e83..644c88deb 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h @@ -58,7 +58,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream); - virtual ~MmseResamplerConditioner(); + ~MmseResamplerConditioner() = default; inline std::string role() override { diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc index 99948c3bb..a0fdc1824 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc @@ -70,9 +70,6 @@ direct_resampler_conditioner_cb::direct_resampler_conditioner_cb( } -direct_resampler_conditioner_cb::~direct_resampler_conditioner_cb() = default; - - void direct_resampler_conditioner_cb::forecast(int noutput_items, gr_vector_int &ninput_items_required) { diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h index e7ceb9683..3c7a92174 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h @@ -50,7 +50,7 @@ direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb( class direct_resampler_conditioner_cb : public gr::block { public: - ~direct_resampler_conditioner_cb(); + ~direct_resampler_conditioner_cb() = default; inline unsigned int sample_freq_in() const { diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc index b302272ca..8529fb8f0 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc @@ -68,9 +68,6 @@ direct_resampler_conditioner_cc::direct_resampler_conditioner_cc( } -direct_resampler_conditioner_cc::~direct_resampler_conditioner_cc() = default; - - void direct_resampler_conditioner_cc::forecast(int noutput_items, gr_vector_int &ninput_items_required) { diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h index 6469aada5..88092561d 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h @@ -58,7 +58,7 @@ direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc( class direct_resampler_conditioner_cc : public gr::block { public: - ~direct_resampler_conditioner_cc(); + ~direct_resampler_conditioner_cc() = default; inline unsigned int sample_freq_in() const { return d_sample_freq_in; diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc index 6a4b5a8d3..0b338d981 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc @@ -71,9 +71,6 @@ direct_resampler_conditioner_cs::direct_resampler_conditioner_cs( } -direct_resampler_conditioner_cs::~direct_resampler_conditioner_cs() = default; - - void direct_resampler_conditioner_cs::forecast(int noutput_items, gr_vector_int &ninput_items_required) { diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h index 5b643be93..a47bef251 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h @@ -50,7 +50,7 @@ direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs( class direct_resampler_conditioner_cs : public gr::block { public: - ~direct_resampler_conditioner_cs(); + ~direct_resampler_conditioner_cs() = default; inline unsigned int sample_freq_in() const { diff --git a/src/algorithms/signal_generator/adapters/signal_generator.cc b/src/algorithms/signal_generator/adapters/signal_generator.cc index 31636f246..700cd6810 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.cc +++ b/src/algorithms/signal_generator/adapters/signal_generator.cc @@ -156,9 +156,6 @@ SignalGenerator::SignalGenerator(ConfigurationInterface* configuration, } -SignalGenerator::~SignalGenerator() = default; - - void SignalGenerator::connect(gr::top_block_sptr top_block) { if (item_type_ == "gr_complex") diff --git a/src/algorithms/signal_generator/adapters/signal_generator.h b/src/algorithms/signal_generator/adapters/signal_generator.h index d2adfc27e..73a408d3f 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.h +++ b/src/algorithms/signal_generator/adapters/signal_generator.h @@ -56,7 +56,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream, std::shared_ptr > queue); - virtual ~SignalGenerator(); + ~SignalGenerator() = default; inline std::string role() override { 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 a130b32f8..192db786d 100644 --- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc @@ -109,9 +109,6 @@ CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configurati } -CustomUDPSignalSource::~CustomUDPSignalSource() = default; - - void CustomUDPSignalSource::connect(gr::top_block_sptr top_block) { // connect null sinks to unused streams diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h index 3d8d400de..ac0f85d41 100644 --- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h +++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h @@ -57,7 +57,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream, std::shared_ptr> queue); - virtual ~CustomUDPSignalSource(); + ~CustomUDPSignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc index b478b6363..ee6f8d7cd 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/file_signal_source.cc @@ -255,9 +255,6 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration, } -FileSignalSource::~FileSignalSource() = default; - - void FileSignalSource::connect(gr::top_block_sptr top_block) { if (samples_ > 0) diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h index 86d87798a..16a8a2c44 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.h +++ b/src/algorithms/signal_source/adapters/file_signal_source.h @@ -59,7 +59,7 @@ public: unsigned int in_streams, unsigned int out_streams, std::shared_ptr> queue); - virtual ~FileSignalSource(); + ~FileSignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc index 478a6973d..5fd4b8dbc 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc @@ -111,9 +111,6 @@ FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configurati } -FlexibandSignalSource::~FlexibandSignalSource() = default; - - void FlexibandSignalSource::connect(gr::top_block_sptr top_block) { for (int n = 0; n < (n_channels_ * 2); n++) diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h index 56c2aff09..ca2b87ba0 100644 --- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h +++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h @@ -59,7 +59,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream, std::shared_ptr> queue); - virtual ~FlexibandSignalSource(); + ~FlexibandSignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc index 4a699d09d..3c6adf815 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc @@ -75,11 +75,6 @@ Gn3sSignalSource::Gn3sSignalSource(ConfigurationInterface* configuration, } -Gn3sSignalSource::~Gn3sSignalSource() -{ -} - - void Gn3sSignalSource::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h index e34b91afe..caf7cae02 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h @@ -52,7 +52,7 @@ public: std::string role, unsigned int in_stream, unsigned int out_stream, std::shared_ptr> queue); - virtual ~Gn3sSignalSource(); + ~Gn3sSignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.cc b/src/algorithms/signal_source/adapters/labsat_signal_source.cc index e6366261a..442c3d907 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc @@ -82,9 +82,6 @@ LabsatSignalSource::LabsatSignalSource(ConfigurationInterface* configuration, } -LabsatSignalSource::~LabsatSignalSource() = default; - - void LabsatSignalSource::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h index 9bf5d2057..094f98cab 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.h +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h @@ -51,7 +51,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream, std::shared_ptr> queue); - virtual ~LabsatSignalSource(); + ~LabsatSignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc index 330b3e43c..88b0c231e 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc @@ -249,9 +249,6 @@ MultichannelFileSignalSource::MultichannelFileSignalSource(ConfigurationInterfac } -MultichannelFileSignalSource::~MultichannelFileSignalSource() = default; - - void MultichannelFileSignalSource::connect(gr::top_block_sptr top_block) { if (enable_throttle_control_ == true) diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h index db3a9c57c..6e6c5e648 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h @@ -59,7 +59,7 @@ public: unsigned int in_streams, unsigned int out_streams, std::shared_ptr> queue); - virtual ~MultichannelFileSignalSource(); + ~MultichannelFileSignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc index dc00bcecb..25868eeb3 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc @@ -181,9 +181,6 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration, } -NsrFileSignalSource::~NsrFileSignalSource() = default; - - void NsrFileSignalSource::connect(gr::top_block_sptr top_block) { if (samples_ > 0) diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h index 2efaa09b3..c36e08be0 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h @@ -58,7 +58,7 @@ public: unsigned int in_streams, unsigned int out_streams, std::shared_ptr> queue); - virtual ~NsrFileSignalSource(); + ~NsrFileSignalSource() = default; inline std::string role() override { return role_; diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc index 38f823248..6b1fec12a 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc @@ -155,9 +155,6 @@ OsmosdrSignalSource::OsmosdrSignalSource(ConfigurationInterface* configuration, } -OsmosdrSignalSource::~OsmosdrSignalSource() = default; - - void OsmosdrSignalSource::driver_instance() { try diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h index 8a96f32d6..7fbbb1e8b 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h @@ -57,7 +57,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream, std::shared_ptr> queue); - virtual ~OsmosdrSignalSource(); + ~OsmosdrSignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc index ba6af1fd6..8aa96e3a4 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc @@ -103,9 +103,6 @@ PlutosdrSignalSource::PlutosdrSignalSource(ConfigurationInterface* configuration } -PlutosdrSignalSource::~PlutosdrSignalSource() = default; - - void PlutosdrSignalSource::connect(gr::top_block_sptr top_block) { if (samples_ != 0) diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h index bc105d171..7b2ccb6b1 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h @@ -56,7 +56,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream, std::shared_ptr> queue); - virtual ~PlutosdrSignalSource(); + ~PlutosdrSignalSource() = default; std::string role() override { diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc index d54a7cb19..611597940 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc @@ -94,9 +94,6 @@ RawArraySignalSource::RawArraySignalSource(ConfigurationInterface* configuration } -RawArraySignalSource::~RawArraySignalSource() = default; - - void RawArraySignalSource::connect(gr::top_block_sptr top_block) { if (dump_) diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.h b/src/algorithms/signal_source/adapters/raw_array_signal_source.h index 750efb3fe..96848afda 100644 --- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h +++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h @@ -51,7 +51,7 @@ public: std::string role, unsigned int in_stream, unsigned int out_stream, std::shared_ptr> queue); - virtual ~RawArraySignalSource(); + ~RawArraySignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc index 478e6b1c7..0f608e62f 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc @@ -46,9 +46,9 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration, unsigned int in_stream, unsigned int out_stream, std::shared_ptr> queue) : role_(role), - in_stream_(in_stream), - out_stream_(out_stream), - queue_(std::move(queue)) + in_stream_(in_stream), + out_stream_(out_stream), + queue_(std::move(queue)) { // DUMP PARAMETERS std::string empty = ""; @@ -143,9 +143,6 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration, } -RtlTcpSignalSource::~RtlTcpSignalSource() = default; - - void RtlTcpSignalSource::MakeBlock() { try diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h index 2fcb9d871..6e649ddd0 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h @@ -60,7 +60,7 @@ public: unsigned int out_stream, std::shared_ptr> queue); - virtual ~RtlTcpSignalSource(); + ~RtlTcpSignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc index 91287020c..f17b3d4dd 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc @@ -180,9 +180,6 @@ SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration } -SpirFileSignalSource::~SpirFileSignalSource() = default; - - void SpirFileSignalSource::connect(gr::top_block_sptr top_block) { if (samples_ > 0) diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_file_signal_source.h index 09aff8c09..7b84b2d65 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h @@ -56,7 +56,7 @@ public: unsigned int in_streams, unsigned int out_streams, std::shared_ptr> queue); - virtual ~SpirFileSignalSource(); + ~SpirFileSignalSource() = default; inline std::string role() override { return role_; diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc index 4b6239ba5..4b28d30df 100644 --- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc @@ -179,9 +179,6 @@ SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(ConfigurationInterface* } -SpirGSS6450FileSignalSource::~SpirGSS6450FileSignalSource() = default; - - void SpirGSS6450FileSignalSource::connect(gr::top_block_sptr top_block) { if (samples_ > 0) diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h index 61edd479c..66103fd7f 100644 --- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h @@ -61,7 +61,7 @@ public: SpirGSS6450FileSignalSource(ConfigurationInterface* configuration, const std::string& role, uint32_t in_streams, uint32_t out_streams, std::shared_ptr> queue); - virtual ~SpirGSS6450FileSignalSource(); + ~SpirGSS6450FileSignalSource() = default; inline std::string role() override { return role_; diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc index 9e0b802d4..5e0e6b1e8 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc @@ -46,9 +46,9 @@ TwoBitCpxFileSignalSource::TwoBitCpxFileSignalSource(ConfigurationInterface* con unsigned int in_streams, unsigned int out_streams, std::shared_ptr> queue) : role_(role), - in_streams_(in_streams), - out_streams_(out_streams), - queue_(std::move(queue)) + in_streams_(in_streams), + out_streams_(out_streams), + queue_(std::move(queue)) { std::string default_filename = "../data/my_capture.dat"; std::string default_item_type = "byte"; @@ -186,9 +186,6 @@ TwoBitCpxFileSignalSource::TwoBitCpxFileSignalSource(ConfigurationInterface* con } -TwoBitCpxFileSignalSource::~TwoBitCpxFileSignalSource() = default; - - void TwoBitCpxFileSignalSource::connect(gr::top_block_sptr top_block) { if (samples_ > 0) diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h index dea315cec..8bd31b4f8 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h @@ -62,7 +62,7 @@ public: unsigned int out_streams, std::shared_ptr> queue); - virtual ~TwoBitCpxFileSignalSource(); + ~TwoBitCpxFileSignalSource() = default; inline std::string role() override { return role_; diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc index 4b0c00345..b60a7b210 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc @@ -48,9 +48,9 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac unsigned int in_streams, unsigned int out_streams, std::shared_ptr> queue) : role_(role), - in_streams_(in_streams), - out_streams_(out_streams), - queue_(std::move(queue)) + in_streams_(in_streams), + out_streams_(out_streams), + queue_(std::move(queue)) { std::string default_filename = "../data/my_capture.dat"; std::string default_item_type = "byte"; @@ -250,9 +250,6 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac } -TwoBitPackedFileSignalSource::~TwoBitPackedFileSignalSource() = default; - - void TwoBitPackedFileSignalSource::connect(gr::top_block_sptr top_block) { gr::basic_block_sptr left_block = file_source_; diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h index ea2bb2d5a..a9018fc3c 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h @@ -61,7 +61,7 @@ public: unsigned int in_streams, unsigned int out_streams, std::shared_ptr> queue); - virtual ~TwoBitPackedFileSignalSource(); + ~TwoBitPackedFileSignalSource() = default; inline std::string role() override { return role_; diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc index 16ab70b8e..dc2de3603 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc @@ -238,9 +238,6 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration, } -UhdSignalSource::~UhdSignalSource() = default; - - void UhdSignalSource::connect(gr::top_block_sptr top_block) { for (int i = 0; i < RF_channels_; i++) diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h index 232f6934f..d6b401fac 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.h +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h @@ -55,7 +55,7 @@ public: const std::string& role, unsigned int in_stream, unsigned int out_stream, std::shared_ptr> queue); - virtual ~UhdSignalSource(); + ~UhdSignalSource() = default; inline std::string role() override { diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc index db56ff0b2..7f09e0647 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc @@ -133,9 +133,6 @@ unpack_2bit_samples::unpack_2bit_samples(bool big_endian_bytes, } -unpack_2bit_samples::~unpack_2bit_samples() = default; - - int unpack_2bit_samples::work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h index f91e2d8d4..d477e71b4 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h @@ -89,7 +89,7 @@ unpack_2bit_samples_sptr make_unpack_2bit_samples( class unpack_2bit_samples : public gr::sync_interpolator { public: - ~unpack_2bit_samples(); + ~unpack_2bit_samples() = default; unpack_2bit_samples(bool big_endian_bytes, size_t item_size, diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc index 692bc22d7..32a74e4a3 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.cc @@ -57,9 +57,6 @@ unpack_byte_2bit_cpx_samples::unpack_byte_2bit_cpx_samples() : sync_interpolator } -unpack_byte_2bit_cpx_samples::~unpack_byte_2bit_cpx_samples() = default; - - int unpack_byte_2bit_cpx_samples::work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h index b399aba19..3c178285d 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h @@ -51,7 +51,7 @@ class unpack_byte_2bit_cpx_samples : public gr::sync_interpolator { public: unpack_byte_2bit_cpx_samples(); - ~unpack_byte_2bit_cpx_samples(); + ~unpack_byte_2bit_cpx_samples() = default; int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc index 28637016b..e5a162b39 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.cc @@ -52,9 +52,6 @@ unpack_byte_2bit_samples::unpack_byte_2bit_samples() : sync_interpolator("unpack } -unpack_byte_2bit_samples::~unpack_byte_2bit_samples() = default; - - int unpack_byte_2bit_samples::work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h index b9b86c503..24d5847f1 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h @@ -47,7 +47,7 @@ class unpack_byte_2bit_samples : public gr::sync_interpolator { public: unpack_byte_2bit_samples(); - ~unpack_byte_2bit_samples(); + ~unpack_byte_2bit_samples() = default; int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.cc index b20ccf21f..ccec3a713 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.cc @@ -47,9 +47,6 @@ unpack_byte_4bit_samples::unpack_byte_4bit_samples() : sync_interpolator("unpack } -unpack_byte_4bit_samples::~unpack_byte_4bit_samples() = default; - - int unpack_byte_4bit_samples::work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h index 599590a2c..e2614c9bf 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h @@ -49,7 +49,7 @@ class unpack_byte_4bit_samples : public gr::sync_interpolator { public: unpack_byte_4bit_samples(); - ~unpack_byte_4bit_samples(); + ~unpack_byte_4bit_samples() = default; int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc index f2a805f17..f89c41f24 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.cc @@ -47,9 +47,6 @@ unpack_intspir_1bit_samples::unpack_intspir_1bit_samples() : sync_interpolator(" } -unpack_intspir_1bit_samples::~unpack_intspir_1bit_samples() = default; - - int unpack_intspir_1bit_samples::work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h index 7be626bf7..b09708150 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h @@ -47,7 +47,7 @@ class unpack_intspir_1bit_samples : public gr::sync_interpolator { public: unpack_intspir_1bit_samples(); - ~unpack_intspir_1bit_samples(); + ~unpack_intspir_1bit_samples() = default; int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc index 02b9e3d30..c2a9e5fc7 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc @@ -49,9 +49,6 @@ unpack_spir_gss6450_samples::unpack_spir_gss6450_samples(unsigned int adc_nbit) } -unpack_spir_gss6450_samples::~unpack_spir_gss6450_samples() = default; - - void unpack_spir_gss6450_samples::decode_4bits_word(uint32_t input_uint32, gr_complex* out, int adc_bits) { int8_t tmp_char; diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h index dcb0552ca..4098961a5 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h @@ -49,7 +49,7 @@ public: friend unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples_sptr(unsigned int adc_nbit); void decode_4bits_word(uint32_t input_uint32, gr_complex *out, int adc_bits); unpack_spir_gss6450_samples(unsigned int adc_nbit); - ~unpack_spir_gss6450_samples(); + ~unpack_spir_gss6450_samples() = default; private: unsigned int adc_bits; diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc index 0850297cf..66766ab1c 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc @@ -61,9 +61,6 @@ BeidouB1iTelemetryDecoder::BeidouB1iTelemetryDecoder(ConfigurationInterface* con } -BeidouB1iTelemetryDecoder::~BeidouB1iTelemetryDecoder() = default; - - void BeidouB1iTelemetryDecoder::set_satellite(const Gnss_Satellite& satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h index cf6d466fe..9ec4eacd4 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~BeidouB1iTelemetryDecoder(); + ~BeidouB1iTelemetryDecoder() = default; inline std::string role() override { diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc index 702041239..110b4cb74 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.cc @@ -34,7 +34,7 @@ #include BeidouB3iTelemetryDecoder::BeidouB3iTelemetryDecoder( - ConfigurationInterface *configuration, const std::string& role, + ConfigurationInterface *configuration, const std::string &role, unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams) { @@ -58,9 +58,6 @@ BeidouB3iTelemetryDecoder::BeidouB3iTelemetryDecoder( } -BeidouB3iTelemetryDecoder::~BeidouB3iTelemetryDecoder() = default; - - void BeidouB3iTelemetryDecoder::set_satellite(const Gnss_Satellite &satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h index f38f6c3b4..17b02a202 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b3i_telemetry_decoder.h @@ -51,7 +51,7 @@ public: const std::string &role, unsigned int in_streams, unsigned int out_streams); - virtual ~BeidouB3iTelemetryDecoder(); + ~BeidouB3iTelemetryDecoder() = default; inline std::string role() override { return role_; } diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc index f6614cd5f..fe97a9b2f 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc @@ -62,9 +62,6 @@ GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder(ConfigurationInterface* c } -GalileoE1BTelemetryDecoder::~GalileoE1BTelemetryDecoder() = default; - - void GalileoE1BTelemetryDecoder::set_satellite(const Gnss_Satellite& satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h index 5a00b5887..4082cbeca 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h @@ -56,7 +56,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE1BTelemetryDecoder(); + ~GalileoE1BTelemetryDecoder() = default; inline std::string role() override { diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc index 7c1dff20f..fbcacf310 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc @@ -65,9 +65,6 @@ GalileoE5aTelemetryDecoder::GalileoE5aTelemetryDecoder(ConfigurationInterface* c } -GalileoE5aTelemetryDecoder::~GalileoE5aTelemetryDecoder() = default; - - void GalileoE5aTelemetryDecoder::set_satellite(const Gnss_Satellite& satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h index 55ae5a6e8..b40283b11 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h @@ -57,7 +57,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE5aTelemetryDecoder(); + ~GalileoE5aTelemetryDecoder() = default; inline std::string role() override { diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc index fce316a5d..fd692bb21 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc @@ -62,9 +62,6 @@ GlonassL1CaTelemetryDecoder::GlonassL1CaTelemetryDecoder(ConfigurationInterface* } -GlonassL1CaTelemetryDecoder::~GlonassL1CaTelemetryDecoder() = default; - - void GlonassL1CaTelemetryDecoder::set_satellite(const Gnss_Satellite& satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h index ae031a3f0..89c4c21fd 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GlonassL1CaTelemetryDecoder(); + ~GlonassL1CaTelemetryDecoder() = default; std::string role() override { return role_; diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc index 2c8aad54f..9fbf9583b 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc @@ -61,9 +61,6 @@ GlonassL2CaTelemetryDecoder::GlonassL2CaTelemetryDecoder(ConfigurationInterface* } -GlonassL2CaTelemetryDecoder::~GlonassL2CaTelemetryDecoder() = default; - - void GlonassL2CaTelemetryDecoder::set_satellite(const Gnss_Satellite& satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h index cdd6be49d..de722a93f 100644 --- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.h @@ -53,7 +53,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GlonassL2CaTelemetryDecoder(); + ~GlonassL2CaTelemetryDecoder() = default; std::string role() override { return role_; diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc index 5fadb8025..f389eef1d 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc @@ -61,9 +61,6 @@ GpsL1CaTelemetryDecoder::GpsL1CaTelemetryDecoder(ConfigurationInterface* configu } -GpsL1CaTelemetryDecoder::~GpsL1CaTelemetryDecoder() = default; - - void GpsL1CaTelemetryDecoder::set_satellite(const Gnss_Satellite& satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h index af1959226..0c899be8e 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h @@ -53,7 +53,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaTelemetryDecoder(); + ~GpsL1CaTelemetryDecoder() = default; inline std::string role() override { diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc index eccee3f2d..8d088e2e9 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc @@ -61,9 +61,6 @@ GpsL2CTelemetryDecoder::GpsL2CTelemetryDecoder(ConfigurationInterface* configura } -GpsL2CTelemetryDecoder::~GpsL2CTelemetryDecoder() = default; - - void GpsL2CTelemetryDecoder::set_satellite(const Gnss_Satellite& satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h index b1ff4d866..1d33abcaa 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h @@ -53,7 +53,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL2CTelemetryDecoder(); + ~GpsL2CTelemetryDecoder() = default; inline std::string role() override { diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc index c50ec9f51..ac98b8e45 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc @@ -61,9 +61,6 @@ GpsL5TelemetryDecoder::GpsL5TelemetryDecoder(ConfigurationInterface* configurati } -GpsL5TelemetryDecoder::~GpsL5TelemetryDecoder() = default; - - void GpsL5TelemetryDecoder::set_satellite(const Gnss_Satellite& satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h index 40d4bd62e..d97904346 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL5TelemetryDecoder(); + ~GpsL5TelemetryDecoder() = default; inline std::string role() override { diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc index 2621402ab..1c88ec4a6 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -61,9 +61,6 @@ SbasL1TelemetryDecoder::SbasL1TelemetryDecoder(ConfigurationInterface* configura } -SbasL1TelemetryDecoder::~SbasL1TelemetryDecoder() = default; - - void SbasL1TelemetryDecoder::set_satellite(const Gnss_Satellite& satellite) { satellite_ = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h index 94671da4b..cf09159c5 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~SbasL1TelemetryDecoder(); + ~SbasL1TelemetryDecoder() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc index ca7a1a045..b7a243301 100644 --- a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc @@ -183,14 +183,12 @@ BeidouB1iDllPllTracking::BeidouB1iDllPllTracking( } -BeidouB1iDllPllTracking::~BeidouB1iDllPllTracking() = default; - - void BeidouB1iDllPllTracking::start_tracking() { tracking_->start_tracking(); } + void BeidouB1iDllPllTracking::stop_tracking() { tracking_->stop_tracking(); diff --git a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h index 0716c0142..78af587b8 100644 --- a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~BeidouB1iDllPllTracking(); + ~BeidouB1iDllPllTracking() = default; inline std::string role() override { 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 b5e4339ef..7d7131fa3 100644 --- a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc @@ -187,9 +187,6 @@ BeidouB3iDllPllTracking::BeidouB3iDllPllTracking( } -BeidouB3iDllPllTracking::~BeidouB3iDllPllTracking() = default; - - void BeidouB3iDllPllTracking::start_tracking() { tracking_->start_tracking(); diff --git a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h index d56d10069..c057c807e 100644 --- a/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~BeidouB3iDllPllTracking(); + ~BeidouB3iDllPllTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc index 62e36c4a8..754b3ec3a 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc @@ -192,9 +192,6 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking( } -GalileoE1DllPllVemlTracking::~GalileoE1DllPllVemlTracking() = default; - - void GalileoE1DllPllVemlTracking::stop_tracking() { } diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h index 035daf48e..a0dacbfff 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h @@ -56,7 +56,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE1DllPllVemlTracking(); + ~GalileoE1DllPllVemlTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc index 7864dcea4..cc0792fc5 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc @@ -114,9 +114,6 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking( } -GalileoE1TcpConnectorTracking::~GalileoE1TcpConnectorTracking() = default; - - void GalileoE1TcpConnectorTracking::stop_tracking() { } @@ -142,6 +139,7 @@ void GalileoE1TcpConnectorTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchr tracking_->set_gnss_synchro(p_gnss_synchro); } + void GalileoE1TcpConnectorTracking::connect(gr::top_block_sptr top_block) { if (top_block) @@ -150,6 +148,7 @@ void GalileoE1TcpConnectorTracking::connect(gr::top_block_sptr top_block) //nothing to connect, now the tracking uses gr_sync_decimator } + void GalileoE1TcpConnectorTracking::disconnect(gr::top_block_sptr top_block) { if (top_block) @@ -158,11 +157,13 @@ void GalileoE1TcpConnectorTracking::disconnect(gr::top_block_sptr top_block) //nothing to disconnect, now the tracking uses gr_sync_decimator } + gr::basic_block_sptr GalileoE1TcpConnectorTracking::get_left_block() { return tracking_; } + gr::basic_block_sptr GalileoE1TcpConnectorTracking::get_right_block() { return tracking_; diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h index ff68056f7..1db7ec363 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h @@ -57,7 +57,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE1TcpConnectorTracking(); + ~GalileoE1TcpConnectorTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc index 6b790063f..201597bbf 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc @@ -188,9 +188,6 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking( } -GalileoE5aDllPllTracking::~GalileoE5aDllPllTracking() = default; - - void GalileoE5aDllPllTracking::stop_tracking() { } diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h index fe29757d7..723208277 100644 --- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GalileoE5aDllPllTracking(); + ~GalileoE5aDllPllTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc index 0c425cf0c..983f16863 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc @@ -135,9 +135,6 @@ GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking( } -GlonassL1CaDllPllCAidTracking::~GlonassL1CaDllPllCAidTracking() = default; - - void GlonassL1CaDllPllCAidTracking::stop_tracking() { } diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h index d50003964..3ca61a690 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h @@ -58,7 +58,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GlonassL1CaDllPllCAidTracking(); + ~GlonassL1CaDllPllCAidTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc index dc4b39f9a..90359e119 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc @@ -108,9 +108,6 @@ GlonassL1CaDllPllTracking::GlonassL1CaDllPllTracking( } -GlonassL1CaDllPllTracking::~GlonassL1CaDllPllTracking() = default; - - void GlonassL1CaDllPllTracking::stop_tracking() { } diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h index cd8482113..1bb0a3a44 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h @@ -56,7 +56,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GlonassL1CaDllPllTracking(); + ~GlonassL1CaDllPllTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc index 15bdbd3ae..bb91fa4d3 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc @@ -133,9 +133,6 @@ GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking( } -GlonassL2CaDllPllCAidTracking::~GlonassL2CaDllPllCAidTracking() = default; - - void GlonassL2CaDllPllCAidTracking::stop_tracking() { } diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h index b5659c527..6d6613a49 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h @@ -56,7 +56,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GlonassL2CaDllPllCAidTracking(); + ~GlonassL2CaDllPllCAidTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc index 9647e4f20..6f2086f33 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc @@ -106,9 +106,6 @@ GlonassL2CaDllPllTracking::GlonassL2CaDllPllTracking( } -GlonassL2CaDllPllTracking::~GlonassL2CaDllPllTracking() = default; - - void GlonassL2CaDllPllTracking::stop_tracking() { } diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h index 1ca41a94b..4dc60f587 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GlonassL2CaDllPllTracking(); + ~GlonassL2CaDllPllTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc index ad8e9d920..668ae88f8 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc @@ -194,9 +194,6 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking( } -GpsL1CaDllPllTracking::~GpsL1CaDllPllTracking() = default; - - void GpsL1CaDllPllTracking::stop_tracking() { tracking_->stop_tracking(); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h index 288de9ae0..b0138fa8a 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaDllPllTracking(); + ~GpsL1CaDllPllTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc index c3b96d3e5..855c9436c 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc @@ -118,9 +118,6 @@ GpsL1CaKfTracking::GpsL1CaKfTracking( } -GpsL1CaKfTracking::~GpsL1CaKfTracking() = default; - - void GpsL1CaKfTracking::stop_tracking() { } diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h index e26198619..9aad5abf3 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.h @@ -57,7 +57,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaKfTracking(); + ~GpsL1CaKfTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc index 2cb2d0741..2c06dffb4 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc @@ -98,9 +98,6 @@ GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking( } -GpsL1CaTcpConnectorTracking::~GpsL1CaTcpConnectorTracking() = default; - - void GpsL1CaTcpConnectorTracking::stop_tracking() { } @@ -126,6 +123,7 @@ void GpsL1CaTcpConnectorTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) tracking_->set_gnss_synchro(p_gnss_synchro); } + void GpsL1CaTcpConnectorTracking::connect(gr::top_block_sptr top_block) { if (top_block) @@ -134,6 +132,7 @@ void GpsL1CaTcpConnectorTracking::connect(gr::top_block_sptr top_block) //nothing to connect, now the tracking uses gr_sync_decimator } + void GpsL1CaTcpConnectorTracking::disconnect(gr::top_block_sptr top_block) { if (top_block) @@ -142,11 +141,13 @@ void GpsL1CaTcpConnectorTracking::disconnect(gr::top_block_sptr top_block) //nothing to disconnect, now the tracking uses gr_sync_decimator } + gr::basic_block_sptr GpsL1CaTcpConnectorTracking::get_left_block() { return tracking_; } + gr::basic_block_sptr GpsL1CaTcpConnectorTracking::get_right_block() { return tracking_; diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h index 1e910839e..b31ca921d 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h @@ -56,7 +56,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL1CaTcpConnectorTracking(); + ~GpsL1CaTcpConnectorTracking() = default; inline std::string role() override { @@ -91,6 +91,7 @@ public: void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; void start_tracking() override; + /*! * \brief Stop running tracking */ @@ -99,9 +100,7 @@ public: private: gps_l1_ca_tcp_connector_tracking_cc_sptr tracking_; size_t item_size_; - unsigned int channel_; - std::string role_; unsigned int in_streams_; unsigned int out_streams_; diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc index 98304fec5..5d6587d78 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc @@ -170,13 +170,11 @@ GpsL2MDllPllTracking::GpsL2MDllPllTracking( } -GpsL2MDllPllTracking::~GpsL2MDllPllTracking() = default; - - void GpsL2MDllPllTracking::stop_tracking() { } + void GpsL2MDllPllTracking::start_tracking() { tracking_->start_tracking(); diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h index 20618a4cf..297b6f8cc 100644 --- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h @@ -55,7 +55,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL2MDllPllTracking(); + ~GpsL2MDllPllTracking() = default; inline std::string role() override { @@ -90,6 +90,7 @@ public: void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro) override; void start_tracking() override; + /*! * \brief Stop running tracking */ diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc index 8595a3fdc..d7c4d0454 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc @@ -190,9 +190,6 @@ GpsL5DllPllTracking::GpsL5DllPllTracking( } -GpsL5DllPllTracking::~GpsL5DllPllTracking() = default; - - void GpsL5DllPllTracking::stop_tracking() { } diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h index 763df8bb0..8b71b442b 100644 --- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h +++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.h @@ -54,7 +54,7 @@ public: unsigned int in_streams, unsigned int out_streams); - virtual ~GpsL5DllPllTracking(); + ~GpsL5DllPllTracking() = default; inline std::string role() override { diff --git a/src/algorithms/tracking/libs/bayesian_estimation.cc b/src/algorithms/tracking/libs/bayesian_estimation.cc index 73ab4cd3e..1c4c56a88 100644 --- a/src/algorithms/tracking/libs/bayesian_estimation.cc +++ b/src/algorithms/tracking/libs/bayesian_estimation.cc @@ -6,10 +6,10 @@ * the properties of a stochastic process based on a sequence of * discrete samples of the sequence. * - * [1]: LaMountain, Gerald, Vilà-Valls, Jordi, Closas, Pau, "Bayesian - * Covariance Estimation for Kalman Filter based Digital Carrier + * [1]: LaMountain, Gerald, Vilà-Valls, Jordi, Closas, Pau, "Bayesian + * Covariance Estimation for Kalman Filter based Digital Carrier * Synchronization," Proceedings of the 31st International Technical Meeting - * of the Satellite Division of The Institute of Navigation + * of the Satellite Division of The Institute of Navigation * (ION GNSS+ 2018), Miami, Florida, September 2018, pp. 3575-3586. * https://doi.org/10.33012/2018.15911 * @@ -57,6 +57,7 @@ Bayesian_estimator::Bayesian_estimator() Psi_est = Psi_prior; } + Bayesian_estimator::Bayesian_estimator(int ny) { mu_prior = arma::zeros(ny, 1); @@ -68,6 +69,7 @@ Bayesian_estimator::Bayesian_estimator(int ny) Psi_est = Psi_prior; } + Bayesian_estimator::Bayesian_estimator(const arma::vec& mu_prior_0, int kappa_prior_0, int nu_prior_0, const arma::mat& Psi_prior_0) { mu_prior = mu_prior_0; @@ -79,7 +81,6 @@ Bayesian_estimator::Bayesian_estimator(const arma::vec& mu_prior_0, int kappa_pr Psi_est = Psi_prior; } -Bayesian_estimator::~Bayesian_estimator() = default; void Bayesian_estimator::init(const arma::mat& mu_prior_0, int kappa_prior_0, int nu_prior_0, const arma::mat& Psi_prior_0) { @@ -92,6 +93,7 @@ void Bayesian_estimator::init(const arma::mat& mu_prior_0, int kappa_prior_0, in Psi_est = Psi_prior; } + /* * Perform Bayesian noise estimation using the normal-inverse-Wishart priors stored in * the class structure, and update the priors according to the computed posteriors @@ -179,11 +181,13 @@ void Bayesian_estimator::update_sequential(const arma::vec& data, const arma::ve Psi_prior = Psi_posterior; } + arma::mat Bayesian_estimator::get_mu_est() const { return mu_est; } + arma::mat Bayesian_estimator::get_Psi_est() const { return Psi_est; diff --git a/src/algorithms/tracking/libs/bayesian_estimation.h b/src/algorithms/tracking/libs/bayesian_estimation.h index 001b19fcd..ccaf7f54d 100644 --- a/src/algorithms/tracking/libs/bayesian_estimation.h +++ b/src/algorithms/tracking/libs/bayesian_estimation.h @@ -6,10 +6,10 @@ * the properties of a stochastic process based on a sequence of * discrete samples of the sequence. * - * [1]: LaMountain, Gerald, Vilà-Valls, Jordi, Closas, Pau, "Bayesian - * Covariance Estimation for Kalman Filter based Digital Carrier + * [1]: LaMountain, Gerald, Vilà-Valls, Jordi, Closas, Pau, "Bayesian + * Covariance Estimation for Kalman Filter based Digital Carrier * Synchronization," Proceedings of the 31st International Technical Meeting - * of the Satellite Division of The Institute of Navigation + * of the Satellite Division of The Institute of Navigation * (ION GNSS+ 2018), Miami, Florida, September 2018, pp. 3575-3586. * https://doi.org/10.33012/2018.15911 * @@ -67,7 +67,7 @@ public: Bayesian_estimator(); Bayesian_estimator(int ny); Bayesian_estimator(const arma::vec& mu_prior_0, int kappa_prior_0, int nu_prior_0, const arma::mat& Psi_prior_0); - ~Bayesian_estimator(); + ~Bayesian_estimator() = default; void init(const arma::mat& mu_prior_0, int kappa_prior_0, int nu_prior_0, const arma::mat& Psi_prior_0); diff --git a/src/algorithms/tracking/libs/nonlinear_tracking.cc b/src/algorithms/tracking/libs/nonlinear_tracking.cc index 645185730..aae5c0026 100644 --- a/src/algorithms/tracking/libs/nonlinear_tracking.cc +++ b/src/algorithms/tracking/libs/nonlinear_tracking.cc @@ -75,9 +75,6 @@ CubatureFilter::CubatureFilter(const arma::vec& x_pred_0, const arma::mat& P_x_p } -CubatureFilter::~CubatureFilter() = default; - - void CubatureFilter::initialize(const arma::mat& x_pred_0, const arma::mat& P_x_pred_0) { x_pred_out = x_pred_0; @@ -236,9 +233,6 @@ UnscentedFilter::UnscentedFilter(const arma::vec& x_pred_0, const arma::mat& P_x } -UnscentedFilter::~UnscentedFilter() = default; - - void UnscentedFilter::initialize(const arma::mat& x_pred_0, const arma::mat& P_x_pred_0) { x_pred_out = x_pred_0; @@ -274,7 +268,6 @@ void UnscentedFilter::predict_sequential(const arma::vec& x_post, const arma::ma arma::mat Xi_post = arma::zeros(nx, np); arma::mat Xi_pred = arma::zeros(nx, np); - Xi_post.col(0) = x_post; Xi_pred.col(0) = (*transition_fcn)(Xi_post.col(0)); for (uint8_t i = 1; i <= nx; i++) diff --git a/src/algorithms/tracking/libs/nonlinear_tracking.h b/src/algorithms/tracking/libs/nonlinear_tracking.h index 642645ea1..a8c853bcf 100644 --- a/src/algorithms/tracking/libs/nonlinear_tracking.h +++ b/src/algorithms/tracking/libs/nonlinear_tracking.h @@ -62,7 +62,7 @@ public: CubatureFilter(); CubatureFilter(int nx); CubatureFilter(const arma::vec& x_pred_0, const arma::mat& P_x_pred_0); - ~CubatureFilter(); + ~CubatureFilter() = default; // Reinitialization function void initialize(const arma::mat& x_pred_0, const arma::mat& P_x_pred_0); @@ -91,7 +91,7 @@ public: UnscentedFilter(); UnscentedFilter(int nx); UnscentedFilter(const arma::vec& x_pred_0, const arma::mat& P_x_pred_0); - ~UnscentedFilter(); + ~UnscentedFilter() = default; // Reinitialization function void initialize(const arma::mat& x_pred_0, const arma::mat& P_x_pred_0); diff --git a/src/algorithms/tracking/libs/tcp_communication.cc b/src/algorithms/tracking/libs/tcp_communication.cc index d68c80733..a5ec1dfdf 100644 --- a/src/algorithms/tracking/libs/tcp_communication.cc +++ b/src/algorithms/tracking/libs/tcp_communication.cc @@ -38,9 +38,6 @@ Tcp_Communication::Tcp_Communication() : tcp_socket_(io_context_) {} // NOLINT -Tcp_Communication::~Tcp_Communication() = default; - - int Tcp_Communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_) { try diff --git a/src/algorithms/tracking/libs/tcp_communication.h b/src/algorithms/tracking/libs/tcp_communication.h index 33cab1a1c..ae7018198 100644 --- a/src/algorithms/tracking/libs/tcp_communication.h +++ b/src/algorithms/tracking/libs/tcp_communication.h @@ -53,7 +53,7 @@ class Tcp_Communication { public: Tcp_Communication(); - ~Tcp_Communication(); + ~Tcp_Communication() = default; int listen_tcp_connection(size_t d_port_, size_t d_port_ch0_); void send_receive_tcp_packet_galileo_e1(boost::array buf, Tcp_Packet_Data *tcp_data_); diff --git a/src/algorithms/tracking/libs/tcp_packet_data.cc b/src/algorithms/tracking/libs/tcp_packet_data.cc index a48c3631a..01bcb067d 100644 --- a/src/algorithms/tracking/libs/tcp_packet_data.cc +++ b/src/algorithms/tracking/libs/tcp_packet_data.cc @@ -36,5 +36,3 @@ Tcp_Packet_Data::Tcp_Packet_Data() proc_pack_carr_error = 0; proc_pack_carrier_doppler_hz = 0; } - -Tcp_Packet_Data::~Tcp_Packet_Data() = default; diff --git a/src/algorithms/tracking/libs/tcp_packet_data.h b/src/algorithms/tracking/libs/tcp_packet_data.h index 44eb4346e..2ff71b9f9 100644 --- a/src/algorithms/tracking/libs/tcp_packet_data.h +++ b/src/algorithms/tracking/libs/tcp_packet_data.h @@ -39,7 +39,7 @@ class Tcp_Packet_Data { public: Tcp_Packet_Data(); - ~Tcp_Packet_Data(); + ~Tcp_Packet_Data() = default; float proc_pack_code_error; float proc_pack_carr_error; float proc_pack_carrier_doppler_hz; diff --git a/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.cc b/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.cc index 01b8641ea..4bb96d590 100644 --- a/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.cc +++ b/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.cc @@ -50,7 +50,7 @@ void Tracking_2nd_DLL_filter::calculate_lopp_coef(float* tau1, float* tau2, floa void Tracking_2nd_DLL_filter::set_DLL_BW(float dll_bw_hz) { - //Calculate filter coefficient values + // Calculate filter coefficient values d_dllnoisebandwidth = dll_bw_hz; calculate_lopp_coef(&d_tau1_code, &d_tau2_code, d_dllnoisebandwidth, d_dlldampingratio, 1.0); // Calculate filter coefficient values } @@ -87,9 +87,6 @@ Tracking_2nd_DLL_filter::Tracking_2nd_DLL_filter() } -Tracking_2nd_DLL_filter::~Tracking_2nd_DLL_filter() = default; - - void Tracking_2nd_DLL_filter::set_pdi(float pdi_code) { d_pdi_code = pdi_code; // Summation interval for code diff --git a/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.h b/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.h index 21e7aa8b8..fa90b21db 100644 --- a/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.h +++ b/src/algorithms/tracking/libs/tracking_2nd_DLL_filter.h @@ -54,7 +54,7 @@ public: float get_code_nco(float DLL_discriminator); //!< Numerically controlled oscillator Tracking_2nd_DLL_filter(float pdi_code); Tracking_2nd_DLL_filter(); - ~Tracking_2nd_DLL_filter(); + ~Tracking_2nd_DLL_filter() = default; private: // PLL filter parameters diff --git a/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.cc b/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.cc index e2da9d943..60aea865b 100644 --- a/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.cc +++ b/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.cc @@ -93,9 +93,6 @@ Tracking_2nd_PLL_filter::Tracking_2nd_PLL_filter() } -Tracking_2nd_PLL_filter::~Tracking_2nd_PLL_filter() = default; - - void Tracking_2nd_PLL_filter::set_pdi(float pdi_carr) { d_pdi_carr = pdi_carr; // Summation interval for code diff --git a/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.h b/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.h index 53e2349cf..a00453024 100644 --- a/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.h +++ b/src/algorithms/tracking/libs/tracking_2nd_PLL_filter.h @@ -53,7 +53,7 @@ public: float get_carrier_nco(float PLL_discriminator); Tracking_2nd_PLL_filter(float pdi_carr); Tracking_2nd_PLL_filter(); - ~Tracking_2nd_PLL_filter(); + ~Tracking_2nd_PLL_filter() = default; private: // PLL filter parameters diff --git a/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.cc b/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.cc index 665ab29e6..cdcebc1d2 100644 --- a/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.cc +++ b/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.cc @@ -50,9 +50,6 @@ Tracking_FLL_PLL_filter::Tracking_FLL_PLL_filter() } -Tracking_FLL_PLL_filter::~Tracking_FLL_PLL_filter() = default; - - void Tracking_FLL_PLL_filter::set_params(float fll_bw_hz, float pll_bw_hz, int order) { /* diff --git a/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.h b/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.h index 40785ea60..4a5b208e2 100644 --- a/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.h +++ b/src/algorithms/tracking/libs/tracking_FLL_PLL_filter.h @@ -41,7 +41,7 @@ public: void initialize(float d_acq_carrier_doppler_hz); float get_carrier_error(float FLL_discriminator, float PLL_discriminator, float correlation_time_s); Tracking_FLL_PLL_filter(); - ~Tracking_FLL_PLL_filter(); + ~Tracking_FLL_PLL_filter() = default; private: // FLL + PLL filter parameters diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc index bed7f1ff2..001a01bbb 100644 --- a/src/core/libs/channel_status_msg_receiver.cc +++ b/src/core/libs/channel_status_msg_receiver.cc @@ -53,9 +53,6 @@ channel_status_msg_receiver::channel_status_msg_receiver() : gr::block("channel_ } -channel_status_msg_receiver::~channel_status_msg_receiver() = default; - - void channel_status_msg_receiver::msg_handler_events(const pmt::pmt_t& msg) { gr::thread::scoped_lock lock(d_setlock); // require mutex with msg_handler_events function called by the scheduler diff --git a/src/core/libs/channel_status_msg_receiver.h b/src/core/libs/channel_status_msg_receiver.h index 196484ed4..112dd6eaa 100644 --- a/src/core/libs/channel_status_msg_receiver.h +++ b/src/core/libs/channel_status_msg_receiver.h @@ -49,7 +49,7 @@ channel_status_msg_receiver_sptr channel_status_msg_receiver_make(); class channel_status_msg_receiver : public gr::block { public: - ~channel_status_msg_receiver(); //!< Default destructor + ~channel_status_msg_receiver() = default; //!< Default destructor /*! * \brief return the current status map of all channels with valid telemetry diff --git a/src/core/libs/gnss_sdr_sample_counter.cc b/src/core/libs/gnss_sdr_sample_counter.cc index a20032edd..954d5d674 100644 --- a/src/core/libs/gnss_sdr_sample_counter.cc +++ b/src/core/libs/gnss_sdr_sample_counter.cc @@ -65,9 +65,6 @@ gnss_sdr_sample_counter::gnss_sdr_sample_counter( } -gnss_sdr_sample_counter::~gnss_sdr_sample_counter() = default; - - gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter(double _fs, int32_t _interval_ms, size_t _size) { gnss_sdr_sample_counter_sptr sample_counter_(new gnss_sdr_sample_counter(_fs, _interval_ms, _size)); diff --git a/src/core/libs/gnss_sdr_sample_counter.h b/src/core/libs/gnss_sdr_sample_counter.h index 4fbf1f103..41e598670 100644 --- a/src/core/libs/gnss_sdr_sample_counter.h +++ b/src/core/libs/gnss_sdr_sample_counter.h @@ -51,7 +51,7 @@ gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter( class gnss_sdr_sample_counter : public gr::sync_decimator { public: - ~gnss_sdr_sample_counter(); + ~gnss_sdr_sample_counter() = default; int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); diff --git a/src/core/libs/gnss_sdr_supl_client.cc b/src/core/libs/gnss_sdr_supl_client.cc index ae7d60db0..68f7ef8b7 100644 --- a/src/core/libs/gnss_sdr_supl_client.cc +++ b/src/core/libs/gnss_sdr_supl_client.cc @@ -57,9 +57,6 @@ Gnss_Sdr_Supl_Client::Gnss_Sdr_Supl_Client() } -Gnss_Sdr_Supl_Client::~Gnss_Sdr_Supl_Client() = default; - - void Gnss_Sdr_Supl_Client::print_assistance() { if (assist.set & SUPL_RRLP_ASSIST_REFTIME) diff --git a/src/core/libs/gnss_sdr_supl_client.h b/src/core/libs/gnss_sdr_supl_client.h index ebae162ee..14fae5f34 100644 --- a/src/core/libs/gnss_sdr_supl_client.h +++ b/src/core/libs/gnss_sdr_supl_client.h @@ -64,7 +64,7 @@ class Gnss_Sdr_Supl_Client { public: Gnss_Sdr_Supl_Client(); - ~Gnss_Sdr_Supl_Client(); + ~Gnss_Sdr_Supl_Client() = default; // SUPL SERVER INFO std::string server_name; diff --git a/src/core/libs/gnss_sdr_time_counter.cc b/src/core/libs/gnss_sdr_time_counter.cc index 1daabf071..2bf29fa77 100644 --- a/src/core/libs/gnss_sdr_time_counter.cc +++ b/src/core/libs/gnss_sdr_time_counter.cc @@ -52,9 +52,6 @@ gnss_sdr_time_counter::gnss_sdr_time_counter() : gr::block("time_counter", } -gnss_sdr_time_counter::~gnss_sdr_time_counter() = default; - - gnss_sdr_time_counter_sptr gnss_sdr_make_time_counter() { gnss_sdr_time_counter_sptr counter_(new gnss_sdr_time_counter()); diff --git a/src/core/libs/gnss_sdr_time_counter.h b/src/core/libs/gnss_sdr_time_counter.h index bbf17d9fc..71a7d595a 100644 --- a/src/core/libs/gnss_sdr_time_counter.h +++ b/src/core/libs/gnss_sdr_time_counter.h @@ -46,7 +46,7 @@ gnss_sdr_time_counter_sptr gnss_sdr_make_time_counter(); class gnss_sdr_time_counter : public gr::block { public: - ~gnss_sdr_time_counter(); + ~gnss_sdr_time_counter() = default; int general_work(int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)), gr_vector_const_void_star &input_items __attribute__((unused)), diff --git a/src/core/libs/string_converter.cc b/src/core/libs/string_converter.cc index ab84dab07..cc6b4fe3c 100644 --- a/src/core/libs/string_converter.cc +++ b/src/core/libs/string_converter.cc @@ -34,12 +34,6 @@ #include -StringConverter::StringConverter() = default; - - -StringConverter::~StringConverter() = default; - - bool StringConverter::convert(const std::string& value, bool default_value) { if (value == "true") diff --git a/src/core/libs/string_converter.h b/src/core/libs/string_converter.h index 1514db265..7b0c32ae3 100644 --- a/src/core/libs/string_converter.h +++ b/src/core/libs/string_converter.h @@ -43,8 +43,8 @@ class StringConverter { public: - StringConverter(); - virtual ~StringConverter(); + StringConverter() = default; + ~StringConverter() = default; bool convert(const std::string& value, bool default_value); int64_t convert(const std::string& value, int64_t default_value); diff --git a/src/core/monitor/gnss_synchro_monitor.cc b/src/core/monitor/gnss_synchro_monitor.cc index 28e26cdf4..cdf68e31d 100644 --- a/src/core/monitor/gnss_synchro_monitor.cc +++ b/src/core/monitor/gnss_synchro_monitor.cc @@ -69,9 +69,6 @@ gnss_synchro_monitor::gnss_synchro_monitor(unsigned int n_channels, } -gnss_synchro_monitor::~gnss_synchro_monitor() = default; - - int gnss_synchro_monitor::work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items __attribute__((unused))) { diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h index 7cb104154..301d12e7c 100644 --- a/src/core/monitor/gnss_synchro_monitor.h +++ b/src/core/monitor/gnss_synchro_monitor.h @@ -61,7 +61,7 @@ gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels, class gnss_synchro_monitor : public gr::sync_block { public: - ~gnss_synchro_monitor(); //!< Default destructor + ~gnss_synchro_monitor() = default; //!< Default destructor int work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items); diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index f7574a986..d6e0eafdc 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -175,17 +175,11 @@ #endif -GNSSBlockFactory::GNSSBlockFactory() = default; - - -GNSSBlockFactory::~GNSSBlockFactory() = default; - - std::unique_ptr GNSSBlockFactory::GetSignalSource( const std::shared_ptr& configuration, const std::shared_ptr> queue, int ID) // NOLINT(performance-unnecessary-value-param) { std::string default_implementation = "File_Signal_Source"; - std::string role = "SignalSource"; //backwards compatibility for old conf files + std::string role = "SignalSource"; // backwards compatibility for old conf files try { if (ID != -1) @@ -207,7 +201,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( const std::shared_ptr& configuration, int ID) { std::string default_implementation = "Pass_Through"; - //backwards compatibility for old conf files + // backwards compatibility for old conf files std::string role_conditioner = "SignalConditioner"; std::string role_datatypeadapter = "DataTypeAdapter"; std::string role_inputfilter = "InputFilter"; @@ -251,7 +245,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( if (signal_conditioner == "Array_Signal_Conditioner") { - //instantiate the array version + // instantiate the array version std::unique_ptr conditioner_(new ArraySignalConditioner(configuration.get(), GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1), GetBlock(configuration, role_inputfilter, input_filter, 1, 1), @@ -260,7 +254,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( return conditioner_; } - //single-antenna version + // single-antenna version std::unique_ptr conditioner_(new SignalConditioner(configuration.get(), GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1), GetBlock(configuration, role_inputfilter, input_filter, 1, 1), @@ -317,14 +311,14 @@ std::unique_ptr GNSSBlockFactory::GetPVT(const std::shared_p } -//********* GPS L1 C/A CHANNEL ***************** +// ********* GPS L1 C/A CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_1C( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, std::shared_ptr> queue) { - //"appendix" is added to the "role" with the aim of Acquisition, Tracking and Telemetry Decoder adapters - //can find their specific configurations when they read the config + // "appendix" is added to the "role" with the aim of Acquisition, Tracking and Telemetry Decoder adapters + // can find their specific configurations when they read the config //TODO: REMOVE APPENDIX!! AND CHECK ALTERNATIVE MECHANISM TO GET PARTICULARIZED PARAMETERS LOG(INFO) << "Instantiating Channel " << channel << " with Acquisition Implementation: " << acq << ", Tracking Implementation: " << trk << ", Telemetry Decoder implementation: " << tlm; @@ -385,7 +379,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1C( } -//********* GPS L2C (M) CHANNEL ***************** +// ********* GPS L2C (M) CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_2S( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, @@ -449,7 +443,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_2S( } -//********* GALILEO E1 B CHANNEL ***************** +// ********* GALILEO E1 B CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_1B( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, @@ -516,7 +510,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1B( } -//********* GALILEO E5a CHANNEL ***************** +// ********* GALILEO E5a CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_5X( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, @@ -583,7 +577,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_5X( } -//********* GLONASS L1 C/A CHANNEL ***************** +// ********* GLONASS L1 C/A CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_1G( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, @@ -651,7 +645,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_1G( } -//********* GLONASS L2 C/A CHANNEL ***************** +// ********* GLONASS L2 C/A CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_2G( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, @@ -719,7 +713,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_2G( } -//********* GPS L5 CHANNEL ***************** +// ********* GPS L5 CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_L5( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, @@ -786,7 +780,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_L5( } -//********* BeiDou B1I CHANNEL ***************** +// ********* BeiDou B1I CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_B1( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, @@ -853,7 +847,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel_B1( } -//********* BeiDou B3I CHANNEL ***************** +// ********* BeiDou B3I CHANNEL ***************** std::unique_ptr GNSSBlockFactory::GetChannel_B3( const std::shared_ptr& configuration, const std::string& acq, const std::string& trk, const std::string& tlm, int channel, @@ -953,7 +947,7 @@ std::unique_ptr>> GNSSBlockFacto std::unique_ptr>> channels(new std::vector>(total_channels)); try { - //**************** GPS L1 C/A CHANNELS ********************** + // **************** GPS L1 C/A CHANNELS ********************** LOG(INFO) << "Getting " << Channels_1C_count << " GPS L1 C/A channels"; acquisition_implementation = configuration->property("Acquisition_1C.implementation", default_implementation); tracking_implementation = configuration->property("Tracking_1C.implementation", default_implementation); @@ -961,11 +955,11 @@ std::unique_ptr>> GNSSBlockFacto for (unsigned int i = 0; i < Channels_1C_count; i++) { - //(i.e. Acquisition_1C0.implementation=xxxx) + // (i.e. Acquisition_1C0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( "Acquisition_1C" + std::to_string(channel_absolute_id) + ".implementation", acquisition_implementation); - //(i.e. Tracking_1C0.implementation=xxxx) + // (i.e. Tracking_1C0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( "Tracking_1C" + std::to_string(channel_absolute_id) + ".implementation", tracking_implementation); @@ -983,18 +977,18 @@ std::unique_ptr>> GNSSBlockFacto channel_absolute_id++; } - //**************** GPS L2C (M) CHANNELS ********************** + // **************** GPS L2C (M) CHANNELS ********************** LOG(INFO) << "Getting " << Channels_2S_count << " GPS L2C (M) channels"; tracking_implementation = configuration->property("Tracking_2S.implementation", default_implementation); telemetry_decoder_implementation = configuration->property("TelemetryDecoder_2S.implementation", default_implementation); acquisition_implementation = configuration->property("Acquisition_2S.implementation", default_implementation); for (unsigned int i = 0; i < Channels_2S_count; i++) { - //(i.e. Acquisition_1C0.implementation=xxxx) + // (i.e. Acquisition_1C0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( "Acquisition_2S" + std::to_string(channel_absolute_id) + ".implementation", acquisition_implementation); - //(i.e. Tracking_1C0.implementation=xxxx) + // (i.e. Tracking_1C0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( "Tracking_2S" + std::to_string(channel_absolute_id) + ".implementation", tracking_implementation); @@ -1012,18 +1006,18 @@ std::unique_ptr>> GNSSBlockFacto channel_absolute_id++; } - //**************** GPS L5 CHANNELS ********************** + // **************** GPS L5 CHANNELS ********************** LOG(INFO) << "Getting " << Channels_L5_count << " GPS L5 channels"; tracking_implementation = configuration->property("Tracking_L5.implementation", default_implementation); telemetry_decoder_implementation = configuration->property("TelemetryDecoder_L5.implementation", default_implementation); acquisition_implementation = configuration->property("Acquisition_L5.implementation", default_implementation); for (unsigned int i = 0; i < Channels_L5_count; i++) { - //(i.e. Acquisition_1C0.implementation=xxxx) + // (i.e. Acquisition_1C0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( "Acquisition_L5" + std::to_string(channel_absolute_id) + ".implementation", acquisition_implementation); - //(i.e. Tracking_1C0.implementation=xxxx) + // (i.e. Tracking_1C0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( "Tracking_L5" + std::to_string(channel_absolute_id) + ".implementation", tracking_implementation); @@ -1041,18 +1035,18 @@ std::unique_ptr>> GNSSBlockFacto channel_absolute_id++; } - //**************** GALILEO E1 B (I/NAV OS) CHANNELS ********************** + // **************** GALILEO E1 B (I/NAV OS) CHANNELS ********************** LOG(INFO) << "Getting " << Channels_1B_count << " GALILEO E1 B (I/NAV OS) channels"; tracking_implementation = configuration->property("Tracking_1B.implementation", default_implementation); telemetry_decoder_implementation = configuration->property("TelemetryDecoder_1B.implementation", default_implementation); acquisition_implementation = configuration->property("Acquisition_1B.implementation", default_implementation); for (unsigned int i = 0; i < Channels_1B_count; i++) { - //(i.e. Acquisition_1C0.implementation=xxxx) + // (i.e. Acquisition_1C0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( "Acquisition_1B" + std::to_string(channel_absolute_id) + ".implementation", acquisition_implementation); - //(i.e. Tracking_1C0.implementation=xxxx) + // (i.e. Tracking_1C0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( "Tracking_1B" + std::to_string(channel_absolute_id) + ".implementation", tracking_implementation); @@ -1070,18 +1064,18 @@ std::unique_ptr>> GNSSBlockFacto channel_absolute_id++; } - //**************** GALILEO E5a I (F/NAV OS) CHANNELS ********************** + // **************** GALILEO E5a I (F/NAV OS) CHANNELS ********************** LOG(INFO) << "Getting " << Channels_5X_count << " GALILEO E5a I (F/NAV OS) channels"; tracking_implementation = configuration->property("Tracking_5X.implementation", default_implementation); telemetry_decoder_implementation = configuration->property("TelemetryDecoder_5X.implementation", default_implementation); acquisition_implementation = configuration->property("Acquisition_5X.implementation", default_implementation); for (unsigned int i = 0; i < Channels_5X_count; i++) { - //(i.e. Acquisition_1C0.implementation=xxxx) + // (i.e. Acquisition_1C0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( "Acquisition_5X" + std::to_string(channel_absolute_id) + ".implementation", acquisition_implementation); - //(i.e. Tracking_1C0.implementation=xxxx) + // (i.e. Tracking_1C0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( "Tracking_5X" + std::to_string(channel_absolute_id) + ".implementation", tracking_implementation); @@ -1099,7 +1093,7 @@ std::unique_ptr>> GNSSBlockFacto channel_absolute_id++; } - //**************** GLONASS L1 C/A CHANNELS ********************** + // **************** GLONASS L1 C/A CHANNELS ********************** LOG(INFO) << "Getting " << Channels_1G_count << " GLONASS L1 C/A channels"; acquisition_implementation = configuration->property("Acquisition_1G.implementation", default_implementation); tracking_implementation = configuration->property("Tracking_1G.implementation", default_implementation); @@ -1107,11 +1101,11 @@ std::unique_ptr>> GNSSBlockFacto for (unsigned int i = 0; i < Channels_1G_count; i++) { - //(i.e. Acquisition_1G0.implementation=xxxx) + // (i.e. Acquisition_1G0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( "Acquisition_1G" + std::to_string(channel_absolute_id) + ".implementation", acquisition_implementation); - //(i.e. Tracking_1G0.implementation=xxxx) + // (i.e. Tracking_1G0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( "Tracking_1G" + std::to_string(channel_absolute_id) + ".implementation", tracking_implementation); @@ -1129,7 +1123,7 @@ std::unique_ptr>> GNSSBlockFacto channel_absolute_id++; } - //**************** GLONASS L2 C/A CHANNELS ********************** + // **************** GLONASS L2 C/A CHANNELS ********************** LOG(INFO) << "Getting " << Channels_2G_count << " GLONASS L2 C/A channels"; acquisition_implementation = configuration->property("Acquisition_2G.implementation", default_implementation); tracking_implementation = configuration->property("Tracking_2G.implementation", default_implementation); @@ -1137,11 +1131,11 @@ std::unique_ptr>> GNSSBlockFacto for (unsigned int i = 0; i < Channels_2G_count; i++) { - //(i.e. Acquisition_2G0.implementation=xxxx) + // (i.e. Acquisition_2G0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( "Acquisition_2G" + std::to_string(channel_absolute_id) + ".implementation", acquisition_implementation); - //(i.e. Tracking_2G0.implementation=xxxx) + // (i.e. Tracking_2G0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( "Tracking_2G" + std::to_string(channel_absolute_id) + ".implementation", tracking_implementation); @@ -1159,7 +1153,7 @@ std::unique_ptr>> GNSSBlockFacto channel_absolute_id++; } - //**************** BEIDOU B1I CHANNELS ********************** + // **************** BEIDOU B1I CHANNELS ********************** LOG(INFO) << "Getting " << Channels_B1_count << " BEIDOU B1I channels"; acquisition_implementation = configuration->property("Acquisition_B1.implementation", default_implementation); tracking_implementation = configuration->property("Tracking_B1.implementation", default_implementation); @@ -1167,11 +1161,11 @@ std::unique_ptr>> GNSSBlockFacto for (unsigned int i = 0; i < Channels_B1_count; i++) { - //(i.e. Acquisition_2G0.implementation=xxxx) + // (i.e. Acquisition_2G0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( "Acquisition_B1" + std::to_string(channel_absolute_id) + ".implementation", acquisition_implementation); - //(i.e. Tracking_2G0.implementation=xxxx) + // (i.e. Tracking_2G0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( "Tracking_B1" + std::to_string(channel_absolute_id) + ".implementation", tracking_implementation); @@ -1189,7 +1183,7 @@ std::unique_ptr>> GNSSBlockFacto channel_absolute_id++; } - //**************** BEIDOU B3I CHANNELS ********************** + // **************** BEIDOU B3I CHANNELS ********************** LOG(INFO) << "Getting " << Channels_B3_count << " BEIDOU B3I channels"; acquisition_implementation = configuration->property("Acquisition_B3.implementation", default_implementation); tracking_implementation = configuration->property("Tracking_B3.implementation", default_implementation); @@ -1197,11 +1191,11 @@ std::unique_ptr>> GNSSBlockFacto for (unsigned int i = 0; i < Channels_B3_count; i++) { - //(i.e. Acquisition_2G0.implementation=xxxx) + // (i.e. Acquisition_2G0.implementation=xxxx) std::string acquisition_implementation_specific = configuration->property( "Acquisition_B3" + std::to_string(channel_absolute_id) + ".implementation", acquisition_implementation); - //(i.e. Tracking_2G0.implementation=xxxx) + // (i.e. Tracking_2G0.implementation=xxxx) std::string tracking_implementation_specific = configuration->property( "Tracking_B3" + std::to_string(channel_absolute_id) + ".implementation", tracking_implementation); @@ -1245,14 +1239,14 @@ std::unique_ptr GNSSBlockFactory::GetBlock( { std::unique_ptr block; - //PASS THROUGH ---------------------------------------------------------------- + // PASS THROUGH ------------------------------------------------------------ if (implementation == "Pass_Through") { std::unique_ptr block_(new Pass_Through(configuration.get(), role, in_streams, out_streams)); block = std::move(block_); } - // SIGNAL SOURCES ------------------------------------------------------------- + // SIGNAL SOURCES ---------------------------------------------------------- else if (implementation == "File_Signal_Source") { try diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index af9889c89..040f0a5dd 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -56,8 +56,8 @@ class TelemetryDecoderInterface; class GNSSBlockFactory { public: - GNSSBlockFactory(); - virtual ~GNSSBlockFactory(); + GNSSBlockFactory() = default; + ~GNSSBlockFactory() = default; std::unique_ptr GetSignalSource(const std::shared_ptr& configuration, const std::shared_ptr> queue, int ID = -1); // NOLINT(performance-unnecessary-value-param) diff --git a/src/core/receiver/tcp_cmd_interface.cc b/src/core/receiver/tcp_cmd_interface.cc index 20d3618a6..9a10bb5f7 100644 --- a/src/core/receiver/tcp_cmd_interface.cc +++ b/src/core/receiver/tcp_cmd_interface.cc @@ -57,9 +57,6 @@ TcpCmdInterface::TcpCmdInterface() } -TcpCmdInterface::~TcpCmdInterface() = default; - - void TcpCmdInterface::register_functions() { functions["status"] = std::bind(&TcpCmdInterface::status, this, std::placeholders::_1); diff --git a/src/core/receiver/tcp_cmd_interface.h b/src/core/receiver/tcp_cmd_interface.h index 993a68312..7ba25b80a 100644 --- a/src/core/receiver/tcp_cmd_interface.h +++ b/src/core/receiver/tcp_cmd_interface.h @@ -49,7 +49,7 @@ class TcpCmdInterface { public: TcpCmdInterface(); - virtual ~TcpCmdInterface(); + ~TcpCmdInterface() = default; void run_cmd_server(int tcp_port); void set_msg_queue(std::shared_ptr> control_queue); diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc index 7dbd89e91..37526da7e 100644 --- a/src/utils/front-end-cal/front_end_cal.cc +++ b/src/utils/front-end-cal/front_end_cal.cc @@ -53,9 +53,6 @@ extern Concurrent_Map global_gps_utc_model_map; extern Concurrent_Map global_gps_almanac_map; extern Concurrent_Map global_gps_acq_assist_map; -FrontEndCal::FrontEndCal() = default; - -FrontEndCal::~FrontEndCal() = default; bool FrontEndCal::read_assistance_from_XML() { diff --git a/src/utils/front-end-cal/front_end_cal.h b/src/utils/front-end-cal/front_end_cal.h index 6bb495c4c..8f5d2690c 100644 --- a/src/utils/front-end-cal/front_end_cal.h +++ b/src/utils/front-end-cal/front_end_cal.h @@ -40,63 +40,10 @@ class ConfigurationInterface; class FrontEndCal { -private: - std::shared_ptr configuration_; - - /*! - * \brief LLA2ECEF Convert geodetic coordinates to Earth-centered Earth-fixed - * (ECEF) coordinates. P = LLA2ECEF( LLA ) converts an M-by-3 array of geodetic coordinates - * (latitude, longitude and altitude), LLA, to an M-by-3 array of ECEF - * coordinates, P. LLA is in [degrees degrees meters]. P is in meters. - * The default ellipsoid planet is WGS84. Original copyright (c) by Kai Borre. - */ - arma::vec lla2ecef(const arma::vec &lla); - /*! - * GEODETIC2ECEF Convert geodetic to geocentric (ECEF) coordinates - * [X, Y, Z] = GEODETIC2ECEF(PHI, LAMBDA, H, ELLIPSOID) converts geodetic - * point locations specified by the coordinate arrays PHI (geodetic - * latitude in radians), LAMBDA (longitude in radians), and H (ellipsoidal - * height) to geocentric Cartesian coordinates X, Y, and Z. The geodetic - * coordinates refer to the reference ellipsoid specified by ELLIPSOID (a - * row vector with the form [semimajor axis, eccentricity]). H must use - * the same units as the semimajor axis; X, Y, and Z will be expressed in - * these units also. - * - * The geocentric Cartesian coordinate system is fixed with respect to the - * Earth, with its origin at the center of the ellipsoid and its X-, Y-, - * and Z-axes intersecting the surface at the following points: - * PHI LAMBDA - * X-axis: 0 0 (Equator at the Prime Meridian) - * Y-axis: 0 pi/2 (Equator at 90-degrees East - * Z-axis: pi/2 0 (North Pole) - * - * A common synonym is Earth-Centered, Earth-Fixed coordinates, or ECEF. - * - * See also ECEF2GEODETIC, ECEF2LV, GEODETIC2GEOCENTRICLAT, LV2ECEF. - * - * Copyright 2004-2009 The MathWorks, Inc. - * $Revision: 1.1.6.4 $ $Date: 2009/04/15 23:34:46 $ - * Reference - * --------- - * Paul R. Wolf and Bon A. Dewitt, "Elements of Photogrammetry with - * Applications in GIS," 3rd Ed., McGraw-Hill, 2000 (Appendix F-3). - */ - arma::vec geodetic2ecef(double phi, double lambda, double h, const arma::vec &ellipsoid); - /*! - * \brief Reads the ephemeris data from an external XML file - * - */ - bool read_assistance_from_XML(); - /*! - * \brief Connects to Secure User Location Protocol (SUPL) server to obtain - * the current GPS ephemeris and GPS assistance data. - * - */ - int Get_SUPL_Assist(); - - const std::string eph_default_xml_filename = "./gps_ephemeris.xml"; - public: + FrontEndCal() = default; + ~FrontEndCal() = default; + /*! * \brief Sets the configuration data required by get_ephemeris function * @@ -135,8 +82,62 @@ public: */ void GPS_L1_front_end_model_E4000(double f_bb_true_Hz, double f_bb_meas_Hz, double fs_nominal_hz, double *estimated_fs_Hz, double *estimated_f_if_Hz, double *f_osc_err_ppm); - FrontEndCal(); - ~FrontEndCal(); +private: + std::shared_ptr configuration_; + + /* + * LLA2ECEF Convert geodetic coordinates to Earth-centered Earth-fixed + * (ECEF) coordinates. P = LLA2ECEF( LLA ) converts an M-by-3 array of geodetic coordinates + * (latitude, longitude and altitude), LLA, to an M-by-3 array of ECEF + * coordinates, P. LLA is in [degrees degrees meters]. P is in meters. + * The default ellipsoid planet is WGS84. Original copyright (c) by Kai Borre. + */ + arma::vec lla2ecef(const arma::vec &lla); + + /* + * GEODETIC2ECEF Convert geodetic to geocentric (ECEF) coordinates + * [X, Y, Z] = GEODETIC2ECEF(PHI, LAMBDA, H, ELLIPSOID) converts geodetic + * point locations specified by the coordinate arrays PHI (geodetic + * latitude in radians), LAMBDA (longitude in radians), and H (ellipsoidal + * height) to geocentric Cartesian coordinates X, Y, and Z. The geodetic + * coordinates refer to the reference ellipsoid specified by ELLIPSOID (a + * row vector with the form [semimajor axis, eccentricity]). H must use + * the same units as the semimajor axis; X, Y, and Z will be expressed in + * these units also. + * + * The geocentric Cartesian coordinate system is fixed with respect to the + * Earth, with its origin at the center of the ellipsoid and its X-, Y-, + * and Z-axes intersecting the surface at the following points: + * PHI LAMBDA + * X-axis: 0 0 (Equator at the Prime Meridian) + * Y-axis: 0 pi/2 (Equator at 90-degrees East + * Z-axis: pi/2 0 (North Pole) + * + * A common synonym is Earth-Centered, Earth-Fixed coordinates, or ECEF. + * + * See also ECEF2GEODETIC, ECEF2LV, GEODETIC2GEOCENTRICLAT, LV2ECEF. + * + * Copyright 2004-2009 The MathWorks, Inc. + * $Revision: 1.1.6.4 $ $Date: 2009/04/15 23:34:46 $ + * Reference + * --------- + * Paul R. Wolf and Bon A. Dewitt, "Elements of Photogrammetry with + * Applications in GIS," 3rd Ed., McGraw-Hill, 2000 (Appendix F-3). + */ + arma::vec geodetic2ecef(double phi, double lambda, double h, const arma::vec &ellipsoid); + + /* + * Reads the ephemeris data from an external XML file + */ + bool read_assistance_from_XML(); + + /* + * Connects to Secure User Location Protocol (SUPL) server to obtain + * the current GPS ephemeris and GPS assistance data. + */ + int Get_SUPL_Assist(); + + const std::string eph_default_xml_filename = "./gps_ephemeris.xml"; }; #endif