Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlazydodo <github@lazydodo.com>2016-10-02 23:01:23 +0300
committerlazydodo <github@lazydodo.com>2016-10-02 23:01:23 +0300
commit3ee5ce155c4cc3f705038a12484351d21a71441d (patch)
tree9a00bafd7ea859fbf715ad8fbb2f77a3885b4f38
parent3f9b69287d287af09c801a5203be07287128b2a0 (diff)
[Windows/Cycles/Clang] Fix compilation error with clang-cl on windows
-rw-r--r--intern/cycles/util/util_simd.h2
1 files changed, 1 insertions, 1 deletions
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);