Changeset ae267366 for libcfa/src/concurrency/kernel/cluster.hfa

Timestamp:

Feb 24, 2023, 3:31:50 PM (15 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

2e77837

Parents:

f883ef1 (diff), f2a1cd2 (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:

fix merge conflict

File:

• libcfa/src/concurrency/kernel/cluster.hfa (modified) (1 diff)

libcfa/src/concurrency/kernel/cluster.hfa

@@ -146 +146 @@
 }
 
-static struct {
-        const unsigned readyq;
-        const unsigned io;
+const static struct {
+        unsigned readyq;
+        unsigned io;
 } __shard_factor = { 2, 1 };