Changeset 2a301ff for tests/concurrency/waituntil/all_types.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/all_types.cfa (modified) (1 diff)

tests/concurrency/waituntil/all_types.cfa

@@ -96 +96 @@
             Churner c;
             for( long long int j = 0; j < numtimes; j++ ) {
-                when( j % 2 == 0 ) waituntil( j >> A ) { total += j; }
+                when( j % 2 == 0 ) waituntil( A << j ) { total += j; }
                 or when( j % 4 < 2 ) waituntil( B ) { produce_b_val( total ); }
-                and when( j % 8 < 4 ) waituntil( j >> C ) { total += j; }
+                and when( j % 8 < 4 ) waituntil( C << j ) { total += j; }
                 and waituntil( timeout( 1`ns ) ) {}
                 if ( j == numtimes / 2 )