Update rviz_rendering and rviz_rendering_tests to C++17. (#1096)

* Update rviz_rendering and rviz_rendering_tests to C++17. Signed-off-by: Chris Lalancette <[email protected]> * Disable a warning on Windows. This is because we are using an older version of Eigen on Windows that deprecated some stuff in C++17. For now, just disable this warning. Signed-off-by: Chris Lalancette <[email protected]> --------- Signed-off-by: Chris Lalancette <[email protected]>
ros2 · Nov 22, 2023 · 8691d3b · 8691d3b
1 parent 9050571
commit 8691d3b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/rviz_rendering/CMakeLists.txt b/rviz_rendering/CMakeLists.txt
@@ -2,9 +2,10 @@ cmake_minimum_required(VERSION 3.5)
 
 project(rviz_rendering)
 
-# Default to C++14
+# Default to C++17
 if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 14)
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")

diff --git a/rviz_rendering/include/rviz_rendering/objects/covariance_visual.hpp b/rviz_rendering/include/rviz_rendering/objects/covariance_visual.hpp
@@ -48,10 +48,15 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
+#elif defined(_WIN32)
+#pragma warning(push)
+#pragma warning(disable:4996)
 #endif
 #include <Eigen/Dense>
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
+#elif defined(_WIN32)
+#pragma warning(pop)
 #endif
 
 #include <OgreVector.h>

diff --git a/rviz_rendering_tests/CMakeLists.txt b/rviz_rendering_tests/CMakeLists.txt
@@ -2,9 +2,10 @@ cmake_minimum_required(VERSION 3.5)
 
 project(rviz_rendering_tests)
 
-# Default to C++14
+# Default to C++17
 if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 14)
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")