Changeset e67a82d for src/InitTweak/InitTweak.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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/InitTweak.cc (modified) (2 diffs)

src/InitTweak/InitTweak.cc

@@ -127 +127 @@
         ast::Pass< InitFlattener_new > flattener;
         maybe_accept( init, flattener );
-        return std::move( flattener.pass.argList );
+        return std::move( flattener.core.argList );
 }
 
@@ -561 +561 @@
                 ast::Pass< CallFinder_new > finder{ std::vector< std::string >{ "?{}", "^?{}" } };
                 maybe_accept( stmt, finder );
-                return std::move( finder.pass.matches );
+                return std::move( finder.core.matches );
         }