From b0f6910f0c932b64572869f38e2e04ccbf617f3d Mon Sep 17 00:00:00 2001 From: Tim R Date: Sun, 31 Mar 2019 14:14:10 -0700 Subject: [PATCH] Update setup.hpp --- glm/detail/setup.hpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 737fc035..3295d6ec 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -289,15 +289,24 @@ #if GLM_HAS_CONSTEXPR # define GLM_CONSTEXPR constexpr -#if GLM_LANG_CXX17_FLAG -# define GLM_IF_CONSTEXPR constexpr -#else -# define GLM_IF_CONSTEXPR -#endif #else # define GLM_CONSTEXPR #endif +// +#if GLM_HAS_CONSTEXPR +# if (GLM_COMPILER & GLM_COMPILER_CLANG ) +# if __has_feature(cxx_if_constexpr) +# define GLM_IF_CONSTEXPR constexpr +# else +# define GLM_IF_CONSTEXPR +# endif +# elif GLM_LANG_CXX17_FLAG +# define GLM_IF_CONSTEXPR constexpr +# else +# define GLM_IF_CONSTEXPR +#endif + // #if GLM_LANG & GLM_LANG_CXX11_FLAG # define GLM_HAS_ASSIGNABLE 1