Changeset 52be2664

Timestamp:

Mar 9, 2023, 11:56:58 AM (14 months ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

2ceb2bf, c74372f

Parents:

7044535 (diff), 0f275f7 (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/actor.hfa (modified) (1 diff)

libcfa/src/concurrency/actor.hfa

@@ -681 +681 @@
 // assigned at creation to __base_msg_finished to avoid unused message warning
 message __base_msg_finished @= { .allocation_ : Finished };
-struct __DeleteMsg { inline message; } DeleteMsg = __base_msg_finished;
-struct __DestroyMsg { inline message; } DestroyMsg = __base_msg_finished;
-struct __FinishedMsg { inline message; } FinishedMsg = __base_msg_finished;
-void ?{}( __DeleteMsg & this, Allocation status ) { ((message &) this){ status }; }
-void ?{}( __DestroyMsg & this, Allocation status ) { ((message &) this){ status }; }
-void ?{}( __FinishedMsg & this, Allocation status ) { ((message &) this){ status }; }
+struct __DeleteMsg { inline message; };
+struct __DestroyMsg { inline message; };
+struct __FinishedMsg { inline message; };
+
+// These are needed so that the compiler doesn't make a temporary when initializing below
+static inline void ?{}( __DeleteMsg & this, message & other ) { this.allocation_ = other.allocation_; }
+static inline void ?{}( __DestroyMsg & this, message & other ) { this.allocation_ = other.allocation_; }
+static inline void ?{}( __FinishedMsg & this, message & other ) { this.allocation_ = other.allocation_; }
+
+__DeleteMsg DeleteMsg = __base_msg_finished;
+__DestroyMsg DestroyMsg = __base_msg_finished;
+__FinishedMsg FinishedMsg = __base_msg_finished;
 
 Allocation receive( actor & this, __DeleteMsg & msg ) { return Delete; }