Changeset 38093ae for src/SymTab/ManglerCommon.cc

Timestamp:

Apr 18, 2024, 8:44:24 PM (7 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

19313be5, cf191ac

Parents:

748c751 (diff), 7a780ad (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/SymTab/ManglerCommon.cc (modified) (2 diffs)

src/SymTab/ManglerCommon.cc

@@ -41 +41 @@
 //   - "Di" char32_t
 //   - "Ds" char16_t
-const std::string basicTypes[ast::BasicType::NUMBER_OF_BASIC_TYPES] = {
+const std::string basicTypes[ast::BasicKind::NUMBER_OF_BASIC_TYPES] = {
         "b",        // _Bool
         "c",        // char
@@ -81 +81 @@
 // GENERATED END
 static_assert(
-        sizeof(basicTypes) / sizeof(basicTypes[0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES,
+        sizeof(basicTypes) / sizeof(basicTypes[0]) == ast::BasicKind::NUMBER_OF_BASIC_TYPES,
         "Each basic type kind should have a corresponding mangler letter"
 );