Changeset c08c3cf for tests/concurrent/multi-monitor.cfa

Timestamp:

Jan 20, 2021, 8:46:31 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

481cf3a

Parents:

467c8b7 (diff), 9db2c92 (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:

fix conflict

File:

• tests/concurrent/multi-monitor.cfa (modified) (1 diff)

tests/concurrent/multi-monitor.cfa

@@ -38 +38 @@
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T & mutex); })
+forall(T & | sized(T) | { void ^?{}(T & mutex); })
 void delete_mutex(T * x) {
         ^(*x){};