From cec63d3aad93560879cc9bae575880be873b74c9 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 3 Jul 2020 21:37:57 +0200 Subject: [PATCH] Fix call to overloded property --- src/algorithms/signal_source/adapters/file_signal_source.cc | 4 ++-- .../signal_source/adapters/fmcomms2_signal_source.cc | 2 +- .../signal_source/adapters/multichannel_file_signal_source.cc | 4 ++-- .../signal_source/adapters/nsr_file_signal_source.cc | 4 ++-- .../signal_source/adapters/osmosdr_signal_source.cc | 2 +- .../signal_source/adapters/plutosdr_signal_source.cc | 2 +- .../signal_source/adapters/rtl_tcp_signal_source.cc | 2 +- .../signal_source/adapters/spir_file_signal_source.cc | 4 ++-- .../signal_source/adapters/spir_gss6450_file_signal_source.cc | 4 ++-- .../signal_source/adapters/two_bit_cpx_file_signal_source.cc | 4 ++-- .../adapters/two_bit_packed_file_signal_source.cc | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc index e7cc94f73..38bce391b 100644 --- a/src/algorithms/signal_source/adapters/file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/file_signal_source.cc @@ -41,8 +41,8 @@ FileSignalSource::FileSignalSource(const ConfigurationInterface* configuration, double default_seconds_to_skip = 0.0; size_t header_size = 0; - samples_ = configuration->property(role + ".samples", 0ULL); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", static_cast(0)); filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc index 6af4d92b1..ad42c39fd 100644 --- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc +++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc @@ -71,7 +71,7 @@ Fmcomms2SignalSource::Fmcomms2SignalSource(const ConfigurationInterface *configu Fstop_ = configuration->property(role + ".Fstop", 0.0); item_type_ = configuration->property(role + ".item_type", default_item_type); - samples_ = configuration->property(role + ".samples", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); dump_ = configuration->property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); 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 117a69809..e484886f9 100644 --- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc @@ -40,8 +40,8 @@ MultichannelFileSignalSource::MultichannelFileSignalSource(const ConfigurationIn double default_seconds_to_skip = 0.0; size_t header_size = 0; - samples_ = configuration->property(role + ".samples", 0ULL); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", static_cast(0)); n_channels_ = configuration->property(role + ".total_channels", 1); for (unsigned int n = 0; n < n_channels_; n++) 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 6d6709f8e..30278e4a6 100644 --- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc @@ -39,8 +39,8 @@ NsrFileSignalSource::NsrFileSignalSource(const ConfigurationInterface* configura std::string default_item_type = "byte"; std::string default_dump_filename = "../data/my_capture_dump.dat"; - samples_ = configuration->property(role + ".samples", 0ULL); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", static_cast(0)); filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc index 2d30830b8..e26467ec5 100644 --- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc @@ -37,7 +37,7 @@ OsmosdrSignalSource::OsmosdrSignalSource(const ConfigurationInterface* configura std::string empty = ""; std::string default_dump_file = "./data/signal_source.dat"; std::string default_item_type = "gr_complex"; - samples_ = configuration->property(role + ".samples", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); dump_ = configuration->property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc index 77426a972..7ec4a3681 100644 --- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc +++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc @@ -57,7 +57,7 @@ PlutosdrSignalSource::PlutosdrSignalSource(const ConfigurationInterface* configu Fpass_ = configuration->property(role + ".Fpass", 0.0); Fstop_ = configuration->property(role + ".Fstop", 0.0); item_type_ = configuration->property(role + ".item_type", default_item_type); - samples_ = configuration->property(role + ".samples", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); dump_ = configuration->property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); 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 876dd85f3..a50030543 100644 --- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc +++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc @@ -42,7 +42,7 @@ RtlTcpSignalSource::RtlTcpSignalSource(const ConfigurationInterface* configurati std::string empty = ""; std::string default_dump_file = "./data/signal_source.dat"; std::string default_item_type = "gr_complex"; - samples_ = configuration->property(role + ".samples", 0ULL); + samples_ = configuration->property(role + ".samples", static_cast(0)); dump_ = configuration->property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); 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 e877ac63b..8663e30d8 100644 --- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc @@ -38,8 +38,8 @@ SpirFileSignalSource::SpirFileSignalSource(const ConfigurationInterface* configu std::string default_item_type = "int"; std::string default_dump_filename = "../data/my_capture_dump.dat"; - samples_ = configuration->property(role + ".samples", 0ULL); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", static_cast(0)); filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present 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 d692cd00f..099627eb0 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 @@ -35,8 +35,8 @@ SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(const ConfigurationInte std::string default_dump_filename = "../data/my_capture_dump.dat"; item_type_ = "int"; - samples_ = configuration->property(role + ".samples", 0ULL); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", static_cast(0)); 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/two_bit_cpx_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc index 75ec3f2e7..087baeb65 100644 --- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc @@ -43,8 +43,8 @@ TwoBitCpxFileSignalSource::TwoBitCpxFileSignalSource( std::string default_item_type = "byte"; std::string default_dump_filename = "../data/my_capture_dump.dat"; - samples_ = configuration->property(role + ".samples", 0ULL); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", static_cast(0)); filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc index 9a3e3468c..dd43bef15 100644 --- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc +++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc @@ -47,8 +47,8 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource( std::string default_sample_type = "real"; double default_seconds_to_skip = 0.0; - samples_ = configuration->property(role + ".samples", 0ULL); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL); + samples_ = configuration->property(role + ".samples", static_cast(0)); + sampling_frequency_ = configuration->property(role + ".sampling_frequency", static_cast(0)); filename_ = configuration->property(role + ".filename", default_filename); // override value with commandline flag, if present