From 598a3dc7b7df2b410daf64e58a6fb2bd29a58ef6 Mon Sep 17 00:00:00 2001 From: Peter Steneteg Date: Wed, 26 Jun 2019 12:47:40 +0200 Subject: [PATCH] Fix for g++6 where -std=c++1z sets __cplusplus to 201500 instead of 201402 --- glm/detail/setup.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index d59808e7..7107f0c6 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -119,7 +119,7 @@ # define GLM_LANG (GLM_LANG_CXX2A | GLM_LANG_EXT) # elif __cplusplus == 201703L || GLM_LANG_PLATFORM == 201703L # define GLM_LANG (GLM_LANG_CXX17 | GLM_LANG_EXT) -# elif __cplusplus == 201402L || GLM_LANG_PLATFORM == 201402L +# elif __cplusplus == 201402L || __cplusplus == 201500L || GLM_LANG_PLATFORM == 201402L # define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_EXT) # elif __cplusplus == 201103L || GLM_LANG_PLATFORM == 201103L # define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_EXT)