Ignore:
Timestamp:
Dec 23, 2020, 10:02:57 AM (13 months ago)
Author:
caparsons <caparson@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/Unify.cc

    r6797f8f rbd144fd  
    811811                /// Creates a tuple type based on a list of DeclWithType
    812812                template< typename Iter >
    813                 static ast::ptr< ast::Type > tupleFromTypes( Iter crnt, Iter end ) {
     813                static const ast::Type * tupleFromTypes( Iter crnt, Iter end ) {
    814814                        std::vector< ast::ptr< ast::Type > > types;
    815815                        while ( crnt != end ) {
     
    821821                        }
    822822
    823                         return { new ast::TupleType{ std::move(types) } };
     823                        return new ast::TupleType{ std::move(types) };
    824824                }
    825825
     
    10341034        private:
    10351035                /// Creates a tuple type based on a list of Type
    1036                 static ast::ptr< ast::Type > tupleFromTypes(
     1036                static const ast::Type * tupleFromTypes(
    10371037                        const std::vector< ast::ptr< ast::Type > > & tys
    10381038                ) {
Note: See TracChangeset for help on using the changeset viewer.