From f10ba2fb1d0bbb7829a0a165da9cc410269247df Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 27 Feb 2015 13:11:06 +0100 Subject: [PATCH] Removing compilation warnings --- src/algorithms/PVT/adapters/galileo_e1_pvt.cc | 6 ++- src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc | 6 ++- src/algorithms/PVT/adapters/hybrid_pvt.cc | 6 ++- .../adapters/galileo_e1_observables.cc | 6 ++- .../adapters/gps_l1_ca_observables.cc | 6 ++- .../adapters/hybrid_observables.cc | 6 ++- .../adapters/galileo_e1b_telemetry_decoder.cc | 6 ++- .../adapters/galileo_e5a_telemetry_decoder.cc | 6 ++- .../adapters/gps_l1_ca_telemetry_decoder.cc | 6 ++- .../adapters/sbas_l1_telemetry_decoder.cc | 6 ++- src/core/interfaces/gnss_block_interface.h | 49 +++++++++---------- src/core/system_parameters/gps_ephemeris.h | 1 + 12 files changed, 63 insertions(+), 47 deletions(-) diff --git a/src/algorithms/PVT/adapters/galileo_e1_pvt.cc b/src/algorithms/PVT/adapters/galileo_e1_pvt.cc index 8a62b5170..ac43d857a 100644 --- a/src/algorithms/PVT/adapters/galileo_e1_pvt.cc +++ b/src/algorithms/PVT/adapters/galileo_e1_pvt.cc @@ -86,14 +86,16 @@ GalileoE1Pvt::~GalileoE1Pvt() void GalileoE1Pvt::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } void GalileoE1Pvt::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } gr::basic_block_sptr GalileoE1Pvt::get_left_block() diff --git a/src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc b/src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc index 6c6c4020e..b72eb3f87 100644 --- a/src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc +++ b/src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc @@ -85,14 +85,16 @@ GpsL1CaPvt::~GpsL1CaPvt() void GpsL1CaPvt::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } void GpsL1CaPvt::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } gr::basic_block_sptr GpsL1CaPvt::get_left_block() diff --git a/src/algorithms/PVT/adapters/hybrid_pvt.cc b/src/algorithms/PVT/adapters/hybrid_pvt.cc index bcad69bfb..6b7b751c7 100644 --- a/src/algorithms/PVT/adapters/hybrid_pvt.cc +++ b/src/algorithms/PVT/adapters/hybrid_pvt.cc @@ -86,14 +86,16 @@ HybridPvt::~HybridPvt() void HybridPvt::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } void HybridPvt::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } gr::basic_block_sptr HybridPvt::get_left_block() diff --git a/src/algorithms/observables/adapters/galileo_e1_observables.cc b/src/algorithms/observables/adapters/galileo_e1_observables.cc index 31a9b3c47..602c1afc3 100644 --- a/src/algorithms/observables/adapters/galileo_e1_observables.cc +++ b/src/algorithms/observables/adapters/galileo_e1_observables.cc @@ -72,7 +72,8 @@ GalileoE1Observables::~GalileoE1Observables() void GalileoE1Observables::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } @@ -80,7 +81,8 @@ void GalileoE1Observables::connect(gr::top_block_sptr top_block) void GalileoE1Observables::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } diff --git a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc b/src/algorithms/observables/adapters/gps_l1_ca_observables.cc index 65f8d20ea..5464799fd 100644 --- a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc +++ b/src/algorithms/observables/adapters/gps_l1_ca_observables.cc @@ -72,7 +72,8 @@ GpsL1CaObservables::~GpsL1CaObservables() void GpsL1CaObservables::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } @@ -80,7 +81,8 @@ void GpsL1CaObservables::connect(gr::top_block_sptr top_block) void GpsL1CaObservables::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index f4511dd48..1eb677a5c 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -72,7 +72,8 @@ HybridObservables::~HybridObservables() void HybridObservables::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } @@ -80,7 +81,8 @@ void HybridObservables::connect(gr::top_block_sptr top_block) void HybridObservables::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc index 6581db9ec..90192a1c9 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc @@ -93,14 +93,16 @@ void GalileoE1BTelemetryDecoder::set_satellite(Gnss_Satellite satellite) void GalileoE1BTelemetryDecoder::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } void GalileoE1BTelemetryDecoder::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc index 29269ebb7..4f1f55af5 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc @@ -99,14 +99,16 @@ void GalileoE5aTelemetryDecoder::set_satellite(Gnss_Satellite satellite) void GalileoE5aTelemetryDecoder::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } void GalileoE5aTelemetryDecoder::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc index 83fe57b50..e27ad1940 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc @@ -97,14 +97,16 @@ void GpsL1CaTelemetryDecoder::set_satellite(Gnss_Satellite satellite) void GpsL1CaTelemetryDecoder::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } void GpsL1CaTelemetryDecoder::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } 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 d9229afcd..aa883047a 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc @@ -92,14 +92,16 @@ void SbasL1TelemetryDecoder::set_satellite(Gnss_Satellite satellite) void SbasL1TelemetryDecoder::connect(gr::top_block_sptr top_block) { - // Nothing to connect internally + if(top_block) { /* top_block is not null */}; + // Nothing to connect internally DLOG(INFO) << "nothing to connect internally"; } void SbasL1TelemetryDecoder::disconnect(gr::top_block_sptr top_block) { - // Nothing to disconnect + if(top_block) { /* top_block is not null */}; + // Nothing to disconnect } diff --git a/src/core/interfaces/gnss_block_interface.h b/src/core/interfaces/gnss_block_interface.h index 78b408fba..bb45902c1 100644 --- a/src/core/interfaces/gnss_block_interface.h +++ b/src/core/interfaces/gnss_block_interface.h @@ -37,6 +37,7 @@ #ifndef GNSS_SDR_GNSS_BLOCK_INTERFACE_H_ #define GNSS_SDR_GNSS_BLOCK_INTERFACE_H_ +#include #include #include @@ -51,35 +52,29 @@ class GNSSBlockInterface { public: - virtual ~GNSSBlockInterface() - {} - virtual std::string role() = 0; - virtual std::string implementation() = 0; - virtual size_t item_size() = 0; - virtual void connect(gr::top_block_sptr top_block) = 0; - virtual void disconnect(gr::top_block_sptr top_block) = 0; + virtual ~GNSSBlockInterface() + {} + virtual std::string role() = 0; + virtual std::string implementation() = 0; + virtual size_t item_size() = 0; + virtual void connect(gr::top_block_sptr top_block) = 0; + virtual void disconnect(gr::top_block_sptr top_block) = 0; - virtual gr::basic_block_sptr get_left_block() = 0; - virtual gr::basic_block_sptr get_right_block() = 0; + virtual gr::basic_block_sptr get_left_block() = 0; + virtual gr::basic_block_sptr get_right_block() = 0; - virtual gr::basic_block_sptr get_left_block(int RF_channel) - { - if (RF_channel==0) // avoid unused param warning - { - return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; - }else{ - return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; - } - } - virtual gr::basic_block_sptr get_right_block(int RF_channel) - { - if (RF_channel==0) // avoid unused param warning - { - return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; - }else{ - return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; - } - } + virtual gr::basic_block_sptr get_left_block(int RF_channel) + { + assert(RF_channel >= 0); + if (RF_channel == 0){}; // avoid unused param warning + return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; + } + virtual gr::basic_block_sptr get_right_block(int RF_channel) + { + assert(RF_channel >= 0); + if (RF_channel == 0){}; // avoid unused param warning + return NULL; // added to support raw array access (non pure virtual to allow left unimplemented)= 0; + } }; #endif /*GNSS_SDR_GNSS_BLOCK_INTERFACE_H_*/ diff --git a/src/core/system_parameters/gps_ephemeris.h b/src/core/system_parameters/gps_ephemeris.h index a968af2f4..930484e0e 100644 --- a/src/core/system_parameters/gps_ephemeris.h +++ b/src/core/system_parameters/gps_ephemeris.h @@ -135,6 +135,7 @@ public: void serialize(Archive& archive, const unsigned int version) { using boost::serialization::make_nvp; + if(version){}; archive & make_nvp("i_satellite_PRN", i_satellite_PRN); // SV PRN NUMBER archive & make_nvp("d_TOW", d_TOW); //!< Time of GPS Week of the ephemeris set (taken from subframes TOW) [s]