Changeset 38093ae for src/ControlStruct/ExceptDecl.cpp

Timestamp:

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

src/ControlStruct/ExceptDecl.cpp

@@ -99 +99 @@
                 createExceptionInstType( exceptionName, params ) ) );
         type->returns.push_back( new ast::PointerType(
-                new ast::BasicType( ast::BasicType::Char, ast::CV::Const ) ) );
+                new ast::BasicType( ast::BasicKind::Char, ast::CV::Const ) ) );
         return type;
 }
@@ -344 +344 @@
                                 "",
                                 new ast::PointerType(
-                                        new ast::BasicType( ast::BasicType::Char, ast::CV::Const ) )
+                                        new ast::BasicType( ast::BasicKind::Char, ast::CV::Const ) )
                         ),
                 },