Disabled GTX_scalar_multiplication for GCC, failing to build tests #242

glm/detail/setup.hpp

@@ -605,8 +605,8 @@
 #	define GLM_HAS_TEMPLATE_ALIASES 1
 #else
 #	define GLM_HAS_TEMPLATE_ALIASES (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
-		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC47)) || \
 		((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL12_1)) || \
+		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC47)) || \
 		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
 #endif
 

glm/gtx/scalar_multiplication.hpp

@@ -43,8 +43,8 @@
 
 #include "../detail/setup.hpp"
 
-#if !GLM_HAS_TEMPLATE_ALIASES
-#	error "GLM_GTX_scalar_multiplication requires C++11 suppport or alias templates"
+#if !GLM_HAS_TEMPLATE_ALIASES && !(GLM_COMPILER & GLM_COMPILER_GCC)
+#	error "GLM_GTX_scalar_multiplication requires C++11 suppport or alias templates and if not support for GCC"
 #endif
 
 #include "../vec2.hpp"

readme.txt

@@ -72,6 +72,7 @@ Features:
 Improvements:
 - Removed assert for perspective with zFar < zNear #298
 - Added Visual Studio natvis support for vec1, quat and dualqual types
+- Cleaned up C++11 feature detections
 
 Fixes:
 - Fixed faceforward build #289
@@ -81,6 +82,7 @@ Fixes:
 - Fixed warnings in F2x11_1x10 packing function in GTC_packing #295
 - Fixed Visual Studio natvis support for vec4 #288
 - Fixed GTC_packing *pack*norm*x* build and added tests #292
+- Disabled GTX_scalar_multiplication for GCC #242
 
 ================================================================================
 GLM 0.9.6.1: 2014-12-10

test/gtx/gtx_scalar_multiplication.cpp

@@ -31,7 +31,7 @@
 
 #include <glm/glm.hpp>
 
-#if GLM_HAS_TEMPLATE_ALIASES
+#if GLM_HAS_TEMPLATE_ALIASES & !(GLM_COMPILER & GLM_COMPILER_GCC)
 #include <glm/gtx/scalar_multiplication.hpp>
 
 int main()