mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed build

Browse Source
This commit is contained in:
Christophe Riccio 2011-10-18 11:02:20 +01:00
parent 8877e038e5
commit 911df15e8a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/core/func_integer.inl
View File

@ -522,7 +522,7 @@ namespace glm
} }
// findMSB // findMSB
#if(GLM_COMPILER & GLM_COMPILER_VC) #if((GLM_ARCH != GLM_ARCH_PURE) && (GLM_COMPILER & GLM_COMPILER_VC))
template <typename genIUType> template <typename genIUType>
GLM_FUNC_QUALIFIER int findMSB GLM_FUNC_QUALIFIER int findMSB
@ -535,7 +535,7 @@ namespace glm
return int(Result); return int(Result);
} }
#elif((GLM_COMPILER & GLM_COMPILER_GCC) && __has_builtin(__builtin_clz)) #elif((GLM_ARCH != GLM_ARCH_PURE) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC40))
template <typename genIUType> template <typename genIUType>
GLM_FUNC_QUALIFIER int findMSB GLM_FUNC_QUALIFIER int findMSB
@ -543,7 +543,7 @@ namespace glm
genIUType const & Value genIUType const & Value
) )
{ {
return __builtin_clz(x); return __builtin_clz(Value);
} }
#else #else

2
test/gtx/gtx_integer.cpp
View File

@ -10,7 +10,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtx/integer.hpp> #include <glm/gtx/integer.hpp>
#include <glm/gtx/epsilon.hpp> #include <glm/gtx/epsilon.hpp>
#include <iostream> #include <cstdio>
int test_floor_log2() int test_floor_log2()
{ {