Changeset ae267366 for src/Parser/ParseNode.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/ParseNode.h (modified) (3 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Nov  2 21:27:07 2022
-// Update Count     : 939
+// Last Modified On : Sun Feb 19 09:02:37 2023
+// Update Count     : 940
 //
 
@@ -325 +325 @@
         Variable_t variable;
 
-        struct Attr_t {
-//              const std::string * name;
-                ExpressionNode * expr;
-                DeclarationNode * type;
-        };
-        Attr_t attr;
-
         struct StaticAssert_t {
                 ExpressionNode * condition;
@@ -343 +336 @@
 
         bool inLine = false;
-        bool enumInLine = false; 
+        bool enumInLine = false;
         Type::FuncSpecifiers funcSpecs;
         Type::StorageClasses storageClasses;