Changeset 2a301ff for tests/concurrency/waituntil/channels.cfa

Timestamp:

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

Author:

JiadaL <j82liang@…>

Branches:

master

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/waituntil/channels.cfa (modified) (1 diff)

tests/concurrency/waituntil/channels.cfa

@@ -69 +69 @@
             Churner c;
             for( long long int j = 0; j < numtimes; j++ ) {
-                when( j % 2 == 0 ) waituntil( j >> A ) { total += j; }
-                or when( j % 4 < 2 ) waituntil( j >> B ) { total += j; }
-                and when( j % 8 < 4 ) waituntil( j >> C ) { total += j; }
+                when( j % 2 == 0 ) waituntil( A << j ) { total += j; }
+                or when( j % 4 < 2 ) waituntil( B << j ) { total += j; }
+                and when( j % 8 < 4 ) waituntil( C << j ) { total += j; }
             }
             done = true;