From 9eca6be8549057edae9cb8817433fc3a9856aad8 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 14 Dec 2010 19:49:52 +0000 Subject: [PATCH] Fixed static_assert on GCC --- glm/setup.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/setup.hpp b/glm/setup.hpp index 38aaded3..7e82ac77 100644 --- a/glm/setup.hpp +++ b/glm/setup.hpp @@ -248,7 +248,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Static assert -#if(GLM_COMPILER >= GLM_COMPILER_VC2010 || GLM_COMPILER >= GLM_COMPILER_GCC45) +#if((GLM_COMPILER & GLM_COMPILER_VC && GLM_COMPILER >= GLM_COMPILER_VC2010) || (GLM_COMPILER & GLM_COMPILER_GCC && GLM_COMPILER >= GLM_COMPILER_GCC45)) #define GLM_STATIC_ASSERT(x, message) static_assert(x, message) #elif(defined(BOOST_STATIC_ASSERT)) #define GLM_STATIC_ASSERT(x, message) BOOST_STATIC_ASSERT(x)