Changeset 1f44196 for src/ResolvExpr/TypeEnvironment.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/ResolvExpr/TypeEnvironment.cc (modified) (1 diff)

src/ResolvExpr/TypeEnvironment.cc

@@ -158 +158 @@
         }
 
-        void TypeEnvironment::add( const std::list< TypeDecl* > &tyDecls ) {
-                for ( std::list< TypeDecl* >::const_iterator i = tyDecls.begin(); i != tyDecls.end(); ++i ) {
+        void TypeEnvironment::add( const Type::ForallList &tyDecls ) {
+                for ( Type::ForallList::const_iterator i = tyDecls.begin(); i != tyDecls.end(); ++i ) {
                         EqvClass newClass;
                         newClass.vars.insert( (*i)->get_name() );