From f270afad0326afc63ae8032c8cd3048164d910e1 Mon Sep 17 00:00:00 2001 From: joanvallve <jvallve@iri.upc.edu> Date: Tue, 23 Jul 2024 12:39:17 +0200 Subject: [PATCH] [skip ci] wip --- include/bodydynamics/common/bodydynamics.h | 1 + .../{load_gnss.h => load_bodydynamics.h} | 21 +++++-------------- .../{load_gnss.cpp => load_bodydynamics.cpp} | 4 ++-- 3 files changed, 8 insertions(+), 18 deletions(-) rename include/bodydynamics/utils/{load_gnss.h => load_bodydynamics.h} (72%) rename src/utils/{load_gnss.cpp => load_bodydynamics.cpp} (91%) diff --git a/include/bodydynamics/common/bodydynamics.h b/include/bodydynamics/common/bodydynamics.h index dcdc54a..a17e2d0 100644 --- a/include/bodydynamics/common/bodydynamics.h +++ b/include/bodydynamics/common/bodydynamics.h @@ -22,6 +22,7 @@ // Enable project-specific definitions and macros #include "bodydynamics/internal/config.h" +#include "bodydynamics/utils/load_bodydynamics.h" #include <core/common/wolf.h> namespace wolf diff --git a/include/bodydynamics/utils/load_gnss.h b/include/bodydynamics/utils/load_bodydynamics.h similarity index 72% rename from include/bodydynamics/utils/load_gnss.h rename to include/bodydynamics/utils/load_bodydynamics.h index 8c23b95..3af6f3a 100644 --- a/include/bodydynamics/utils/load_gnss.h +++ b/include/bodydynamics/utils/load_bodydynamics.h @@ -20,32 +20,21 @@ #pragma once +#include "core/utils/unused.h" + namespace wolf { // This class is just to force the .so to be easily loaded in tests -class LoadGnss +class LoadBodydynamics { public: static bool aux_var; }; -#ifdef __GNUC__ -#define WOLF_UNUSED __attribute__((used)) -#elif defined _MSC_VER -#pragma warning(disable : Cxxxxx) -#define WOLF_UNUSED -#elif defined(__LCLINT__) -#define WOLF_UNUSED /*@unused@*/ -#elif defined(__cplusplus) -#define WOLF_UNUSED -#else -#define UNUSED(x) x -#endif - -#define WOLF_LOAD_GNSS \ +#define WOLF_LOAD_BODYDYBAMICS \ namespace \ { \ - const bool WOLF_UNUSED aux_var_gnss = wolf::LoadGnss::aux_var; \ + const bool WOLF_UNUSED aux_var_bodydynamics = wolf::LoadBodydynamics::aux_var; \ } } // namespace wolf diff --git a/src/utils/load_gnss.cpp b/src/utils/load_bodydynamics.cpp similarity index 91% rename from src/utils/load_gnss.cpp rename to src/utils/load_bodydynamics.cpp index 4e727fe..20bda7a 100644 --- a/src/utils/load_gnss.cpp +++ b/src/utils/load_bodydynamics.cpp @@ -18,9 +18,9 @@ // You should have received a copy of the GNU Lesser General Public License // along with this program. If not, see <http://www.gnu.org/licenses/>. -#include "gnss/utils/load_gnss.h" +#include "bodydynamics/utils/load_bodydynamics.h" namespace wolf { -bool LoadGnss::aux_var = true; +bool LoadBodydynamics::aux_var = true; } // namespace wolf -- GitLab