actually MSVC doesn't set __cpp_constexpr

mosra · Oct 22, 2022 · beef203 · beef203
1 parent f75ad17
commit beef203
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Magnum/Math/Math.h b/src/Magnum/Math/Math.h
@@ -117,7 +117,8 @@ namespace Implementation {
 }}
 
 // TODO remove this once corrade#152 gets merged
-#if __cpp_constexpr >= 201304
+#if defined __cpp_constexpr && __cpp_constexpr >= 201304 || \
+    defined CORRADE_TARGET_MSVC && _MSC_VER >= 1910 && CORRADE_CXX_STANDARD >= 201402L
 #define MAGNUM_CONSTEXPR14 constexpr
 #else
 #define MAGNUM_CONSTEXPR14