From 4304876284533abab643dc80191542e053253861 Mon Sep 17 00:00:00 2001 From: HedgehogInTheCPP Date: Fri, 21 Aug 2026 22:23:59 +0300 Subject: [PATCH] Improvements detection of features, part 11. --- .github/workflows/vs17-arm-ci.yml | 2 +- .github/workflows/vs17-ci.yml | 2 +- .github/workflows/vs17-clang-ci.yml | 2 +- .github/workflows/vs17-cxx20.yml | 2 +- .github/workflows/vs18-arm-ci.yml | 2 +- .github/workflows/vs18-ci.yml | 2 +- .github/workflows/vs18-clang-ci.yml | 2 +- .github/workflows/vs18-cxx23.yml | 2 +- include/fast_float/constexpr_feature_detect.h | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/vs17-arm-ci.yml b/.github/workflows/vs17-arm-ci.yml index 3d0c9d8..6b4bf39 100644 --- a/.github/workflows/vs17-arm-ci.yml +++ b/.github/workflows/vs17-arm-ci.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: ci: name: vs17/${{matrix.arch}}/${{matrix.cfg}} - runs-on: windows-latest + runs-on: windows-2022 strategy: fail-fast: false matrix: diff --git a/.github/workflows/vs17-ci.yml b/.github/workflows/vs17-ci.yml index 8f45372..23ae2d8 100644 --- a/.github/workflows/vs17-ci.yml +++ b/.github/workflows/vs17-ci.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: ci: name: vs17/${{matrix.arch}}/${{matrix.cfg}} - runs-on: windows-latest + runs-on: windows-2022 strategy: fail-fast: false matrix: diff --git a/.github/workflows/vs17-clang-ci.yml b/.github/workflows/vs17-clang-ci.yml index f769dd2..85338de 100644 --- a/.github/workflows/vs17-clang-ci.yml +++ b/.github/workflows/vs17-clang-ci.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: ci: name: vs17/${{matrix.arch}}/${{matrix.cfg}} - runs-on: windows-latest + runs-on: windows-2022 strategy: fail-fast: false matrix: diff --git a/.github/workflows/vs17-cxx20.yml b/.github/workflows/vs17-cxx20.yml index 2a064af..3fce65a 100644 --- a/.github/workflows/vs17-cxx20.yml +++ b/.github/workflows/vs17-cxx20.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: ci: name: vs17/${{matrix.arch}}/${{matrix.cfg}} - runs-on: windows-latest + runs-on: windows-2022 strategy: fail-fast: false matrix: diff --git a/.github/workflows/vs18-arm-ci.yml b/.github/workflows/vs18-arm-ci.yml index 43168ca..c7c4ec1 100644 --- a/.github/workflows/vs18-arm-ci.yml +++ b/.github/workflows/vs18-arm-ci.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: ci: name: vs18/${{matrix.arch}}/${{matrix.cfg}} - runs-on: windows-latest + runs-on: windows-2025 strategy: fail-fast: false matrix: diff --git a/.github/workflows/vs18-ci.yml b/.github/workflows/vs18-ci.yml index 0b7603a..6c21344 100644 --- a/.github/workflows/vs18-ci.yml +++ b/.github/workflows/vs18-ci.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: ci: name: vs18/${{matrix.arch}}/${{matrix.cfg}} - runs-on: windows-latest + runs-on: windows-2025 strategy: fail-fast: false matrix: diff --git a/.github/workflows/vs18-clang-ci.yml b/.github/workflows/vs18-clang-ci.yml index b5c104b..0128081 100644 --- a/.github/workflows/vs18-clang-ci.yml +++ b/.github/workflows/vs18-clang-ci.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: ci: name: vs18/${{matrix.arch}}/${{matrix.cfg}} - runs-on: windows-latest + runs-on: windows-2025 strategy: fail-fast: false matrix: diff --git a/.github/workflows/vs18-cxx23.yml b/.github/workflows/vs18-cxx23.yml index e15d9bb..4a66ccc 100644 --- a/.github/workflows/vs18-cxx23.yml +++ b/.github/workflows/vs18-cxx23.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: ci: name: vs18/${{matrix.arch}}/${{matrix.cfg}} - runs-on: windows-latest + runs-on: windows-2025 strategy: fail-fast: false matrix: diff --git a/include/fast_float/constexpr_feature_detect.h b/include/fast_float/constexpr_feature_detect.h index b3398eb..269f1af 100644 --- a/include/fast_float/constexpr_feature_detect.h +++ b/include/fast_float/constexpr_feature_detect.h @@ -24,7 +24,7 @@ #elif __cplusplus >= 201402L #define FASTFLOAT_HAS_VARIABLE_TEMPLATES 1 #elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918L && \ - _MSVC_LANG >= 201402L + defined(_MSC_VER) && _MSVC_LANG >= 201402L #define FASTFLOAT_HAS_VARIABLE_TEMPLATES 1 #else #define FASTFLOAT_HAS_VARIABLE_TEMPLATES 0 @@ -55,7 +55,7 @@ #endif // Before C++17, constexpr variables may need an out-of-class definition. -#if __cplusplus >= 201703L || _MSVC_LANG >= 201703L +#if __cplusplus >= 201703L || (defined(_MSC_VER) && _MSVC_LANG >= 201703L) #define FASTFLOAT_DETAIL_MUST_DEFINE_CONSTEXPR_VARIABLE 0 #else #define FASTFLOAT_DETAIL_MUST_DEFINE_CONSTEXPR_VARIABLE 1