Changeset bd144fd for src/ResolvExpr/Unify.cc

Timestamp:

Dec 23, 2020, 10:02:57 AM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0536c03, 9bb9545b

Parents:

6797f8f (diff), 2daea42 (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) (3 diffs)

src/ResolvExpr/Unify.cc

@@ -811 +811 @@
                 /// Creates a tuple type based on a list of DeclWithType
                 template< typename Iter >
-                static ast::ptr< ast::Type > tupleFromTypes( Iter crnt, Iter end ) {
+                static const ast::Type * tupleFromTypes( Iter crnt, Iter end ) {
                         std::vector< ast::ptr< ast::Type > > types;
                         while ( crnt != end ) {
@@ -821 +821 @@
                         }
 
-                        return { new ast::TupleType{ std::move(types) } };
+                        return new ast::TupleType{ std::move(types) };
                 }
 
@@ -1034 +1034 @@
         private:
                 /// Creates a tuple type based on a list of Type
-                static ast::ptr< ast::Type > tupleFromTypes(
+                static const ast::Type * tupleFromTypes(
                         const std::vector< ast::ptr< ast::Type > > & tys
                 ) {