From a09f3e138ff8684a73cc1b7988c469f716a5edd2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 4 May 2016 20:29:34 +0200 Subject: [PATCH] Remove unused variable --- src/algorithms/PVT/adapters/hybrid_pvt.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/algorithms/PVT/adapters/hybrid_pvt.cc b/src/algorithms/PVT/adapters/hybrid_pvt.cc index c6349b9a6..3d7f0a6aa 100644 --- a/src/algorithms/PVT/adapters/hybrid_pvt.cc +++ b/src/algorithms/PVT/adapters/hybrid_pvt.cc @@ -90,7 +90,7 @@ HybridPvt::HybridPvt(ConfigurationInterface* configuration, const std::string iono_default_xml_filename = "./gps_iono.xml"; const std::string ref_time_default_xml_filename = "./gps_ref_time.xml"; const std::string ref_location_default_xml_filename = "./gps_ref_location.xml"; - eph_xml_filename_= configuration->property("GNSS-SDR.SUPL_gps_ephemeris_xml", eph_default_xml_filename); + eph_xml_filename_ = configuration->property("GNSS-SDR.SUPL_gps_ephemeris_xml", eph_default_xml_filename); //std::string utc_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_utc_model.xml", utc_default_xml_filename); //std::string iono_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_iono_xml", iono_default_xml_filename); //std::string ref_time_xml_filename = configuration_->property("GNSS-SDR.SUPL_gps_ref_time_xml", ref_time_default_xml_filename); @@ -104,12 +104,9 @@ HybridPvt::HybridPvt(ConfigurationInterface* configuration, bool HybridPvt::save_assistance_to_XML() { - // return variable (true == succeeded) - bool ret = false; - LOG(INFO) << "SUPL: Try to save GPS ephemeris to XML file " << eph_xml_filename_; - - std::map eph_map=pvt_->get_GPS_L1_ephemeris_map(); + std::map eph_map = pvt_->get_GPS_L1_ephemeris_map(); + if (eph_map.size() > 0) { try @@ -122,10 +119,10 @@ bool HybridPvt::save_assistance_to_XML() } catch (std::exception& e) { - LOG(ERROR) << e.what(); + LOG(WARNING) << e.what(); return false; } - return true; + return true; // return variable (true == succeeded) } else { @@ -134,11 +131,13 @@ bool HybridPvt::save_assistance_to_XML() } } + HybridPvt::~HybridPvt() { save_assistance_to_XML(); } + void HybridPvt::connect(gr::top_block_sptr top_block) { if(top_block) { /* top_block is not null */}; @@ -162,6 +161,6 @@ gr::basic_block_sptr HybridPvt::get_left_block() gr::basic_block_sptr HybridPvt::get_right_block() { - return pvt_; + return pvt_; // this is a sink, nothing downstream }