[Bf-blender-cvs] [728fd9a78c] blender-v2.78c-release: Cycles: Fix compilation warning with CUDA on OSX

[Sergey Sharybin]

Commit: 728fd9a78cb19a7d4357bfd06ff63bbfa2cd6511
Author: Sergey Sharybin
Date:   Fri Feb 24 14:33:10 2017 +0100
Branches: blender-v2.78c-release
https://developer.blender.org/rB728fd9a78cb19a7d4357bfd06ff63bbfa2cd6511

Cycles: Fix compilation warning with CUDA on OSX

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

M	intern/cycles/util/util_static_assert.h

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

diff --git a/intern/cycles/util/util_static_assert.h b/intern/cycles/util/util_static_assert.h
index 033d85e8ec..e90049254d 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,