From e4c3373d161df2486c7f066b392771dea2e072d0 Mon Sep 17 00:00:00 2001 From: Jan Breuer <74359367+jbreue16@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:46:43 +0200 Subject: [PATCH] Update to cpp23 standard (#204) Co-authored-by: Samuel Leweke --- CMakeLists.txt | 2 +- ThirdParty/tclap/include/tclap/ArgTraits.h | 4 ++-- ThirdParty/tclap/include/tclap/MultiArg.h | 2 +- ThirdParty/tclap/include/tclap/ValueArg.h | 2 +- src/build-tools/CMakeLists.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19abf8b0f..3730d6cb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -436,7 +436,7 @@ endif() # --------------------------------------------------- add_library(CADET::CompileOptions INTERFACE IMPORTED) -target_compile_features(CADET::CompileOptions INTERFACE cxx_std_17) +target_compile_features(CADET::CompileOptions INTERFACE cxx_std_23) set(CMAKE_CXX_EXTENSIONS OFF) if (WIN32) diff --git a/ThirdParty/tclap/include/tclap/ArgTraits.h b/ThirdParty/tclap/include/tclap/ArgTraits.h index 0b2c18f70..96bebfe96 100644 --- a/ThirdParty/tclap/include/tclap/ArgTraits.h +++ b/ThirdParty/tclap/include/tclap/ArgTraits.h @@ -82,6 +82,6 @@ struct ArgTraits { //typedef ValueLike ValueCategory; }; -#endif - } // namespace + +#endif diff --git a/ThirdParty/tclap/include/tclap/MultiArg.h b/ThirdParty/tclap/include/tclap/MultiArg.h index 37905a0eb..d4156af31 100644 --- a/ThirdParty/tclap/include/tclap/MultiArg.h +++ b/ThirdParty/tclap/include/tclap/MultiArg.h @@ -239,7 +239,7 @@ class MultiArg : public Arg /** * Prevent accidental copying */ - MultiArg(const MultiArg& rhs); + MultiArg(const MultiArg& rhs); MultiArg& operator=(const MultiArg& rhs); }; diff --git a/ThirdParty/tclap/include/tclap/ValueArg.h b/ThirdParty/tclap/include/tclap/ValueArg.h index ede491d35..1f714ed03 100644 --- a/ThirdParty/tclap/include/tclap/ValueArg.h +++ b/ThirdParty/tclap/include/tclap/ValueArg.h @@ -254,7 +254,7 @@ class ValueArg : public Arg /** * Prevent accidental copying */ - ValueArg(const ValueArg& rhs); + ValueArg(const ValueArg& rhs); ValueArg& operator=(const ValueArg& rhs); }; diff --git a/src/build-tools/CMakeLists.txt b/src/build-tools/CMakeLists.txt index 44bd8158b..17e69cab8 100644 --- a/src/build-tools/CMakeLists.txt +++ b/src/build-tools/CMakeLists.txt @@ -16,7 +16,7 @@ project(CadetBuildTools CXX C) # Add the template code generator add_executable(templateCodeGen ${CMAKE_SOURCE_DIR}/src/build-tools/templateCodeGen.cpp) target_include_directories(templateCodeGen PRIVATE ${CMAKE_SOURCE_DIR}/ThirdParty/json ${CMAKE_SOURCE_DIR}/ThirdParty/inja) -target_compile_features(templateCodeGen PRIVATE cxx_std_14) +target_compile_features(templateCodeGen PRIVATE cxx_std_23) set_target_properties(templateCodeGen PROPERTIES CXX_EXTENSIONS OFF) # Info message