Changeset 777ed2b for src/InitTweak

Timestamp:

Jul 11, 2018, 11:55:59 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

0fc52b6

Parents:

fc20514 (diff), 7de22b28 (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:

fix conflicts

File:

• src/InitTweak/FixInit.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -1163 +1163 @@
 
                         std::string fname = getFunctionName( appExpr );
-                        if ( fname == function->get_name() ) {
+                        if ( fname == function->name ) {
                                 // call to same kind of function
-                                Expression * firstParam = appExpr->get_args().front();
+                                Expression * firstParam = appExpr->args.front();
 
                                 if ( isThisExpression( firstParam, thisParam ) ) {
@@ -1174 +1174 @@
                                         // if first parameter is a member expression on the this parameter,
                                         // then remove the member from unhandled set.
-                                        if ( isThisExpression( memberExpr->get_aggregate(), thisParam ) ) {
-                                                unhandled.erase( memberExpr->get_member() );
+                                        if ( isThisExpression( memberExpr->aggregate, thisParam ) ) {
+                                                unhandled.erase( memberExpr->member );
                                         }
                                 }