Changeset 0720e049 for src/include/cassert

Timestamp:

Aug 11, 2017, 10:33:37 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

54cd58b0

Parents:

3d4b23fa (diff), 59a75cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/include/cassert (moved) (moved from src/include/assert.h ) (2 diffs)

src/include/cassert

@@ -10 +10 @@
 // Created On       : Thu Aug 18 13:19:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 13:25:55 2016
-// Update Count     : 4
+// Last Modified On : Tue Aug  1 11:56:01 2017
+// Update Count     : 16
 //
 
@@ -18 +18 @@
 // IWYU pragma: private, include <cassert>
 
-#include_next <assert.h>
+#include_next <cassert>
 
-#define __STRINGIFY__(str) #str
-#define __VSTRINGIFY__(str) __STRINGIFY__(str)
-#define assertf(expr, fmt, ...) ((expr) ? static_cast<void>(0) : __assert_fail_f(__VSTRINGIFY__(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, ## __VA_ARGS__ ))
+#ifdef NDEBUG
 
-void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) __attribute__((noreturn));
+#define assertf(expr, fmt, ...) (__ASSERT_VOID_ASSERT (0))
+
+#else
+
+#define assertf(expr, fmt, ...) ((expr) \
+        ? (__ASSERT_VOID_CAST (0)) \
+        : __assert_fail_f( #expr, __FILE__, __LINE__, \
+        __ASSERT_FUNCTION, fmt, ## __VA_ARGS__ ))
+
+void __assert_fail_f(   const char *assertion, const char *file, 
+                                                unsigned int line, const char *function, 
+                                                const char *fmt, ... 
+        ) __attribute__((noreturn, format(printf, 5, 6)));
+
+#endif
 
 template<typename T, typename U>
-static inline T safe_dynamic_cast(const U& src) {
+static inline T safe_dynamic_cast( const U & src ) {
         T ret = dynamic_cast<T>(src);
         assert(ret);