From fe6c08ea10a5b233f6dc6e4157c455f1aff75c91 Mon Sep 17 00:00:00 2001 From: Tim R Date: Sun, 31 Mar 2019 17:47:11 -0700 Subject: [PATCH] Update setup.hpp --- glm/detail/setup.hpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 555c401a..5f2e7185 100644 --- 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