From 49b326b44adabac72e62970e1b0ae443ac9619ec Mon Sep 17 00:00:00 2001 From: Christophe Juniet Date: Thu, 27 Nov 2014 18:04:15 +0100 Subject: [PATCH] Fix MSVC intrinsics detection MSVC and Clang support BitScanFoward and BitScanReverse only on Windows. --- glm/detail/func_integer.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl index 45e2033a..4345e8fa 100644 --- a/glm/detail/func_integer.inl +++ b/glm/detail/func_integer.inl @@ -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 struct compute_findLSB { @@ -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 GLM_FUNC_QUALIFIER int compute_findMSB_32(genIUType Value) {