From 69d571c3a64f0ad377412f1f72db97ba8eb7b65d Mon Sep 17 00:00:00 2001 From: PepMS <jmarti@iri.upc.edu> Date: Fri, 3 Apr 2020 14:55:45 +0200 Subject: [PATCH] [utils] includes fix --- CMakeLists.txt | 2 -- include/gnss_utils/observations.h | 6 +++--- include/gnss_utils/ublox_raw.h | 3 ++- include/gnss_utils/utils/gnss_utils.h | 27 --------------------------- src/examples/gnss_utils_test.cpp | 2 +- src/observations.cpp | 1 - src/utils/gnss_utils.cpp | 7 ------- test/gtest_observations.cpp | 1 - 8 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 include/gnss_utils/utils/gnss_utils.h delete mode 100644 src/utils/gnss_utils.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 685a9a2..83308db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,6 @@ SET(RTKLIB_SRC_DIR ${RTKLIB_DIR}/src) # driver source files SET(SOURCES - src/utils/gnss_utils.cpp src/utils/utils.cpp src/utils/transformations.cpp src/utils/rcv_position.cpp @@ -91,7 +90,6 @@ SET(RTKLIB_SRC # application header files SET(HEADERS - include/gnss_utils/utils/gnss_utils.h include/gnss_utils/utils/utils.h include/gnss_utils/utils/transformations.h include/gnss_utils/utils/rcv_position.h diff --git a/include/gnss_utils/observations.h b/include/gnss_utils/observations.h index 9b0cb1d..7fb34ba 100644 --- a/include/gnss_utils/observations.h +++ b/include/gnss_utils/observations.h @@ -1,5 +1,5 @@ -#ifndef OBSERVATIONS_H -#define OBSERVATIONS_H +#ifndef INCLUDE_GNSS_UTILS_OBSERVATIONS_H_ +#define INCLUDE_GNSS_UTILS_OBSERVATIONS_H_ #include <vector> #include <map> @@ -132,4 +132,4 @@ inline bool Observations::hasSatellite(const unsigned char& i) const } } // namespace GNSSUtils -#endif +#endif // INCLUDE_GNSS_UTILS_OBSERVATIONS_H_ diff --git a/include/gnss_utils/ublox_raw.h b/include/gnss_utils/ublox_raw.h index 7c8c6eb..1c36ba2 100644 --- a/include/gnss_utils/ublox_raw.h +++ b/include/gnss_utils/ublox_raw.h @@ -1,7 +1,8 @@ #ifndef UBLOX_RAW_H #define UBLOX_RAW_H -#include "gnss_utils/utils/gnss_utils.h" +#include "gnss_utils/observations.h" +#include "gnss_utils/navigation.h" namespace GNSSUtils { diff --git a/include/gnss_utils/utils/gnss_utils.h b/include/gnss_utils/utils/gnss_utils.h deleted file mode 100644 index 1e76fa4..0000000 --- a/include/gnss_utils/utils/gnss_utils.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef GNSS_UTILS_H -#define GNSS_UTILS_H - -#include <vector> -#include <iostream> -#include <memory> -#include <string> - -#include <eigen3/Eigen/Dense> -#include <eigen3/Eigen/Geometry> -#include <eigen3/Eigen/Sparse> - -#include "gnss_utils/observations.h" -#include "gnss_utils/navigation.h" -#include "gnss_utils/utils/transformations.h" -#include "gnss_utils/utils/rcv_position.h" - -extern "C" { -#include "rtklib.h" -} - -namespace GNSSUtils -{ - -} // namespace GNSSUtils - -#endif diff --git a/src/examples/gnss_utils_test.cpp b/src/examples/gnss_utils_test.cpp index df97ca9..10520e0 100644 --- a/src/examples/gnss_utils_test.cpp +++ b/src/examples/gnss_utils_test.cpp @@ -1,6 +1,6 @@ #include "gnss_utils/observations.h" #include "gnss_utils/navigation.h" -#include "gnss_utils/utils/gnss_utils.h" +#include "gnss_utils/utils/transformations.h" #include <typeinfo> diff --git a/src/observations.cpp b/src/observations.cpp index 3e8762d..e68fb8d 100644 --- a/src/observations.cpp +++ b/src/observations.cpp @@ -1,4 +1,3 @@ -#include "gnss_utils/utils/gnss_utils.h" #include "gnss_utils/observations.h" using namespace GNSSUtils; diff --git a/src/utils/gnss_utils.cpp b/src/utils/gnss_utils.cpp deleted file mode 100644 index fdd3296..0000000 --- a/src/utils/gnss_utils.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "gnss_utils/utils/gnss_utils.h" - -namespace GNSSUtils -{ - - -} // namespace GNSSUtils diff --git a/test/gtest_observations.cpp b/test/gtest_observations.cpp index 57244d4..275f013 100644 --- a/test/gtest_observations.cpp +++ b/test/gtest_observations.cpp @@ -1,5 +1,4 @@ #include "gtest/utils_gtest.h" -#include "gnss_utils/utils/gnss_utils.h" #include "gnss_utils/observations.h" using namespace GNSSUtils; -- GitLab