From cfac6e1b06504c6cfe035835e64da9333aee4f0d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 29 Nov 2014 19:10:55 +0100 Subject: [PATCH] Fixed _tzcnt_u32 build, only with Windows --- test/core/core_func_integer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp index 739d3347..93646bd1 100644 --- a/test/core/core_func_integer.cpp +++ b/test/core/core_func_integer.cpp @@ -593,7 +593,7 @@ namespace findMSB } # endif//GLM_HAS_BITSCAN_WINDOWS -# if GLM_ARCH & GLM_ARCH_AVX +# if GLM_ARCH & GLM_ARCH_AVX && GLM_COMPILER & GLM_COMPILER_VC template GLM_FUNC_QUALIFIER int findMSB_avx(genIUType Value) { @@ -604,7 +604,7 @@ namespace findMSB return int(_tzcnt_u32(Value)); } -# endif +# endif//GLM_ARCH & GLM_ARCH_AVX && GLM_PLATFORM & GLM_PLATFORM_WINDOWS template GLM_FUNC_QUALIFIER int findMSB_095(genIUType Value) @@ -794,9 +794,9 @@ namespace findMSB # endif//GLM_HAS_BITSCAN_WINDOWS std::printf("findMSB - pop: %d clocks\n", static_cast(Timestamps6 - Timestamps5)); -# if GLM_ARCH & GLM_ARCH_AVX +# if GLM_ARCH & GLM_ARCH_AVX && GLM_COMPILER & GLM_COMPILER_VC std::printf("findMSB - avx tzcnt: %d clocks\n", static_cast(Timestamps7 - Timestamps6)); -# endif +# endif//GLM_ARCH & GLM_ARCH_AVX && GLM_PLATFORM & GLM_PLATFORM_WINDOWS return Error; }