kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T49286: Compilation error with XCode 7.0

Browse Source 
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? :)
This commit is contained in:
Sergey Sharybin 2016-09-08 09:27:51 +02:00
parent 7e7a9d146c
commit 18ae1504ea
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/util/util_static_assert.h
View File

@ -25,6 +25,10 @@ CCL_NAMESPACE_BEGIN
#ifndef __KERNEL_GPU__ #ifndef __KERNEL_GPU__
# if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) # if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
/* C++11 has built-in static_assert() */ /* 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 */ # else /* C++11 or MSVC2015 */
template <bool Test> class StaticAssertFailure; template <bool Test> class StaticAssertFailure;
template <> class StaticAssertFailure<true> {}; template <> class StaticAssertFailure<true> {};