Changeset 8d66610 for libcfa/src/concurrency/locks.hfa

Timestamp:

May 21, 2021, 4:48:10 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f1bce515

Parents:

5407cdc (diff), 7404cdc (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:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/locks.hfa (modified) (2 diffs)

libcfa/src/concurrency/locks.hfa

@@ -290 +290 @@
         bool wait( condition_variable(L) & this, Duration duration );
         bool wait( condition_variable(L) & this, uintptr_t info, Duration duration );
-        bool wait( condition_variable(L) & this, Time time );
-        bool wait( condition_variable(L) & this, uintptr_t info, Time time );
 
         void wait( condition_variable(L) & this, L & l );
@@ -297 +295 @@
         bool wait( condition_variable(L) & this, L & l, Duration duration );
         bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration );
-        bool wait( condition_variable(L) & this, L & l, Time time );
-        bool wait( condition_variable(L) & this, L & l, uintptr_t info, Time time );
-}
+}