diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-08 10:27:51 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-08 10:27:51 +0300 |
| commit | 18ae1504ea1a8d934df5ea383e4367befd854703 (patch) | |
| tree | e179b904e0983e444f889a9c3849bdfb5fdf970b | |
| parent | 7e7a9d146ca631f3e71d35bb71add041570eab23 (diff) | |
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? :)
| -rw-r--r-- | intern/cycles/util/util_static_assert.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 <bool Test> class StaticAssertFailure; template <> class StaticAssertFailure<true> {}; |