Ignore:
Timestamp:
Apr 26, 2021, 6:54:39 PM (7 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
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:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/thread.cfa

    r24711a3 r8840228  
    8080
    8181forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
    82     | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
     82    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
    8383void ?{}( thread_dtor_guard_t & this,
    8484                T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
     
    159159//-----------------------------------------------------------------------------
    160160forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
    161     | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
     161    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
    162162T & join( T & this ) {
    163163        thread_dtor_guard_t guard = { this, defaultResumptionHandler };
Note: See TracChangeset for help on using the changeset viewer.