From 9cab8261891ca57b29aa85c7a4edf4ae9b3eda17 Mon Sep 17 00:00:00 2001
From: Christoph Pohl <christoph.pohl@kit.edu>
Date: Thu, 21 Dec 2023 12:27:00 +0000
Subject: [PATCH] Fix missing F32 error (c++2b)
---
.../components/ArticulatedObjectLocalizerExample/CMakeLists.txt | 1 +
.../RobotAPI/components/DynamicObstacleManager/CMakeLists.txt | 1 +
.../armem/client/VirtualRobotWriterExample/CMakeLists.txt | 2 ++
.../NJointHolonomicPlatformGlobalPositionController.cpp | 2 +-
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/source/RobotAPI/components/ArticulatedObjectLocalizerExample/CMakeLists.txt b/source/RobotAPI/components/ArticulatedObjectLocalizerExample/CMakeLists.txt
index e92a5b368..bac8435fc 100644
--- a/source/RobotAPI/components/ArticulatedObjectLocalizerExample/CMakeLists.txt
+++ b/source/RobotAPI/components/ArticulatedObjectLocalizerExample/CMakeLists.txt
@@ -17,6 +17,7 @@ armarx_add_component(
# Add unit tests
add_subdirectory(test)
+target_compile_options("${LIB_NAME}" PRIVATE -std=c++2b)
# Generate the application
armarx_generate_and_add_component_executable(
diff --git a/source/RobotAPI/components/DynamicObstacleManager/CMakeLists.txt b/source/RobotAPI/components/DynamicObstacleManager/CMakeLists.txt
index 7136f05db..da370a54d 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/CMakeLists.txt
+++ b/source/RobotAPI/components/DynamicObstacleManager/CMakeLists.txt
@@ -40,6 +40,7 @@ set(HEADERS
armarx_add_component("${SOURCES}" "${HEADERS}")
+target_compile_options("DynamicObstacleManager" PRIVATE -std=c++2b)
armarx_generate_and_add_component_executable()
diff --git a/source/RobotAPI/components/armem/client/VirtualRobotWriterExample/CMakeLists.txt b/source/RobotAPI/components/armem/client/VirtualRobotWriterExample/CMakeLists.txt
index a87ba755c..025c71bf7 100644
--- a/source/RobotAPI/components/armem/client/VirtualRobotWriterExample/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/client/VirtualRobotWriterExample/CMakeLists.txt
@@ -15,6 +15,8 @@ armarx_add_component(
VirtualRobotWriterExample.h
)
+target_compile_options("${LIB_NAME}" PRIVATE -std=c++2b)
+
# Generate the application
armarx_generate_and_add_component_executable(
# If your component is not defined in ::armarx, specify its namespace here:
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.cpp
index 8ce9b397c..c8732fb16 100755
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.cpp
@@ -159,7 +159,7 @@ namespace armarx
getWriterControlStruct().target << x, y;
getWriterControlStruct().targetOrientation =
- simox::math::periodic_clamp(yaw, -M_PIf32, M_PIf32);
+ simox::math::periodic_clamp(yaw, -M_PIf, M_PIf);
getWriterControlStruct().translationAccuracy = translationAccuracy;
getWriterControlStruct().rotationAccuracy = rotationAccuracy;
--
GitLab