mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #279 from cjuniet/master

Browse Source 
Fix MSVC intrinsics detection #279 #278
This commit is contained in:
Christophe Riccio 2014-11-29 02:19:59 +01:00
commit 1a2a121acb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/detail/func_integer.inl
View File

@ -104,7 +104,7 @@ namespace detail
} }
}; };
# if(GLM_ARCH != GLM_ARCH_PURE) && (GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) # if(GLM_ARCH != GLM_ARCH_PURE) && ((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_LLVM) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
template <typename genIUType> template <typename genIUType>
struct compute_findLSB<genIUType, 32> struct compute_findLSB<genIUType, 32>
{ {
@ -162,7 +162,7 @@ namespace detail
} }
}; };
# if(GLM_ARCH != GLM_ARCH_PURE) && (GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) # if(GLM_ARCH != GLM_ARCH_PURE) && ((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_LLVM) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
template <typename genIUType> template <typename genIUType>
GLM_FUNC_QUALIFIER int compute_findMSB_32(genIUType Value) GLM_FUNC_QUALIFIER int compute_findMSB_32(genIUType Value)
{ {