Changeset 8840228 for libcfa/src/concurrency/thread.cfa

Timestamp:

Apr 26, 2021, 6:54:39 PM (3 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:

ef3ac46

Parents:

24711a3 (diff), 5456537 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/thread.cfa (modified) (2 diffs)

libcfa/src/concurrency/thread.cfa

@@ -80 +80 @@
 
 forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
-    | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
+    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
 void ?{}( thread_dtor_guard_t & this,
                 T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
@@ -159 +159 @@
 //-----------------------------------------------------------------------------
 forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
-    | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
+    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
 T & join( T & this ) {
         thread_dtor_guard_t guard = { this, defaultResumptionHandler };