Update setup.hpp

zqingxi · Apr 1, 2019 · fe6c08e · fe6c08e
1 parent a03e1fc
commit fe6c08e
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
@@ -296,17 +296,19 @@
 //
 #if GLM_HAS_CONSTEXPR
 # if (GLM_COMPILER & GLM_COMPILER_CLANG )
-#  if __has_feature(cxx_if_constexpr)
-# 	define GLM_IF_CONSTEXPR if constexpr
-#  else
-# 	define GLM_IF_CONSTEXPR if
-#  endif
+#	define GLM_HAS_IF_CONSTEXPR __has_feature(cxx_if_constexpr)
 # elif GLM_LANG_CXX17_FLAG
-# 	define GLM_IF_CONSTEXPR if constexpr
+# 	define GLM_HAS_IF_CONSTEXPR 1
 # else
-# 	define GLM_IF_CONSTEXPR if
+# 	define GLM_HAS_IF_CONSTEXPR 0
 # endif
 #else
+#	define GLM_HAS_IF_CONSTEXPR 0
+#endif
+
+#if GLM_HAS_IF_CONSTEXPR
+# 	define GLM_IF_CONSTEXPR if constexpr
+#else
 #	define GLM_IF_CONSTEXPR if
 #endif