diff --git a/extras/rapidfuzz_amalgamated.hpp b/extras/rapidfuzz_amalgamated.hpp index fc142bbe..c744cfb7 100644 --- a/extras/rapidfuzz_amalgamated.hpp +++ b/extras/rapidfuzz_amalgamated.hpp @@ -447,7 +447,9 @@ struct ShiftedBitMatrix { # define RAPIDFUZZ_IF_CONSTEXPR if #endif -#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) || __cplusplus >= 201402L) +#if defined(_MSC_VER) && !defined(__clang__) && _MSC_VER < 1910 +# define RAPIDFUZZ_CONSTEXPR_CXX14 inline +#elif ((defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) || __cplusplus >= 201402L) # define RAPIDFUZZ_CONSTEXPR_CXX14 constexpr #else # define RAPIDFUZZ_CONSTEXPR_CXX14 inline diff --git a/rapidfuzz/details/config.hpp b/rapidfuzz/details/config.hpp index b17c4aac..175d8f6d 100644 --- a/rapidfuzz/details/config.hpp +++ b/rapidfuzz/details/config.hpp @@ -23,7 +23,9 @@ # define RAPIDFUZZ_IF_CONSTEXPR if #endif -#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) || __cplusplus >= 201402L) +#if defined(_MSC_VER) && !defined(__clang__) && _MSC_VER < 1910 +# define RAPIDFUZZ_CONSTEXPR_CXX14 inline +#elif ((defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) || __cplusplus >= 201402L) # define RAPIDFUZZ_CONSTEXPR_CXX14 constexpr #else # define RAPIDFUZZ_CONSTEXPR_CXX14 inline