Changeset 579263a for src/libcfa/libhdr/libdebug.h

Timestamp:

Jun 26, 2017, 4:48:35 PM (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:

bb1cd95

Parents:

e4d829b (diff), 2a7b3ca (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' into designations

Conflicts:

src/InitTweak/FixInit.cc
src/SymTab/Autogen.h
src/SynTree/Initializer.cc
src/SynTree/Initializer.h
src/Tuples/TupleExpansion.cc

File:

• src/libcfa/libhdr/libdebug.h (modified) (1 diff)

src/libcfa/libhdr/libdebug.h

@@ -18 +18 @@
 
 #ifdef __CFA_DEBUG__
-      #define LIB_DEBUG_DO(x) x
-      #define LIB_NO_DEBUG_DO(x) ((void)0)
+        #define LIB_DEBUG_DO(x) x
+        #define LIB_NO_DEBUG_DO(x) ((void)0)
 #else
-      #define LIB_DEBUG_DO(x) ((void)0)
-      #define LIB_NO_DEBUG_DO(x) x      
+        #define LIB_DEBUG_DO(x) ((void)0)
+        #define LIB_NO_DEBUG_DO(x) x      
 #endif
+
+#if !defined(NDEBUG) && (defined(__CFA_DEBUG__) || defined(__CFA_VERIFY__))
+        #define verify(x) assert(x)
+        #define verifyf(x, ...) assertf(x, __VA_ARGS__)
+#else
+        #define verify(x)
+        #define verifyf(x, ...)
+#endif
+
 
 #ifdef __cforall