Changes in libcfa/src/concurrency/actor.hfa [e23169b:d40555e]

File:

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

libcfa/src/concurrency/actor.hfa

@@ -442 +442 @@
 
 static inline void check_message( message & this ) {
-    CFA_DEBUG( this.allocation_ = Finished; )
-    switch ( this.allocation_ ) {                                               // analyze message status
+    #ifdef __CFA_DEBUG__
+    Allocation temp = this.allocation_;
+    this.allocation_ = Finished;
+    switch ( temp )
+    #else
+    switch ( this.allocation_ )
+    #endif
+    {                                           // analyze message status
         case Nodelete: break;
         case Delete: delete( &this ); break;
@@ -675 +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; }