Changeset 38093ae for src/Concurrency/Corun.cpp

Timestamp:

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

src/Concurrency/Corun.cpp

@@ -130 +130 @@
                 new ObjectDecl( loc,
                     numProcsName,
-                    new BasicType( BasicType::Kind::UnsignedInt ),
+                    new BasicType( BasicKind::UnsignedInt ),
                     new SingleInit( loc, 
                         new UntypedExpr( loc,
@@ -146 +146 @@
                 new ObjectDecl( loc,
                     currProcsName,
-                    new BasicType( BasicType::Kind::UnsignedInt ),
+                    new BasicType( BasicKind::UnsignedInt ),
                     new SingleInit( loc, ConstantExpr::from_int( loc, 0 ) )
                 )