Changeset 3d5701e for tests/concurrent/examples/boundedBufferTHREAD.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

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/examples/boundedBufferTHREAD.cfa (modified) (2 diffs)

tests/concurrent/examples/boundedBufferTHREAD.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 11:50:12 2019
-// Update Count     : 24
+// Last Modified On : Thu Jan 16 23:09:43 2020
+// Update Count     : 25
 //
 
@@ -44 +44 @@
         void main( Buffer & buffer ) with( buffer ) {
                 for () {
-                        waitfor( ^?{}, buffer ) {
+                        waitfor( ^?{} : buffer ) {
                                 break;
-                        } or when ( count != 20 ) waitfor( insert, buffer ) {
+                        } or when ( count != 20 ) waitfor( insert : buffer ) {
                                 back = (back + 1) % 20;
                                 count += 1;
-                        } or when ( count != 0 ) waitfor( remove, buffer ) {
+                        } or when ( count != 0 ) waitfor( remove : buffer ) {
                                 front = (front + 1) % 20;
                                 count -= 1;