This branch requires C++23 now

morzhovets · Dec 25, 2024 · df031ea · df031ea
1 parent 842f9d3
commit df031ea
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 58 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ target_include_directories(momo INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>)
 
-target_compile_features(momo INTERFACE cxx_std_20)
+target_compile_features(momo INTERFACE cxx_std_23)
 
 install(DIRECTORY include/momo DESTINATION include)
 

diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -72,42 +72,6 @@
       "cmakeCommandArgs": "-DMOMO_TEST=ON -DCMAKE_CXX_STANDARD=23",
       "buildCommandArgs": "-v"
     },
-    {
-      "name": "x64-cpp20-Debug",
-      "generator": "Ninja",
-      "inheritEnvironments": [ "msvc_x64" ],
-      "configurationType": "Debug",
-      "buildRoot": "${projectDir}\\build\\${name}",
-      "cmakeCommandArgs": "-DMOMO_TEST=ON -DCMAKE_CXX_STANDARD=20",
-      "buildCommandArgs": "-v"
-    },
-    {
-      "name": "x64-cpp20-Release",
-      "generator": "Ninja",
-      "inheritEnvironments": [ "msvc_x64" ],
-      "configurationType": "RelWithDebInfo",
-      "buildRoot": "${projectDir}\\build\\${name}",
-      "cmakeCommandArgs": "-DMOMO_TEST=ON -DCMAKE_CXX_STANDARD=20",
-      "buildCommandArgs": "-v"
-    },
-    {
-      "name": "x64-2019-Debug",
-      "generator": "Visual Studio 16",
-      "inheritEnvironments": [],
-      "configurationType": "Debug",
-      "buildRoot": "${projectDir}\\build\\${name}",
-      "cmakeCommandArgs": "-DMOMO_TEST=ON -DCMAKE_CXX_STANDARD=20",
-      "buildCommandArgs": ""
-    },
-    {
-      "name": "x64-2019-Release",
-      "generator": "Visual Studio 16",
-      "inheritEnvironments": [],
-      "configurationType": "RelWithDebInfo",
-      "buildRoot": "${projectDir}\\build\\${name}",
-      "cmakeCommandArgs": "-DMOMO_TEST=ON -DCMAKE_CXX_STANDARD=20",
-      "buildCommandArgs": ""
-    },
     {
       "name": "x64-2022-Debug",
       "generator": "Visual Studio 17",

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![GCC](https://github.com/morzhovets/momo/actions/workflows/gcc.yml/badge.svg?branch=master)](https://github.com/morzhovets/momo/actions/workflows/gcc.yml?query=branch%3Amaster)
 [![Clang](https://github.com/morzhovets/momo/actions/workflows/clang.yml/badge.svg?branch=master)](https://github.com/morzhovets/momo/actions/workflows/clang.yml?query=branch%3Amaster)
 
-This is an experimental branch that requires a compiler with C++20 support.
+This is an experimental branch that requires a compiler with C++23 support.
 [Here](https://github.com/morzhovets/momo/tree/branch_cpp11) is a stable branch requiring only C++11.
 
 #### momo (Memory Optimization is the Main Objective)
@@ -70,8 +70,8 @@ Some examples are [here](https://github.com/morzhovets/momo/blob/master/test/sou
 
 #### Supported compilers
 
-- MS Visual C++ (19.29+, Visual Studio 2019 16.10+) with /std:c++20
+- MS Visual C++ (19.42+, Visual Studio 2022 17.12+) with /std:c++latest
 
-- GCC (10+) with -std=c++20
+- GCC (14+) with -std=c++23
 
-- Clang (12+) with -std=c++20
+- Clang (18+) with -std=c++23
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -6,7 +6,7 @@ project(momo_test
 file(GLOB MOMO_TEST_SOURCES CONFIGURE_DEPENDS "sources/*.cpp")
 add_executable(momo_test ${MOMO_TEST_SOURCES})
 
-target_compile_features(momo_test PRIVATE cxx_std_20)
+target_compile_features(momo_test PRIVATE cxx_std_23)
 
 if(NOT (${CMAKE_VERSION} VERSION_LESS "3.16"))
   target_precompile_headers(momo_test PRIVATE "sources/pch.h")

diff --git a/test/projects/CodeBlocks/momo.cbp b/test/projects/CodeBlocks/momo.cbp
@@ -6,14 +6,14 @@
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
-			<Target title="Debug GCC C++20">
-				<Option output="bin/Debug GCC C++20/momo" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug GCC C++20/" />
+			<Target title="Debug GCC C++23">
+				<Option output="bin/Debug GCC C++23/momo" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug GCC C++23/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-pedantic" />
-					<Add option="-std=c++20" />
+					<Add option="-std=c++23" />
 					<Add option="-Wextra" />
 					<Add option="-Wall" />
 					<Add option="-g" />
@@ -23,15 +23,15 @@
 					<Add option="-msse2" />
 				</Compiler>
 			</Target>
-			<Target title="Release GCC C++20">
-				<Option output="bin/Release GCC C++20/momo" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release GCC C++20/" />
+			<Target title="Release GCC C++23">
+				<Option output="bin/Release GCC C++23/momo" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release GCC C++23/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-O3" />
 					<Add option="-pedantic" />
-					<Add option="-std=c++20" />
+					<Add option="-std=c++23" />
 					<Add option="-Wextra" />
 					<Add option="-Wall" />
 					<Add option="-Wold-style-cast" />
@@ -44,34 +44,34 @@
 					<Add option="-s" />
 				</Linker>
 			</Target>
-			<Target title="Debug Clang C++20">
-				<Option output="bin/Debug Clang C++20/momo" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug Clang C++20/" />
+			<Target title="Debug Clang C++23">
+				<Option output="bin/Debug Clang C++23/momo" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug Clang C++23/" />
 				<Option type="1" />
 				<Option compiler="clang" />
 				<Compiler>
 					<Add option="-pedantic" />
 					<Add option="-Wall" />
 					<Add option="-Wextra" />
-					<Add option="-std=c++20" />
+					<Add option="-std=c++23" />
 					<Add option="-g" />
 					<Add option="-Wold-style-cast" />
 					<Add option="-Wsign-conversion" />
 					<Add option="-Wno-unused-local-typedefs" />
 					<Add option="-msse2" />
 				</Compiler>
 			</Target>
-			<Target title="Release Clang C++20">
-				<Option output="bin/Release Clang C++20/momo" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release Clang C++20/" />
+			<Target title="Release Clang C++23">
+				<Option output="bin/Release Clang C++23/momo" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release Clang C++23/" />
 				<Option type="1" />
 				<Option compiler="clang" />
 				<Compiler>
 					<Add option="-O3" />
 					<Add option="-pedantic" />
 					<Add option="-Wall" />
 					<Add option="-Wextra" />
-					<Add option="-std=c++20" />
+					<Add option="-std=c++23" />
 					<Add option="-Wold-style-cast" />
 					<Add option="-Wsign-conversion" />
 					<Add option="-Wno-unused-local-typedefs" />