Changeset c0c940a for libcfa/src/concurrency/kernel

Timestamp:

May 4, 2021, 12:25:36 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

1716e1c, 58c671ba, 78a6b9c

Parents:

692f0c8 (diff), 9fa538c (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 conflicit

File:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel/startup.cfa

@@ -461 +461 @@
         self_mon_p = &self_mon;
         link.next = 0p;
-        link.prev = 0p;
-        link.preferred = -1u;
+        link.ts   = 0;
+        preferred = -1u;
         last_proc = 0p;
         #if defined( __CFA_WITH_VERIFY__ )