1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-15 01:29:58 +00:00

Removing compilation warnings

This commit is contained in:
Carles Fernandez 2015-02-27 13:11:06 +01:00
parent e4fb7a294d
commit f10ba2fb1d
12 changed files with 63 additions and 47 deletions

View File

@ -86,14 +86,16 @@ GalileoE1Pvt::~GalileoE1Pvt()
void GalileoE1Pvt::connect(gr::top_block_sptr top_block) 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"; DLOG(INFO) << "nothing to connect internally";
} }
void GalileoE1Pvt::disconnect(gr::top_block_sptr top_block) 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() gr::basic_block_sptr GalileoE1Pvt::get_left_block()

View File

@ -85,14 +85,16 @@ GpsL1CaPvt::~GpsL1CaPvt()
void GpsL1CaPvt::connect(gr::top_block_sptr top_block) 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"; DLOG(INFO) << "nothing to connect internally";
} }
void GpsL1CaPvt::disconnect(gr::top_block_sptr top_block) 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() gr::basic_block_sptr GpsL1CaPvt::get_left_block()

View File

@ -86,14 +86,16 @@ HybridPvt::~HybridPvt()
void HybridPvt::connect(gr::top_block_sptr top_block) 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"; DLOG(INFO) << "nothing to connect internally";
} }
void HybridPvt::disconnect(gr::top_block_sptr top_block) 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() gr::basic_block_sptr HybridPvt::get_left_block()

View File

@ -72,7 +72,8 @@ GalileoE1Observables::~GalileoE1Observables()
void GalileoE1Observables::connect(gr::top_block_sptr top_block) 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"; 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) void GalileoE1Observables::disconnect(gr::top_block_sptr top_block)
{ {
// Nothing to disconnect if(top_block) { /* top_block is not null */};
// Nothing to disconnect
} }

View File

@ -72,7 +72,8 @@ GpsL1CaObservables::~GpsL1CaObservables()
void GpsL1CaObservables::connect(gr::top_block_sptr top_block) 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"; 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) void GpsL1CaObservables::disconnect(gr::top_block_sptr top_block)
{ {
// Nothing to disconnect if(top_block) { /* top_block is not null */};
// Nothing to disconnect
} }

View File

@ -72,7 +72,8 @@ HybridObservables::~HybridObservables()
void HybridObservables::connect(gr::top_block_sptr top_block) 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"; 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) void HybridObservables::disconnect(gr::top_block_sptr top_block)
{ {
// Nothing to disconnect if(top_block) { /* top_block is not null */};
// Nothing to disconnect
} }

View File

@ -93,14 +93,16 @@ void GalileoE1BTelemetryDecoder::set_satellite(Gnss_Satellite satellite)
void GalileoE1BTelemetryDecoder::connect(gr::top_block_sptr top_block) 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"; DLOG(INFO) << "nothing to connect internally";
} }
void GalileoE1BTelemetryDecoder::disconnect(gr::top_block_sptr top_block) void GalileoE1BTelemetryDecoder::disconnect(gr::top_block_sptr top_block)
{ {
// Nothing to disconnect if(top_block) { /* top_block is not null */};
// Nothing to disconnect
} }

View File

@ -99,14 +99,16 @@ void GalileoE5aTelemetryDecoder::set_satellite(Gnss_Satellite satellite)
void GalileoE5aTelemetryDecoder::connect(gr::top_block_sptr top_block) 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"; DLOG(INFO) << "nothing to connect internally";
} }
void GalileoE5aTelemetryDecoder::disconnect(gr::top_block_sptr top_block) void GalileoE5aTelemetryDecoder::disconnect(gr::top_block_sptr top_block)
{ {
// Nothing to disconnect if(top_block) { /* top_block is not null */};
// Nothing to disconnect
} }

View File

@ -97,14 +97,16 @@ void GpsL1CaTelemetryDecoder::set_satellite(Gnss_Satellite satellite)
void GpsL1CaTelemetryDecoder::connect(gr::top_block_sptr top_block) 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"; DLOG(INFO) << "nothing to connect internally";
} }
void GpsL1CaTelemetryDecoder::disconnect(gr::top_block_sptr top_block) void GpsL1CaTelemetryDecoder::disconnect(gr::top_block_sptr top_block)
{ {
// Nothing to disconnect if(top_block) { /* top_block is not null */};
// Nothing to disconnect
} }

View File

@ -92,14 +92,16 @@ void SbasL1TelemetryDecoder::set_satellite(Gnss_Satellite satellite)
void SbasL1TelemetryDecoder::connect(gr::top_block_sptr top_block) 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"; DLOG(INFO) << "nothing to connect internally";
} }
void SbasL1TelemetryDecoder::disconnect(gr::top_block_sptr top_block) void SbasL1TelemetryDecoder::disconnect(gr::top_block_sptr top_block)
{ {
// Nothing to disconnect if(top_block) { /* top_block is not null */};
// Nothing to disconnect
} }

View File

@ -37,6 +37,7 @@
#ifndef GNSS_SDR_GNSS_BLOCK_INTERFACE_H_ #ifndef GNSS_SDR_GNSS_BLOCK_INTERFACE_H_
#define GNSS_SDR_GNSS_BLOCK_INTERFACE_H_ #define GNSS_SDR_GNSS_BLOCK_INTERFACE_H_
#include <cassert>
#include <string> #include <string>
#include <gnuradio/top_block.h> #include <gnuradio/top_block.h>
@ -51,35 +52,29 @@
class GNSSBlockInterface class GNSSBlockInterface
{ {
public: public:
virtual ~GNSSBlockInterface() virtual ~GNSSBlockInterface()
{} {}
virtual std::string role() = 0; virtual std::string role() = 0;
virtual std::string implementation() = 0; virtual std::string implementation() = 0;
virtual size_t item_size() = 0; virtual size_t item_size() = 0;
virtual void connect(gr::top_block_sptr top_block) = 0; virtual void connect(gr::top_block_sptr top_block) = 0;
virtual void disconnect(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_left_block() = 0;
virtual gr::basic_block_sptr get_right_block() = 0; virtual gr::basic_block_sptr get_right_block() = 0;
virtual gr::basic_block_sptr get_left_block(int RF_channel) virtual gr::basic_block_sptr get_left_block(int RF_channel)
{ {
if (RF_channel==0) // avoid unused param warning 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; 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)
} {
} assert(RF_channel >= 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;
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;
}
}
}; };
#endif /*GNSS_SDR_GNSS_BLOCK_INTERFACE_H_*/ #endif /*GNSS_SDR_GNSS_BLOCK_INTERFACE_H_*/

View File

@ -135,6 +135,7 @@ public:
void serialize(Archive& archive, const unsigned int version) void serialize(Archive& archive, const unsigned int version)
{ {
using boost::serialization::make_nvp; using boost::serialization::make_nvp;
if(version){};
archive & make_nvp("i_satellite_PRN", i_satellite_PRN); // SV PRN NUMBER 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] archive & make_nvp("d_TOW", d_TOW); //!< Time of GPS Week of the ephemeris set (taken from subframes TOW) [s]