diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-03 05:24:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-03 05:24:09 +0400 |
| commit | c6642b8ec8c2b12aed3bf9c72d7378bcfd75da77 (patch) | |
| tree | 1ff85c0025cdc0e996f4aa8a06659801d3dd314c /source/blender/blenlib/BLI_utildefines.h | |
| parent | 24437b6171396ead93756db7026688543adcc9fa (diff) | |
enable triangulation with collada, disable BLI_STATIC_ASSERT for C++.
Diffstat (limited to 'source/blender/blenlib/BLI_utildefines.h')
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 95ad786c7c2..bbafd28ddbc 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -399,7 +399,8 @@ typedef bool _BLI_Bool; # define BLI_assert(a) (void)0 #endif -#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406)) /* gcc4.6+ only */ +/* C++ can't use _Static_assert, expects static_assert() but c++0x only */ +#if (!defined(__cplusplus)) && (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406)) /* gcc4.6+ only */ # define BLI_STATIC_ASSERT(a, msg) _Static_assert(a, msg); #else /* TODO msvc, clang */ |