Skip to content

Commit 25fcfd7

Browse files
authored
Merge pull request #428 from ANYbotics/mergify/bp/iron/pr-420
Enfore C++17 (backport #420)
2 parents eaf0399 + 3651307 commit 25fcfd7

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

grid_map/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
22
project(grid_map)
33

44
if(NOT CMAKE_CXX_STANDARD)
5-
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_STANDARD 17)
66
endif()
77

88
find_package(ament_cmake REQUIRED)

grid_map_cmake_helpers/cmake/grid_map_package.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ macro(grid_map_package)
1212
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
1313
endif()
1414

15-
# Default to C++14
1615
if(NOT CMAKE_CXX_STANDARD)
1716
set(CMAKE_CXX_STANDARD 17)
1817
endif()

0 commit comments

Comments
 (0)