Utility: more strict CONSTEXPR14 macro

Should fix compile errors with partial implementations of C++14 such as GCC 4.8.
mosra · Oct 22, 2022 · 5723da7 · 5723da7
1 parent 23e1135
commit 5723da7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Corrade/Utility/Macros.h b/src/Corrade/Utility/Macros.h
@@ -394,7 +394,8 @@ Expands to @cpp constexpr @ce on C++14 and newer, empty on C++11. Useful for
 selectively marking functions that make use of C++14 relaxed constexpr rules.
 @see @ref CORRADE_CXX_STANDARD
 */
-#if CORRADE_CXX_STANDARD >= 201402
+#if defined __cpp_constexpr && __cpp_constexpr >= 201304 || \
+    defined CORRADE_TARGET_MSVC && _MSC_VER >= 1910 && CORRADE_CXX_STANDARD >= 201402L
 #define CORRADE_CONSTEXPR14 constexpr
 #else
 #define CORRADE_CONSTEXPR14