Changeset 579263a for src/libcfa/concurrency/alarm.c

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/concurrency/alarm.c (modified) (1 diff)

src/libcfa/concurrency/alarm.c

@@ -104 +104 @@
 
 static inline void remove_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t it ) {
-        assert( it );
-        assert( (*it)->next == n );
+        verify( it );
+        verify( (*it)->next == n );
 
         (*it)->next = n->next;