From dc3e2f31271f6495635ff51a1d9a2d003628ceb3 Mon Sep 17 00:00:00 2001
From: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
Date: Tue, 23 Nov 2021 22:27:19 +0100
Subject: [PATCH] Move using namespace units to namespace mantle_api
- using the namespace "units" globally creates a name clash of
units::inverse with the glm library's glm::inverse, which is used within
the glm library. glm lib doesn't compile anymore then
- moved "using namespace units;" to mantle_api namespace for now
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
---
MantleAPI/include/MantleAPI/Common/spline.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/MantleAPI/include/MantleAPI/Common/spline.h b/MantleAPI/include/MantleAPI/Common/spline.h
index 7b91677a..fd713272 100644
--- a/MantleAPI/include/MantleAPI/Common/spline.h
+++ b/MantleAPI/include/MantleAPI/Common/spline.h
@@ -24,8 +24,6 @@
#include <tuple>
-using namespace units;
-
namespace units
{
UNIT_ADD(jerk,
@@ -58,6 +56,8 @@ UNIT_ADD_CATEGORY_TRAIT(jerk_acceleration)
namespace mantle_api
{
+using namespace units;
+
template <typename T>
struct SplineSegment
{
--
GitLab