Changeset 92538ab for src/AST/TranslationUnit.hpp

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• src/AST/TranslationUnit.hpp (modified) (2 diffs)

src/AST/TranslationUnit.hpp

@@ -10 +10 @@
 // Created On       : Tue Jun 11 15:30:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jun 11 15:42:00 2019
-// Update Count     : 0
+// Last Modified On : Tue Mar 11 11:19:00 2022
+// Update Count     : 1
 //
 
@@ -23 +23 @@
 namespace ast {
 
+class TranslationGlobal {
+public:
+        std::map< UniqueId, Decl * > idMap;
+
+        ptr<Type> sizeType;
+        const FunctionDecl * dereference;
+        const StructDecl * dtorStruct;
+        const FunctionDecl * dtorDestroy;
+};
+
 class TranslationUnit {
 public:
         std::list< ptr< Decl > > decls;
-
-        struct Global {
-                std::map< UniqueId, Decl * > idMap;
-
-                ptr<Type> sizeType;
-                const FunctionDecl * dereference;
-                const StructDecl * dtorStruct;
-                const FunctionDecl * dtorDestroy;
-        } global;
+        TranslationGlobal global;
 };