diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-03 17:08:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-03 17:08:51 +0400 |
| commit | ea95a78b0bf69b2e8a90a60d01342de47c4b2d12 (patch) | |
| tree | 30f4f958db8b43ba408924e0131548f9efbd45c7 | |
| parent | 66a40779271b55498216cc14b4df3ca8d575137c (diff) | |
skip BLI_STATIC_ASSERT for Coverity builds (caused parse error)
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 4d80080ed86..63235ad9c82 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -388,8 +388,11 @@ # define BLI_assert(a) (void)0 #endif -/* 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 */ +/* C++ can't use _Static_assert, expects static_assert() but c++0x only, + * Coverity also errors out. */ +#if (!defined(__cplusplus)) && \ + (!defined(__COVERITY__)) && \ + (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406)) /* gcc4.6+ only */ # define BLI_STATIC_ASSERT(a, msg) _Static_assert(a, msg); #else /* TODO msvc, clang */ |