Changeset bf7b9da7


Ignore:
Timestamp:
Aug 25, 2017, 4:57:00 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
212c421e
Parents:
6b224a5
Message:

fixed broken merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/concurrency/monitor

    r6b224a5 rbf7b9da7  
    4545}
    4646
    47 void ?{}( monitor_guard_t & this, monitor_desc ** m, int count );
     47void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() );
    4848void ^?{}( monitor_guard_t & this );
    4949
Note: See TracChangeset for help on using the changeset viewer.