Changeset c08c3cf for tests/genericUnion.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/genericUnion.cfa (modified) (3 diffs)

tests/genericUnion.cfa

@@ -16 +16 @@
 #include <limits.hfa>
 
-forall(otype T)
+forall(T)
 union ByteView {
         T val;
@@ -22 +22 @@
 };
 
-forall(otype T)
+forall(T)
 void print(ByteView(T) x) {
         for (int i = 0; i < sizeof(int); i++) {                         // want to change to sizeof(T)
@@ -29 +29 @@
 }
 
-forall(otype T)
+forall(T)
 void f(ByteView(T) x, T val) {
         print(x);