From 2e5e845bb96267f4ede8f76acce1aafacb3bfa70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Thu, 2 Nov 2023 08:54:14 +0100 Subject: [PATCH] Add C++23 to the workflow. (#1713) --- .github/workflows/ci-macos.yml | 2 +- .github/workflows/ci-ubuntu.yml | 2 +- .github/workflows/ci-windows.yml | 2 +- snippets/macros.hpp | 4 +++- vulkan/vulkan.hpp | 2 +- vulkan/vulkan_hpp_macros.hpp | 4 +++- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 9b5a802..26017c1 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -15,7 +15,7 @@ jobs: compiler: - {cxx: "g++-11", c: "clang"} - {cxx: "clang++", c: "clang"} - cxx_standard: [11, 14, 17, 20] + cxx_standard: [11, 14, 17, 20, 23] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index 228bd89..ff7bb7e 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -18,7 +18,7 @@ jobs: - {cxx: "g++-11", c: "gcc-11"} - {cxx: "clang++-13", c: "clang-13"} - {cxx: "clang++-14", c: "clang-14"} - cxx_standard: [11, 14, 17, 20] + cxx_standard: [11, 14, 17, 20, 23] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index e31ab78..d11c49e 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -14,7 +14,7 @@ jobs: os: [windows-latest, windows-2019] architecture: [x86, x64] build_type: [Debug, Release] - cxx_standard: [11, 14, 17, 20] + cxx_standard: [11, 14, 17, 20, 23] steps: - uses: actions/checkout@v4 with: diff --git a/snippets/macros.hpp b/snippets/macros.hpp index 45851bd..9f10f56 100644 --- a/snippets/macros.hpp +++ b/snippets/macros.hpp @@ -4,7 +4,9 @@ # define VULKAN_HPP_CPLUSPLUS __cplusplus #endif -#if 201703L < VULKAN_HPP_CPLUSPLUS +#if 202002L < VULKAN_HPP_CPLUSPLUS +# define VULKAN_HPP_CPP_VERSION 23 +#elif 201703L < VULKAN_HPP_CPLUSPLUS # define VULKAN_HPP_CPP_VERSION 20 #elif 201402L < VULKAN_HPP_CPLUSPLUS # define VULKAN_HPP_CPP_VERSION 17 diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 1df34c4..8573b08 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -15973,7 +15973,7 @@ namespace VULKAN_HPP_NAMESPACE # elif defined( __APPLE__ ) m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); # elif defined( _WIN32 ) - m_library = ::LoadLibraryA( "vulkan-1.dll" ); + m_library = ::LoadLibraryA( "vulkan-1.dll" ); # else # error unsupported platform # endif diff --git a/vulkan/vulkan_hpp_macros.hpp b/vulkan/vulkan_hpp_macros.hpp index 18554a5..583ecfe 100644 --- a/vulkan/vulkan_hpp_macros.hpp +++ b/vulkan/vulkan_hpp_macros.hpp @@ -14,7 +14,9 @@ # define VULKAN_HPP_CPLUSPLUS __cplusplus #endif -#if 201703L < VULKAN_HPP_CPLUSPLUS +#if 202002L < VULKAN_HPP_CPLUSPLUS +# define VULKAN_HPP_CPP_VERSION 23 +#elif 201703L < VULKAN_HPP_CPLUSPLUS # define VULKAN_HPP_CPP_VERSION 20 #elif 201402L < VULKAN_HPP_CPLUSPLUS # define VULKAN_HPP_CPP_VERSION 17