From 351155b9e1145270c629b204a32ac97a65196335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Viksand?= Date: Tue, 10 Apr 2018 11:14:22 +0200 Subject: [PATCH] Do not define GLM_CONSTEXPR_CXX14 on MSVC < 2017 --- glm/detail/setup.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index d6e7ba1a..74759165 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -754,7 +754,11 @@ #endif #if GLM_LANG >= GLM_LANG_CXX14 -# define GLM_CONSTEXPR_CXX14 GLM_CONSTEXPR +# if ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER <= GLM_COMPILER_VC14)) // Visual C++ < 2017 does not support extended const expressions https://msdn.microsoft.com/en-us/library/hh567368.aspx https://github.com/g-truc/glm/issues/749 +# define GLM_CONSTEXPR_CXX14 +# else +# define GLM_CONSTEXPR_CXX14 GLM_CONSTEXPR +# endif # define GLM_CONSTEXPR_CTOR_CXX14 GLM_CONSTEXPR_CTOR #else # define GLM_CONSTEXPR_CXX14