Cycles: Fix compilation warning with CUDA on OSX

2017-02-24 14:33:10 +01:00 · 2017-02-24 14:33:10 +01:00 · 728fd9a78c
parent 90d96de0a8
commit 728fd9a78c
1 changed files with 3 additions and 1 deletions
--- 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,