Changeset 1f44196 for src/GenPoly/FindFunction.cc

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/GenPoly/FindFunction.cc (modified) (2 diffs)

src/GenPoly/FindFunction.cc

@@ -29 +29 @@
                 virtual Type *mutate( PointerType *pointerType );
           private:
-                void handleForall( const std::list< TypeDecl* > &forall );
+                void handleForall( const Type::ForallList &forall );
 
                 std::list< FunctionType* > &functions;
@@ -51 +51 @@
         }
 
-        void FindFunction::handleForall( const std::list< TypeDecl* > &forall ) {
-                for ( std::list< TypeDecl* >::const_iterator i = forall.begin(); i != forall.end(); ++i ) {
+        void FindFunction::handleForall( const Type::ForallList &forall ) {
+                for ( Type::ForallList::const_iterator i = forall.begin(); i != forall.end(); ++i ) {
                         TyVarMap::iterator var = tyVars.find( (*i)->get_name() );
                         if ( var != tyVars.end() ) {