diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-23 12:48:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-23 12:48:54 +0300 |
| commit | 08fbc303e17e2a783808ade71e709b621b53743f (patch) | |
| tree | 3840ae75b790d5a28e957152cf09b1de7749695f /intern/cycles/util | |
| parent | 4be7fb7651418240347b78dd5874a3bb6f84d73c (diff) | |
Cycles: Resolve compilation error of avx2 kernel with certain compilers
It was redefined macro happening with Clang 3.6 here.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_simd.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h index 7c15199d4e1..a1c35b7174d 100644 --- a/intern/cycles/util/util_simd.h +++ b/intern/cycles/util/util_simd.h @@ -58,8 +58,12 @@ __forceinline operator int ( ) const { return std::numeric_limits< /* Intrinsics Functions */ #if defined(__BMI__) && defined(__GNUC__) -#define _tzcnt_u32 __tzcnt_u32 -#define _tzcnt_u64 __tzcnt_u64 +# ifndef _tzcnt_u32 +# define _tzcnt_u32 __tzcnt_u32 +# endif +# ifndef _tzcnt_u64 +# define _tzcnt_u64 __tzcnt_u64 +# endif #endif #if defined(__LZCNT__) |