Changeset 6e1e2d0 for src/AST/Init.hpp

Timestamp:

May 1, 2023, 4:19:09 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c083c3d

Parents:

a50fdfb (diff), 985b624 (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:

resolved merge conflicts

File:

• src/AST/Init.hpp (modified) (1 diff)

src/AST/Init.hpp

@@ -117 +117 @@
         ptr<Init> init;
 
-        ConstructorInit( 
+        ConstructorInit(
                 const CodeLocation & loc, const Stmt * ctor, const Stmt * dtor, const Init * init )
         : Init( loc, MaybeConstruct ), ctor( ctor ), dtor( dtor ), init( init ) {}