From 4eec569f92ba83505c955e7ab360d9db78fbcde5 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 10 Jan 2015 13:45:41 +0100 Subject: [PATCH] Disabled GTX_scalar_multiplication for GCC, failing to build tests #242 --- glm/detail/setup.hpp | 2 +- glm/gtx/scalar_multiplication.hpp | 4 ++-- readme.txt | 2 ++ test/gtx/gtx_scalar_multiplication.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index be60e051..623a8e05 100644 --- a/glm/detail/setup.hpp +++ b/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 diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp index 0de66f24..5f6c4d9e 100644 --- a/glm/gtx/scalar_multiplication.hpp +++ b/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" diff --git a/readme.txt b/readme.txt index 1b990718..51107f91 100644 --- a/readme.txt +++ b/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 diff --git a/test/gtx/gtx_scalar_multiplication.cpp b/test/gtx/gtx_scalar_multiplication.cpp index 19325653..93ae5546 100644 --- a/test/gtx/gtx_scalar_multiplication.cpp +++ b/test/gtx/gtx_scalar_multiplication.cpp @@ -31,7 +31,7 @@ #include -#if GLM_HAS_TEMPLATE_ALIASES +#if GLM_HAS_TEMPLATE_ALIASES & !(GLM_COMPILER & GLM_COMPILER_GCC) #include int main()