Changeset ae267366 for src/Parser/TypeData.h

Timestamp:

Feb 24, 2023, 3:31:50 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

2e77837

Parents:

f883ef1 (diff), f2a1cd2 (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/Parser/TypeData.h (modified) (2 diffs)

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 10 22:18:49 2022
-// Update Count     : 203
+// Last Modified On : Fri Feb 24 14:25:02 2023
+// Update Count     : 205
 //
 
@@ -37 +37 @@
                 bool body;
                 bool anon;
-
                 bool tagged;
                 const std::string * parent = nullptr;
         };
 
-        struct AggInst_t {
+        struct AggInst_t {                                                                      // handles SUE
                 TypeData * aggregate = nullptr;
                 ExpressionNode * params = nullptr;