Changeset 2a301ff for libcfa/src/concurrency/future.hfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

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

libcfa/src/concurrency/future.hfa

@@ -39 +39 @@
         futex_mutex lock;
         };
+    __CFA_SELECT_GET_TYPE( future(T) );
 
     struct future_node {
@@ -180 +181 @@
         }
                 
-        void on_selected( future(T) & this, select_node & node ) {}
+        bool on_selected( future(T) & this, select_node & node ) { return true; }
         }
 }