Fix T49286: Compilation error with XCode 7.0
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 8 Sep 2016 07:27:51 +0000 (09:27 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 14 Sep 2016 08:26:19 +0000 (10:26 +0200)
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

index 1b94570..033d85e 100644 (file)
@@ -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> {};