Changeset bf7b9da7

Timestamp:

Aug 25, 2017, 4:57:00 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

212c421e

Parents:

6b224a52

Message:

fixed broken merge

File:

• src/libcfa/concurrency/monitor (modified) (1 diff)

src/libcfa/concurrency/monitor

@@ -45 +45 @@
 }
 
-void ?{}( monitor_guard_t & this, monitor_desc ** m, int count );
+void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() );
 void ^?{}( monitor_guard_t & this );