Skip to content

Commit 0b7f65f

Browse files
committed
Switch to C++17 as minimum requirement
1 parent 932e7fc commit 0b7f65f

File tree

4 files changed

+6
-23
lines changed

4 files changed

+6
-23
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,17 @@ jobs:
2222
- "fedora:43"
2323
build_type: [Dev]
2424
cpp_compiler: [g++]
25-
cpp_version: [c++14]
25+
cpp_version: [c++17]
2626
include:
2727
- image: "ubuntu:22.04"
2828
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
2929
- image: "ubuntu:24.04"
3030
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
31-
- image: "debian:bookworm"
32-
cpp_version: c++17
3331
- image: "debian:bookworm"
3432
cpp_version: c++20
3533
- image: "debian:bookworm"
3634
c_compiler: clang
3735
cpp_compiler: clang++
38-
- image: "debian:bookworm"
39-
c_compiler: clang
40-
cpp_compiler: clang++
41-
cpp_version: c++17
4236
- image: "debian:bookworm"
4337
c_compiler: clang
4438
cpp_compiler: clang++
@@ -47,19 +41,12 @@ jobs:
4741
build_type: RelWithDebInfo
4842
- image: "debian:trixie"
4943
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
50-
- image: "debian:trixie"
51-
cpp_version: c++17
52-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
5344
- image: "debian:trixie"
5445
cpp_version: c++20
5546
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
5647
- image: "debian:trixie"
5748
c_compiler: clang
5849
cpp_compiler: clang++
59-
- image: "debian:trixie"
60-
c_compiler: clang
61-
cpp_compiler: clang++
62-
cpp_version: c++17
6350
- image: "debian:trixie"
6451
c_compiler: clang
6552
cpp_compiler: clang++
@@ -121,10 +108,6 @@ jobs:
121108
nlohmann-json3-dev \
122109
pandoc \
123110
zlib1g-dev
124-
- name: Install compiler
125-
shell: bash
126-
if: matrix.cpp_compiler == 'clang++-14'
127-
run: apt-get install -yq --no-install-suggests --no-install-recommends clang-14
128111
- name: Prepare container (dnf)
129112
shell: bash
130113
if: startsWith(matrix.image, 'fedora:')

.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
BUILD_TYPE: Dev
2323
CC: clang-${{ matrix.clang }}
2424
CXX: clang++-${{ matrix.clang }}
25-
CPP_VERSION: c++14
25+
CPP_VERSION: c++17
2626
APT_LISTCHANGES_FRONTEND: none
2727
DEBIAN_FRONTEND: noninteractive
2828
steps:

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ if(CPPCHECK)
8787
# cpp doesn't find system includes for some reason, suppress that report
8888
set(CPPCHECK_OPTIONS ${CPPCHECK_OPTIONS} --suppress=missingIncludeSystem)
8989

90-
add_custom_target(cppcheck ${CPPCHECK} --std=c++14 ${CPPCHECK_OPTIONS} ${CMAKE_SOURCE_DIR}/src/*pp)
90+
add_custom_target(cppcheck ${CPPCHECK} --std=c++17 ${CPPCHECK_OPTIONS} ${CMAKE_SOURCE_DIR}/src/*pp)
9191
else()
9292
message(STATUS "Looking for cppcheck - not found")
9393
message(STATUS " Build target 'cppcheck' will not be available")
@@ -113,12 +113,12 @@ endif()
113113

114114
#-----------------------------------------------------------------------------
115115
#
116-
# Decide which C++ version to use (Minimum/default: C++14).
116+
# Decide which C++ version to use (Minimum/default: C++17).
117117
#
118118
#-----------------------------------------------------------------------------
119119
if(NOT MSVC)
120120
if(NOT USE_CPP_VERSION)
121-
set(USE_CPP_VERSION c++14)
121+
set(USE_CPP_VERSION c++17)
122122
endif()
123123
message(STATUS "Use C++ version: ${USE_CPP_VERSION}")
124124
add_compile_options(-std=${USE_CPP_VERSION})

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Official web site: https://osmcode.org/osmium-tool/
1111

1212
## Prerequisites
1313

14-
You need a C++14 compliant compiler.
14+
You need a C++17 compliant compiler.
1515

1616
You also need the following libraries:
1717

0 commit comments

Comments
 (0)