Changeset c08c3cf for tests/bugs/194.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/bugs/194.cfa (modified) (1 diff)

tests/bugs/194.cfa

@@ -2 +2 @@
 // https://cforall.uwaterloo.ca/trac/ticket/194
 
-forall( dtype T | sized(T) ) T * foo( void ) {
+forall( T & | sized(T) ) T * foo( void ) {
       printf( "foo1\n" );
         return (T *)0;
 }
-forall( dtype T | sized(T) ) T & foo( void ) {
+forall( T & | sized(T) ) T & foo( void ) {
         printf( "foo2\n" );
         return (T &)*(T *)0;