diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2021-11-06 10:24:35 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2021-11-06 10:33:15 +0100 |
| commit | 1689e28435021f9bd12d92d167113338eb230057 (patch) | |
| tree | d8a8aeba7e12c1f11c299471dc8dd98a4c554dee | |
| parent | 463f0740e1731c15917ffdb3e2f4b3f4c83aa024 (diff) | |
Use C++20.
| -rwxr-xr-x | bootstrap.sh | 4 | ||||
| -rw-r--r-- | ctor.cc | 2 | ||||
| -rw-r--r-- | src/rebuild.cc | 2 | ||||
| -rw-r--r-- | test/ctor.cc | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 06cd903..a5c11ac 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,7 +1,7 @@ #!/bin/sh echo "Bootstrapping..." -g++ -std=c++17 -Wall -O3 -Isrc -pthread src/bootstrap.cc ctor.cc test/ctor.cc -o ctor && \ +g++ -std=c++20 -Wall -O3 -Isrc -pthread src/bootstrap.cc ctor.cc test/ctor.cc -o ctor && \ ./ctor && \ -g++ -std=c++17 -Wall -O3 -Isrc -pthread ctor.cc test/ctor.cc -Lbuild -lctor -o ctor && \ +g++ -std=c++20 -Wall -O3 -Isrc -pthread ctor.cc test/ctor.cc -Lbuild -lctor -o ctor && \ ./ctor configure --ctor-includedir=src --ctor-libdir=build && \ echo "Done. Now run ./ctor to (re)build." @@ -28,7 +28,7 @@ BuildConfigurations ctorConfigs() "src/unittest.cc", }, .cxxflags = { - "-std=c++17", + "-std=c++20", "-O3", "-s", "-Wall", diff --git a/src/rebuild.cc b/src/rebuild.cc index 3492955..af2bd8a 100644 --- a/src/rebuild.cc +++ b/src/rebuild.cc @@ -126,7 +126,7 @@ void recompileCheck(const Settings& global_settings, int argc, char* argv[], BuildConfiguration config; config.name = "ctor"; - config.cxxflags = std::vector<std::string>({ "-s", "-O3", "-std=c++17" }); + config.cxxflags = std::vector<std::string>({ "-s", "-O3", "-std=c++20" }); if(hasConfiguration(cfg::ctor_includedir)) { config.cxxflags.push_back("-I"s + getConfiguration(cfg::ctor_includedir)); diff --git a/test/ctor.cc b/test/ctor.cc index d7cad34..0c3acfd 100644 --- a/test/ctor.cc +++ b/test/ctor.cc @@ -18,7 +18,7 @@ BuildConfigurations ctorTestConfigs() "../src/execute.cc", }, .cxxflags = { - "-std=c++17", "-O3", "-s", "-Wall", "-Werror", + "-std=c++20", "-O3", "-s", "-Wall", "-Werror", "-I../src", "-Iuunit", "-DOUTPUT=\"execute\"", }, @@ -33,7 +33,7 @@ BuildConfigurations ctorTestConfigs() }, .depends = {"libctor.a"}, .cxxflags = { - "-std=c++17", "-O3", "-s", "-Wall", "-Werror", + "-std=c++20", "-O3", "-s", "-Wall", "-Werror", "-I../src", "-Iuunit", "-DOUTPUT=\"tasks\"", }, @@ -48,7 +48,7 @@ BuildConfigurations ctorTestConfigs() }, .depends = {"libctor.a"}, .cxxflags = { - "-std=c++17", "-O3", "-s", "-Wall", "-Werror", + "-std=c++20", "-O3", "-s", "-Wall", "-Werror", "-I../src", "-Iuunit", "-DOUTPUT=\"source_type\"", }, |