Changeset c08c3cf for tests/exceptions/virtual-poly.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/exceptions/virtual-poly.cfa (modified) (2 diffs)

tests/exceptions/virtual-poly.cfa

@@ -16 +16 @@
 };
 
-forall(otype T)
+forall(T)
 struct mono_child_vtable {
         mono_base_vtable const * const parent;
 };
 
-forall(otype T)
+forall(T)
 struct mono_child {
         mono_child_vtable(T) const * virtual_table;
@@ -37 +37 @@
 }
 
-forall(otype U)
+forall(U)
 struct poly_base_vtable {
         poly_base_vtable(U) const * const parent;
 };
 
-forall(otype U)
+forall(U)
 struct poly_base {
         poly_base_vtable(U) const * virtual_table;
 };
 
-forall(otype V)
+forall(V)
 struct poly_child_vtable {
         poly_base_vtable(V) const * const parent;
 };
 
-forall(otype V)
+forall(V)
 struct poly_child {
         poly_child_vtable(V) const * virtual_table;