Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

src/algorithms/PVT/libs/rtklib_solver.cc

@@ -94,6 +94,7 @@ Rtklib_Solver::Rtklib_Solver(int nchannels, std::string dump_filename, bool flag
     d_dump_filename = std::move(dump_filename);
     d_flag_dump_enabled = flag_dump_to_file;
     d_flag_dump_mat_enabled = flag_dump_to_mat;
+    count_valid_position = 0;
     this->set_averaging_flag(false);
     rtk_ = rtk;
 

src/algorithms/PVT/libs/rtklib_solver.h

@@ -126,6 +126,8 @@ public:
     Beidou_Dnav_Iono beidou_dnav_iono;
     std::map<int, Beidou_Dnav_Almanac> beidou_dnav_almanac_map;
 
+    int count_valid_position;
+
 private:
     rtk_t rtk_{};
     std::string d_dump_filename;

src/utils/front-end-cal/main.cc

@@ -619,7 +619,7 @@ int main(int argc, char** argv)
                 {
                     std::cout << "Exception caught while reading ephemeris" << std::endl;
                 }
-            catch (int ex)
+            catch (const std::exception& ex)
                 {
                     std::cout << "  " << it.first << "   " << it.second - mean_f_if_Hz << "  (Eph not found)" << std::endl;
                 }