From 243bbf4b75c44e212f3daeb266ca230b13b35fc8 Mon Sep 17 00:00:00 2001 From: Artyom Polkovnikov Date: Fri, 14 Nov 2014 18:34:57 +0300 Subject: [PATCH] [3party/glm] C++11 constexpr is not defined for MSVC <= v18.00, disable it for these versions. --- 3party/glm/glm/detail/setup.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/3party/glm/glm/detail/setup.hpp b/3party/glm/glm/detail/setup.hpp index c982c469fe..7f5d810f17 100755 --- a/3party/glm/glm/detail/setup.hpp +++ b/3party/glm/glm/detail/setup.hpp @@ -771,6 +771,12 @@ namespace glm #if GLM_HAS_CONSTEXPR # define GLM_CONSTEXPR constexpr +// TODO(artyom): LowPriority. constexpr doesn't work in MSVC <= 18.00. Maybe some other nice workaround? +# ifdef _MSC_VER +# if _MSC_VER <= 1800 +# define GLM_CONSTEXPR +# endif +# endif #else # define GLM_CONSTEXPR #endif