Changeset e2f601f for libcfa/src/concurrency/alarm.hfa

Timestamp:

May 13, 2021, 3:49:30 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:

aff7e86, c457dc41

Parents:

8cd5434 (diff), 69914cbc (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/alarm.hfa (modified) (3 diffs)

libcfa/src/concurrency/alarm.hfa

@@ -49 +49 @@
         Duration period;                        // if > 0 => period of alarm
 
-        DLISTED_MGD_IMPL_IN(alarm_node_t)
+        inline dlink(alarm_node_t);
 
         union {
@@ -60 +60 @@
         enum alarm_type type;           // true if this is not a user defined alarm
 };
-DLISTED_MGD_IMPL_OUT(alarm_node_t)
+P9_EMBEDDED( alarm_node_t, dlink(alarm_node_t) )
 
 void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period );
@@ -67 +67 @@
 void ^?{}( alarm_node_t & this );
 
-typedef dlist(alarm_node_t, alarm_node_t) alarm_list_t;
+typedef dlist(alarm_node_t) alarm_list_t;
 
 void insert( alarm_list_t * this, alarm_node_t * n );