From 3ee5ce155c4cc3f705038a12484351d21a71441d Mon Sep 17 00:00:00 2001 From: lazydodo Date: Sun, 2 Oct 2016 14:01:23 -0600 Subject: [Windows/Cycles/Clang] Fix compilation error with clang-cl on windows --- intern/cycles/util/util_simd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h index 36da1550a94..8d4d79068d6 100644 --- a/intern/cycles/util/util_simd.h +++ b/intern/cycles/util/util_simd.h @@ -71,7 +71,7 @@ __forceinline operator int ( ) const { return std::numeric_limits< #define _lzcnt_u64 __lzcnt64 #endif -#if defined(_WIN32) && !defined(__MINGW32__) +#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__clang__) __forceinline int __popcnt(int in) { return _mm_popcnt_u32(in); -- cgit v1.2.3