diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-24 16:33:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-24 16:33:10 +0300 |
| commit | 1e29286c8c98aedcb01ef66378ca10c49f354e50 (patch) | |
| tree | e184175dd4bc0c2d63cbd6039165967c886d6611 | |
| parent | f49e28bae71b7efa08df0fe6900595046fa31814 (diff) | |
Cycles: Fix compilation warning with CUDA on OSX
| -rw-r--r-- | intern/cycles/util/util_static_assert.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/util/util_static_assert.h b/intern/cycles/util/util_static_assert.h index 033d85e8ec6..e90049254de 100644 --- a/intern/cycles/util/util_static_assert.h +++ b/intern/cycles/util/util_static_assert.h @@ -43,7 +43,9 @@ template <> class StaticAssertFailure<true> {}; # endif /* __COUNTER__ */ # endif /* C++11 or MSVC2015 */ #else /* __KERNEL_GPU__ */ -# define static_assert(statement, message) +# ifndef static_assert +# define static_assert(statement, message) +# endif #endif /* __KERNEL_GPU__ */ /* TODO(sergey): For until C++11 is a bare minimum for us, |