Merge pull request #921 from inviwo/feature/gcc6-standard-version

Fix for g++6 where -std=c++1z sets __cplusplus to 201500 instead of 201402 #921
g-truc · Jul 9, 2019 · 513af73 · 513af73
2 parents 867a40a + 598a3dc
commit 513af73
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)