From 128a0b997e67d0fd37a3dbd3bb579c2ee6093fa4 Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Sat, 11 Feb 2023 21:17:05 +0100 Subject: [PATCH] switch to c++20 --- .vscode/c_cpp_properties.json | 5 ++--- .vscode/settings.json | 2 +- src/Makefile | 2 +- src/Makefile.windows.mk | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 7372a347..65fc43cf 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -5,7 +5,7 @@ "includePath": [ "${workspaceFolder}/src/include" ], - "cppStandard": "c++17", + "cppStandard": "c++20", "configurationProvider": "ms-vscode.makefile-tools" }, { @@ -20,8 +20,7 @@ ], "windowsSdkVersion": "10.0.19041.0", "compilerPath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.30.30705\\bin\\Hostx64\\x64\\cl.exe", - "cStandard": "c17", - "cppStandard": "c++17", + "cppStandard": "c++20", "intelliSenseMode": "windows-msvc-x64" } ], diff --git a/.vscode/settings.json b/.vscode/settings.json index c8ccdbfc..cdec7664 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -90,7 +90,7 @@ "no-pragma-once-outside-header" ], "c-cpp-flylint.clang.standard": [ - "c++17" + "c++20" ], "c-cpp-flylint.flexelint.enable": false } \ No newline at end of file diff --git a/src/Makefile b/src/Makefile index bb900396..4bcadda8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -CXXFLAGS += -Iinclude -Iexternal -O2 -g -Wall -Werror -fmessage-length=0 -std=c++17 +CXXFLAGS += -Iinclude -Iexternal -O2 -g -Wall -Werror -fmessage-length=0 -std=c++20 ifdef LODA_VERSION CXXFLAGS += -DLODA_VERSION=$(LODA_VERSION) diff --git a/src/Makefile.windows.mk b/src/Makefile.windows.mk index 07f14376..49135602 100644 --- a/src/Makefile.windows.mk +++ b/src/Makefile.windows.mk @@ -1,4 +1,4 @@ -CXXFLAGS = /Iinclude /Iexternal /O2 /std:c++17 +CXXFLAGS = /Iinclude /Iexternal /O2 /std:c++20 !IFDEF LODA_VERSION CXXFLAGS = $(CXXFLAGS) /DLODA_VERSION=$(LODA_VERSION)