Changeset 38093ae for src/GenPoly

Timestamp:

Apr 18, 2024, 8:44:24 PM (5 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/GenPoly/Box.cpp (modified) (2 diffs)

src/GenPoly/Box.cpp

@@ -43 +43 @@
 /// The layout type is used to represent sizes, alignments and offsets.
 ast::BasicType * makeLayoutType() {
-        return new ast::BasicType( ast::BasicType::LongUnsignedInt );
+        return new ast::BasicType( ast::BasicKind::LongUnsignedInt );
 }
 
 /// Fixed version of layout type (just adding a 'C' in C++ style).
 ast::BasicType * makeLayoutCType() {
-        return new ast::BasicType( ast::BasicType::LongUnsignedInt,
+        return new ast::BasicType( ast::BasicKind::LongUnsignedInt,
                 ast::CV::Qualifiers( ast::CV::Const ) );
 }
@@ -1617 +1617 @@
 ast::Type * polyToMonoType( CodeLocation const & location,
                 ast::Type const * declType ) {
-        auto charType = new ast::BasicType( ast::BasicType::Char );
+        auto charType = new ast::BasicType( ast::BasicKind::Char );
         auto size = new ast::NameExpr( location,
                 sizeofName( Mangle::mangleType( declType ) ) );