[Bf-blender-cvs] [3ee5ce1] master: [Windows/Cycles/Clang] Fix compilation error with clang-cl on windows

lazydodo noreply at git.blender.org
Sun Oct 2 22:01:34 CEST 2016


Commit: 3ee5ce155c4cc3f705038a12484351d21a71441d
Author: lazydodo
Date:   Sun Oct 2 14:01:23 2016 -0600
Branches: master
https://developer.blender.org/rB3ee5ce155c4cc3f705038a12484351d21a71441d

[Windows/Cycles/Clang] Fix compilation error with clang-cl on windows

===================================================================

M	intern/cycles/util/util_simd.h

===================================================================

diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h
index 36da155..8d4d790 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);




More information about the Bf-blender-cvs mailing list