Changeset 2a301ff for src/Validate/NoIdSymbolTable.hpp

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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/Validate/NoIdSymbolTable.hpp (modified) (1 diff)

src/Validate/NoIdSymbolTable.hpp

@@ -46 +46 @@
         FORWARD_1( addUnion , const ast::UnionDecl *     )
         FORWARD_1( addTrait , const ast::TraitDecl *     )
-        FORWARD_1( addStruct, const std::string &        )
-        FORWARD_1( addUnion , const std::string &        )
         FORWARD_2( addWith  , const std::vector< ast::ptr<ast::Expr> > &, const ast::Decl * )
+        FORWARD_1( addStructId, const std::string & )
+        FORWARD_1( addUnionId , const std::string & )
 
         FORWARD_1( globalLookupType, const std::string & )