Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

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
Christophe 6 years ago
parent
867a40acf5 598a3dc7b7
commit
513af73cc4
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      glm/detail/setup.hpp

+ 1 - 1
glm/detail/setup.hpp
View File 

@@ -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)