Changeset 2a301ff for libcfa/src/bits/weakso_locks.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/bits/weakso_locks.hfa (modified) (3 diffs)

libcfa/src/bits/weakso_locks.hfa

@@ -20 +20 @@
 #include "bits/locks.hfa"
 #include "bits/sequence.hfa"
-#include "bits/containers.hfa"
-#include "containers/list.hfa"
+#include "bits/collections.hfa"
+#include "collections/list.hfa"
 
 struct select_node;
@@ -62 +62 @@
 bool register_select( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
 bool unregister_select( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
-void on_selected( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
+bool on_selected( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
+blocking_lock __CFA_select_get_type( blocking_lock this ) OPTIONAL_THREAD;
 
 //----------
@@ -80 +81 @@
 static inline bool   register_select( multiple_acquisition_lock & this, select_node & node ) { return register_select( (blocking_lock &)this, node ); }
 static inline bool   unregister_select( multiple_acquisition_lock & this, select_node & node ) { return unregister_select( (blocking_lock &)this, node ); }
-static inline void   on_selected( multiple_acquisition_lock & this, select_node & node ) { on_selected( (blocking_lock &)this, node ); }
+static inline bool   on_selected( multiple_acquisition_lock & this, select_node & node ) { return on_selected( (blocking_lock &)this, node ); }
+multiple_acquisition_lock __CFA_select_get_type( multiple_acquisition_lock this );