Ignore:
Timestamp:
Aug 23, 2016, 10:30:02 AM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
f39096c
Parents:
837a17c (diff), bd9f8be (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

Conflicts:

src/SynTree/Expression.cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/InitTweak/FixInit.cc

    r837a17c rdadc1b5  
    284284                        UntypedExpr * untyped = new UntypedExpr( new NameExpr( fname ) );
    285285                        untyped->get_args().push_back( new AddressExpr( new VariableExpr( var ) ) );
    286                         if (cpArg) untyped->get_args().push_back( cpArg );
     286                        if (cpArg) untyped->get_args().push_back( cpArg->clone() );
    287287
    288288                        // resolve copy constructor
Note: See TracChangeset for help on using the changeset viewer.