Changeset 2a301ff for tests/concurrency/actors/inherit.cfa

Timestamp:

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

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

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:

• tests/concurrency/actors/inherit.cfa (modified) (1 diff)

tests/concurrency/actors/inherit.cfa

@@ -13 +13 @@
 struct D_msg { int a; inline message; };
 void ?{}( D_msg & this ) { set_allocation( this, Delete ); }
-void ^?{}( D_msg & this ) { mutex(sout) sout | 'A'; }
+void ^?{}( D_msg & ) { mutex(sout) sout | 'A'; }
 
 struct D_msg2 { inline D_msg; };