Changeset 3d5701e for tests/concurrent/waitfor/recurse.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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/concurrent/waitfor/recurse.cfa (modified) (3 diffs)

tests/concurrent/waitfor/recurse.cfa

@@ -66 +66 @@
 
         rand_yield();
-        waitfor( call4, this );
+        waitfor( call4 : this );
         rand_yield();
 
@@ -78 +78 @@
 
         rand_yield();
-        waitfor( call3, this );
+        waitfor( call3 : this );
         rand_yield();
 
@@ -92 +92 @@
 
         rand_yield();
-        waitfor( call2, this );
+        waitfor( call2 : this );
         rand_yield();