Merge pull request #420 from Ryanf55/enfore-cpp17

Enfore C++17
ANYbotics · Feb 4, 2024 · 734c11d · 734c11d
2 parents 886ba24 + acdee6e
commit 734c11d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/grid_map/CMakeLists.txt b/grid_map/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 project(grid_map)
 
 if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 14)
+  set(CMAKE_CXX_STANDARD 17)
 endif()
 
 find_package(ament_cmake REQUIRED)

diff --git a/grid_map_cmake_helpers/cmake/grid_map_package.cmake b/grid_map_cmake_helpers/cmake/grid_map_package.cmake
@@ -12,7 +12,6 @@ macro(grid_map_package)
       "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
   endif()
 
-  # Default to C++14
   if(NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 17)
   endif()