Changeset 38093ae for src/Concurrency/Waitfor.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/Concurrency/Waitfor.cpp (modified) (3 diffs)

src/Concurrency/Waitfor.cpp

@@ -244 +244 @@
         ast::ObjectDecl * flag = new ast::ObjectDecl( location,
                 namer_flg.newName(),
-                new ast::BasicType( ast::BasicType::Bool ),
+                new ast::BasicType( ast::BasicKind::Bool ),
                 new ast::SingleInit( location,
                         ast::ConstantExpr::from_ulong( location, 0 )
@@ -349 +349 @@
         ast::ObjectDecl * timeout = new ast::ObjectDecl( topLocation,
                 namer_tim.newName(),
-                new ast::BasicType( ast::BasicType::LongLongUnsignedInt ),
+                new ast::BasicType( ast::BasicKind::LongLongUnsignedInt ),
                 new ast::SingleInit( topLocation,
                         ast::ConstantExpr::from_int( topLocation, -1 )
@@ -397 +397 @@
         ast::ObjectDecl * index = new ast::ObjectDecl( location,
                 namer_idx.newName(),
-                new ast::BasicType( ast::BasicType::ShortSignedInt ),
+                new ast::BasicType( ast::BasicKind::ShortSignedInt ),
                 new ast::SingleInit( location,
                         ast::ConstantExpr::from_int( location, -1 )