From facbeb4f27155ffe1e282eac859c38385dbe0cef Mon Sep 17 00:00:00 2001 From: MikePopoloski Date: Sat, 23 Sep 2023 03:49:47 -0400 Subject: [PATCH] Make gcc 11 the minimum required version --- .github/workflows/build.yml | 4 ++-- CMakePresets.json | 4 ++-- docs/building.dox | 2 +- source/ast/ASTSerializer.cpp | 3 --- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ba1b433f..afa8eff92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: os: ubuntu-22.04 - preset: gcc-release os: ubuntu-22.04 - - preset: gcc-10-release + - preset: gcc-11-release os: ubuntu-22.04 - preset: gcc-debug-shared os: ubuntu-22.04 @@ -43,7 +43,7 @@ jobs: sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-get install -y g++-13 g++-10 clang-17 clang-tidy-17 + sudo apt-get install -y g++-13 g++-11 clang-17 clang-tidy-17 - uses: ilammy/msvc-dev-cmd@v1 if: matrix.os == 'windows-latest' - uses: maxim-lobanov/setup-xcode@v1 diff --git a/CMakePresets.json b/CMakePresets.json index acbc60cfb..4404b2cf2 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -192,7 +192,7 @@ } }, { - "name": "gcc-10-release", + "name": "gcc-11-release", "displayName": "GCC Release", "inherits": [ "linux-base", @@ -200,7 +200,7 @@ ], "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", - "CMAKE_CXX_COMPILER": "g++-10" + "CMAKE_CXX_COMPILER": "g++-11" } }, { diff --git a/docs/building.dox b/docs/building.dox index 4e7f2df01..7c5bfa60f 100644 --- a/docs/building.dox +++ b/docs/building.dox @@ -17,7 +17,7 @@ slang requires the following tools in order to build: - [python 3](https://www.python.org/) - [CMake](https://cmake.org/) (3.20 or later) - C++20 compatible compiler. Minimum supported compiler versions: - - GCC 10 + - GCC 11 - clang 16 - Xcode 15 - MSVC support is tested only against the most recent update of VS 2022 diff --git a/source/ast/ASTSerializer.cpp b/source/ast/ASTSerializer.cpp index aeb6743ec..7b89448a0 100644 --- a/source/ast/ASTSerializer.cpp +++ b/source/ast/ASTSerializer.cpp @@ -171,9 +171,6 @@ void ASTSerializer::writeProperty(std::string_view name) { template void ASTSerializer::visit(const T& elem, bool inMembersArray) { - // TODO: remove once we no longer support gcc-10 - (void)inMembersArray; - if constexpr (std::is_base_of_v) { writer.startObject(); write("kind", toString(elem.kind));