Commit: 1e29286c8c98aedcb01ef66378ca10c49f354e50 Author: Sergey Sharybin Date: Fri Feb 24 14:33:10 2017 +0100 Branches: master https://developer.blender.org/rB1e29286c8c98aedcb01ef66378ca10c49f354e50
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, _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs