From bc6891e1fbec0b137ac5795542d728a1ad124c11 Mon Sep 17 00:00:00 2001 From: Mark Gillard Date: Thu, 3 Jun 2021 11:05:20 +0300 Subject: [PATCH] fixed `TOML_CONSTEVAL` still being broken in MSVC :( --- include/toml++/toml_preprocessor.h | 5 ++--- toml.hpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/toml++/toml_preprocessor.h b/include/toml++/toml_preprocessor.h index bc54a58..6c23c36 100644 --- a/include/toml++/toml_preprocessor.h +++ b/include/toml++/toml_preprocessor.h @@ -547,9 +547,8 @@ is no longer necessary. #define TOML_NO_DEFAULT_CASE default: TOML_UNREACHABLE -#if defined(__cpp_consteval) && __cpp_consteval >= 201811 \ - && (!defined(_MSC_FULL_VER) || _MSC_FULL_VER != 192930031) - // https://developercommunity.visualstudio.com/t/Erroneous-C7595-error-with-consteval-in/1404234 +#if defined(__cpp_consteval) && __cpp_consteval >= 201811 && !defined(_MSC_VER) + // https://developercommunity.visualstudio.com/t/Erroneous-C7595-error-with-consteval-in/1404234 #define TOML_CONSTEVAL consteval #else #define TOML_CONSTEVAL constexpr diff --git a/toml.hpp b/toml.hpp index efb450a..9126930 100644 --- a/toml.hpp +++ b/toml.hpp @@ -558,9 +558,8 @@ is no longer necessary. #define TOML_NO_DEFAULT_CASE default: TOML_UNREACHABLE -#if defined(__cpp_consteval) && __cpp_consteval >= 201811 \ - && (!defined(_MSC_FULL_VER) || _MSC_FULL_VER != 192930031) - // https://developercommunity.visualstudio.com/t/Erroneous-C7595-error-with-consteval-in/1404234 +#if defined(__cpp_consteval) && __cpp_consteval >= 201811 && !defined(_MSC_VER) + // https://developercommunity.visualstudio.com/t/Erroneous-C7595-error-with-consteval-in/1404234 #define TOML_CONSTEVAL consteval #else #define TOML_CONSTEVAL constexpr