From e820eb0bc4b5d1cac06d6f5f18db00644e3b422c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 15 Jul 2019 11:57:32 +0200 Subject: [PATCH 1/2] Revert "Keep eph_data and geph_data as std::array" This reverts commit d07a2c2a8054518b46b8591f0834d5909e980654. --- src/algorithms/PVT/libs/rtklib_solver.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index 604ee17c2..5044f0654 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -443,8 +443,8 @@ bool Rtklib_Solver::get_PVT(const std::map &gnss_observables_ int glo_valid_obs = 0; // GLONASS L1/L2 valid observations counter std::array obs_data{}; - std::array eph_data{}; - std::array geph_data{}; + std::vector eph_data(MAXOBS); + std::vector geph_data(MAXOBS); // Workaround for NAV/CNAV clash problem bool gps_dual_band = false; @@ -827,6 +827,7 @@ bool Rtklib_Solver::get_PVT(const std::map &gnss_observables_ if ((valid_obs + glo_valid_obs) > 3) { int result = 0; + int sat = 0; nav_t nav_data{}; nav_data.eph = eph_data.data(); nav_data.geph = geph_data.data(); From 7436188f34ed626c4a586363e1f4f5ee017686ab Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 15 Jul 2019 12:00:11 +0200 Subject: [PATCH 2/2] Remove unused variable --- src/algorithms/PVT/libs/rtklib_solver.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index 5044f0654..726b85719 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -827,7 +827,6 @@ bool Rtklib_Solver::get_PVT(const std::map &gnss_observables_ if ((valid_obs + glo_valid_obs) > 3) { int result = 0; - int sat = 0; nav_t nav_data{}; nav_data.eph = eph_data.data(); nav_data.geph = geph_data.data();