[hamradio-commits] [gnss-sdr] 11/60: Some warnings removed
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sun Mar 22 11:15:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit 8cd59646bb0c43423dac0e5e65973615e560f888
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Fri Feb 27 14:55:46 2015 +0100
Some warnings removed
---
.../adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 3 ++-
.../adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc | 6 ++++--
.../acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc | 5 +++--
.../acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc | 6 +++---
src/algorithms/libs/pass_through.cc | 6 ++++--
src/algorithms/output_filter/adapters/file_output_filter.cc | 6 ++++--
src/algorithms/output_filter/adapters/null_sink_output_filter.cc | 6 ++++--
.../tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc | 6 ++++--
.../tracking/adapters/galileo_e1_tcp_connector_tracking.cc | 6 ++++--
src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc | 6 ++++--
.../tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc | 6 ++++--
src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc | 6 ++++--
.../tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc | 6 ++++--
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc | 6 ++++--
.../tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc | 6 ++++--
src/core/system_parameters/gps_iono.h | 2 +-
src/core/system_parameters/gps_ref_location.h | 2 +-
src/core/system_parameters/gps_ref_time.h | 1 +
src/core/system_parameters/gps_utc_model.h | 2 +-
19 files changed, 60 insertions(+), 33 deletions(-)
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 9f03aab..43f8b30 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
@@ -269,7 +269,8 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::set_state(int state)
float GalileoE1PcpsCccwsrAmbiguousAcquisition::calculate_threshold(float pfa)
{
- return 0.0;
+ if(pfa){ /* Not implemented*/};
+ return 0.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 7e50600..ad21e08 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
@@ -307,13 +307,15 @@ float GalileoE5aNoncoherentIQAcquisitionCaf::calculate_threshold(float pfa)
void GalileoE5aNoncoherentIQAcquisitionCaf::connect(gr::top_block_sptr top_block)
{
- // Nothing to connect internally
+ if(top_block) { /* top_block is not null */};
+ // Nothing to connect internally
}
void GalileoE5aNoncoherentIQAcquisitionCaf::disconnect(gr::top_block_sptr top_block)
{
- // Nothing to disconnect internally
+ if(top_block) { /* top_block is not null */};
+ // Nothing to disconnect internally
}
gr::basic_block_sptr GalileoE5aNoncoherentIQAcquisitionCaf::get_left_block()
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 508eac6..0dfbcbb 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
@@ -166,7 +166,7 @@ void GpsL1CaPcpsAcquisitionFineDoppler::reset()
void GpsL1CaPcpsAcquisitionFineDoppler::connect(boost::shared_ptr<gr::top_block> top_block)
{
-
+ if(top_block) { /* top_block is not null */};
//nothing to disconnect, now the tracking uses gr_sync_decimator
}
@@ -174,7 +174,8 @@ void GpsL1CaPcpsAcquisitionFineDoppler::connect(boost::shared_ptr<gr::top_block>
void GpsL1CaPcpsAcquisitionFineDoppler::disconnect(boost::shared_ptr<gr::top_block> top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
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 7a58692..4eff7d2 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
@@ -163,15 +163,15 @@ void GpsL1CaPcpsAssistedAcquisition::reset()
void GpsL1CaPcpsAssistedAcquisition::connect(gr::top_block_sptr top_block)
{
-
+ if(top_block) { /* top_block is not null */};
//nothing to disconnect, now the tracking uses gr_sync_decimator
-
}
void GpsL1CaPcpsAssistedAcquisition::disconnect(gr::top_block_sptr top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc
index 8b30c07..21cfeb7 100644
--- a/src/algorithms/libs/pass_through.cc
+++ b/src/algorithms/libs/pass_through.cc
@@ -91,14 +91,16 @@ Pass_Through::~Pass_Through()
void Pass_Through::connect(gr::top_block_sptr top_block)
{
- DLOG(INFO) << "nothing to connect internally";
+ if(top_block) { /* top_block is not null */};
+ DLOG(INFO) << "nothing to connect internally";
}
void Pass_Through::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/output_filter/adapters/file_output_filter.cc b/src/algorithms/output_filter/adapters/file_output_filter.cc
index 4044509..86cde40 100644
--- a/src/algorithms/output_filter/adapters/file_output_filter.cc
+++ b/src/algorithms/output_filter/adapters/file_output_filter.cc
@@ -78,13 +78,15 @@ FileOutputFilter::~FileOutputFilter()
void FileOutputFilter::connect(gr::top_block_sptr top_block)
{
- DLOG(INFO) << "nothing to connect internally";
+ if(top_block) { /* top_block is not null */};
+ DLOG(INFO) << "nothing to connect internally";
}
void FileOutputFilter::disconnect(gr::top_block_sptr top_block)
{
- // Nothing to disconnect internally
+ if(top_block) { /* top_block is not null */};
+ // Nothing to disconnect internally
}
diff --git a/src/algorithms/output_filter/adapters/null_sink_output_filter.cc b/src/algorithms/output_filter/adapters/null_sink_output_filter.cc
index d1b6f35..51263ba 100644
--- a/src/algorithms/output_filter/adapters/null_sink_output_filter.cc
+++ b/src/algorithms/output_filter/adapters/null_sink_output_filter.cc
@@ -76,14 +76,16 @@ NullSinkOutputFilter::~NullSinkOutputFilter()
void NullSinkOutputFilter::connect(gr::top_block_sptr top_block)
{
- DLOG(INFO) << "nothing to connect internally";
+ if(top_block) { /* top_block is not null */};
+ DLOG(INFO) << "nothing to connect internally";
}
void NullSinkOutputFilter::disconnect(gr::top_block_sptr top_block)
{
- // Nothing to connect
+ if(top_block) { /* top_block is not null */};
+ // Nothing to connect
}
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
index a8e86cf..b965386 100755
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
@@ -138,12 +138,14 @@ void GalileoE1DllPllVemlTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
void GalileoE1DllPllVemlTracking::connect(gr::top_block_sptr top_block)
{
- //nothing to connect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to connect, now the tracking uses gr_sync_decimator
}
void GalileoE1DllPllVemlTracking::disconnect(gr::top_block_sptr top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
gr::basic_block_sptr GalileoE1DllPllVemlTracking::get_left_block()
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 f1d9a06..fc9361c 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@@ -141,12 +141,14 @@ void GalileoE1TcpConnectorTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchr
void GalileoE1TcpConnectorTracking::connect(gr::top_block_sptr top_block)
{
- //nothing to connect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to connect, now the tracking uses gr_sync_decimator
}
void GalileoE1TcpConnectorTracking::disconnect(gr::top_block_sptr top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
gr::basic_block_sptr GalileoE1TcpConnectorTracking::get_left_block()
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
index 2d84969..a094521 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
@@ -144,12 +144,14 @@ void GalileoE5aDllPllTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
void GalileoE5aDllPllTracking::connect(gr::top_block_sptr top_block)
{
- //nothing to connect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to connect, now the tracking uses gr_sync_decimator
}
void GalileoE5aDllPllTracking::disconnect(gr::top_block_sptr top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
gr::basic_block_sptr GalileoE5aDllPllTracking::get_left_block()
diff --git a/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc
index 95332d3..4879416 100644
--- a/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.cc
@@ -138,12 +138,14 @@ void GalileoVolkE1DllPllVemlTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_sync
void GalileoVolkE1DllPllVemlTracking::connect(gr::top_block_sptr top_block)
{
- //nothing to connect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to connect, now the tracking uses gr_sync_decimator
}
void GalileoVolkE1DllPllVemlTracking::disconnect(gr::top_block_sptr top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
gr::basic_block_sptr GalileoVolkE1DllPllVemlTracking::get_left_block()
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc
index 528235b..0f7ff61 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.cc
@@ -138,12 +138,14 @@ void GpsL1CaDllFllPllTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
void GpsL1CaDllFllPllTracking::connect(gr::top_block_sptr top_block)
{
- //nothing to connect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to connect, now the tracking uses gr_sync_decimator
}
void GpsL1CaDllFllPllTracking::disconnect(gr::top_block_sptr top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
gr::basic_block_sptr GpsL1CaDllFllPllTracking::get_left_block()
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
index 3226e4a..ad46b5b 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
@@ -134,12 +134,14 @@ void GpsL1CaDllPllOptimTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
void GpsL1CaDllPllOptimTracking::connect(gr::top_block_sptr top_block)
{
- //nothing to connect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to connect, now the tracking uses gr_sync_decimator
}
void GpsL1CaDllPllOptimTracking::disconnect(gr::top_block_sptr top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
gr::basic_block_sptr GpsL1CaDllPllOptimTracking::get_left_block()
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
index 09ed890..0613e9a 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
@@ -134,12 +134,14 @@ void GpsL1CaDllPllTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
void GpsL1CaDllPllTracking::connect(gr::top_block_sptr top_block)
{
- //nothing to connect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to connect, now the tracking uses gr_sync_decimator
}
void GpsL1CaDllPllTracking::disconnect(gr::top_block_sptr top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
gr::basic_block_sptr GpsL1CaDllPllTracking::get_left_block()
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 e1e8e7f..2da95a6 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
@@ -135,12 +135,14 @@ void GpsL1CaTcpConnectorTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
void GpsL1CaTcpConnectorTracking::connect(gr::top_block_sptr top_block)
{
- //nothing to connect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to connect, now the tracking uses gr_sync_decimator
}
void GpsL1CaTcpConnectorTracking::disconnect(gr::top_block_sptr top_block)
{
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
gr::basic_block_sptr GpsL1CaTcpConnectorTracking::get_left_block()
diff --git a/src/core/system_parameters/gps_iono.h b/src/core/system_parameters/gps_iono.h
index e885d65..46af3e0 100644
--- a/src/core/system_parameters/gps_iono.h
+++ b/src/core/system_parameters/gps_iono.h
@@ -66,7 +66,7 @@ public:
void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
-
+ if(version){};
archive & make_nvp("d_alpha0",d_alpha0);
archive & make_nvp("d_alpha1",d_alpha1);
archive & make_nvp("d_alpha2",d_alpha2);
diff --git a/src/core/system_parameters/gps_ref_location.h b/src/core/system_parameters/gps_ref_location.h
index 327d41c..21b1a22 100644
--- a/src/core/system_parameters/gps_ref_location.h
+++ b/src/core/system_parameters/gps_ref_location.h
@@ -61,7 +61,7 @@ public:
void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
-
+ if(version){};
archive & make_nvp("valid", valid);
archive & make_nvp("lat", lat);
archive & make_nvp("lon", lon);
diff --git a/src/core/system_parameters/gps_ref_time.h b/src/core/system_parameters/gps_ref_time.h
index 9d7cd5a..4360ccb 100644
--- a/src/core/system_parameters/gps_ref_time.h
+++ b/src/core/system_parameters/gps_ref_time.h
@@ -62,6 +62,7 @@ public:
void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
+ if(version){};
archive & make_nvp("valid", valid);
archive & make_nvp("d_TOW", d_TOW);
archive & make_nvp("d_Week", d_Week);
diff --git a/src/core/system_parameters/gps_utc_model.h b/src/core/system_parameters/gps_utc_model.h
index 7a97c95..9d11101 100644
--- a/src/core/system_parameters/gps_utc_model.h
+++ b/src/core/system_parameters/gps_utc_model.h
@@ -68,7 +68,7 @@ public:
void serialize(Archive& archive, const unsigned int version)
{
using boost::serialization::make_nvp;
-
+ if(version){};
archive & make_nvp("valid",valid);
archive & make_nvp("d_A1",d_A1);
archive & make_nvp("d_A0",d_A0);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list