[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58857] trunk/blender/source/blender/ blenlib/BLI_utildefines.h: skip BLI_STATIC_ASSERT for Coverity builds ( caused parse error)

[Campbell Barton]

Revision: 58857
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58857
Author:   campbellbarton
Date:     2013-08-03 13:08:51 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
skip BLI_STATIC_ASSERT for Coverity builds (caused parse error)

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_utildefines.h

Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h      2013-08-03 
12:49:08 UTC (rev 58856)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h      2013-08-03 
13:08:51 UTC (rev 58857)
@@ -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 */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs