From bc76648f8eb6a26c33c7f0683f4c6e35b9db9779 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 10 Dec 2014 09:48:00 +0100 Subject: [PATCH] VC2015 still doesn't fully support C++11 --- glm/detail/setup.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 7f0f8d85..9c18cf3c 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -392,8 +392,8 @@ # ifdef _MSC_EXTENSIONS # if __cplusplus >= 201402L # define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_CXXMS_FLAG) -# elif GLM_COMPILER >= GLM_COMPILER_VC2015 -# define GLM_LANG (GLM_LANG_CXX1Y | GLM_LANG_CXXMS_FLAG) +//# elif GLM_COMPILER >= GLM_COMPILER_VC2015 +//# define GLM_LANG (GLM_LANG_CXX1Y | GLM_LANG_CXXMS_FLAG) # elif __cplusplus >= 201103L # define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_CXXMS_FLAG) # elif GLM_COMPILER >= GLM_COMPILER_VC2010 @@ -406,8 +406,8 @@ # else # if __cplusplus >= 201402L # define GLM_LANG GLM_LANG_CXX14 -# elif GLM_COMPILER >= GLM_COMPILER_VC2015 -# define GLM_LANG GLM_LANG_CXX1Y +//# elif GLM_COMPILER >= GLM_COMPILER_VC2015 +//# define GLM_LANG GLM_LANG_CXX1Y # elif __cplusplus >= 201103L # define GLM_LANG GLM_LANG_CXX11 # elif GLM_COMPILER >= GLM_COMPILER_VC2010