Changeset cf0b892 for src/ResolvExpr/Unify.cc

Timestamp:

May 24, 2017, 5:03:06 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, 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:

79b5869

Parents:

e39647e (diff), 447bf833 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/Unify.cc (modified) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -344 +344 @@
                 std::cerr << "unifyInexact type 1 is ";
                 type1->print( std::cerr );
-                std::cerr << "type 2 is ";
+                std::cerr << " type 2 is ";
                 type2->print( std::cerr );
                 std::cerr << std::endl;
@@ -595 +595 @@
                         TypeExpr *otherParam = dynamic_cast< TypeExpr* >(*jt);
                         assertf(otherParam, "Aggregate parameters should be type expressions");
-                        
+
                         Type* paramTy = param->get_type();
                         Type* otherParamTy = otherParam->get_type();