Changeset 23a08aa0 for src/Virtual

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, stuck-waitfor-destruct

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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 merge conflict

File:

• src/Virtual/ExpandCasts.cc (modified) (2 diffs)

src/Virtual/ExpandCasts.cc

@@ -317 +317 @@
 };
 
-struct ExpandCastsCore {
+struct ExpandCastsCore final {
         void previsit( ast::FunctionDecl const * decl );
         void previsit( ast::StructDecl const * decl );
@@ -362 +362 @@
 }
 
+/// Copy newType, but give the copy the params of the oldType.
 ast::StructInstType * polyCopy(
                 ast::StructInstType const * oldType,