Changeset 0720e049 for src/libcfa/stdhdr/assert.h

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/libcfa/stdhdr/assert.h (modified) (2 diffs)

src/libcfa/stdhdr/assert.h

@@ -10 +10 @@
 // Created On       : Mon Jul  4 23:25:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 20:34:23 2016
-// Update Count     : 8
+// Last Modified On : Mon Jul 31 23:09:32 2017
+// Update Count     : 13
 // 
 
@@ -18 +18 @@
 #endif //__CFORALL__
 
-// has internal check for multiple expansion
 #include_next <assert.h>
+
+#ifdef NDEBUG
+        #define assertf( expr, fmt, ... ) ((void)0)
+#else
+        #define __STRINGIFY__(str) #str
+        #define __VSTRINGIFY__(str) __STRINGIFY__(str)
+        #define assertf( expr, fmt, ... ) ((expr) ? ((void)0) : __assert_fail_f(__VSTRINGIFY__(expr), __FILE__, __LINE__, __PRETTY_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
 
 #ifdef __CFORALL__