From 75aa6a3c5df913b1f0c65c5f51e600a87bb9ff9e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 29 Jul 2019 20:14:31 +0200 Subject: [PATCH] Fix for ARM --- src/algorithms/PVT/libs/CMakeLists.txt | 1 - src/algorithms/PVT/libs/rtklib_solver.cc | 2 +- src/algorithms/PVT/libs/rtklib_solver.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt index 368fbabe7..d20cac4c6 100644 --- a/src/algorithms/PVT/libs/CMakeLists.txt +++ b/src/algorithms/PVT/libs/CMakeLists.txt @@ -83,7 +83,6 @@ target_link_libraries(pvt_libs Gflags::gflags Glog::glog Matio::matio - Volkgnsssdr::volkgnsssdr ) get_filename_component(PROTO_INCLUDE_HEADERS ${PROTO_HDRS} DIRECTORY) diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index 25a38fa47..d43f98b50 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -443,7 +443,7 @@ bool Rtklib_Solver::get_PVT(const std::map &gnss_observables_ int valid_obs = 0; // valid observations counter int glo_valid_obs = 0; // GLONASS L1/L2 valid observations counter - obs_data.fill({}); + std::array obs_data{}; std::vector eph_data(MAXOBS); std::vector geph_data(MAXOBS); diff --git a/src/algorithms/PVT/libs/rtklib_solver.h b/src/algorithms/PVT/libs/rtklib_solver.h index 1fda864e6..a393c1f63 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.h +++ b/src/algorithms/PVT/libs/rtklib_solver.h @@ -135,7 +135,6 @@ private: bool d_flag_dump_mat_enabled; int d_nchannels; // Number of available channels for positioning std::array dop_{}; - std::array obs_data{}; Monitor_Pvt monitor_pvt{}; };