Changeset c08c3cf for tests/raii/ctor-autogen.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/raii/ctor-autogen.cfa (modified) (4 diffs)

tests/raii/ctor-autogen.cfa

@@ -33 +33 @@
 
 // dtype-static generic type is otype
-forall(dtype T)
+forall(T &)
 struct DtypeStaticStruct {
   T * data;
@@ -39 +39 @@
 };
 
-forall(dtype T)
+forall(T &)
 union DtypeStaticUnion {
   T * data;
@@ -46 +46 @@
 
 // dynamic generic type is otype
-forall(otype T)
+forall(T)
 struct DynamicStruct {
         T x;
 };
 
-forall(otype T)
+forall(T)
 union DynamicUnion {
         T x;
@@ -80 +80 @@
 
 
-forall(otype T)
+forall(T)
 T identity(T x) { return x; }