Changeset 800d275 for src/GenPoly

Timestamp:

Aug 29, 2017, 2:54:49 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

235b41f

Parents:

28e58fd (diff), 6454949 (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/GenPoly/Box.cc (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -756 +756 @@
                                 Type * newType = arg->get_result()->clone();
                                 if ( env ) env->apply( newType );
-                                std::auto_ptr<Type> manager( newType );
+                                std::unique_ptr<Type> manager( newType );
                                 if ( isPolyType( newType ) ) {
                                         // if the argument's type is polymorphic, we don't need to box again!
@@ -774 +774 @@
                                         newObj->get_type()->get_qualifiers() = Type::Qualifiers(); // TODO: is this right???
                                         stmtsToAdd.push_back( new DeclStmt( noLabels, newObj ) );
-                                        UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );
+                                        UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) ); // TODO: why doesn't this just use initialization syntax?
                                         assign->get_args().push_back( new VariableExpr( newObj ) );
                                         assign->get_args().push_back( arg );