Changeset c08c3cf for tests/zombies/Rank2.c

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/zombies/Rank2.c (modified) (2 diffs)

tests/zombies/Rank2.c

@@ -1 +1 @@
 int ?=?( int &, int );
-forall(dtype DT) DT * ?=?( DT *&, DT * );
+forall(DT &) DT * ?=?( DT *&, DT * );
 
 void a() {
-        forall( otype T ) void f( T );
-        void g( forall( otype U ) void p( U ) );
+        forall( T ) void f( T );
+        void g( forall( U ) void p( U ) );
         g( f );
 }
@@ -10 +10 @@
 void g() {
         void h( int *null );
-        forall( otype T ) T id( T );
+        forall( T ) T id( T );
 //      forall( dtype T ) T *0;
 //      int 0;