From b9c834acba8dabcb124ae1f78f64761f831858ce Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 24 Jan 2025 00:41:06 +0100 Subject: [PATCH] Revert unnecessary moves --- src/algorithms/PVT/adapters/rtklib_pvt.cc | 18 +++++++++--------- src/algorithms/PVT/libs/rtklib_solver.cc | 2 +- ...alileo_e1_pcps_8ms_ambiguous_acquisition.cc | 4 ++-- ...leo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 4 ++-- ..._e1_pcps_quicksync_ambiguous_acquisition.cc | 4 ++-- ...lileo_e1_pcps_tong_ambiguous_acquisition.cc | 4 ++-- ...lileo_e5a_noncoherent_iq_acquisition_caf.cc | 4 ++-- .../gps_l1_ca_pcps_acquisition_fine_doppler.cc | 2 +- .../gps_l1_ca_pcps_assisted_acquisition.cc | 2 +- .../gps_l1_ca_pcps_quicksync_acquisition.cc | 2 +- .../gps_l1_ca_pcps_tong_acquisition.cc | 2 +- .../gnuradio_blocks/pcps_acquisition.cc | 2 +- .../adapters/byte_to_short.cc | 4 ++-- .../adapters/cshort_to_grcomplex.cc | 2 +- .../adapters/ibyte_to_cbyte.cc | 4 ++-- .../adapters/ibyte_to_complex.cc | 4 ++-- .../adapters/ibyte_to_cshort.cc | 4 ++-- .../adapters/ishort_to_complex.cc | 4 ++-- .../adapters/ishort_to_cshort.cc | 4 ++-- .../input_filter/adapters/beamformer_filter.cc | 4 ++-- .../input_filter/adapters/fir_filter.cc | 12 ++++++------ .../adapters/freq_xlating_fir_filter.cc | 12 ++++++------ .../input_filter/adapters/notch_filter.cc | 4 ++-- .../input_filter/adapters/notch_filter_lite.cc | 4 ++-- .../adapters/pulse_blanking_filter.cc | 4 ++-- src/algorithms/libs/pass_through.cc | 2 +- .../observables/adapters/hybrid_observables.cc | 2 +- .../adapters/direct_resampler_conditioner.cc | 4 ++-- .../adapters/mmse_resampler_conditioner.cc | 4 ++-- .../adapters/signal_generator.cc | 4 ++-- .../adapters/custom_udp_signal_source.cc | 10 +++++----- .../adapters/labsat_signal_source.cc | 6 +++--- .../multichannel_file_signal_source.cc | 2 +- .../adapters/rtl_tcp_signal_source.cc | 6 +++--- .../spir_gss6450_file_signal_source.cc | 4 ++-- .../adapters/sbas_l1_telemetry_decoder.cc | 2 +- .../telemetry_decoder/libs/tlm_conf.cc | 4 ++-- .../galileo_e1_tcp_connector_tracking.cc | 4 ++-- .../glonass_l1_ca_dll_pll_c_aid_tracking.cc | 4 ++-- .../adapters/glonass_l1_ca_dll_pll_tracking.cc | 4 ++-- .../glonass_l2_ca_dll_pll_c_aid_tracking.cc | 4 ++-- .../adapters/glonass_l2_ca_dll_pll_tracking.cc | 4 ++-- .../adapters/gps_l1_ca_gaussian_tracking.cc | 4 ++-- .../gps_l1_ca_tcp_connector_tracking.cc | 4 ++-- src/core/receiver/control_thread.cc | 10 +++++----- src/core/receiver/file_configuration.cc | 18 +++++++++--------- src/core/receiver/gnss_block_factory.cc | 6 +++--- src/core/receiver/in_memory_configuration.cc | 18 +++++++++--------- src/core/system_parameters/gnss_almanac.cc | 4 ++-- src/core/system_parameters/gnss_ephemeris.cc | 4 ++-- .../adapter/adapter_test.cc | 4 ++-- 51 files changed, 129 insertions(+), 129 deletions(-) diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc index cc6460adb..51b3977a1 100644 --- a/src/algorithms/PVT/adapters/rtklib_pvt.cc +++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc @@ -63,7 +63,7 @@ Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, const std::string default_rtcm_dump_devname("/dev/pts/1"); DLOG(INFO) << "role " << role; pvt_output_parameters.dump = configuration->property(role + ".dump", false); - pvt_output_parameters.dump_filename = configuration->property(role + ".dump_filename", std::move(default_dump_filename)); + pvt_output_parameters.dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); pvt_output_parameters.dump_mat = configuration->property(role + ".dump_mat", true); pvt_output_parameters.rtk_trace_level = configuration->property(role + ".rtk_trace_level"s, 0); @@ -88,7 +88,7 @@ Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, // NMEA Printer settings pvt_output_parameters.flag_nmea_tty_port = configuration->property(role + ".flag_nmea_tty_port", false); - pvt_output_parameters.nmea_dump_filename = configuration->property(role + ".nmea_dump_filename", std::move(default_nmea_dump_filename)); + pvt_output_parameters.nmea_dump_filename = configuration->property(role + ".nmea_dump_filename", default_nmea_dump_filename); pvt_output_parameters.nmea_dump_devname = configuration->property(role + ".nmea_dump_devname", default_nmea_dump_devname); // RINEX version @@ -127,7 +127,7 @@ Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, #endif // RTCM Printer settings pvt_output_parameters.flag_rtcm_tty_port = configuration->property(role + ".flag_rtcm_tty_port", false); - pvt_output_parameters.rtcm_dump_devname = configuration->property(role + ".rtcm_dump_devname", std::move(default_rtcm_dump_devname)); + pvt_output_parameters.rtcm_dump_devname = configuration->property(role + ".rtcm_dump_devname", default_rtcm_dump_devname); pvt_output_parameters.flag_rtcm_server = configuration->property(role + ".flag_rtcm_server", false); pvt_output_parameters.rtcm_tcp_port = configuration->property(role + ".rtcm_tcp_port", 2101); pvt_output_parameters.rtcm_station_id = configuration->property(role + ".rtcm_station_id", 1234); @@ -158,7 +158,7 @@ Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, // Advanced Nativation Protocol Printer settings pvt_output_parameters.an_output_enabled = configuration->property(role + ".an_output_enabled", pvt_output_parameters.an_output_enabled); - pvt_output_parameters.an_dump_devname = configuration->property(role + ".an_dump_devname", std::move(default_nmea_dump_devname)); + pvt_output_parameters.an_dump_devname = configuration->property(role + ".an_dump_devname", default_nmea_dump_devname); if (pvt_output_parameters.an_output_enabled && pvt_output_parameters.flag_nmea_tty_port) { if (pvt_output_parameters.nmea_dump_devname == pvt_output_parameters.an_dump_devname) @@ -497,7 +497,7 @@ Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, // Settings 1 int positioning_mode = -1; const std::string default_pos_mode("Single"); - const std::string positioning_mode_str = configuration->property(role + ".positioning_mode", std::move(default_pos_mode)); // (PMODE_XXX) see src/algorithms/libs/rtklib/rtklib.h + const std::string positioning_mode_str = configuration->property(role + ".positioning_mode", default_pos_mode); // (PMODE_XXX) see src/algorithms/libs/rtklib/rtklib.h if (positioning_mode_str == "Single") { positioning_mode = PMODE_SINGLE; @@ -582,7 +582,7 @@ Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, } const std::string default_iono_model("OFF"); - const std::string iono_model_str = configuration->property(role + ".iono_model", std::move(default_iono_model)); /* (IONOOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */ + const std::string iono_model_str = configuration->property(role + ".iono_model", default_iono_model); /* (IONOOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */ int iono_model = -1; if (iono_model_str == "OFF") { @@ -621,7 +621,7 @@ Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, const std::string default_trop_model("OFF"); int trop_model = -1; - const std::string trop_model_str = configuration->property(role + ".trop_model", std::move(default_trop_model)); /* (TROPOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */ + const std::string trop_model_str = configuration->property(role + ".trop_model", default_trop_model); /* (TROPOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */ if (trop_model_str == "OFF") { trop_model = TROPOPT_OFF; @@ -699,7 +699,7 @@ Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, // Settings 2 const std::string default_gps_ar("Continuous"); - const std::string integer_ambiguity_resolution_gps_str = configuration->property(role + ".AR_GPS", std::move(default_gps_ar)); /* Integer Ambiguity Resolution mode for GPS (0:off,1:continuous,2:instantaneous,3:fix and hold,4:ppp-ar) */ + const std::string integer_ambiguity_resolution_gps_str = configuration->property(role + ".AR_GPS", default_gps_ar); /* Integer Ambiguity Resolution mode for GPS (0:off,1:continuous,2:instantaneous,3:fix and hold,4:ppp-ar) */ int integer_ambiguity_resolution_gps = -1; if (integer_ambiguity_resolution_gps_str == "OFF") { @@ -883,7 +883,7 @@ Rtklib_Pvt::Rtklib_Pvt(const ConfigurationInterface* configuration, pvt_output_parameters.xml_output_path = configuration->property(role + ".xml_output_path", default_output_path); pvt_output_parameters.nmea_output_file_path = configuration->property(role + ".nmea_output_file_path", default_output_path); pvt_output_parameters.rtcm_output_file_path = configuration->property(role + ".rtcm_output_file_path", default_output_path); - pvt_output_parameters.has_output_file_path = configuration->property(role + ".has_output_file_path", std::move(default_output_path)); + pvt_output_parameters.has_output_file_path = configuration->property(role + ".has_output_file_path", default_output_path); // Read PVT MONITOR Configuration pvt_output_parameters.monitor_enabled = configuration->property(role + ".enable_monitor", false); diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index c4aba97c2..433819649 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -311,7 +311,7 @@ bool Rtklib_Solver::save_matfile() const // WRITE MAT FILE mat_t *matfp; matvar_t *matvar; - std::string filename = std::move(dump_filename); + std::string filename = dump_filename; filename.erase(filename.length() - 4, 4); filename.append(".mat"); matfp = Mat_CreateVer(filename.c_str(), nullptr, MAT_FT_MAT73); diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc index f327dac91..1efbcfe4d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc @@ -58,10 +58,10 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition( { const std::string default_item_type("gr_complex"); const std::string default_dump_filename("./acquisition.dat"); - item_type_ = configuration_->property(role_ + ".item_type", std::move(default_item_type)); + item_type_ = configuration_->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - dump_filename_ = configuration_->property(role_ + ".dump_filename", std::move(default_dump_filename)); + dump_filename_ = configuration_->property(role_ + ".dump_filename", default_dump_filename); #if USE_GLOG_AND_GFLAGS if (FLAGS_doppler_max != 0) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc index 4ff5201f1..dab9dcc47 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc @@ -49,10 +49,10 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition { const std::string default_item_type("gr_complex"); const std::string default_dump_filename("./acquisition.dat"); - item_type_ = configuration_->property(role_ + ".item_type", std::move(default_item_type)); + item_type_ = configuration_->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - dump_filename_ = configuration_->property(role_ + ".dump_filename", std::move(default_dump_filename)); + dump_filename_ = configuration_->property(role_ + ".dump_filename", default_dump_filename); #if USE_GLOG_AND_GFLAGS if (FLAGS_doppler_max != 0) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc index 930e7c948..16a13e02d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc @@ -58,10 +58,10 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui { const std::string default_item_type("gr_complex"); const std::string default_dump_filename("./acquisition.dat"); - item_type_ = configuration_->property(role + ".item_type", std::move(default_item_type)); + item_type_ = configuration_->property(role + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - dump_filename_ = configuration_->property(role + ".dump_filename", std::move(default_dump_filename)); + dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename); #if USE_GLOG_AND_GFLAGS if (FLAGS_doppler_max != 0) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc index fc9eef727..27a60b479 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc @@ -63,10 +63,10 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition( DLOG(INFO) << "role " << role_; - item_type_ = configuration_->property(role_ + ".item_type", std::move(default_item_type)); + item_type_ = configuration_->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - dump_filename_ = configuration_->property(role_ + ".dump_filename", std::move(default_dump_filename)); + dump_filename_ = configuration_->property(role_ + ".dump_filename", default_dump_filename); if (sampled_ms_ % 4 != 0) { diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc index baabd31f0..153412bc0 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc @@ -67,8 +67,8 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf( { const std::string default_item_type("gr_complex"); const std::string default_dump_filename("./acquisition.dat"); - item_type_ = configuration_->property(role_ + ".item_type", std::move(default_item_type)); - dump_filename_ = configuration_->property(role_ + ".dump_filename", std::move(default_dump_filename)); + item_type_ = configuration_->property(role_ + ".item_type", default_item_type); + dump_filename_ = configuration_->property(role_ + ".dump_filename", default_dump_filename); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 32000000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc index 3ad727b0f..f119a60c4 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc @@ -53,7 +53,7 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler( std::string default_dump_filename = "./acquisition.mat"; Acq_Conf acq_parameters = Acq_Conf(); - item_type_ = configuration->property(role_ + ".item_type", std::move(default_item_type)); + item_type_ = configuration->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); acq_parameters.fs_in = fs_in_; diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc index 0801d6f87..0bd82c2dc 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc @@ -51,7 +51,7 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition( const std::string default_item_type("gr_complex"); std::string default_dump_filename = "./data/acquisition.dat"; dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); - item_type_ = configuration->property(role_ + ".item_type", std::move(default_item_type)); + item_type_ = configuration->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc index 4c1c94d20..9fd146be2 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc @@ -59,7 +59,7 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition( { const std::string default_item_type("gr_complex"); std::string default_dump_filename = "./data/acquisition.dat"; - item_type_ = configuration_->property(role_ + ".item_type", std::move(default_item_type)); + item_type_ = configuration_->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc index b5788ac8a..63efcab00 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc @@ -63,7 +63,7 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition( DLOG(INFO) << "role " << role_; - item_type_ = configuration_->property(role_ + ".item_type", std::move(default_item_type)); + item_type_ = configuration_->property(role_ + ".item_type", default_item_type); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); dump_filename_ = configuration_->property(role_ + ".dump_filename", std::move(default_dump_filename)); diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc index fa379e8e0..569319d1c 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc @@ -145,7 +145,7 @@ pcps_acquisition::pcps_acquisition(const Acq_Conf& conf_) { const std::string dump_filename_ = d_dump_filename.substr(d_dump_filename.find_last_of('/') + 1); dump_path = d_dump_filename.substr(0, d_dump_filename.find_last_of('/')); - d_dump_filename = std::move(dump_filename_); + d_dump_filename = dump_filename_; } else { diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc index 1f1d9cc63..d25a23f0e 100644 --- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc +++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc @@ -39,8 +39,8 @@ ByteToShort::ByteToShort(const ConfigurationInterface* configuration, DLOG(INFO) << "role " << role_; - input_item_type_ = configuration->property(role_ + ".input_item_type", std::move(default_input_item_type)); - dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); gr_char_to_short_ = gr::blocks::char_to_short::make(); diff --git a/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc b/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc index 1a9c83ec0..ad63835ce 100644 --- a/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc +++ b/src/algorithms/data_type_adapter/adapters/cshort_to_grcomplex.cc @@ -36,7 +36,7 @@ CshortToGrComplex::CshortToGrComplex(const ConfigurationInterface* configuration DLOG(INFO) << "role " << role_; - dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); cshort_to_gr_complex_ = make_cshort_to_gr_complex(); DLOG(INFO) << "data_type_adapter_(" << cshort_to_gr_complex_->unique_id() << ")"; diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc index 035d416bb..df7322761 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc @@ -42,8 +42,8 @@ IbyteToCbyte::IbyteToCbyte(const ConfigurationInterface* configuration, DLOG(INFO) << "role " << role_; - input_item_type_ = configuration->property(role_ + ".input_item_type", std::move(default_input_item_type)); - dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); ibyte_to_cbyte_ = make_interleaved_byte_to_complex_byte(); diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc index dda4fbfd9..7682f4405 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc @@ -39,8 +39,8 @@ IbyteToComplex::IbyteToComplex(const ConfigurationInterface* configuration, cons DLOG(INFO) << "role " << role_; - input_item_type_ = configuration->property(role_ + ".input_item_type", std::move(default_input_item_type)); - dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); gr_interleaved_char_to_complex_ = gr::blocks::interleaved_char_to_complex::make(); diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc index 1a6d185f1..5e37d724b 100644 --- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc @@ -41,8 +41,8 @@ IbyteToCshort::IbyteToCshort(const ConfigurationInterface* configuration, DLOG(INFO) << "role " << role_; - input_item_type_ = configuration->property(role_ + ".input_item_type", std::move(default_input_item_type)); - dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); interleaved_byte_to_complex_short_ = make_interleaved_byte_to_complex_short(); diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc index 4a850038f..e18d61015 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc @@ -39,8 +39,8 @@ IshortToComplex::IshortToComplex(const ConfigurationInterface* configuration, DLOG(INFO) << "role " << role_; - input_item_type_ = configuration->property(role_ + ".input_item_type", std::move(default_input_item_type)); - dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); gr_interleaved_short_to_complex_ = gr::blocks::interleaved_short_to_complex::make(); diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc index 27c740657..717d7064d 100644 --- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc +++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc @@ -41,8 +41,8 @@ IshortToCshort::IshortToCshort(const ConfigurationInterface* configuration, DLOG(INFO) << "role " << role_; - input_item_type_ = configuration->property(role_ + ".input_item_type", std::move(default_input_item_type)); - dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); interleaved_short_to_complex_short_ = make_interleaved_short_to_complex_short(); diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.cc b/src/algorithms/input_filter/adapters/beamformer_filter.cc index 54603143a..b3efdee03 100644 --- a/src/algorithms/input_filter/adapters/beamformer_filter.cc +++ b/src/algorithms/input_filter/adapters/beamformer_filter.cc @@ -36,8 +36,8 @@ BeamformerFilter::BeamformerFilter( { const std::string default_item_type("gr_complex"); const std::string default_dump_file("./input_filter.dat"); - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file)); + item_type_ = configuration->property(role + ".item_type", default_item_type); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); DLOG(INFO) << "role " << role_; if (item_type_ == "gr_complex") { diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc index 2f8cf042d..92c84645a 100644 --- a/src/algorithms/input_filter/adapters/fir_filter.cc +++ b/src/algorithms/input_filter/adapters/fir_filter.cc @@ -153,14 +153,14 @@ void FirFilter::init() const int number_of_taps = config_->property(role_ + ".number_of_taps", default_number_of_taps); const unsigned int number_of_bands = config_->property(role_ + ".number_of_bands", default_number_of_bands); - const std::string filter_type = config_->property(role_ + ".filter_type", std::move(default_filter_type)); + const std::string filter_type = config_->property(role_ + ".filter_type", default_filter_type); const int grid_density = config_->property(role_ + ".grid_density", default_grid_density); - input_item_type_ = config_->property(role_ + ".input_item_type", std::move(default_input_item_type)); - output_item_type_ = config_->property(role_ + ".output_item_type", std::move(default_output_item_type)); - taps_item_type_ = config_->property(role_ + ".taps_item_type", std::move(default_taps_item_type)); + input_item_type_ = config_->property(role_ + ".input_item_type", default_input_item_type); + output_item_type_ = config_->property(role_ + ".output_item_type", default_output_item_type); + taps_item_type_ = config_->property(role_ + ".taps_item_type", default_taps_item_type); dump_ = config_->property(role_ + ".dump", false); - dump_filename_ = config_->property(role_ + ".dump_filename", std::move(default_dump_filename)); + dump_filename_ = config_->property(role_ + ".dump_filename", default_dump_filename); std::vector bands; std::vector ampl; @@ -194,7 +194,7 @@ void FirFilter::init() // It calculates the optimal (in the Chebyshev/minimax sense) FIR filter // impulse response given a set of band edges, the desired response on // those bands, and the weight given to the error in those bands. - const std::vector taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, std::move(filter_type), grid_density); + const std::vector taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, filter_type, grid_density); taps_ = std::vector(taps_d.begin(), taps_d.end()); } 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 a55e48155..ba75c6f67 100644 --- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc +++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc @@ -55,12 +55,12 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(const ConfigurationInterface* configu const int number_of_taps = configuration->property(role_ + ".number_of_taps", default_number_of_taps); const unsigned int number_of_bands = configuration->property(role_ + ".number_of_bands", default_number_of_bands); - const std::string filter_type = configuration->property(role_ + ".filter_type", std::move(default_filter_type)); + const std::string filter_type = configuration->property(role_ + ".filter_type", default_filter_type); - dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); - input_item_type_ = configuration->property(role_ + ".input_item_type", std::move(default_input_item_type)); - output_item_type_ = configuration->property(role_ + ".output_item_type", std::move(default_output_item_type)); - taps_item_type_ = configuration->property(role_ + ".taps_item_type", std::move(default_taps_item_type)); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); + input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type); + output_item_type_ = configuration->property(role_ + ".output_item_type", default_output_item_type); + taps_item_type_ = configuration->property(role_ + ".taps_item_type", default_taps_item_type); intermediate_freq_ = configuration->property(role_ + ".IF", default_intermediate_freq); sampling_freq_ = configuration->property(role_ + ".sampling_frequency", default_sampling_freq); decimation_factor_ = configuration->property(role_ + ".decimation_factor", default_decimation_factor); @@ -97,7 +97,7 @@ FreqXlatingFirFilter::FreqXlatingFirFilter(const ConfigurationInterface* configu } const int grid_density = configuration->property(role_ + ".grid_density", default_grid_density); - const std::vector taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, std::move(filter_type), grid_density); + const std::vector taps_d = gr::filter::pm_remez(number_of_taps - 1, bands, ampl, error_w, filter_type, grid_density); taps_ = std::vector(taps_d.begin(), taps_d.end()); } else diff --git a/src/algorithms/input_filter/adapters/notch_filter.cc b/src/algorithms/input_filter/adapters/notch_filter.cc index 9762072f1..b84c8833d 100644 --- a/src/algorithms/input_filter/adapters/notch_filter.cc +++ b/src/algorithms/input_filter/adapters/notch_filter.cc @@ -50,8 +50,8 @@ NotchFilter::NotchFilter(const ConfigurationInterface* configuration, const int n_segments_est = configuration->property(role + ".segments_est", default_n_segments_est); const int n_segments_reset = configuration->property(role + ".segments_reset", default_n_segments_reset); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file)); - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); + item_type_ = configuration->property(role + ".item_type", default_item_type); DLOG(INFO) << "role " << role_; if (item_type_ == "gr_complex") diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.cc b/src/algorithms/input_filter/adapters/notch_filter_lite.cc index 72aa08b94..c6b4ab8d7 100644 --- a/src/algorithms/input_filter/adapters/notch_filter_lite.cc +++ b/src/algorithms/input_filter/adapters/notch_filter_lite.cc @@ -54,8 +54,8 @@ NotchFilterLite::NotchFilterLite(const ConfigurationInterface* configuration, const int n_segments_est = configuration->property(role + ".segments_est", default_n_segments_est); const int n_segments_reset = configuration->property(role + ".segments_reset", default_n_segments_reset); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file)); - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); + item_type_ = configuration->property(role + ".item_type", default_item_type); int n_segments_coeff = static_cast((samp_freq / coeff_rate) / static_cast(length_)); n_segments_coeff = std::max(1, n_segments_coeff); diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc index f452eb7fa..8732ba4f8 100644 --- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc +++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc @@ -52,8 +52,8 @@ PulseBlankingFilter::PulseBlankingFilter(const ConfigurationInterface* configura const double if_aux = configuration->property(role_ + ".if", default_if); const double if_ = configuration->property(role_ + ".IF", if_aux); - dump_filename_ = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); - item_type_ = configuration->property(role_ + ".item_type", std::move(default_item_type)); + dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename); + item_type_ = configuration->property(role_ + ".item_type", default_item_type); dump_ = configuration->property(role_ + ".dump", false); DLOG(INFO) << "role " << role_; diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc index 0e68f85c3..0c2a17fa3 100644 --- a/src/algorithms/libs/pass_through.cc +++ b/src/algorithms/libs/pass_through.cc @@ -40,7 +40,7 @@ Pass_Through::Pass_Through(const ConfigurationInterface* configuration, inverted_spectrum(configuration->property(role + ".inverted_spectrum", false)) { const std::string default_item_type("gr_complex"); - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); + item_type_ = configuration->property(role + ".item_type", default_item_type); if (item_type_ == "float") { diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index e04be0681..ae28766ea 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -38,7 +38,7 @@ HybridObservables::HybridObservables(const ConfigurationInterface* configuration dump_mat_(configuration->property(role + ".dump_mat", true)) { const std::string default_dump_filename("./observables.dat"); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_filename)); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); Obs_Conf conf{}; conf.dump = dump_; diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc index 4ffb449e8..444f1ed19 100644 --- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc @@ -47,8 +47,8 @@ DirectResamplerConditioner::DirectResamplerConditioner( const std::string default_dump_file("./resampler.dat"); const double fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000.0); const double fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file)); + item_type_ = configuration->property(role + ".item_type", default_item_type); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); sample_freq_in_ = configuration->property(role_ + ".sample_freq_in", 4000000.0); sample_freq_out_ = configuration->property(role_ + ".sample_freq_out", fs_in); diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc index ae592c2f9..09dafa8b6 100644 --- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc +++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc @@ -43,8 +43,8 @@ MmseResamplerConditioner::MmseResamplerConditioner( const std::string default_dump_file("./resampler.dat"); const double fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000.0); const double fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file)); + item_type_ = configuration->property(role + ".item_type", default_item_type); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); sample_freq_in_ = configuration->property(role_ + ".sample_freq_in", 4000000.0); sample_freq_out_ = configuration->property(role_ + ".sample_freq_out", fs_in); diff --git a/src/algorithms/signal_generator/adapters/signal_generator.cc b/src/algorithms/signal_generator/adapters/signal_generator.cc index 260861fbb..c5d745689 100644 --- a/src/algorithms/signal_generator/adapters/signal_generator.cc +++ b/src/algorithms/signal_generator/adapters/signal_generator.cc @@ -47,8 +47,8 @@ SignalGenerator::SignalGenerator(const ConfigurationInterface* configuration, const std::string default_system("G"); const std::string default_signal("1C"); - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file)); + item_type_ = configuration->property(role + ".item_type", default_item_type); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); const unsigned int fs_in = configuration->property("SignalSource.fs_hz", static_cast(4e6)); const bool data_flag = configuration->property("SignalSource.data_flag", false); diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc index 2caaec9b2..705ef2bb9 100644 --- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc @@ -46,20 +46,20 @@ CustomUDPSignalSource::CustomUDPSignalSource(const ConfigurationInterface* confi // DUMP PARAMETERS const std::string default_dump_file("./data/signal_source.dat"); const std::string default_item_type("gr_complex"); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file)); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); // network PARAMETERS const std::string default_capture_device("eth0"); const std::string default_address("127.0.0.1"); const int default_port = 1234; - const std::string address = configuration->property(role + ".origin_address", std::move(default_address)); - std::string capture_device = configuration->property(role + ".capture_device", std::move(default_capture_device)); + const std::string address = configuration->property(role + ".origin_address", default_address); + std::string capture_device = configuration->property(role + ".capture_device", default_capture_device); int port = configuration->property(role + ".port", default_port); int payload_bytes = configuration->property(role + ".payload_bytes", 1024); const std::string default_sample_type("cbyte"); - const std::string sample_type = configuration->property(role + ".sample_type", std::move(default_sample_type)); - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); + const std::string sample_type = configuration->property(role + ".sample_type", default_sample_type); + item_type_ = configuration->property(role + ".item_type", default_item_type); udp_gnss_rx_source_ = Gr_Complex_Ip_Packet_Source::make(capture_device, address, diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.cc b/src/algorithms/signal_source/adapters/labsat_signal_source.cc index 459e21a89..75bd7dc54 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc @@ -44,12 +44,12 @@ LabsatSignalSource::LabsatSignalSource(const ConfigurationInterface* configurati const std::string default_item_type("gr_complex"); const std::string default_dump_file("./labsat_output.dat"); item_type_ = configuration->property(role + ".item_type", default_item_type); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file)); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); const int64_t sampling_frequency_deprecated = configuration->property(role + ".sampling_frequency", static_cast(16368000)); const int64_t throttle_frequency_sps = configuration->property(role + ".throttle_frequency_sps", static_cast(sampling_frequency_deprecated)); - std::string channels_to_read = configuration->property(role + ".selected_channel", std::move(default_item_type)); + std::string channels_to_read = configuration->property(role + ".selected_channel", default_item_type); std::stringstream ss(channels_to_read); int found; while (ss.good()) @@ -70,7 +70,7 @@ LabsatSignalSource::LabsatSignalSource(const ConfigurationInterface* configurati } const std::string default_filename("./example_capture.LS3"); - filename_ = configuration->property(role + ".filename", std::move(default_filename)); + filename_ = configuration->property(role + ".filename", default_filename); const bool digital_io_enabled = configuration->property(role + ".digital_io_enabled", false); diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc index b41e34617..84271beea 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc @@ -54,7 +54,7 @@ MultichannelFileSignalSource::MultichannelFileSignalSource(const ConfigurationIn filename_vec_.push_back(configuration->property(role + ".filename" + std::to_string(n), default_filename)); } - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); + item_type_ = configuration->property(role + ".item_type", default_item_type); repeat_ = configuration->property(role + ".repeat", false); enable_throttle_control_ = configuration->property(role + ".enable_throttle_control", false); 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 01e4f37b7..2e5849eb5 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc @@ -55,13 +55,13 @@ RtlTcpSignalSource::RtlTcpSignalSource(const ConfigurationInterface* configurati // DUMP PARAMETERS const std::string default_dump_file("./data/signal_source.dat"); const std::string default_item_type("gr_complex"); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_file)); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); // rtl_tcp PARAMETERS const std::string default_address("127.0.0.1"); const int16_t default_port = 1234; - item_type_ = configuration->property(role + ".item_type", std::move(default_item_type)); - address_ = configuration->property(role + ".address", std::move(default_address)); + item_type_ = configuration->property(role + ".item_type", default_item_type); + address_ = configuration->property(role + ".address", default_address); port_ = configuration->property(role + ".port", default_port); if (item_type_ == "short") 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 0cfc1eba4..1b29d773e 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 @@ -56,8 +56,8 @@ SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(const ConfigurationInte { const std::string default_filename("./my_capture.dat"); const std::string default_dump_filename("./my_capture_dump.dat"); - filename_ = configuration->property(role + ".filename", std::move(default_filename)); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_filename)); + filename_ = configuration->property(role + ".filename", default_filename); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); const int64_t bytes_seek = configuration->property(role + ".bytes_to_skip", static_cast(65536)); const double sample_size_byte = static_cast(adc_bits_) / 4.0; diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc index 901e10c80..4fdd9a18d 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -36,7 +36,7 @@ SbasL1TelemetryDecoder::SbasL1TelemetryDecoder( dump_(configuration->property(role + ".dump", false)) { const std::string default_dump_filename("./navigation.dat"); - dump_filename_ = configuration->property(role + ".dump_filename", std::move(default_dump_filename)); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); // make telemetry decoder object telemetry_decoder_ = sbas_l1_make_telemetry_decoder_gs(satellite_, dump_); // TODO fix me DLOG(INFO) << "role " << role; diff --git a/src/algorithms/telemetry_decoder/libs/tlm_conf.cc b/src/algorithms/telemetry_decoder/libs/tlm_conf.cc index d3a1ae733..cb520a978 100644 --- a/src/algorithms/telemetry_decoder/libs/tlm_conf.cc +++ b/src/algorithms/telemetry_decoder/libs/tlm_conf.cc @@ -23,13 +23,13 @@ void Tlm_Conf::SetFromConfiguration(const ConfigurationInterface *configuration, const std::string &role) { const std::string default_dumpname("telemetry"); - dump_filename = configuration->property(role + ".dump_filename", std::move(default_dumpname)); + dump_filename = configuration->property(role + ".dump_filename", default_dumpname); dump = configuration->property(role + ".dump", false); dump_mat = configuration->property(role + ".dump_mat", dump); remove_dat = configuration->property(role + ".remove_dat", false); dump_crc_stats = configuration->property(role + ".dump_crc_stats", false); const std::string default_crc_stats_dumpname("telemetry_crc_stats"); - dump_crc_stats_filename = configuration->property(role + ".dump_crc_stats_filename", std::move(default_crc_stats_dumpname)); + dump_crc_stats_filename = configuration->property(role + ".dump_crc_stats_filename", default_crc_stats_dumpname); enable_navdata_monitor = configuration->property("NavDataMonitor.enable_monitor", false); if (configuration->property("Channels_1B.count", 0) > 0) { diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc index bd66e5c3c..fc79e02ab 100644 --- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc @@ -46,7 +46,7 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking( { // ################# CONFIGURATION PARAMETERS ######################## const std::string default_item_type("gr_complex"); - std::string item_type = configuration->property(role_ + ".item_type", std::move(default_item_type)); + std::string item_type = configuration->property(role_ + ".item_type", default_item_type); int fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); int fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); bool dump = configuration->property(role_ + ".dump", false); @@ -79,7 +79,7 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking( float very_early_late_space_chips = configuration->property(role_ + ".very_early_late_space_chips", static_cast(0.5)); size_t port_ch0 = configuration->property(role_ + ".port_ch0", 2060); const std::string default_dump_filename("./track_ch"); - std::string dump_filename = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + std::string dump_filename = configuration->property(role_ + ".dump_filename", default_dump_filename); const auto vector_length = static_cast(std::round(fs_in / (GALILEO_E1_CODE_CHIP_RATE_CPS / GALILEO_E1_B_CODE_LENGTH_CHIPS))); // ################# MAKE TRACKING GNURadio object ################### diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc index f048166d0..c8835db47 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc @@ -49,7 +49,7 @@ GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking( { // ################# CONFIGURATION PARAMETERS ######################## const std::string default_item_type("gr_complex"); - item_type_ = configuration->property(role_ + ".item_type", std::move(default_item_type)); + item_type_ = configuration->property(role_ + ".item_type", default_item_type); int fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); int fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); bool dump = configuration->property(role_ + ".dump", false); @@ -84,7 +84,7 @@ GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking( float early_late_space_chips = configuration->property(role_ + ".early_late_space_chips", static_cast(0.5)); const std::string default_dump_filename("./track_ch"); - std::string dump_filename = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + std::string dump_filename = configuration->property(role_ + ".dump_filename", default_dump_filename); const auto vector_length = static_cast(std::round(fs_in / (GLONASS_L1_CA_CODE_RATE_CPS / GLONASS_L1_CA_CODE_LENGTH_CHIPS))); // ################# MAKE TRACKING GNURadio object ################### diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc index 3c60624be..12deb5f90 100644 --- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc @@ -48,7 +48,7 @@ GlonassL1CaDllPllTracking::GlonassL1CaDllPllTracking( { // ################# CONFIGURATION PARAMETERS ######################## const std::string default_item_type("gr_complex"); - std::string item_type = configuration->property(role_ + ".item_type", std::move(default_item_type)); + std::string item_type = configuration->property(role_ + ".item_type", default_item_type); int fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); int fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); bool dump = configuration->property(role_ + ".dump", false); @@ -79,7 +79,7 @@ GlonassL1CaDllPllTracking::GlonassL1CaDllPllTracking( #endif float early_late_space_chips = configuration->property(role_ + ".early_late_space_chips", static_cast(0.5)); const std::string default_dump_filename("./track_ch"); - std::string dump_filename = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + std::string dump_filename = configuration->property(role_ + ".dump_filename", default_dump_filename); const auto vector_length = static_cast(std::round(fs_in / (GLONASS_L1_CA_CODE_RATE_CPS / GLONASS_L1_CA_CODE_LENGTH_CHIPS))); // ################# MAKE TRACKING GNURadio object ################### diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc index 3bef9b6f5..4150a4ad5 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc @@ -47,7 +47,7 @@ GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking( { // ################# CONFIGURATION PARAMETERS ######################## const std::string default_item_type("gr_complex"); - item_type_ = configuration->property(role_ + ".item_type", std::move(default_item_type)); + item_type_ = configuration->property(role_ + ".item_type", default_item_type); int fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); int fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); bool dump = configuration->property(role_ + ".dump", false); @@ -82,7 +82,7 @@ GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking( float early_late_space_chips = configuration->property(role_ + ".early_late_space_chips", static_cast(0.5)); const std::string default_dump_filename("./track_ch"); - std::string dump_filename = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + std::string dump_filename = configuration->property(role_ + ".dump_filename", default_dump_filename); const auto vector_length = static_cast(std::round(fs_in / (GLONASS_L2_CA_CODE_RATE_CPS / GLONASS_L2_CA_CODE_LENGTH_CHIPS))); // ################# MAKE TRACKING GNURadio object ################### diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc index a5dbc3fc4..e145f2867 100644 --- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc @@ -46,7 +46,7 @@ GlonassL2CaDllPllTracking::GlonassL2CaDllPllTracking( { // ################# CONFIGURATION PARAMETERS ######################## const std::string default_item_type("gr_complex"); - std::string item_type = configuration->property(role_ + ".item_type", std::move(default_item_type)); + std::string item_type = configuration->property(role_ + ".item_type", default_item_type); int fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); int fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); bool dump = configuration->property(role_ + ".dump", false); @@ -76,7 +76,7 @@ GlonassL2CaDllPllTracking::GlonassL2CaDllPllTracking( #endif float early_late_space_chips = configuration->property(role_ + ".early_late_space_chips", static_cast(0.5)); const std::string default_dump_filename("./track_ch"); - std::string dump_filename = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + std::string dump_filename = configuration->property(role_ + ".dump_filename", default_dump_filename); const auto vector_length = static_cast(std::round(fs_in / (GLONASS_L2_CA_CODE_RATE_CPS / GLONASS_L2_CA_CODE_LENGTH_CHIPS))); // ################# MAKE TRACKING GNURadio object ################### diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_gaussian_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_gaussian_tracking.cc index 85088e9af..f9b5f70c9 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_gaussian_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_gaussian_tracking.cc @@ -50,7 +50,7 @@ GpsL1CaGaussianTracking::GpsL1CaGaussianTracking( { // ################# CONFIGURATION PARAMETERS ######################## const std::string default_item_type("gr_complex"); - std::string item_type = configuration->property(role_ + ".item_type", std::move(default_item_type)); + std::string item_type = configuration->property(role_ + ".item_type", default_item_type); int order = configuration->property(role_ + ".order", 2); int fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); int fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); @@ -69,7 +69,7 @@ GpsL1CaGaussianTracking::GpsL1CaGaussianTracking( #endif float early_late_space_chips = configuration->property(role_ + ".early_late_space_chips", static_cast(0.5)); const std::string default_dump_filename("./track_ch"); - std::string dump_filename = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + std::string dump_filename = configuration->property(role_ + ".dump_filename", default_dump_filename); const auto vector_length = static_cast(std::round(fs_in / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS))); bool bce_run = configuration->property(role_ + ".bce_run", false); diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc index 7ffa6ff5c..887dbdbc5 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc @@ -46,14 +46,14 @@ GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking( { // ################# CONFIGURATION PARAMETERS ######################## const std::string default_item_type("gr_complex"); - std::string item_type = configuration->property(role_ + ".item_type", std::move(default_item_type)); + std::string item_type = configuration->property(role_ + ".item_type", default_item_type); int fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000); int fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); bool dump = configuration->property(role_ + ".dump", false); float early_late_space_chips = configuration->property(role_ + ".early_late_space_chips", static_cast(0.5)); size_t port_ch0 = configuration->property(role_ + ".port_ch0", 2060); const std::string default_dump_filename("./track_ch"); - std::string dump_filename = configuration->property(role_ + ".dump_filename", std::move(default_dump_filename)); + std::string dump_filename = configuration->property(role_ + ".dump_filename", default_dump_filename); const auto vector_length = static_cast(std::round(fs_in / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS))); // ################# MAKE TRACKING GNURadio object ################### diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc index d6ddf4c6c..9a265254d 100644 --- a/src/core/receiver/control_thread.cc +++ b/src/core/receiver/control_thread.cc @@ -142,7 +142,7 @@ ControlThread::ControlThread() std::string pvt_impl = configuration_->property("PVT.implementation", empty_implementation); conf_has_pvt_ = !pvt_impl.empty(); - std::string obs_impl = configuration_->property("Observables.implementation", std::move(empty_implementation)); + std::string obs_impl = configuration_->property("Observables.implementation", empty_implementation); conf_has_observables_ = !obs_impl.empty(); well_formatted_configuration_ = conf_file_has_section_ && conf_file_has_mandatory_globals_ && conf_has_signal_sources_ && conf_has_observables_ && conf_has_pvt_; @@ -747,8 +747,8 @@ void ControlThread::assist_GNSS() std::cout << "SUPL RRLP GPS assistance enabled!\n"; const std::string default_acq_server("supl.google.com"); const std::string default_eph_server("supl.google.com"); - supl_client_ephemeris_.server_name = configuration_->property("GNSS-SDR.SUPL_gps_ephemeris_server", std::move(default_acq_server)); - supl_client_acquisition_.server_name = configuration_->property("GNSS-SDR.SUPL_gps_acquisition_server", std::move(default_eph_server)); + supl_client_ephemeris_.server_name = configuration_->property("GNSS-SDR.SUPL_gps_ephemeris_server", default_acq_server); + supl_client_acquisition_.server_name = configuration_->property("GNSS-SDR.SUPL_gps_acquisition_server", default_eph_server); supl_client_ephemeris_.server_port = configuration_->property("GNSS-SDR.SUPL_gps_ephemeris_port", 7275); supl_client_acquisition_.server_port = configuration_->property("GNSS-SDR.SUPL_gps_acquisition_port", 7275); supl_mcc_ = configuration_->property("GNSS-SDR.SUPL_MCC", 244); @@ -756,8 +756,8 @@ void ControlThread::assist_GNSS() const std::string default_lac("0x59e2"); const std::string default_ci("0x31b0"); - const std::string supl_lac_s = configuration_->property("GNSS-SDR.SUPL_LAC", std::move(default_lac)); - const std::string supl_ci_s = configuration_->property("GNSS-SDR.SUPL_CI", std::move(default_ci)); + const std::string supl_lac_s = configuration_->property("GNSS-SDR.SUPL_LAC", default_lac); + const std::string supl_ci_s = configuration_->property("GNSS-SDR.SUPL_CI", default_ci); try { supl_lac_ = std::stoi(supl_lac_s, nullptr, 0); diff --git a/src/core/receiver/file_configuration.cc b/src/core/receiver/file_configuration.cc index a76d8b8de..4f873f1d4 100644 --- a/src/core/receiver/file_configuration.cc +++ b/src/core/receiver/file_configuration.cc @@ -88,7 +88,7 @@ bool FileConfiguration::property(std::string property_name, bool default_value) return overrided_->property(std::move(property_name), default_value); } const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } @@ -99,7 +99,7 @@ int64_t FileConfiguration::property(std::string property_name, int64_t default_v return overrided_->property(std::move(property_name), default_value); } const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } @@ -110,7 +110,7 @@ uint64_t FileConfiguration::property(std::string property_name, uint64_t default return overrided_->property(std::move(property_name), default_value); } const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } @@ -121,7 +121,7 @@ int FileConfiguration::property(std::string property_name, int default_value) co return overrided_->property(std::move(property_name), default_value); } const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } @@ -132,7 +132,7 @@ unsigned int FileConfiguration::property(std::string property_name, unsigned int return overrided_->property(std::move(property_name), default_value); } const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } @@ -143,7 +143,7 @@ uint16_t FileConfiguration::property(std::string property_name, uint16_t default return overrided_->property(std::move(property_name), default_value); } const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } @@ -154,7 +154,7 @@ int16_t FileConfiguration::property(std::string property_name, int16_t default_v return overrided_->property(std::move(property_name), default_value); } const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } @@ -165,7 +165,7 @@ float FileConfiguration::property(std::string property_name, float default_value return overrided_->property(std::move(property_name), default_value); } const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } @@ -176,7 +176,7 @@ double FileConfiguration::property(std::string property_name, double default_val return overrided_->property(std::move(property_name), default_value); } const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 12ee51285..1635aa5f5 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -337,7 +337,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( std::unique_ptr GNSSBlockFactory::GetObservables(const ConfigurationInterface* configuration) { const std::string empty_implementation; - std::string implementation = configuration->property("Observables.implementation", std::move(empty_implementation)); + std::string implementation = configuration->property("Observables.implementation", empty_implementation); LOG(INFO) << "Getting Observables with implementation " << implementation; if (implementation.find("_Observables") == std::string::npos) { @@ -372,7 +372,7 @@ std::unique_ptr GNSSBlockFactory::GetObservables(const Confi std::unique_ptr GNSSBlockFactory::GetPVT(const ConfigurationInterface* configuration) { const std::string empty_implementation; - std::string implementation = configuration->property("PVT.implementation", std::move(empty_implementation)); + std::string implementation = configuration->property("PVT.implementation", empty_implementation); LOG(INFO) << "Getting PVT with implementation " << implementation; if (implementation.find("_PVT") == std::string::npos) { @@ -428,7 +428,7 @@ std::unique_ptr GNSSBlockFactory::GetChannel( // Automatically detect input data type const std::string default_item_type("gr_complex"); std::string acq_item_type = configuration->property("Acquisition_" + signal + appendix1 + item_prop, default_item_type); - std::string trk_item_type = configuration->property("Tracking_" + signal + appendix2 + item_prop, std::move(default_item_type)); + std::string trk_item_type = configuration->property("Tracking_" + signal + appendix2 + item_prop, default_item_type); if (acq_item_type != trk_item_type) { std::cerr << "Configuration error: Acquisition and Tracking blocks must have the same input data type!\n"; diff --git a/src/core/receiver/in_memory_configuration.cc b/src/core/receiver/in_memory_configuration.cc index 5f864fcdd..b3cde9946 100644 --- a/src/core/receiver/in_memory_configuration.cc +++ b/src/core/receiver/in_memory_configuration.cc @@ -47,63 +47,63 @@ std::string InMemoryConfiguration::property(std::string property_name, std::stri bool InMemoryConfiguration::property(std::string property_name, bool default_value) const { const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } int64_t InMemoryConfiguration::property(std::string property_name, int64_t default_value) const { const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } uint64_t InMemoryConfiguration::property(std::string property_name, uint64_t default_value) const { const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } int32_t InMemoryConfiguration::property(std::string property_name, int32_t default_value) const { const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } uint32_t InMemoryConfiguration::property(std::string property_name, uint32_t default_value) const { const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } uint16_t InMemoryConfiguration::property(std::string property_name, uint16_t default_value) const { const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } int16_t InMemoryConfiguration::property(std::string property_name, int16_t default_value) const { const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } float InMemoryConfiguration::property(std::string property_name, float default_value) const { const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } double InMemoryConfiguration::property(std::string property_name, double default_value) const { const std::string empty; - return converter_->convert(property(std::move(property_name), std::move(empty)), default_value); + return converter_->convert(property(std::move(property_name), empty), default_value); } diff --git a/src/core/system_parameters/gnss_almanac.cc b/src/core/system_parameters/gnss_almanac.cc index 03080cd1a..66ae631f6 100644 --- a/src/core/system_parameters/gnss_almanac.cc +++ b/src/core/system_parameters/gnss_almanac.cc @@ -73,12 +73,12 @@ double Gnss_Almanac::predicted_doppler(double rx_time_s, const std::vector pos_sat = {sat_pos_vel[0], sat_pos_vel[1], sat_pos_vel[2]}; const std::vector vel_sat = {sat_pos_vel[3], sat_pos_vel[4], sat_pos_vel[5]}; - std::vector x_sr = std::move(pos_sat); + std::vector x_sr = pos_sat; std::transform(x_sr.begin(), x_sr.end(), pos_rx.begin(), x_sr.begin(), std::minus()); // pos_sat - pos_rx const double norm_x_sr = std::sqrt(std::inner_product(x_sr.begin(), x_sr.end(), x_sr.begin(), 0.0)); // Euclidean norm - std::vector v_sr = std::move(vel_sat); + std::vector v_sr = vel_sat; std::transform(v_sr.begin(), v_sr.end(), vel_rx.begin(), v_sr.begin(), std::minus()); // vel_sat - vel_rx const double radial_vel = std::inner_product(v_sr.begin(), v_sr.end(), x_sr.begin(), 0.0) / norm_x_sr; diff --git a/src/core/system_parameters/gnss_ephemeris.cc b/src/core/system_parameters/gnss_ephemeris.cc index e6231357e..e49bf8b81 100644 --- a/src/core/system_parameters/gnss_ephemeris.cc +++ b/src/core/system_parameters/gnss_ephemeris.cc @@ -69,12 +69,12 @@ double Gnss_Ephemeris::predicted_doppler(double rx_time_s, const std::vector pos_sat = {sat_pos_vel[0], sat_pos_vel[1], sat_pos_vel[2]}; const std::vector vel_sat = {sat_pos_vel[3], sat_pos_vel[4], sat_pos_vel[5]}; - std::vector x_sr = std::move(pos_sat); + std::vector x_sr = pos_sat; std::transform(x_sr.begin(), x_sr.end(), pos_rx.begin(), x_sr.begin(), std::minus()); // pos_sat - pos_rx const double norm_x_sr = std::sqrt(std::inner_product(x_sr.begin(), x_sr.end(), x_sr.begin(), 0.0)); // Euclidean norm - std::vector v_sr = std::move(vel_sat); + std::vector v_sr = vel_sat; std::transform(v_sr.begin(), v_sr.end(), vel_rx.begin(), v_sr.begin(), std::minus()); // vel_sat - vel_rx const double radial_vel = std::inner_product(v_sr.begin(), v_sr.end(), x_sr.begin(), 0.0) / norm_x_sr; diff --git a/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc b/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc index 7eb3bc891..6aa9d5358 100644 --- a/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc +++ b/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc @@ -60,10 +60,10 @@ DataTypeAdapter::DataTypeAdapter() std::array input_shorts{2, 23, -1, 127, -127, 0, 255, 255}; const std::vector input_data_bytes_(input_bytes.data(), input_bytes.data() + input_bytes.size() / sizeof(int8_t)); - input_data_bytes = std::move(input_data_bytes_); + input_data_bytes = input_data_bytes_; const std::vector input_data_shorts_(input_shorts.data(), input_shorts.data() + input_shorts.size() / sizeof(int16_t)); - input_data_shorts = std::move(input_data_shorts_); + input_data_shorts = input_data_shorts_; }