Fixed language detection on GCC when the C++0x mode isn't enabled #95

ago%!(EXTRA string=12 years) · 4688f896f9
parent 119b36c4f2
commit 4688f896f9
2 changed files with 7 additions and 2 deletions
--- a/glm/core/setup.hpp
+++ b/glm/core/setup.hpp
@ -434,8 +434,12 @@
 #else
 #	if(__cplusplus >= 201103L)
 #		define GLM_LANG GLM_LANG_CXX11
-#	elif(((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) 
-#		define GLM_LANG GLM_LANG_CXX0X
+#	elif((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC)
+#		if defined(__GXX_EXPERIMENTAL_CXX0X__)
+#			define GLM_LANG GLM_LANG_CXX0X
+#		else
+#			define GLM_LANG GLM_LANG_CXX98
+#		endif
 #	elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && defined(_MSC_EXTENSIONS))
 #		define GLM_LANG GLM_LANG_CXXMS
 #	elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && !defined(_MSC_EXTENSIONS))
--- a/readme.txt
+++ b/readme.txt
@ -40,6 +40,7 @@ http://glm.g-truc.net/glm.pdf
 GLM 0.9.4.5: 2013-06-XX
 --------------------------------------------------------------------------------
 - Fixed inclusion of intrinsics in "pure" mode #92 
+- Fixed language detection on GCC when the C++0x mode isn't enabled #95

 ================================================================================
 GLM 0.9.4.4: 2013-05-29