From 18ae1504ea1a8d934df5ea383e4367befd854703 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 8 Sep 2016 09:27:51 +0200 Subject: [PATCH] Fix T49286: Compilation error with XCode 7.0 Weirdly enough, this version of XCode seems to have static_assert() even when NOT using C++11. This is totally weird and counter intuitive since static_assert() is supposed to be C++11 onlky feature. Can XCode stop using future, please? :) --- intern/cycles/util/util_static_assert.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/intern/cycles/util/util_static_assert.h b/intern/cycles/util/util_static_assert.h index 1b945705145..033d85e8ec6 100644 --- a/intern/cycles/util/util_static_assert.h +++ b/intern/cycles/util/util_static_assert.h @@ -25,6 +25,10 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_GPU__ # if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) /* C++11 has built-in static_assert() */ +# elif defined(static_assert) +/* Some platforms might have static_assert() defined even tho their + * C++ support wouldn't be declared to be C++11. + */ # else /* C++11 or MSVC2015 */ template class StaticAssertFailure; template <> class StaticAssertFailure {};