From ca2e22cd9f14a48e39bbf961d799c282bf751667 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 00:38:44 +0100 Subject: [PATCH 01/13] Replace boost::lexical_cast by std::to_string --- src/algorithms/PVT/libs/rinex_printer.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc index 2da35daa2..dfa3aaa08 100644 --- a/src/algorithms/PVT/libs/rinex_printer.cc +++ b/src/algorithms/PVT/libs/rinex_printer.cc @@ -1657,8 +1657,8 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Beidou_Dnav_Iono& // -------- Line 6 leap seconds // For leap second information, see http://www.endruntechnologies.com/leap.htm line.clear(); - line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LS), 6); - line += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6); + line += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LS), 6); + line += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LSF), 6); line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6); line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6); line += std::string(36, ' '); @@ -2831,8 +2831,8 @@ void Rinex_Printer::update_nav_header(std::fstream& out, const Beidou_Dnav_Utc_M } else if (line_str.find("LEAP SECONDS", 59) != std::string::npos) { - line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LS), 6); - line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6); + line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LS), 6); + line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LSF), 6); line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6); line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6); line_aux += std::string(36, ' '); @@ -7666,8 +7666,8 @@ void Rinex_Printer::update_obs_header(std::fstream& out, const Beidou_Dnav_Utc_M if (line_str.find("TIME OF FIRST OBS", 59) != std::string::npos) { data.push_back(line_str); - line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LS), 6); - line_aux += Rinex_Printer::rightJustify(boost::lexical_cast(utc_model.d_DeltaT_LSF), 6); + line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LS), 6); + line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LSF), 6); line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6); line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6); line_aux += std::string(36, ' '); From 64f7a900c6dfe24d9d28c03a087605bf8a542aec Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 11:26:43 +0100 Subject: [PATCH 02/13] Remove llvm-header-guard filter --- .clang-tidy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index 50fa566d0..2e3964f82 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,3 +1,3 @@ --- -Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,llvm-header-guard,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-deprecated-headers,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-using,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare' +Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-deprecated-headers,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-using,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare' HeaderFilterRegex: '.*' From b9c115bdf8f952a5ca724b51f8c16295a00c53b4 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 13:02:18 +0100 Subject: [PATCH 03/13] clang-tidy: apply modernize-use-using check --- src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h | 2 +- .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.h | 2 +- .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h | 2 +- .../acquisition/gnuradio_blocks/pcps_acquisition.h | 2 +- .../gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h | 3 +-- .../gnuradio_blocks/pcps_assisted_acquisition_cc.h | 3 +-- .../acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h | 2 +- .../gnuradio_blocks/pcps_quicksync_acquisition_cc.h | 3 +-- .../acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h | 2 +- src/algorithms/channel/libs/channel_msg_receiver_cc.h | 2 +- .../gnuradio_blocks/interleaved_byte_to_complex_byte.h | 2 +- .../gnuradio_blocks/interleaved_byte_to_complex_short.h | 2 +- .../gnuradio_blocks/interleaved_short_to_complex_short.h | 2 +- src/algorithms/input_filter/gnuradio_blocks/beamformer.h | 2 +- src/algorithms/input_filter/gnuradio_blocks/notch_cc.h | 2 +- src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h | 2 +- .../input_filter/gnuradio_blocks/pulse_blanking_cc.h | 2 +- src/algorithms/libs/byte_x2_to_complex_byte.h | 2 +- src/algorithms/libs/complex_byte_to_float_x2.h | 2 +- src/algorithms/libs/complex_float_to_complex_byte.h | 2 +- src/algorithms/libs/conjugate_cc.h | 2 +- src/algorithms/libs/conjugate_ic.h | 2 +- src/algorithms/libs/conjugate_sc.h | 2 +- src/algorithms/libs/cshort_to_float_x2.h | 2 +- src/algorithms/libs/gnss_sdr_sample_counter.h | 2 +- src/algorithms/libs/rtklib/rtklib.h | 2 +- src/algorithms/libs/short_x2_to_cshort.h | 2 +- .../observables/gnuradio_blocks/hybrid_observables_cc.h | 2 +- .../gnuradio_blocks/direct_resampler_conditioner_cb.h | 3 +-- .../gnuradio_blocks/direct_resampler_conditioner_cc.h | 2 +- .../gnuradio_blocks/direct_resampler_conditioner_cs.h | 3 +-- .../signal_generator/gnuradio_blocks/signal_generator_c.h | 2 +- .../signal_source/gnuradio_blocks/labsat23_source.h | 2 +- .../signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h | 5 ++--- .../signal_source/gnuradio_blocks/unpack_2bit_samples.h | 2 +- .../gnuradio_blocks/unpack_byte_2bit_cpx_samples.h | 2 +- .../signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h | 2 +- .../signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h | 2 +- .../gnuradio_blocks/unpack_intspir_1bit_samples.h | 2 +- .../gnuradio_blocks/unpack_spir_gss6450_samples.h | 2 +- .../gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h | 2 +- .../gnuradio_blocks/galileo_telemetry_decoder_cc.h | 2 +- .../gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h | 2 +- .../gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h | 2 +- .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h | 2 +- .../gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h | 2 +- .../gnuradio_blocks/gps_l5_telemetry_decoder_cc.h | 2 +- .../gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h | 2 +- .../tracking/gnuradio_blocks/dll_pll_veml_tracking.h | 2 +- .../gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h | 2 +- .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.h | 3 +-- .../glonass_l1_ca_dll_pll_c_aid_tracking_sc.h | 3 +-- .../gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h | 3 +-- .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.h | 3 +-- .../glonass_l2_ca_dll_pll_c_aid_tracking_sc.h | 3 +-- .../gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h | 3 +-- .../gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h | 3 +-- .../gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h | 3 +-- .../tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h | 3 +-- .../gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h | 2 +- src/core/monitor/gnss_synchro_monitor.h | 2 +- ...alileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 2 +- .../galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 2 +- .../galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc | 2 +- .../galileo_e1_pcps_ambiguous_acquisition_test.cc | 2 +- ...leo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 2 +- ..._e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc | 2 +- ...lileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc | 2 +- .../galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 2 +- .../glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc | 2 +- .../acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 2 +- .../gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 2 +- .../gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 2 +- .../signal-processing-blocks/libs/acquisition_msg_rx.h | 2 +- .../tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc | 2 +- .../tracking/glonass_l1_ca_dll_pll_tracking_test.cc | 2 +- 76 files changed, 77 insertions(+), 92 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h index 4f84f8a27..f2174039e 100644 --- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h +++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h @@ -56,7 +56,7 @@ class rtklib_pvt_cc; -typedef boost::shared_ptr rtklib_pvt_cc_sptr; +using rtklib_pvt_cc_sptr = boost::shared_ptr; rtklib_pvt_cc_sptr rtklib_make_pvt_cc(uint32_t n_channels, const Pvt_Conf& conf_, diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h index 352dc938c..c95a74b82 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h @@ -47,7 +47,7 @@ class galileo_e5a_noncoherentIQ_acquisition_caf_cc; -typedef boost::shared_ptr galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr; +using galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr = boost::shared_ptr; galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make_acquisition_caf_cc(unsigned int sampled_ms, diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h index d9f794d1e..0c1b81e20 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h @@ -41,7 +41,7 @@ class galileo_pcps_8ms_acquisition_cc; -typedef boost::shared_ptr galileo_pcps_8ms_acquisition_cc_sptr; +using galileo_pcps_8ms_acquisition_cc_sptr = boost::shared_ptr; galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_make_acquisition_cc(uint32_t sampled_ms, diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h index c403b7d50..0447dd308 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h @@ -63,7 +63,7 @@ class pcps_acquisition; -typedef boost::shared_ptr pcps_acquisition_sptr; +using pcps_acquisition_sptr = boost::shared_ptr; pcps_acquisition_sptr pcps_make_acquisition(const Acq_Conf& conf_); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h index d92ed1db7..544aefc18 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h @@ -60,8 +60,7 @@ class pcps_acquisition_fine_doppler_cc; -typedef boost::shared_ptr - pcps_acquisition_fine_doppler_cc_sptr; +using pcps_acquisition_fine_doppler_cc_sptr = boost::shared_ptr; pcps_acquisition_fine_doppler_cc_sptr pcps_make_acquisition_fine_doppler_cc(const Acq_Conf& conf_); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h index d582821c6..b27f920df 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h @@ -57,8 +57,7 @@ class pcps_assisted_acquisition_cc; -typedef boost::shared_ptr - pcps_assisted_acquisition_cc_sptr; +using pcps_assisted_acquisition_cc_sptr = boost::shared_ptr; pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc( diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h index 85050cc21..b1edf0106 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h @@ -47,7 +47,7 @@ class pcps_cccwsr_acquisition_cc; -typedef boost::shared_ptr pcps_cccwsr_acquisition_cc_sptr; +using pcps_cccwsr_acquisition_cc_sptr = boost::shared_ptr; pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_make_acquisition_cc( diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h index 1e8e07a05..cf24625a5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h @@ -63,8 +63,7 @@ class pcps_quicksync_acquisition_cc; -typedef boost::shared_ptr - pcps_quicksync_acquisition_cc_sptr; +using pcps_quicksync_acquisition_cc_sptr = boost::shared_ptr; pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc( diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h index f4cb31068..e2443fa33 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h @@ -61,7 +61,7 @@ class pcps_tong_acquisition_cc; -typedef boost::shared_ptr pcps_tong_acquisition_cc_sptr; +using pcps_tong_acquisition_cc_sptr = boost::shared_ptr; pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc( diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.h b/src/algorithms/channel/libs/channel_msg_receiver_cc.h index 7fc172923..cc05892d8 100644 --- a/src/algorithms/channel/libs/channel_msg_receiver_cc.h +++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.h @@ -36,7 +36,7 @@ class channel_msg_receiver_cc; -typedef boost::shared_ptr channel_msg_receiver_cc_sptr; +using channel_msg_receiver_cc_sptr = boost::shared_ptr; channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr channel_fsm, bool repeat); diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h index c9ce17b4a..437d60d4e 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h @@ -37,7 +37,7 @@ class interleaved_byte_to_complex_byte; -typedef boost::shared_ptr interleaved_byte_to_complex_byte_sptr; +using interleaved_byte_to_complex_byte_sptr = boost::shared_ptr; interleaved_byte_to_complex_byte_sptr make_interleaved_byte_to_complex_byte(); diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h index 5eab0f314..0b0fbdf1b 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h @@ -36,7 +36,7 @@ class interleaved_byte_to_complex_short; -typedef boost::shared_ptr interleaved_byte_to_complex_short_sptr; +using interleaved_byte_to_complex_short_sptr = boost::shared_ptr; interleaved_byte_to_complex_short_sptr make_interleaved_byte_to_complex_short(); diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h index 10287459a..e31b6ac98 100644 --- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h +++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h @@ -36,7 +36,7 @@ class interleaved_short_to_complex_short; -typedef boost::shared_ptr interleaved_short_to_complex_short_sptr; +using interleaved_short_to_complex_short_sptr = boost::shared_ptr; interleaved_short_to_complex_short_sptr make_interleaved_short_to_complex_short(); diff --git a/src/algorithms/input_filter/gnuradio_blocks/beamformer.h b/src/algorithms/input_filter/gnuradio_blocks/beamformer.h index 8236b11d3..6fc126272 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/beamformer.h +++ b/src/algorithms/input_filter/gnuradio_blocks/beamformer.h @@ -34,7 +34,7 @@ #include class beamformer; -typedef boost::shared_ptr beamformer_sptr; +using beamformer_sptr = boost::shared_ptr; beamformer_sptr make_beamformer(); diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h index ab8f3b693..186d1feb1 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h +++ b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h @@ -39,7 +39,7 @@ class Notch; -typedef boost::shared_ptr notch_sptr; +using notch_sptr = boost::shared_ptr; notch_sptr make_notch_filter(float pfa, float p_c_factor, int32_t length_, int32_t n_segments_est, int32_t n_segments_reset); diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h index c312c2b98..111dd65b0 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h +++ b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h @@ -39,7 +39,7 @@ class NotchLite; -typedef boost::shared_ptr notch_lite_sptr; +using notch_lite_sptr = boost::shared_ptr; notch_lite_sptr make_notch_filter_lite(float p_c_factor, float pfa, int32_t length_, int32_t n_segments_est, int32_t n_segments_reset, int32_t n_segments_coeff); diff --git a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h index 4d0f72f00..af5584463 100644 --- a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h +++ b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h @@ -37,7 +37,7 @@ class pulse_blanking_cc; -typedef boost::shared_ptr pulse_blanking_cc_sptr; +using pulse_blanking_cc_sptr = boost::shared_ptr; pulse_blanking_cc_sptr make_pulse_blanking_cc(float pfa, int32_t length_, int32_t n_segments_est, int32_t n_segments_reset); diff --git a/src/algorithms/libs/byte_x2_to_complex_byte.h b/src/algorithms/libs/byte_x2_to_complex_byte.h index c7e49bc98..05db6cb2d 100644 --- a/src/algorithms/libs/byte_x2_to_complex_byte.h +++ b/src/algorithms/libs/byte_x2_to_complex_byte.h @@ -37,7 +37,7 @@ class byte_x2_to_complex_byte; -typedef boost::shared_ptr byte_x2_to_complex_byte_sptr; +using byte_x2_to_complex_byte_sptr = boost::shared_ptr; byte_x2_to_complex_byte_sptr make_byte_x2_to_complex_byte(); diff --git a/src/algorithms/libs/complex_byte_to_float_x2.h b/src/algorithms/libs/complex_byte_to_float_x2.h index 74c2e9c55..170cd6033 100644 --- a/src/algorithms/libs/complex_byte_to_float_x2.h +++ b/src/algorithms/libs/complex_byte_to_float_x2.h @@ -37,7 +37,7 @@ class complex_byte_to_float_x2; -typedef boost::shared_ptr complex_byte_to_float_x2_sptr; +using complex_byte_to_float_x2_sptr = boost::shared_ptr; complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2(); diff --git a/src/algorithms/libs/complex_float_to_complex_byte.h b/src/algorithms/libs/complex_float_to_complex_byte.h index 74eb0b5c3..f8368543e 100644 --- a/src/algorithms/libs/complex_float_to_complex_byte.h +++ b/src/algorithms/libs/complex_float_to_complex_byte.h @@ -36,7 +36,7 @@ class complex_float_to_complex_byte; -typedef boost::shared_ptr complex_float_to_complex_byte_sptr; +using complex_float_to_complex_byte_sptr = boost::shared_ptr; complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte(); diff --git a/src/algorithms/libs/conjugate_cc.h b/src/algorithms/libs/conjugate_cc.h index a04cd2410..56a3ece78 100644 --- a/src/algorithms/libs/conjugate_cc.h +++ b/src/algorithms/libs/conjugate_cc.h @@ -36,7 +36,7 @@ class conjugate_cc; -typedef boost::shared_ptr conjugate_cc_sptr; +using conjugate_cc_sptr = boost::shared_ptr; conjugate_cc_sptr make_conjugate_cc(); diff --git a/src/algorithms/libs/conjugate_ic.h b/src/algorithms/libs/conjugate_ic.h index 4b51f86da..4acc7af3a 100644 --- a/src/algorithms/libs/conjugate_ic.h +++ b/src/algorithms/libs/conjugate_ic.h @@ -36,7 +36,7 @@ class conjugate_ic; -typedef boost::shared_ptr conjugate_ic_sptr; +using conjugate_ic_sptr = boost::shared_ptr; conjugate_ic_sptr make_conjugate_ic(); diff --git a/src/algorithms/libs/conjugate_sc.h b/src/algorithms/libs/conjugate_sc.h index 019d16dcb..a26b39ad7 100644 --- a/src/algorithms/libs/conjugate_sc.h +++ b/src/algorithms/libs/conjugate_sc.h @@ -36,7 +36,7 @@ class conjugate_sc; -typedef boost::shared_ptr conjugate_sc_sptr; +using conjugate_sc_sptr = boost::shared_ptr; conjugate_sc_sptr make_conjugate_sc(); diff --git a/src/algorithms/libs/cshort_to_float_x2.h b/src/algorithms/libs/cshort_to_float_x2.h index 7a235e68a..87a5d89a7 100644 --- a/src/algorithms/libs/cshort_to_float_x2.h +++ b/src/algorithms/libs/cshort_to_float_x2.h @@ -37,7 +37,7 @@ class cshort_to_float_x2; -typedef boost::shared_ptr cshort_to_float_x2_sptr; +using cshort_to_float_x2_sptr = boost::shared_ptr; cshort_to_float_x2_sptr make_cshort_to_float_x2(); diff --git a/src/algorithms/libs/gnss_sdr_sample_counter.h b/src/algorithms/libs/gnss_sdr_sample_counter.h index 8a645d9f3..ed065b193 100644 --- a/src/algorithms/libs/gnss_sdr_sample_counter.h +++ b/src/algorithms/libs/gnss_sdr_sample_counter.h @@ -38,7 +38,7 @@ class gnss_sdr_sample_counter; -typedef boost::shared_ptr gnss_sdr_sample_counter_sptr; +using gnss_sdr_sample_counter_sptr = boost::shared_ptr; gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter( double _fs, diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h index da2644a3a..7edb5786b 100644 --- a/src/algorithms/libs/rtklib/rtklib.h +++ b/src/algorithms/libs/rtklib/rtklib.h @@ -343,7 +343,7 @@ const int POSOPT_RINEX = 3; //!< pos option: rinex header pos const int MAXSTRPATH = 1024; //!< max length of stream path const int MAXSTRMSG = 1024; //!< max length of stream message -typedef void fatalfunc_t(const char *); //!< fatal callback function type +using fatalfunc_t = void (const char *); //!< fatal callback function type #define STR_MODE_R 0x1 /* stream mode: read */ #define STR_MODE_W 0x2 /* stream mode: write */ diff --git a/src/algorithms/libs/short_x2_to_cshort.h b/src/algorithms/libs/short_x2_to_cshort.h index a95ae1214..1591c5412 100644 --- a/src/algorithms/libs/short_x2_to_cshort.h +++ b/src/algorithms/libs/short_x2_to_cshort.h @@ -37,7 +37,7 @@ class short_x2_to_cshort; -typedef boost::shared_ptr short_x2_to_cshort_sptr; +using short_x2_to_cshort_sptr = boost::shared_ptr; short_x2_to_cshort_sptr make_short_x2_to_cshort(); diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h index 9f6d31e47..8a4d4c56e 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h @@ -45,7 +45,7 @@ class hybrid_observables_cc; -typedef boost::shared_ptr hybrid_observables_cc_sptr; +using hybrid_observables_cc_sptr = boost::shared_ptr; hybrid_observables_cc_sptr hybrid_make_observables_cc(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, std::string dump_filename); 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 1db7f374d..ac93ab82b 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h @@ -36,8 +36,7 @@ #include class direct_resampler_conditioner_cb; -typedef boost::shared_ptr - direct_resampler_conditioner_cb_sptr; +using direct_resampler_conditioner_cb_sptr = boost::shared_ptr; direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb(double sample_freq_in, 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 0c477c571..945f797ce 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h @@ -43,7 +43,7 @@ #include class direct_resampler_conditioner_cc; -typedef boost::shared_ptr direct_resampler_conditioner_cc_sptr; +using direct_resampler_conditioner_cc_sptr = boost::shared_ptr; direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc(double sample_freq_in, double sample_freq_out); 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 40602a68d..9d904abfb 100644 --- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h +++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h @@ -36,8 +36,7 @@ #include class direct_resampler_conditioner_cs; -typedef boost::shared_ptr - direct_resampler_conditioner_cs_sptr; +using direct_resampler_conditioner_cs_sptr = boost::shared_ptr; direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(double sample_freq_in, diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h index 0c412432d..2201a849c 100644 --- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h +++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h @@ -51,7 +51,7 @@ class signal_generator_c; * * As a convention, the _sptr suffix indicates a boost::shared_ptr */ -typedef boost::shared_ptr signal_generator_c_sptr; +using signal_generator_c_sptr = boost::shared_ptr; /*! * \brief Return a shared_ptr to a new instance of gen_source. diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h index e7776efd9..6f4435c24 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h +++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h @@ -39,7 +39,7 @@ class labsat23_source; -typedef boost::shared_ptr labsat23_source_sptr; +using labsat23_source_sptr = boost::shared_ptr; labsat23_source_sptr labsat23_make_source(const char *signal_file_basename, int channel_selector); diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h index 62e7f2c07..d685b26a1 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h +++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h @@ -50,8 +50,7 @@ class rtl_tcp_signal_source_c; -typedef boost::shared_ptr - rtl_tcp_signal_source_c_sptr; +using rtl_tcp_signal_source_c_sptr = boost::shared_ptr; rtl_tcp_signal_source_c_sptr rtl_tcp_make_signal_source_c(const std::string &address, @@ -78,7 +77,7 @@ public: void set_if_gain(int gain); private: - typedef boost::circular_buffer_space_optimized buffer_type; + using buffer_type = boost::circular_buffer_space_optimized; friend rtl_tcp_signal_source_c_sptr rtl_tcp_make_signal_source_c(const std::string &address, 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 e91fefd2d..33f3cb73e 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h +++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h @@ -73,7 +73,7 @@ class unpack_2bit_samples; -typedef boost::shared_ptr unpack_2bit_samples_sptr; +using unpack_2bit_samples_sptr = boost::shared_ptr; unpack_2bit_samples_sptr make_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.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h index 090568aa7..66ff922df 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 @@ -39,7 +39,7 @@ class unpack_byte_2bit_cpx_samples; -typedef boost::shared_ptr unpack_byte_2bit_cpx_samples_sptr; +using unpack_byte_2bit_cpx_samples_sptr = boost::shared_ptr; unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples(); 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 90ed74e60..92a115adf 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 @@ -35,7 +35,7 @@ class unpack_byte_2bit_samples; -typedef boost::shared_ptr unpack_byte_2bit_samples_sptr; +using unpack_byte_2bit_samples_sptr = boost::shared_ptr; unpack_byte_2bit_samples_sptr make_unpack_byte_2bit_samples(); 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 0a48bcb5f..2ee08145e 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 @@ -37,7 +37,7 @@ class unpack_byte_4bit_samples; -typedef boost::shared_ptr unpack_byte_4bit_samples_sptr; +using unpack_byte_4bit_samples_sptr = boost::shared_ptr; unpack_byte_4bit_samples_sptr make_unpack_byte_4bit_samples(); 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 536816f0c..7b8e7d7dc 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 @@ -35,7 +35,7 @@ class unpack_intspir_1bit_samples; -typedef boost::shared_ptr unpack_intspir_1bit_samples_sptr; +using unpack_intspir_1bit_samples_sptr = boost::shared_ptr; unpack_intspir_1bit_samples_sptr make_unpack_intspir_1bit_samples(); 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 a8f4b47f9..28ef0b073 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 @@ -36,7 +36,7 @@ class unpack_spir_gss6450_samples; -typedef boost::shared_ptr unpack_spir_gss6450_samples_sptr; +using unpack_spir_gss6450_samples_sptr = boost::shared_ptr; unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(unsigned int adc_nbit); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h index bd5eafb5a..e1b0b02ec 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h @@ -49,7 +49,7 @@ class beidou_b1i_telemetry_decoder_cc; -typedef boost::shared_ptr beidou_b1i_telemetry_decoder_cc_sptr; +using beidou_b1i_telemetry_decoder_cc_sptr = boost::shared_ptr; beidou_b1i_telemetry_decoder_cc_sptr beidou_b1i_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.h index c06df6010..96bd0081b 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.h @@ -50,7 +50,7 @@ class galileo_telemetry_decoder_cc; -typedef boost::shared_ptr galileo_telemetry_decoder_cc_sptr; +using galileo_telemetry_decoder_cc_sptr = boost::shared_ptr; galileo_telemetry_decoder_cc_sptr galileo_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, int frame_type, bool dump); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h index 1bdde14da..01b8dcd5a 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h @@ -48,7 +48,7 @@ class glonass_l1_ca_telemetry_decoder_cc; -typedef boost::shared_ptr glonass_l1_ca_telemetry_decoder_cc_sptr; +using glonass_l1_ca_telemetry_decoder_cc_sptr = boost::shared_ptr; glonass_l1_ca_telemetry_decoder_cc_sptr glonass_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h index 8b1a25ee9..0ee799a34 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h @@ -47,7 +47,7 @@ class glonass_l2_ca_telemetry_decoder_cc; -typedef boost::shared_ptr glonass_l2_ca_telemetry_decoder_cc_sptr; +using glonass_l2_ca_telemetry_decoder_cc_sptr = boost::shared_ptr; glonass_l2_ca_telemetry_decoder_cc_sptr glonass_l2_ca_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h index c1b55cd9f..f77a98153 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h @@ -42,7 +42,7 @@ class gps_l1_ca_telemetry_decoder_cc; -typedef boost::shared_ptr gps_l1_ca_telemetry_decoder_cc_sptr; +using gps_l1_ca_telemetry_decoder_cc_sptr = boost::shared_ptr; gps_l1_ca_telemetry_decoder_cc_sptr gps_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h index 8b5922575..3c7747f1b 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h @@ -57,7 +57,7 @@ extern "C" class gps_l2c_telemetry_decoder_cc; -typedef boost::shared_ptr gps_l2c_telemetry_decoder_cc_sptr; +using gps_l2c_telemetry_decoder_cc_sptr = boost::shared_ptr; gps_l2c_telemetry_decoder_cc_sptr gps_l2c_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h index eb57696bc..2414343ee 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h @@ -53,7 +53,7 @@ extern "C" class gps_l5_telemetry_decoder_cc; -typedef boost::shared_ptr gps_l5_telemetry_decoder_cc_sptr; +using gps_l5_telemetry_decoder_cc_sptr = boost::shared_ptr; gps_l5_telemetry_decoder_cc_sptr gps_l5_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump); diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h index 5dcf4f27b..c1956d5e4 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h @@ -46,7 +46,7 @@ class sbas_l1_telemetry_decoder_cc; -typedef boost::shared_ptr sbas_l1_telemetry_decoder_cc_sptr; +using sbas_l1_telemetry_decoder_cc_sptr = boost::shared_ptr; sbas_l1_telemetry_decoder_cc_sptr sbas_l1_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump); diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h index bce6e9048..484f0b63c 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h @@ -47,7 +47,7 @@ class dll_pll_veml_tracking; -typedef boost::shared_ptr dll_pll_veml_tracking_sptr; +using dll_pll_veml_tracking_sptr = boost::shared_ptr; dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(const Dll_Pll_Conf &conf_); diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h index acce9db54..ff14ab9cb 100644 --- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h @@ -51,7 +51,7 @@ class Galileo_E1_Tcp_Connector_Tracking_cc; -typedef boost::shared_ptr galileo_e1_tcp_connector_tracking_cc_sptr; +using galileo_e1_tcp_connector_tracking_cc_sptr = boost::shared_ptr; galileo_e1_tcp_connector_tracking_cc_sptr galileo_e1_tcp_connector_make_tracking_cc( diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h index 10f1064f5..2a5102942 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h @@ -53,8 +53,7 @@ class glonass_l1_ca_dll_pll_c_aid_tracking_cc; -typedef boost::shared_ptr - glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr; +using glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr = boost::shared_ptr; glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr glonass_l1_ca_dll_pll_c_aid_make_tracking_cc( diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h index b0717532e..54c30e270 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h @@ -54,8 +54,7 @@ class glonass_l1_ca_dll_pll_c_aid_tracking_sc; -typedef boost::shared_ptr - glonass_l1_ca_dll_pll_c_aid_tracking_sc_sptr; +using glonass_l1_ca_dll_pll_c_aid_tracking_sc_sptr = boost::shared_ptr; glonass_l1_ca_dll_pll_c_aid_tracking_sc_sptr glonass_l1_ca_dll_pll_c_aid_make_tracking_sc( diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h index d8716f5ee..15bc1c90f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h @@ -50,8 +50,7 @@ class Glonass_L1_Ca_Dll_Pll_Tracking_cc; -typedef boost::shared_ptr - glonass_l1_ca_dll_pll_tracking_cc_sptr; +using glonass_l1_ca_dll_pll_tracking_cc_sptr = boost::shared_ptr; glonass_l1_ca_dll_pll_tracking_cc_sptr glonass_l1_ca_dll_pll_make_tracking_cc( diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h index 129e4609e..1be8d3c7f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h @@ -51,8 +51,7 @@ class glonass_l2_ca_dll_pll_c_aid_tracking_cc; -typedef boost::shared_ptr - glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr; +using glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr = boost::shared_ptr; glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr glonass_l2_ca_dll_pll_c_aid_make_tracking_cc( diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h index 5745d8ff9..3b2618eb9 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h @@ -52,8 +52,7 @@ class glonass_l2_ca_dll_pll_c_aid_tracking_sc; -typedef boost::shared_ptr - glonass_l2_ca_dll_pll_c_aid_tracking_sc_sptr; +using glonass_l2_ca_dll_pll_c_aid_tracking_sc_sptr = boost::shared_ptr; glonass_l2_ca_dll_pll_c_aid_tracking_sc_sptr glonass_l2_ca_dll_pll_c_aid_make_tracking_sc( diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h index f2f4ebab5..29f6bb077 100644 --- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h @@ -48,8 +48,7 @@ class Glonass_L2_Ca_Dll_Pll_Tracking_cc; -typedef boost::shared_ptr - glonass_l2_ca_dll_pll_tracking_cc_sptr; +using glonass_l2_ca_dll_pll_tracking_cc_sptr = boost::shared_ptr; glonass_l2_ca_dll_pll_tracking_cc_sptr glonass_l2_ca_dll_pll_make_tracking_cc( diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h index 43db468ae..ecbe2c15f 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h @@ -51,8 +51,7 @@ class gps_l1_ca_dll_pll_c_aid_tracking_cc; -typedef boost::shared_ptr - gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr; +using gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr = boost::shared_ptr; gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr gps_l1_ca_dll_pll_c_aid_make_tracking_cc( diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h index f7624e944..6b67fa09b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h @@ -52,8 +52,7 @@ class gps_l1_ca_dll_pll_c_aid_tracking_sc; -typedef boost::shared_ptr - gps_l1_ca_dll_pll_c_aid_tracking_sc_sptr; +using gps_l1_ca_dll_pll_c_aid_tracking_sc_sptr = boost::shared_ptr; gps_l1_ca_dll_pll_c_aid_tracking_sc_sptr gps_l1_ca_dll_pll_c_aid_make_tracking_sc( diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h index a40e257b9..e4acf778b 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h @@ -53,8 +53,7 @@ class Gps_L1_Ca_Kf_Tracking_cc; -typedef boost::shared_ptr - gps_l1_ca_kf_tracking_cc_sptr; +using gps_l1_ca_kf_tracking_cc_sptr = boost::shared_ptr; gps_l1_ca_kf_tracking_cc_sptr gps_l1_ca_kf_make_tracking_cc(uint32_t order, diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h index 636a9fe28..a4a1c82e7 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h @@ -48,7 +48,7 @@ class Gps_L1_Ca_Tcp_Connector_Tracking_cc; -typedef boost::shared_ptr gps_l1_ca_tcp_connector_tracking_cc_sptr; +using gps_l1_ca_tcp_connector_tracking_cc_sptr = boost::shared_ptr; gps_l1_ca_tcp_connector_tracking_cc_sptr gps_l1_ca_tcp_connector_make_tracking_cc( diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h index 4346c9fb5..7c22a1290 100644 --- a/src/core/monitor/gnss_synchro_monitor.h +++ b/src/core/monitor/gnss_synchro_monitor.h @@ -43,7 +43,7 @@ class gnss_synchro_monitor; -typedef boost::shared_ptr gnss_synchro_monitor_sptr; +using gnss_synchro_monitor_sptr = boost::shared_ptr; gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels, int output_rate_ms, diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc index 7e3be06c6..21967ff9e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc @@ -55,7 +55,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx; -typedef boost::shared_ptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr; +using GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr; GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc index 7f15ac400..300f90f63 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc @@ -56,7 +56,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx; -typedef boost::shared_ptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr; +using GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr; GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc index 73b67416b..3657fa0f1 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc @@ -64,7 +64,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx; -typedef boost::shared_ptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr; +using GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr = boost::shared_ptr; GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc index 786bfbff7..c76cc762e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc @@ -60,7 +60,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx; -typedef boost::shared_ptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr; +using GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr = boost::shared_ptr; GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc index df2d68e1f..a8d818ff6 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc @@ -56,7 +56,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx; -typedef boost::shared_ptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr; +using GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr = boost::shared_ptr; GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index b4a7b4410..fa331c6dd 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -64,7 +64,7 @@ using google::LogMessage; // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx; -typedef boost::shared_ptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr; +using GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr = boost::shared_ptr; GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc index 8fe2305a3..7b3f8daf7 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc @@ -58,7 +58,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx; -typedef boost::shared_ptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr; +using GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr; GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index df67c7756..7b1a6b975 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -55,7 +55,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx; -typedef boost::shared_ptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr; +using GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr = boost::shared_ptr; GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc index cf515debb..3e16bd39e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc @@ -60,7 +60,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx; -typedef boost::shared_ptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr; +using GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr = boost::shared_ptr; GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc index 641672a9a..5ad20f059 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc @@ -60,7 +60,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx; -typedef boost::shared_ptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr; +using GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr; GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index 966b33473..6e5392296 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -62,7 +62,7 @@ using google::LogMessage; // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx; -typedef boost::shared_ptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr; +using GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr = boost::shared_ptr; GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc index d24b4b0f7..efdc554e4 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc @@ -58,7 +58,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx; -typedef boost::shared_ptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr; +using GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr; GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue& queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h index 90a61a482..4dca5bcb8 100644 --- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h +++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h @@ -40,7 +40,7 @@ // ######## GNURADIO ACQUISITION BLOCK MESSAGE RECEVER ######### class Acquisition_msg_rx; -typedef boost::shared_ptr Acquisition_msg_rx_sptr; +using Acquisition_msg_rx_sptr = boost::shared_ptr; Acquisition_msg_rx_sptr Acquisition_msg_rx_make(); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc index 64c6df3b5..6fbda7a6e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc @@ -55,7 +55,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GlonassL1CaDllPllCAidTrackingTest_msg_rx; -typedef boost::shared_ptr GlonassL1CaDllPllCAidTrackingTest_msg_rx_sptr; +using GlonassL1CaDllPllCAidTrackingTest_msg_rx_sptr = boost::shared_ptr; GlonassL1CaDllPllCAidTrackingTest_msg_rx_sptr GlonassL1CaDllPllCAidTrackingTest_msg_rx_make(); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc index 2bf4f8938..c18809d5a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc @@ -56,7 +56,7 @@ // ######## GNURADIO BLOCK MESSAGE RECEVER ######### class GlonassL1CaDllPllTrackingTest_msg_rx; -typedef boost::shared_ptr GlonassL1CaDllPllTrackingTest_msg_rx_sptr; +using GlonassL1CaDllPllTrackingTest_msg_rx_sptr = boost::shared_ptr; GlonassL1CaDllPllTrackingTest_msg_rx_sptr GlonassL1CaDllPllTrackingTest_msg_rx_make(); From 16bd8aa983e57998bb92e7e51b6ccbf84c4c78f1 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 13:13:54 +0100 Subject: [PATCH 04/13] clang-tidy: apply modernize-use-bool-literals check --- .../unit-tests/signal-processing-blocks/pvt/rtcm_test.cc | 2 +- .../system-parameters/glonass_gnav_nav_message_test.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc index cd8771880..ae0a89039 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc @@ -295,7 +295,7 @@ TEST(RtcmTest, MT1020) // Bit distribution per fields dependent on other factors gnav_ephemeris.d_t_b = 8100; // Binary flag representation - gnav_ephemeris.d_P_3 = 1; + gnav_ephemeris.d_P_3 = true; std::string tx_msg = rtcm->print_MT1020(gnav_ephemeris, gnav_utc_model); diff --git a/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc b/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc index 3b91be0e6..0f570fe2a 100644 --- a/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc +++ b/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc @@ -126,7 +126,7 @@ TEST(GlonassGnavNavigationMessageTest, String2Decoder) // Fill out ephemeris values for truth gnav_ephemeris.d_B_n = 0; - gnav_ephemeris.d_P_2 = 1; + gnav_ephemeris.d_P_2 = true; gnav_ephemeris.d_t_b = 8100; gnav_ephemeris.d_VYn = -2.69022750854492; gnav_ephemeris.d_AYn = 0; @@ -162,10 +162,10 @@ TEST(GlonassGnavNavigationMessageTest, String3Decoder) Glonass_Gnav_Ephemeris gnav_ephemeris; // Fill out ephemeris values for truth - gnav_ephemeris.d_P_3 = 1; + gnav_ephemeris.d_P_3 = true; gnav_ephemeris.d_gamma_n = 1.81898940354586e-12; gnav_ephemeris.d_P = 3; - gnav_ephemeris.d_l3rd_n = 0; + gnav_ephemeris.d_l3rd_n = false; gnav_ephemeris.d_VZn = -1.82016849517822; gnav_ephemeris.d_AZn = -2.79396772384644e-09; gnav_ephemeris.d_Zn = 19929.2377929688; @@ -203,7 +203,7 @@ TEST(GlonassGnavNavigationMessageTest, String4Decoder) gnav_ephemeris.d_tau_n = -8.30907374620438e-05; gnav_ephemeris.d_Delta_tau_n = 9.31322574615479e-10; gnav_ephemeris.d_E_n = 0; - gnav_ephemeris.d_P_4 = 0; + gnav_ephemeris.d_P_4 = false; gnav_ephemeris.d_F_T = 6; gnav_ephemeris.d_N_T = 268; gnav_ephemeris.d_n = 21; From 298a9c2391bb1c8e854c4f35c8aa04b3ffe287ce Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 14:47:18 +0100 Subject: [PATCH 05/13] clang-tidy: apply readability-container-size-empty check --- src/tests/common-files/gnuplot_i.h | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h index 7a971f02e..7ef3acad8 100644 --- a/src/tests/common-files/gnuplot_i.h +++ b/src/tests/common-files/gnuplot_i.h @@ -786,7 +786,7 @@ inline Gnuplot::Gnuplot(const std::vector &x, template Gnuplot &Gnuplot::plot_x(const X &x, const std::string &title) { - if (x.size() == 0) + if (x.empty()) { throw GnuplotException("std::vector too small"); return *this; @@ -794,7 +794,7 @@ Gnuplot &Gnuplot::plot_x(const X &x, const std::string &title) std::ofstream tmp; std::string name = create_tmpfile(tmp); - if (name == "") + if (name.empty()) return *this; // @@ -819,7 +819,7 @@ Gnuplot &Gnuplot::plot_x(const X &x, const std::string &title) template Gnuplot &Gnuplot::plot_xy(const X &x, const Y &y, const std::string &title, const unsigned int decimate) { - if (x.size() == 0 || y.size() == 0) + if (x.empty() || y.empty()) { throw GnuplotException("std::vectors too small"); return *this; @@ -833,7 +833,7 @@ Gnuplot &Gnuplot::plot_xy(const X &x, const Y &y, const std::string &title, cons std::ofstream tmp; std::string name = create_tmpfile(tmp); - if (name == "") + if (name.empty()) return *this; // @@ -875,7 +875,7 @@ Gnuplot &Gnuplot::plot_xy_err(const X &x, std::ofstream tmp; std::string name = create_tmpfile(tmp); - if (name == "") + if (name.empty()) return *this; // @@ -904,14 +904,14 @@ Gnuplot &Gnuplot::plot_grid3d(const X &x, const E &mag, const std::string &title) { - if (x.size() == 0 || y.size() == 0) + if (x.empty() || y.empty()) { throw GnuplotException("std::vectors too small"); return *this; } std::ofstream tmp; std::string name = create_tmpfile(tmp); - if (name == "") + if (name.empty()) return *this; // @@ -937,7 +937,7 @@ Gnuplot &Gnuplot::plot_grid3d(const X &x, cmdstr << " splot \"" << name << "\" u 1:2:3"; - if (title == "") + if (title.empty()) cmdstr << " notitle with " << pstyle << " palette"; else cmdstr << " title \"" << title << "\" with " << pstyle << " palette"; @@ -961,7 +961,7 @@ Gnuplot &Gnuplot::plot_xyz(const X &x, const Z &z, const std::string &title) { - if (x.size() == 0 || y.size() == 0 || z.size() == 0) + if (x.empty() || y.empty() || z.empty()) { throw GnuplotException("std::vectors too small"); return *this; @@ -975,7 +975,7 @@ Gnuplot &Gnuplot::plot_xyz(const X &x, std::ofstream tmp; std::string name = create_tmpfile(tmp); - if (name == "") + if (name.empty()) return *this; // @@ -1507,7 +1507,7 @@ Gnuplot &Gnuplot::plot_slope(const double a, cmdstr << a << " * x + " << b << " title \""; - if (title == "") + if (title.empty()) cmdstr << "f(x) = " << a << " * x + " << b; else cmdstr << title; @@ -1541,7 +1541,7 @@ Gnuplot &Gnuplot::plot_equation(const std::string &equation, cmdstr << equation << " title \""; - if (title == "") + if (title.empty()) cmdstr << "f(x) = " << equation; else cmdstr << title; @@ -1575,7 +1575,7 @@ Gnuplot &Gnuplot::plot_equation3d(const std::string &equation, cmdstr << equation << " title \""; - if (title == "") + if (title.empty()) cmdstr << "f(x,y) = " << equation; else cmdstr << title; @@ -1615,12 +1615,12 @@ Gnuplot &Gnuplot::plotfile_x(const std::string &filename, cmdstr << "\"" << filename << "\" using " << column; - if (title == "") + if (title.empty()) cmdstr << " notitle "; else cmdstr << " title \"" << title << "\" "; - if (smooth == "") + if (smooth.empty()) cmdstr << "with " << pstyle; else cmdstr << "smooth " << smooth; @@ -1660,12 +1660,12 @@ Gnuplot &Gnuplot::plotfile_xy(const std::string &filename, cmdstr << "\"" << filename << "\" using " << column_x << ":" << column_y << " every " << std::to_string(decimate); - if (title == "") + if (title.empty()) cmdstr << " notitle "; else cmdstr << " title \"" << title << "\" "; - if (smooth == "") + if (smooth.empty()) cmdstr << "with " << pstyle; else cmdstr << "smooth " << smooth; @@ -1707,7 +1707,7 @@ Gnuplot &Gnuplot::plotfile_xy_err(const std::string &filename, << column_x << ":" << column_y << ":" << column_dy << " with errorbars "; - if (title == "") + if (title.empty()) cmdstr << " notitle "; else cmdstr << " title \"" << title << "\" "; @@ -1748,7 +1748,7 @@ Gnuplot &Gnuplot::plotfile_xyz(const std::string &filename, cmdstr << "\"" << filename << "\" using " << column_x << ":" << column_y << ":" << column_z; - if (title == "") + if (title.empty()) cmdstr << " notitle with " << pstyle; else cmdstr << " title \"" << title << "\" with " << pstyle; @@ -1773,7 +1773,7 @@ Gnuplot &Gnuplot::plot_image(const unsigned char *ucPicBuf, { std::ofstream tmp; std::string name = create_tmpfile(tmp); - if (name == "") + if (name.empty()) return *this; // @@ -1801,7 +1801,7 @@ Gnuplot &Gnuplot::plot_image(const unsigned char *ucPicBuf, else cmdstr << "plot "; - if (title == "") + if (title.empty()) cmdstr << "\"" << name << "\" with image"; else cmdstr << "\"" << name << "\" title \"" << title << "\" with image"; @@ -1824,7 +1824,7 @@ Gnuplot &Gnuplot::plot_circle(double east, double north, double radius, const st cmdstr << "set object circle at " + std::to_string(east) + "," + std::to_string(north) + " size " + std::to_string(radius) + " back\n"; - if (label != "") + if (!label.empty()) { double east_label = (std::cos(M_PI / 3.0) * radius) * 1.1 + east; double north_label = (std::sin(M_PI / 3.0) * radius) * 1.1 + north; @@ -2151,7 +2151,7 @@ std::string Gnuplot::create_tmpfile(std::ofstream &tmp) void Gnuplot::remove_tmpfiles() { - if ((tmpfile_list).size() > 0) + if (!(tmpfile_list).empty()) { for (auto &i : tmpfile_list) if (remove(i.c_str()) != 0) From b257c6433fa1e1acfb4e6cba8a12a73e9b04a516 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 15:31:01 +0100 Subject: [PATCH 06/13] clang-tidy: apply readability-named-parameter check See https://google.github.io/styleguide/cppguide.html#Function_Declarations_and_Definitions --- src/core/system_parameters/gnss_satellite.h | 25 +++++++++++---------- src/core/system_parameters/gnss_signal.h | 9 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/core/system_parameters/gnss_satellite.h b/src/core/system_parameters/gnss_satellite.h index 519deb671..064b34b2e 100644 --- a/src/core/system_parameters/gnss_satellite.h +++ b/src/core/system_parameters/gnss_satellite.h @@ -47,18 +47,19 @@ class Gnss_Satellite { public: - Gnss_Satellite(); //!< Default Constructor. - Gnss_Satellite(const std::string& system_, uint32_t PRN_); //!< Concrete GNSS satellite Constructor. - ~Gnss_Satellite(); //!< Default Destructor. - void update_PRN(uint32_t PRN); //!< Updates the PRN Number when information is decoded, only applies to GLONASS GNAV messages - uint32_t get_PRN() const; //!< Gets satellite's PRN - int32_t get_rf_link() const; //!< Gets the satellite's rf link - std::string get_system() const; //!< Gets the satellite system {"GPS", "GLONASS", "SBAS", "Galileo", "Beidou"} - std::string get_system_short() const; //!< Gets the satellite system {"G", "R", "SBAS", "E", "C"} - std::string get_block() const; //!< Gets the satellite block. If GPS, returns {"IIA", "IIR", "IIR-M", "IIF"} - std::string what_block(const std::string& system_, uint32_t PRN_); //!< Gets the block of a given satellite - friend bool operator==(const Gnss_Satellite&, const Gnss_Satellite&); //!< operator== for comparison - friend std::ostream& operator<<(std::ostream&, const Gnss_Satellite&); //!< operator<< for pretty printing + Gnss_Satellite(); //!< Default Constructor. + Gnss_Satellite(const std::string& system_, uint32_t PRN_); //!< Concrete GNSS satellite Constructor. + ~Gnss_Satellite(); //!< Default Destructor. + void update_PRN(uint32_t PRN); //!< Updates the PRN Number when information is decoded, only applies to GLONASS GNAV messages + uint32_t get_PRN() const; //!< Gets satellite's PRN + int32_t get_rf_link() const; //!< Gets the satellite's rf link + std::string get_system() const; //!< Gets the satellite system {"GPS", "GLONASS", "SBAS", "Galileo", "Beidou"} + std::string get_system_short() const; //!< Gets the satellite system {"G", "R", "SBAS", "E", "C"} + std::string get_block() const; //!< Gets the satellite block. If GPS, returns {"IIA", "IIR", "IIR-M", "IIF"} + std::string what_block(const std::string& system_, uint32_t PRN_); //!< Gets the block of a given satellite + + friend bool operator==(const Gnss_Satellite& /*sat1*/, const Gnss_Satellite& /*sat2*/); //!< operator== for comparison + friend std::ostream& operator<<(std::ostream& /*out*/, const Gnss_Satellite& /*sat*/); //!< operator<< for pretty printing //Gnss_Satellite& operator=(const Gnss_Satellite &); private: uint32_t PRN; diff --git a/src/core/system_parameters/gnss_signal.h b/src/core/system_parameters/gnss_signal.h index 2b739c633..a2abc773f 100644 --- a/src/core/system_parameters/gnss_signal.h +++ b/src/core/system_parameters/gnss_signal.h @@ -52,10 +52,11 @@ public: Gnss_Signal(const std::string& signal_); Gnss_Signal(const Gnss_Satellite& satellite_, const std::string& signal_); ~Gnss_Signal(); - std::string get_signal_str() const; //!< Get the satellite signal {"1C" for GPS L1 C/A, "2S" for GPS L2C (M), "L5" for GPS L5, "1G" for GLONASS L1 C/A, "1B" for Galileo E1B, "5X" for Galileo E5a. - Gnss_Satellite get_satellite() const; //!< Get the Gnss_Satellite associated to the signal - friend bool operator==(const Gnss_Signal&, const Gnss_Signal&); //!< operator== for comparison - friend std::ostream& operator<<(std::ostream&, const Gnss_Signal&); //!< operator<< for pretty printing + std::string get_signal_str() const; //!< Get the satellite signal {"1C" for GPS L1 C/A, "2S" for GPS L2C (M), "L5" for GPS L5, "1G" for GLONASS L1 C/A, "1B" for Galileo E1B, "5X" for Galileo E5a. + Gnss_Satellite get_satellite() const; //!< Get the Gnss_Satellite associated to the signal + + friend bool operator==(const Gnss_Signal& /*sig1*/, const Gnss_Signal& /*sig2*/); //!< operator== for comparison + friend std::ostream& operator<<(std::ostream& /*out*/, const Gnss_Signal& /*sig*/); //!< operator<< for pretty printing }; #endif From 18fda22221d928b9c0915bdb8e93cdd0caf9f89e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 15:32:06 +0100 Subject: [PATCH 07/13] Improve const usage --- .../telemetry_decoder/libs/convolutional.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/algorithms/telemetry_decoder/libs/convolutional.h b/src/algorithms/telemetry_decoder/libs/convolutional.h index 4195154df..23b9976b9 100644 --- a/src/algorithms/telemetry_decoder/libs/convolutional.h +++ b/src/algorithms/telemetry_decoder/libs/convolutional.h @@ -88,7 +88,7 @@ inline static int parity_counter(int symbol, int length) inline static int nsc_enc_bit(int state_out_p[], int input, int state_in, - int g[], + const int g[], int KK, int nn) { @@ -144,7 +144,7 @@ inline static void nsc_transit(int output_p[], * \param[in] nn The length of the received vector * */ -inline static float Gamma(float rec_array[], +inline static float Gamma(const float rec_array[], int symbol, int nn) { @@ -175,11 +175,11 @@ inline static float Gamma(float rec_array[], * */ inline static void Viterbi(int output_u_int[], - int out0[], - int state0[], - int out1[], - int state1[], - double input_c[], + const int out0[], + const int state0[], + const int out1[], + const int state1[], + const double input_c[], int KK, int nn, int LL) From f1871a84e253233209ce78d0300c679695eb0d3a Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 15:33:24 +0100 Subject: [PATCH 08/13] clang-tidy: apply checks --- .../arithmetic/code_generation_test.cc | 6 +++--- .../arithmetic/complex_carrier_test.cc | 8 ++++---- .../unit-tests/arithmetic/conjugate_test.cc | 8 ++++---- .../unit-tests/arithmetic/fft_length_test.cc | 2 +- .../unit-tests/arithmetic/fft_speed_test.cc | 5 +++-- .../arithmetic/magnitude_squared_test.cc | 8 ++++---- .../unit-tests/arithmetic/multiply_test.cc | 16 ++++++++-------- ...s_8ms_ambiguous_acquisition_gsoc2013_test.cc | 9 ++++----- ..._pcps_ambiguous_acquisition_gsoc2013_test.cc | 9 ++++----- ...o_e1_pcps_ambiguous_acquisition_gsoc_test.cc | 9 ++++----- ...alileo_e1_pcps_ambiguous_acquisition_test.cc | 17 ++++++++--------- ...ccwsr_ambiguous_acquisition_gsoc2013_test.cc | 9 ++++----- ...ksync_ambiguous_acquisition_gsoc2014_test.cc | 9 ++++----- ..._tong_ambiguous_acquisition_gsoc2013_test.cc | 9 ++++----- ..._pcps_acquisition_gsoc2014_gensource_test.cc | 9 ++++----- ...nass_l1_ca_pcps_acquisition_gsoc2017_test.cc | 15 +++++++-------- .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 11 +++++------ ..._pcps_quicksync_acquisition_gsoc2014_test.cc | 9 ++++----- ...l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 9 ++++----- .../pvt/nmea_printer_test.cc | 3 +-- .../galileo_fnav_inav_decoder_test.cc | 10 +++++----- .../tracking/galileo_e5a_tracking_test.cc | 3 +-- ...glonass_l1_ca_dll_pll_c_aid_tracking_test.cc | 9 ++++----- .../glonass_l1_ca_dll_pll_tracking_test.cc | 9 ++++----- 24 files changed, 98 insertions(+), 113 deletions(-) diff --git a/src/tests/unit-tests/arithmetic/code_generation_test.cc b/src/tests/unit-tests/arithmetic/code_generation_test.cc index d89b03365..e252771af 100644 --- a/src/tests/unit-tests/arithmetic/code_generation_test.cc +++ b/src/tests/unit-tests/arithmetic/code_generation_test.cc @@ -37,7 +37,7 @@ TEST(CodeGenerationTest, CodeGenGPSL1Test) { - std::complex* _dest = new std::complex[1023]; + auto* _dest = new std::complex[1023]; signed int _prn = 1; unsigned int _chip_shift = 4; @@ -68,7 +68,7 @@ TEST(CodeGenerationTest, CodeGenGPSL1SampledTest) const signed int _codeFreqBasis = 1023000; //Hz const signed int _codeLength = 1023; int _samplesPerCode = round(_fs / static_cast(_codeFreqBasis / _codeLength)); - std::complex* _dest = new std::complex[_samplesPerCode]; + auto* _dest = new std::complex[_samplesPerCode]; int iterations = 1000; @@ -96,7 +96,7 @@ TEST(CodeGenerationTest, ComplexConjugateTest) const signed int _codeFreqBasis = 1023000; //Hz const signed int _codeLength = 1023; int _samplesPerCode = round(_fs / static_cast(_codeFreqBasis / _codeLength)); - std::complex* _dest = new std::complex[_samplesPerCode]; + auto* _dest = new std::complex[_samplesPerCode]; int iterations = 1000; diff --git a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc index 3cac38fbe..72e12bcc0 100644 --- a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc +++ b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc @@ -41,10 +41,10 @@ TEST(ComplexCarrierTest, StandardComplexImplementation) { // Dynamic allocation creates new usable space on the program STACK // (an area of RAM specifically allocated to the program) - std::complex* output = new std::complex[FLAGS_size_carrier_test]; + auto* output = new std::complex[FLAGS_size_carrier_test]; const double _f = 2000.0; const double _fs = 2000000.0; - const double phase_step = static_cast((GPS_TWO_PI * _f) / _fs); + const auto phase_step = static_cast((GPS_TWO_PI * _f) / _fs); double phase = 0.0; std::chrono::time_point start, end; @@ -84,7 +84,7 @@ TEST(ComplexCarrierTest, C11ComplexImplementation) std::vector> output(FLAGS_size_carrier_test); const double _f = 2000.0; const double _fs = 2000000.0; - const double phase_step = static_cast((GPS_TWO_PI * _f) / _fs); + const auto phase_step = static_cast((GPS_TWO_PI * _f) / _fs); double phase = 0.0; std::chrono::time_point start, end; @@ -113,7 +113,7 @@ TEST(ComplexCarrierTest, C11ComplexImplementation) TEST(ComplexCarrierTest, OwnComplexImplementation) { - std::complex* output = new std::complex[FLAGS_size_carrier_test]; + auto* output = new std::complex[FLAGS_size_carrier_test]; double _f = 2000.0; double _fs = 2000000.0; std::chrono::time_point start, end; diff --git a/src/tests/unit-tests/arithmetic/conjugate_test.cc b/src/tests/unit-tests/arithmetic/conjugate_test.cc index 1eaa4cc09..a32b12ebf 100644 --- a/src/tests/unit-tests/arithmetic/conjugate_test.cc +++ b/src/tests/unit-tests/arithmetic/conjugate_test.cc @@ -41,8 +41,8 @@ DEFINE_int32(size_conjugate_test, 100000, "Size of the arrays used for conjugate TEST(ConjugateTest, StandardCComplexImplementation) { - std::complex* input = new std::complex[FLAGS_size_conjugate_test]; - std::complex* output = new std::complex[FLAGS_size_conjugate_test]; + auto* input = new std::complex[FLAGS_size_conjugate_test]; + auto* output = new std::complex[FLAGS_size_conjugate_test]; std::fill_n(input, FLAGS_size_conjugate_test, std::complex(0.0, 0.0)); std::chrono::time_point start, end; @@ -114,8 +114,8 @@ TEST(ConjugateTest, ArmadilloComplexImplementation) TEST(ConjugateTest, VolkComplexImplementation) { - std::complex* input = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); - std::complex* output = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); + auto* input = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); + auto* output = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); std::fill_n(input, FLAGS_size_conjugate_test, std::complex(0.0, 0.0)); std::chrono::time_point start, end; diff --git a/src/tests/unit-tests/arithmetic/fft_length_test.cc b/src/tests/unit-tests/arithmetic/fft_length_test.cc index 3e75c4285..ff5d2fdb6 100644 --- a/src/tests/unit-tests/arithmetic/fft_length_test.cc +++ b/src/tests/unit-tests/arithmetic/fft_length_test.cc @@ -112,7 +112,7 @@ TEST(FFTLengthTest, MeasureExecutionTime) { boost::filesystem::path p(gnuplot_executable); boost::filesystem::path dir = p.parent_path(); - std::string gnuplot_path = dir.native(); + const std::string& gnuplot_path = dir.native(); Gnuplot::set_GNUPlotPath(gnuplot_path); Gnuplot g1("linespoints"); diff --git a/src/tests/unit-tests/arithmetic/fft_speed_test.cc b/src/tests/unit-tests/arithmetic/fft_speed_test.cc index 009b40838..8d5486e62 100644 --- a/src/tests/unit-tests/arithmetic/fft_speed_test.cc +++ b/src/tests/unit-tests/arithmetic/fft_speed_test.cc @@ -46,8 +46,9 @@ TEST(FFTSpeedTest, ArmadilloVSGNURadioExecutionTime) unsigned int fft_sizes[19] = {16, 25, 32, 45, 64, 95, 128, 195, 256, 325, 512, 785, 1024, 1503, 2048, 3127, 4096, 6349, 8192}; double d_execution_time; EXPECT_NO_THROW( - for (int i = 0; i < 19; i++) { - d_fft_size = fft_sizes[i]; + for (unsigned int fft_size + : fft_sizes) { + d_fft_size = fft_size; gr::fft::fft_complex* d_gr_fft; d_gr_fft = new gr::fft::fft_complex(d_fft_size, true); arma::arma_rng::set_seed_random(); diff --git a/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc b/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc index 5a51b32be..d8bd2bd1e 100644 --- a/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc +++ b/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc @@ -42,8 +42,8 @@ DEFINE_int32(size_magnitude_test, 100000, "Size of the arrays used for magnitude TEST(MagnitudeSquaredTest, StandardCComplexImplementation) { - std::complex* input = new std::complex[FLAGS_size_magnitude_test]; - float* output = new float[FLAGS_size_magnitude_test]; + auto* input = new std::complex[FLAGS_size_magnitude_test]; + auto* output = new float[FLAGS_size_magnitude_test]; unsigned int number = 0; std::chrono::time_point start, end; start = std::chrono::system_clock::now(); @@ -114,9 +114,9 @@ TEST(MagnitudeSquaredTest, ArmadilloComplexImplementation) TEST(MagnitudeSquaredTest, VolkComplexImplementation) { - std::complex* input = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); + auto* input = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); std::fill_n(input, FLAGS_size_magnitude_test, std::complex(0.0, 0.0)); - float* output = static_cast(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(float), volk_gnsssdr_get_alignment())); + auto* output = static_cast(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(float), volk_gnsssdr_get_alignment())); std::chrono::time_point start, end; start = std::chrono::system_clock::now(); diff --git a/src/tests/unit-tests/arithmetic/multiply_test.cc b/src/tests/unit-tests/arithmetic/multiply_test.cc index f4747431f..43a7e21ff 100644 --- a/src/tests/unit-tests/arithmetic/multiply_test.cc +++ b/src/tests/unit-tests/arithmetic/multiply_test.cc @@ -43,8 +43,8 @@ DEFINE_int32(size_multiply_test, 100000, "Size of the arrays used for multiply t TEST(MultiplyTest, StandardCDoubleImplementation) { - double* input = new double[FLAGS_size_multiply_test]; - double* output = new double[FLAGS_size_multiply_test]; + auto* input = new double[FLAGS_size_multiply_test]; + auto* output = new double[FLAGS_size_multiply_test]; std::fill_n(input, FLAGS_size_multiply_test, 0.0); std::chrono::time_point start, end; start = std::chrono::system_clock::now(); @@ -95,8 +95,8 @@ TEST(MultiplyTest, ArmadilloImplementation) TEST(MultiplyTest, StandardCComplexImplementation) { - std::complex* input = new std::complex[FLAGS_size_multiply_test]; - std::complex* output = new std::complex[FLAGS_size_multiply_test]; + auto* input = new std::complex[FLAGS_size_multiply_test]; + auto* output = new std::complex[FLAGS_size_multiply_test]; std::fill_n(input, FLAGS_size_multiply_test, std::complex(0.0, 0.0)); std::chrono::time_point start, end; start = std::chrono::system_clock::now(); @@ -174,8 +174,8 @@ TEST(MultiplyTest, ArmadilloComplexImplementation) TEST(MultiplyTest, VolkComplexImplementation) { - std::complex* input = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); - std::complex* output = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); + auto* input = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); + auto* output = static_cast*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex), volk_gnsssdr_get_alignment())); std::fill_n(input, FLAGS_size_multiply_test, std::complex(0.0, 0.0)); std::chrono::time_point start, end; @@ -190,10 +190,10 @@ TEST(MultiplyTest, VolkComplexImplementation) << " microseconds" << std::endl; ASSERT_LE(0, elapsed_seconds.count() * 1e6); - float* mag = static_cast(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(float), volk_gnsssdr_get_alignment())); + auto* mag = static_cast(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(float), volk_gnsssdr_get_alignment())); volk_32fc_magnitude_32f(mag, output, FLAGS_size_multiply_test); - float* result = new float(0); + auto* result = new float(0); volk_32f_accumulator_s32f(result, mag, FLAGS_size_multiply_test); // Comparing floating-point numbers is tricky. // Due to round-off errors, it is very unlikely that two floating-points will match exactly. diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc index 21967ff9e..8c1b365e9 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc @@ -35,6 +35,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -84,7 +85,7 @@ void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -104,8 +105,7 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguo } GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx() -{ -} += default; // ########################################################### @@ -124,8 +124,7 @@ protected: } ~GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test() - { - } + = default; void init(); void config_1(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc index 300f90f63..493e8f56f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc @@ -35,6 +35,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -85,7 +86,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pm { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -105,8 +106,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcqu } GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx() -{ -} += default; // ########################################################### @@ -125,8 +125,7 @@ protected: } ~GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test() - { - } + = default; void init(); void config_1(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc index 3657fa0f1..ad9332cc3 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc @@ -45,6 +45,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -93,7 +94,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events(pmt::p { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -113,8 +114,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisit } GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx() -{ -} += default; // ########################################################### @@ -134,8 +134,7 @@ protected: } ~GalileoE1PcpsAmbiguousAcquisitionGSoCTest() - { - } + = default; void init(); void start_queue(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc index c76cc762e..ac68a9229 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc @@ -37,6 +37,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -87,7 +88,7 @@ void GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } catch (boost::bad_any_cast& e) @@ -107,8 +108,7 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionT GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx() -{ -} += default; // ########################################################### @@ -127,8 +127,7 @@ protected: } ~GalileoE1PcpsAmbiguousAcquisitionTest() - { - } + = default; void init(); void plot_grid(); @@ -176,9 +175,9 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::plot_grid() { //load the measured values std::string basename = "./tmp-acq-gal1/acquisition_E_1B"; - unsigned int sat = static_cast(gnss_synchro.PRN); + auto sat = static_cast(gnss_synchro.PRN); - unsigned int samples_per_code = static_cast(round(4000000 / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS))); // !! + auto samples_per_code = static_cast(round(4000000 / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS))); // !! acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code); if (!acq_dump.read_binary_acq()) std::cout << "Error reading files" << std::endl; @@ -201,7 +200,7 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::plot_grid() { boost::filesystem::path p(gnuplot_executable); boost::filesystem::path dir = p.parent_path(); - std::string gnuplot_path = dir.native(); + const std::string& gnuplot_path = dir.native(); Gnuplot::set_GNUPlotPath(gnuplot_path); Gnuplot g1("lines"); @@ -351,7 +350,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) std::cout << "Doppler: " << gnss_synchro.Acq_doppler_hz << std::endl; double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro.Acq_delay_samples); - float delay_error_chips = static_cast(delay_error_samples * 1023 / 4000000); + auto delay_error_chips = static_cast(delay_error_samples * 1023 / 4000000); double doppler_error_hz = std::abs(expected_doppler_hz - gnss_synchro.Acq_doppler_hz); EXPECT_LE(doppler_error_hz, 166) << "Doppler error exceeds the expected value: 166 Hz = 2/(3*integration period)"; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc index a8d818ff6..c87ebc536 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc @@ -36,6 +36,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -85,7 +86,7 @@ void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt: { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -105,8 +106,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguous } GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx() -{ -} += default; // ########################################################### @@ -125,8 +125,7 @@ protected: } ~GalileoE1PcpsCccwsrAmbiguousAcquisitionTest() - { - } + = default; void init(); void config_1(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index fa331c6dd..bc94b1f04 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -39,6 +39,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -93,7 +94,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_ { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -114,8 +115,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx() -{ -} += default; // ########################################################### @@ -133,8 +133,7 @@ protected: init(); } ~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test() - { - } + = default; void init(); void config_1(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc index 7b3f8daf7..578cccf6a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc @@ -36,6 +36,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -87,7 +88,7 @@ void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_event { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -108,8 +109,7 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbig GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx() -{ -} += default; class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test : public ::testing::Test @@ -126,8 +126,7 @@ protected: } ~GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test() - { - } + = default; void init(); void config_1(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index 7b1a6b975..76f5b5d29 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -33,6 +33,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -84,7 +85,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events(p { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -105,8 +106,7 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisition GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::~GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx() -{ -} += default; class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest : public ::testing::Test @@ -122,8 +122,7 @@ protected: } ~GalileoE5aPcpsAcquisitionGSoC2014GensourceTest() - { - } + = default; void init(); void config_1(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc index 3e16bd39e..29cfd0068 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc @@ -35,6 +35,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -89,7 +90,7 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events(pmt::pmt_ { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -110,8 +111,7 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC201 GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::~GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx() -{ -} += default; // ########################################################### @@ -125,13 +125,12 @@ protected: stop = false; message = 0; gnss_synchro = Gnss_Synchro(); - acquisition = 0; + acquisition = nullptr; init(); } ~GlonassL1CaPcpsAcquisitionGSoC2017Test() - { - } + = default; void init(); void config_1(); @@ -370,12 +369,12 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test::wait_message() { acquisition->reset(); - gettimeofday(&tv, NULL); + gettimeofday(&tv, nullptr); begin = tv.tv_sec * 1e6 + tv.tv_usec; channel_internal_queue.wait_and_pop(message); - gettimeofday(&tv, NULL); + gettimeofday(&tv, nullptr); end = tv.tv_sec * 1e6 + tv.tv_usec; mean_acq_time_us += (end - begin); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc index 5ad20f059..0e82f6f03 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc @@ -35,6 +35,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -89,7 +90,7 @@ void GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t ms { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -109,8 +110,7 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_ms } GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::~GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx() -{ -} += default; // ########################################################### @@ -124,13 +124,12 @@ protected: stop = false; message = 0; gnss_synchro = Gnss_Synchro(); - acquisition = 0; + acquisition = nullptr; init(); } ~GpsL1CaPcpsAcquisitionGSoC2013Test() - { - } + = default; void init(); void config_1(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index 6e5392296..48e1bda56 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -37,6 +37,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -91,7 +92,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events(pmt: { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -112,8 +113,7 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisit GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::~GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx() -{ -} += default; // ########################################################### @@ -131,8 +131,7 @@ protected: } ~GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test() - { - } + = default; void init(); void config_1(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc index efdc554e4..526bd3476 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc @@ -36,6 +36,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -87,7 +88,7 @@ void GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_ { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; channel_internal_queue.push(rx_message); } @@ -107,8 +108,7 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC201 } GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::~GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx() -{ -} += default; // ########################################################### @@ -125,8 +125,7 @@ protected: } ~GpsL1CaPcpsTongAcquisitionGSoC2013Test() - { - } + = default; void init(); void config_1(); diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc index 074deea05..72522a769 100644 --- a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc @@ -43,8 +43,7 @@ protected: this->conf(); } ~NmeaPrinterTest() - { - } + = default; void conf(); rtk_t rtk; }; diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc index 748811a20..3da6e861f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc @@ -61,7 +61,7 @@ public: } - void deinterleaver(int32_t rows, int32_t cols, double *in, double *out) + void deinterleaver(int32_t rows, int32_t cols, const double *in, double *out) { for (int32_t r = 0; r < rows; r++) { @@ -76,7 +76,7 @@ public: bool decode_INAV_word(double *page_part_symbols, int32_t frame_length) { // 1. De-interleave - double *page_part_symbols_deint = static_cast(volk_gnsssdr_malloc(frame_length * sizeof(double), volk_gnsssdr_get_alignment())); + auto *page_part_symbols_deint = static_cast(volk_gnsssdr_malloc(frame_length * sizeof(double), volk_gnsssdr_get_alignment())); deinterleaver(GALILEO_INAV_INTERLEAVER_ROWS, GALILEO_INAV_INTERLEAVER_COLS, page_part_symbols, page_part_symbols_deint); // 2. Viterbi decoder @@ -90,7 +90,7 @@ public: } } - int32_t *page_part_bits = static_cast(volk_gnsssdr_malloc((frame_length / 2) * sizeof(int32_t), volk_gnsssdr_get_alignment())); + auto *page_part_bits = static_cast(volk_gnsssdr_malloc((frame_length / 2) * sizeof(int32_t), volk_gnsssdr_get_alignment())); const int32_t CodeLength = 240; int32_t DataLength = (CodeLength / nn) - mm; @@ -137,7 +137,7 @@ public: bool decode_FNAV_word(double *page_symbols, int32_t frame_length) { // 1. De-interleave - double *page_symbols_deint = static_cast(volk_gnsssdr_malloc(frame_length * sizeof(double), volk_gnsssdr_get_alignment())); + auto *page_symbols_deint = static_cast(volk_gnsssdr_malloc(frame_length * sizeof(double), volk_gnsssdr_get_alignment())); deinterleaver(GALILEO_FNAV_INTERLEAVER_ROWS, GALILEO_FNAV_INTERLEAVER_COLS, page_symbols, page_symbols_deint); // 2. Viterbi decoder @@ -150,7 +150,7 @@ public: page_symbols_deint[i] = -page_symbols_deint[i]; } } - int32_t *page_bits = static_cast(volk_gnsssdr_malloc((frame_length / 2) * sizeof(int32_t), volk_gnsssdr_get_alignment())); + auto *page_bits = static_cast(volk_gnsssdr_malloc((frame_length / 2) * sizeof(int32_t), volk_gnsssdr_get_alignment())); const int32_t CodeLength = 488; int32_t DataLength = (CodeLength / nn) - mm; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc index 29ffe6edd..1094fbd7f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc @@ -66,8 +66,7 @@ protected: } ~GalileoE5aTrackingTest() - { - } + = default; void init(); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc index 6fbda7a6e..c8a6f94d0 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc @@ -46,6 +46,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -80,7 +81,7 @@ void GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } catch (boost::bad_any_cast& e) @@ -98,8 +99,7 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx::GlonassL1CaDllPllCAidTrackingTest_msg_ } GlonassL1CaDllPllCAidTrackingTest_msg_rx::~GlonassL1CaDllPllCAidTrackingTest_msg_rx() -{ -} += default; // ########################################################### @@ -117,8 +117,7 @@ protected: } ~GlonassL1CaDllPllCAidTrackingTest() - { - } + = default; void init(); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc index c18809d5a..d83116a49 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc @@ -46,6 +46,7 @@ #include #include #include +#include #ifdef GR_GREATER_38 #include #else @@ -81,7 +82,7 @@ void GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg) { try { - int64_t message = pmt::to_long(msg); + int64_t message = pmt::to_long(std::move(msg)); rx_message = message; } catch (boost::bad_any_cast& e) @@ -99,8 +100,7 @@ GlonassL1CaDllPllTrackingTest_msg_rx::GlonassL1CaDllPllTrackingTest_msg_rx() : g } GlonassL1CaDllPllTrackingTest_msg_rx::~GlonassL1CaDllPllTrackingTest_msg_rx() -{ -} += default; // ########################################################### @@ -118,8 +118,7 @@ protected: } ~GlonassL1CaDllPllTrackingTest() - { - } + = default; void init(); From dfc963ad86bad5954a0ae4eebfe3f69cb39325ce Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 15:53:50 +0100 Subject: [PATCH 09/13] clang-tidy: apply readability-else-after-return check See https://clang.llvm.org/extra/clang-tidy/checks/readability-else-after-return.html --- .../adapters/beidou_b1i_pcps_acquisition.cc | 2 +- .../input_filter/adapters/fir_filter.cc | 14 ++----- .../adapters/freq_xlating_fir_filter.cc | 4 +- src/algorithms/libs/rtklib/rtklib_rtkcmn.cc | 2 +- .../adapters/rtl_tcp_signal_source.cc | 5 +-- .../signal_source/libs/rtl_tcp_dongle_info.cc | 5 +-- src/core/receiver/gnss_block_factory.cc | 42 +++++++++---------- .../galileo_fnav_inav_decoder_test.cc | 5 +-- 8 files changed, 31 insertions(+), 48 deletions(-) diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc index d2c8a99e2..733146e4a 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc @@ -315,7 +315,7 @@ gr::basic_block_sptr BeidouB1iPcpsAcquisition::get_left_block() { return acquisition_; } - else if (item_type_ == "cshort") + if (item_type_ == "cshort") { return acquisition_; } diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc index b436b1407..48dfb4871 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.cc +++ b/src/algorithms/input_filter/adapters/fir_filter.cc @@ -299,11 +299,8 @@ gr::basic_block_sptr FirFilter::get_left_block() { return cshort_to_float_x2_; } - else - { - return nullptr; - LOG(ERROR) << " Unknown item type conversion"; - } + LOG(WARNING) << "Unknown item type conversion"; + return nullptr; } @@ -329,11 +326,8 @@ gr::basic_block_sptr FirFilter::get_right_block() { return float_to_complex_; } - else - { - return nullptr; - LOG(ERROR) << " unknown input filter item type"; - } + LOG(WARNING) << "Unknown input filter taps item type"; + return nullptr; } 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 9e904d2e8..17ab25dab 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -339,7 +339,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_left_block() { return gr_char_to_short_; } - else if ((taps_item_type_ == "float") && (input_item_type_ == "byte") && (output_item_type_ == "cbyte")) + if ((taps_item_type_ == "float") && (input_item_type_ == "byte") && (output_item_type_ == "cbyte")) { return gr_char_to_short_; } @@ -373,7 +373,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_right_block() { return freq_xlating_fir_filter_scf_; } - else if ((taps_item_type_ == "float") && (input_item_type_ == "byte") && (output_item_type_ == "cbyte")) + if ((taps_item_type_ == "float") && (input_item_type_ == "byte") && (output_item_type_ == "cbyte")) { return complex_to_complex_byte_; } diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc index a4a8d2673..03a391700 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc @@ -3653,7 +3653,7 @@ double satwavelen(int sat, int frq, const nav_t *nav) return SPEED_OF_LIGHT / FREQ6; /* L6/LEX */ if (frq == 4) return SPEED_OF_LIGHT / FREQ7; /* E5b */ - else if (frq == 5) + if (frq == 5) return SPEED_OF_LIGHT / FREQ8; /* E5a+b */ else if (frq == 6) return SPEED_OF_LIGHT / FREQ9; /* S */ 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 85f1a562f..bbd16d2ca 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc @@ -215,8 +215,5 @@ gr::basic_block_sptr RtlTcpSignalSource::get_right_block() { return valve_; } - else - { - return signal_source_; - } + return signal_source_; } diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc index 6ad323015..c359b6d35 100644 --- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc +++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc @@ -138,10 +138,7 @@ double rtl_tcp_dongle_info::clip_gain(int gain) const { return g; } - else - { - return last_stop; - } + return last_stop; } last_stop = g; } diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index ac0bb8aad..e0e08a8c0 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -193,7 +193,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalSource( role = "SignalSource" + std::to_string(ID); } } - catch (const std::exception &e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -222,7 +222,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( role_resampler = "Resampler" + std::to_string(ID); } } - catch (const std::exception &e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -259,16 +259,14 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( role_conditioner, "Signal_Conditioner")); return conditioner_; } - else - { - //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), - GetBlock(configuration, role_resampler, resampler, 1, 1), - role_conditioner, "Signal_Conditioner")); - return conditioner_; - } + + //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), + GetBlock(configuration, role_resampler, resampler, 1, 1), + role_conditioner, "Signal_Conditioner")); + return conditioner_; } @@ -1119,7 +1117,7 @@ std::unique_ptr>> GNSSBlockFacto channel_absolute_id++; } } - catch (const std::exception &e) + catch (const std::exception& e) { LOG(WARNING) << e.what(); } @@ -1162,7 +1160,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( block = std::move(block_); } - catch (const std::exception &e) + catch (const std::exception& e) { std::cout << "GNSS-SDR program ended." << std::endl; exit(1); @@ -1178,7 +1176,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( block = std::move(block_); } - catch (const std::exception &e) + catch (const std::exception& e) { std::cout << "GNSS-SDR program ended." << std::endl; exit(1); @@ -1193,7 +1191,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( out_streams, queue)); block = std::move(block_); } - catch (const std::exception &e) + catch (const std::exception& e) { std::cout << "GNSS-SDR program ended." << std::endl; exit(1); @@ -1208,7 +1206,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( out_streams, queue)); block = std::move(block_); } - catch (const std::exception &e) + catch (const std::exception& e) { std::cout << "GNSS-SDR program ended." << std::endl; exit(1); @@ -1222,7 +1220,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( out_streams, queue)); block = std::move(block_); } - catch (const std::exception &e) + catch (const std::exception& e) { std::cout << "GNSS-SDR program ended." << std::endl; exit(1); @@ -1237,7 +1235,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( out_streams, queue)); block = std::move(block_); } - catch (const std::exception &e) + catch (const std::exception& e) { std::cout << "GNSS-SDR program ended." << std::endl; exit(1); @@ -1251,7 +1249,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( out_streams, queue)); block = std::move(block_); } - catch (const std::exception &e) + catch (const std::exception& e) { std::cout << "GNSS-SDR program ended." << std::endl; exit(1); @@ -1265,7 +1263,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( out_streams, queue)); block = std::move(block_); } - catch (const std::exception &e) + catch (const std::exception& e) { std::cout << "GNSS-SDR program ended." << std::endl; exit(1); @@ -1280,7 +1278,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( block = std::move(block_); } - catch (const std::exception &e) + catch (const std::exception& e) { std::cout << "GNSS-SDR program ended." << std::endl; exit(1); diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc index 3da6e861f..ae2416ec3 100644 --- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc @@ -180,10 +180,7 @@ public: std::cout << "Galileo E5a FNAV PAGE CRC correct \n"; return true; } - else - { - return false; - } + return false; } Galileo_FNAV_INAV_test() From 45b4478047ec0e56cd90798ec3fc3103e9cc1cbb Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 17:15:48 +0100 Subject: [PATCH 10/13] clang-tidy fixes --- src/algorithms/libs/rtcm.h | 8 ++++---- src/core/libs/supl/asn-supl/GeneralizedTime.h | 10 +++++----- src/core/libs/supl/asn-supl/UTCTime.h | 4 ++-- src/core/libs/supl/asn-supl/ber_tlv_tag.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h index 77696cf88..64eeb2d26 100644 --- a/src/algorithms/libs/rtcm.h +++ b/src/algorithms/libs/rtcm.h @@ -605,14 +605,14 @@ private: class Rtcm_Listener_Room { public: - inline void join(std::shared_ptr participant) + inline void join(const std::shared_ptr& participant) { participants_.insert(participant); for (auto msg : recent_msgs_) participant->deliver(msg); } - inline void leave(std::shared_ptr participant) + inline void leave(const std::shared_ptr& participant) { participants_.erase(participant); } @@ -754,7 +754,7 @@ private: boost::asio::ip::tcp::resolver::iterator endpoint_iterator) : io_context_(io_context), socket_(io_context) { - do_connect(endpoint_iterator); + do_connect(std::move(endpoint_iterator)); } inline void close() @@ -778,7 +778,7 @@ private: private: inline void do_connect(boost::asio::ip::tcp::resolver::iterator endpoint_iterator) { - boost::asio::async_connect(socket_, endpoint_iterator, + boost::asio::async_connect(socket_, std::move(endpoint_iterator), [this](boost::system::error_code ec, boost::asio::ip::tcp::resolver::iterator) { if (!ec) { diff --git a/src/core/libs/supl/asn-supl/GeneralizedTime.h b/src/core/libs/supl/asn-supl/GeneralizedTime.h index 9e9583c7a..657461d0f 100644 --- a/src/core/libs/supl/asn-supl/GeneralizedTime.h +++ b/src/core/libs/supl/asn-supl/GeneralizedTime.h @@ -34,11 +34,11 @@ extern "C" * instead of default local one. * On error returns -1 and errno set to EINVAL */ - time_t asn_GT2time(const GeneralizedTime_t *, struct tm *_optional_tm4fill, + time_t asn_GT2time(const GeneralizedTime_t * /*st*/, struct tm *_optional_tm4fill, int as_gmt); /* A version of the above function also returning the fractions of seconds */ - time_t asn_GT2time_frac(const GeneralizedTime_t *, + time_t asn_GT2time_frac(const GeneralizedTime_t * /*st*/, int *frac_value, int *frac_digits, /* (value / (10 ^ digits)) */ struct tm *_optional_tm4fill, int as_gmt); @@ -47,7 +47,7 @@ extern "C" * For example, parsing of the time ending with ".1" seconds * with frac_digits=3 (msec) would yield frac_value = 100. */ - time_t asn_GT2time_prec(const GeneralizedTime_t *, + time_t asn_GT2time_prec(const GeneralizedTime_t * /*st*/, int *frac_value, int frac_digits, struct tm *_optional_tm4fill, int as_gmt); @@ -59,9 +59,9 @@ extern "C" * On error, this function returns 0 and sets errno. */ GeneralizedTime_t *asn_time2GT(GeneralizedTime_t *_optional_gt, - const struct tm *, int force_gmt); + const struct tm * /*tm*/, int force_gmt); GeneralizedTime_t *asn_time2GT_frac(GeneralizedTime_t *_optional_gt, - const struct tm *, int frac_value, int frac_digits, int force_gmt); + const struct tm * /*tm*/, int frac_value, int frac_digits, int force_gmt); #ifdef __cplusplus } diff --git a/src/core/libs/supl/asn-supl/UTCTime.h b/src/core/libs/supl/asn-supl/UTCTime.h index 53517fde6..477c7931d 100644 --- a/src/core/libs/supl/asn-supl/UTCTime.h +++ b/src/core/libs/supl/asn-supl/UTCTime.h @@ -27,10 +27,10 @@ extern "C" struct tm; /* */ /* See asn_GT2time() in GeneralizedTime.h */ - time_t asn_UT2time(const UTCTime_t *, struct tm *_optional_tm4fill, int as_gmt); + time_t asn_UT2time(const UTCTime_t * /*st*/, struct tm *_optional_tm4fill, int as_gmt); /* See asn_time2GT() in GeneralizedTime.h */ - UTCTime_t *asn_time2UT(UTCTime_t *__opt_ut, const struct tm *, int force_gmt); + UTCTime_t *asn_time2UT(UTCTime_t *__opt_ut, const struct tm * /*tm*/, int force_gmt); #ifdef __cplusplus } diff --git a/src/core/libs/supl/asn-supl/ber_tlv_tag.h b/src/core/libs/supl/asn-supl/ber_tlv_tag.h index 31b634345..c8361549a 100644 --- a/src/core/libs/supl/asn-supl/ber_tlv_tag.h +++ b/src/core/libs/supl/asn-supl/ber_tlv_tag.h @@ -34,7 +34,7 @@ extern "C" * Return values correspond to their libc counterparts (if any). */ ssize_t ber_tlv_tag_snprint(ber_tlv_tag_t tag, char *buf, size_t buflen); - ssize_t ber_tlv_tag_fwrite(ber_tlv_tag_t tag, FILE *); + ssize_t ber_tlv_tag_fwrite(ber_tlv_tag_t tag, FILE * /*f*/); char *ber_tlv_tag_string(ber_tlv_tag_t tag); From 0707963ab5de9b926fb140fac294cd129e0df8b6 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 17:17:35 +0100 Subject: [PATCH 11/13] Use cstdint type names --- .../adapters/beidou_b1i_pcps_acquisition.cc | 14 +++++----- .../adapters/beidou_b1i_pcps_acquisition.h | 27 ++++++++++--------- .../adapters/file_signal_source.cc | 4 +-- .../adapters/file_signal_source.h | 6 ++--- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc index 733146e4a..84de3096b 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc @@ -81,7 +81,7 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition( dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename); acq_parameters.dump_filename = dump_filename_; //--- Find number of samples per spreading code ------------------------- - code_length_ = static_cast(std::round(static_cast(fs_in_) / (BEIDOU_B1I_CODE_RATE_HZ / BEIDOU_B1I_CODE_LENGTH_CHIPS))); + code_length_ = static_cast(std::round(static_cast(fs_in_) / (BEIDOU_B1I_CODE_RATE_HZ / BEIDOU_B1I_CODE_LENGTH_CHIPS))); vector_length_ = code_length_ * sampled_ms_; @@ -144,7 +144,7 @@ void BeidouB1iPcpsAcquisition::stop_acquisition() { } -void BeidouB1iPcpsAcquisition::set_channel(unsigned int channel) +void BeidouB1iPcpsAcquisition::set_channel(uint32_t channel) { channel_ = channel; acquisition_->set_channel(channel_); @@ -170,7 +170,7 @@ void BeidouB1iPcpsAcquisition::set_threshold(float threshold) } -void BeidouB1iPcpsAcquisition::set_doppler_max(unsigned int doppler_max) +void BeidouB1iPcpsAcquisition::set_doppler_max(uint32_t doppler_max) { doppler_max_ = doppler_max; @@ -178,7 +178,7 @@ void BeidouB1iPcpsAcquisition::set_doppler_max(unsigned int doppler_max) } -void BeidouB1iPcpsAcquisition::set_doppler_step(unsigned int doppler_step) +void BeidouB1iPcpsAcquisition::set_doppler_step(uint32_t doppler_step) { doppler_step_ = doppler_step; @@ -213,7 +213,7 @@ void BeidouB1iPcpsAcquisition::set_local_code() beidou_b1i_code_gen_complex_sampled(code, gnss_synchro_->PRN, fs_in_, 0); - for (unsigned int i = 0; i < sampled_ms_; i++) + for (uint32_t i = 0; i < sampled_ms_; i++) { memcpy(&(code_[i * code_length_]), code, sizeof(gr_complex) * code_length_); @@ -239,7 +239,7 @@ void BeidouB1iPcpsAcquisition::set_state(int state) float BeidouB1iPcpsAcquisition::calculate_threshold(float pfa) { //Calculate the threshold - unsigned int frequency_bins = 0; + uint32_t frequency_bins = 0; /* for (int doppler = (int)(-doppler_max_); doppler <= (int)doppler_max_; doppler += doppler_step_) { @@ -250,7 +250,7 @@ float BeidouB1iPcpsAcquisition::calculate_threshold(float pfa) frequency_bins = (2 * doppler_max_ + doppler_step_) / doppler_step_; DLOG(INFO) << "Channel " << channel_ << " Pfa = " << pfa; - unsigned int ncells = vector_length_ * frequency_bins; + uint32_t ncells = vector_length_ * frequency_bins; double exponent = 1 / static_cast(ncells); double val = pow(1.0 - pfa, exponent); auto lambda = static_cast(vector_length_); diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h index 13e623949..a0312ebe6 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h @@ -42,6 +42,7 @@ #include #include #include +#include class ConfigurationInterface; @@ -92,7 +93,7 @@ public: /*! * \brief Set acquisition channel unique ID */ - void set_channel(unsigned int channel) override; + void set_channel(uint32_t channel) override; /*! * \brief Set statistics threshold of PCPS algorithm @@ -102,12 +103,12 @@ public: /*! * \brief Set maximum Doppler off grid search */ - void set_doppler_max(unsigned int doppler_max) override; + void set_doppler_max(uint32_t doppler_max) override; /*! * \brief Set Doppler steps for the grid search */ - void set_doppler_step(unsigned int doppler_step) override; + void set_doppler_step(uint32_t doppler_step) override; /*! * \brief Initializes acquisition algorithm. @@ -153,25 +154,25 @@ private: complex_byte_to_float_x2_sptr cbyte_to_float_x2_; size_t item_size_; std::string item_type_; - unsigned int vector_length_; - unsigned int code_length_; + uint32_t vector_length_; + uint32_t code_length_; bool bit_transition_flag_; bool use_CFAR_algorithm_flag_; - unsigned int channel_; + uint32_t channel_; float threshold_; - unsigned int doppler_max_; - unsigned int doppler_step_; - unsigned int sampled_ms_; - unsigned int max_dwells_; - long fs_in_; + uint32_t doppler_max_; + uint32_t doppler_step_; + uint32_t sampled_ms_; + uint32_t max_dwells_; + int64_t fs_in_; bool dump_; bool blocking_; std::string dump_filename_; std::complex* code_; Gnss_Synchro* gnss_synchro_; std::string role_; - unsigned int in_streams_; - unsigned int out_streams_; + uint32_t in_streams_; + uint32_t out_streams_; float calculate_threshold(float pfa); }; diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc index bc4fb6329..c3dbde10f 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/file_signal_source.cc @@ -55,8 +55,8 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration, double default_seconds_to_skip = 0.0; size_t header_size = 0; - samples_ = configuration->property(role + ".samples", 0); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0); + samples_ = configuration->property(role + ".samples", 0ULL); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h index 0d4658304..bfded2ce8 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.h +++ b/src/algorithms/signal_source/adapters/file_signal_source.h @@ -97,19 +97,19 @@ public: return repeat_; } - inline long sampling_frequency() const + inline int64_t sampling_frequency() const { return sampling_frequency_; } - inline long samples() const + inline uint64_t samples() const { return samples_; } private: uint64_t samples_; - long sampling_frequency_; + int64_t sampling_frequency_; std::string filename_; std::string item_type_; bool repeat_; From 14fb555b3c8fd52abc0de56eb1d9f279dabc32b3 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 17:19:51 +0100 Subject: [PATCH 12/13] Remove modernize-deprecated-headers and modernize-use-using checks since they affect C code --- .clang-tidy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index 2e3964f82..425050765 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,3 +1,4 @@ --- -Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-deprecated-headers,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-using,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare' +Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare' HeaderFilterRegex: '.*' +FormatStyle: 'file' From 6abebac5ebeeb41157cf70f77dcc45959cc48277 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 11 Feb 2019 17:51:20 +0100 Subject: [PATCH 13/13] Make use of cstdint type names --- .../pcps_acquisition_fine_doppler_cc.h | 3 ++- .../input_filter/adapters/beamformer_filter.cc | 2 +- .../input_filter/adapters/beamformer_filter.h | 3 ++- .../signal_source/adapters/labsat_signal_source.cc | 2 +- .../signal_source/adapters/labsat_signal_source.h | 2 +- .../signal_source/adapters/nsr_file_signal_source.cc | 4 ++-- .../signal_source/adapters/nsr_file_signal_source.h | 12 ++++++------ .../signal_source/adapters/rtl_tcp_signal_source.cc | 10 +++++----- .../signal_source/adapters/rtl_tcp_signal_source.h | 2 +- .../adapters/spir_file_signal_source.cc | 4 ++-- .../signal_source/adapters/spir_file_signal_source.h | 9 +++++---- .../adapters/spir_gss6450_file_signal_source.cc | 4 ++-- .../adapters/spir_gss6450_file_signal_source.h | 6 +++--- .../signal_source/adapters/uhd_signal_source.cc | 12 ++++++------ .../signal_source/adapters/uhd_signal_source.h | 3 ++- 15 files changed, 41 insertions(+), 37 deletions(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h index 544aefc18..e414c6611 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -86,7 +87,7 @@ private: bool start(); Acq_Conf acq_parameters; - long d_fs_in; + int64_t d_fs_in; int d_samples_per_ms; int d_max_dwells; int d_gnuradio_forecast_samples; diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.cc b/src/algorithms/input_filter/adapters/beamformer_filter.cc index 52c19352d..dae0d1386 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.cc +++ b/src/algorithms/input_filter/adapters/beamformer_filter.cc @@ -67,7 +67,7 @@ BeamformerFilter::BeamformerFilter( file_sink_ = gr::blocks::file_sink::make(item_size_, dump_filename_.c_str()); DLOG(INFO) << "file_sink(" << file_sink_->unique_id() << ")"; } - samples_ = 0; + samples_ = 0ULL; if (in_stream_ > 8) { LOG(ERROR) << "This implementation only supports eight input streams"; diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.h b/src/algorithms/input_filter/adapters/beamformer_filter.h index c97c32732..89df25223 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.h +++ b/src/algorithms/input_filter/adapters/beamformer_filter.h @@ -34,6 +34,7 @@ #include "gnss_block_interface.h" #include +#include #include class ConfigurationInterface; @@ -78,7 +79,7 @@ private: unsigned int out_stream_; std::string item_type_; size_t item_size_; - unsigned long long samples_; + uint64_t samples_; bool dump_; std::string dump_filename_; gr::block_sptr beamformer_; diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.cc b/src/algorithms/signal_source/adapters/labsat_signal_source.cc index cf1278d9d..d88619cd9 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc @@ -50,7 +50,7 @@ LabsatSignalSource::LabsatSignalSource(ConfigurationInterface* configuration, int channel_selector = configuration->property(role + ".selected_channel", 1); std::string default_filename = "./example_capture.LS3"; - samples_ = configuration->property(role + ".samples", 0); + samples_ = configuration->property(role + ".samples", 0ULL); filename_ = configuration->property(role + ".filename", default_filename); if (item_type_ == "gr_complex") diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h index 8a36f8ad5..bf8f990ef 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.h +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h @@ -81,7 +81,7 @@ private: unsigned int out_stream_; std::string item_type_; size_t item_size_; - long samples_; + uint64_t samples_; std::string filename_; bool dump_; std::string dump_filename_; 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 60566ed5e..7fe8dbd8f 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc @@ -53,8 +53,8 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration, std::string default_item_type = "byte"; std::string default_dump_filename = "../data/my_capture_dump.dat"; - samples_ = configuration->property(role + ".samples", 0); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0); + samples_ = configuration->property(role + ".samples", 0ULL); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present 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 89bc32ac0..a2b3ee547 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h @@ -96,27 +96,27 @@ public: return repeat_; } - inline long sampling_frequency() const + inline int64_t sampling_frequency() const { return sampling_frequency_; } - inline long samples() const + inline uint64_t samples() const { return samples_; } private: - unsigned long long samples_; - long sampling_frequency_; + uint64_t samples_; + int64_t sampling_frequency_; std::string filename_; std::string item_type_; bool repeat_; bool dump_; std::string dump_filename_; std::string role_; - unsigned int in_streams_; - unsigned int out_streams_; + uint32_t in_streams_; + uint32_t out_streams_; gr::blocks::file_source::sptr file_source_; unpack_byte_2bit_samples_sptr unpack_byte_; boost::shared_ptr valve_; 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 bbd16d2ca..4037de974 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc @@ -57,7 +57,7 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration, std::string empty = ""; std::string default_dump_file = "./data/signal_source.dat"; std::string default_item_type = "gr_complex"; - samples_ = configuration->property(role + ".samples", 0); + samples_ = configuration->property(role + ".samples", 0ULL); dump_ = configuration->property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); @@ -122,7 +122,7 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration, item_size_ = sizeof(int16_t); } - if (samples_ != 0) + if (samples_ != 0ULL) { DLOG(INFO) << "Send STOP signal after " << samples_ << " samples"; valve_ = gnss_sdr_make_valve(item_size_, samples_, queue_); @@ -167,7 +167,7 @@ void RtlTcpSignalSource::MakeBlock() void RtlTcpSignalSource::connect(gr::top_block_sptr top_block) { - if (samples_) + if (samples_ != 0ULL) { top_block->connect(signal_source_, 0, valve_, 0); DLOG(INFO) << "connected rtl tcp source to valve"; @@ -187,7 +187,7 @@ void RtlTcpSignalSource::connect(gr::top_block_sptr top_block) void RtlTcpSignalSource::disconnect(gr::top_block_sptr top_block) { - if (samples_) + if (samples_ != 0ULL) { top_block->disconnect(signal_source_, 0, valve_, 0); if (dump_) @@ -211,7 +211,7 @@ gr::basic_block_sptr RtlTcpSignalSource::get_left_block() gr::basic_block_sptr RtlTcpSignalSource::get_right_block() { - if (samples_ != 0) + if (samples_ != 0ULL) { return valve_; } 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 3a89bb088..74fdbf77a 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h @@ -105,7 +105,7 @@ private: std::string item_type_; size_t item_size_; - long samples_; + uint64_t samples_; bool dump_; std::string dump_filename_; 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 d5692e434..2d4b96db5 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc @@ -52,8 +52,8 @@ SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration std::string default_item_type = "int"; std::string default_dump_filename = "../data/my_capture_dump.dat"; - samples_ = configuration->property(role + ".samples", 0); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0); + samples_ = configuration->property(role + ".samples", 0ULL); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present 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 659f5b19a..ad76ce23b 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h @@ -39,6 +39,7 @@ #include #include #include +#include #include class ConfigurationInterface; @@ -93,19 +94,19 @@ public: return repeat_; } - inline long sampling_frequency() const + inline int64_t sampling_frequency() const { return sampling_frequency_; } - inline long samples() const + inline uint64_t samples() const { return samples_; } private: - unsigned long long samples_; - long sampling_frequency_; + uint64_t samples_; + int64_t sampling_frequency_; std::string filename_; std::string item_type_; bool repeat_; 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 ff8f45411..e94a97fb6 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 @@ -49,8 +49,8 @@ SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(ConfigurationInterface* std::string default_dump_filename = "../data/my_capture_dump.dat"; item_type_ = "int"; - samples_ = configuration->property(role + ".samples", 0); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0.0); + samples_ = configuration->property(role + ".samples", 0ULL); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); filename_ = configuration->property(role + ".filename", default_filename); repeat_ = configuration->property(role + ".repeat", false); dump_ = configuration->property(role + ".dump", false); 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 71eb9c9df..0757c24af 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 @@ -97,19 +97,19 @@ public: return repeat_; } - inline long sampling_frequency() const + inline int64_t sampling_frequency() const { return sampling_frequency_; } - inline long samples() const + inline uint64_t samples() const { return samples_; } private: uint64_t samples_; - double sampling_frequency_; + int64_t sampling_frequency_; std::string filename_; bool repeat_; bool dump_; //Enables dumping the gr_complex sample output diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc index 54a353837..46a48e45a 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc @@ -77,7 +77,7 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration, if (RF_channels_ == 1) { // Single RF channel UHD operation (backward compatible config file format) - samples_.push_back(configuration->property(role + ".samples", 0)); + samples_.push_back(configuration->property(role + ".samples", 0ULL)); dump_.push_back(configuration->property(role + ".dump", false)); dump_filename_.push_back(configuration->property(role + ".dump_filename", default_dump_file)); @@ -92,7 +92,7 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration, for (int i = 0; i < RF_channels_; i++) { // Single RF channel UHD operation (backward compatible config file format) - samples_.push_back(configuration->property(role + ".samples" + std::to_string(i), 0)); + samples_.push_back(configuration->property(role + ".samples" + std::to_string(i), 0ULL)); dump_.push_back(configuration->property(role + ".dump" + std::to_string(i), false)); dump_filename_.push_back(configuration->property(role + ".dump_filename" + std::to_string(i), default_dump_file)); @@ -215,7 +215,7 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration, for (int i = 0; i < RF_channels_; i++) { - if (samples_.at(i) != 0) + if (samples_.at(i) != 0ULL) { LOG(INFO) << "RF_channel " << i << " Send STOP signal after " << samples_.at(i) << " samples"; valve_.push_back(gnss_sdr_make_valve(item_size_, samples_.at(i), queue_)); @@ -247,7 +247,7 @@ void UhdSignalSource::connect(gr::top_block_sptr top_block) { for (int i = 0; i < RF_channels_; i++) { - if (samples_.at(i) != 0) + if (samples_.at(i) != 0ULL) { top_block->connect(uhd_source_, i, valve_.at(i), 0); DLOG(INFO) << "connected usrp source to valve RF Channel " << i; @@ -273,7 +273,7 @@ void UhdSignalSource::disconnect(gr::top_block_sptr top_block) { for (int i = 0; i < RF_channels_; i++) { - if (samples_.at(i) != 0) + if (samples_.at(i) != 0ULL) { top_block->disconnect(uhd_source_, i, valve_.at(i), 0); LOG(INFO) << "UHD source disconnected"; @@ -310,7 +310,7 @@ gr::basic_block_sptr UhdSignalSource::get_right_block() gr::basic_block_sptr UhdSignalSource::get_right_block(int RF_channel) { //TODO: There is a incoherence here: Multichannel UHD is a single block with multiple outputs, but if the sample limit is enabled, the output is a multiple block! - if (samples_.at(RF_channel) != 0) + if (samples_.at(RF_channel) != 0ULL) { return valve_.at(RF_channel); } diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h index 68d6e6b76..50d233c2e 100644 --- a/src/algorithms/signal_source/adapters/uhd_signal_source.h +++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -99,7 +100,7 @@ private: std::vector freq_; std::vector gain_; std::vector IF_bandwidth_hz_; - std::vector samples_; + std::vector samples_; std::vector dump_; std::vector dump_filename_;