Changeset 28d426a

Timestamp:

Apr 24, 2021, 8:21:54 PM (4 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:

e9c0b4c

Parents:

fb0be05 (diff), c323837 (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/future.hfa (modified) (2 diffs)

libcfa/src/concurrency/future.hfa

@@ -37 +37 @@
 
                 // Fulfil the future, returns whether or not someone was unblocked
-                bool fulfil( future(T) & this, T result ) {
+                $thread * fulfil( future(T) & this, T result ) {
                         this.result = result;
                         return fulfil( (future_t&)this );
@@ -96 +96 @@
                 bool fulfil( multi_future(T) & this, T result ) {
                         this.result = result;
-                        return fulfil( (future_t&)this );
+                        return fulfil( (future_t&)this ) != 0p;
                 }