Ignore:
Timestamp:
Apr 28, 2021, 1:06:13 PM (18 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
b7fd2db6
Parents:
e9c0b4c (diff), c7015e6b (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

    re9c0b4c radaee12  
    8282
    8383forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
    84     | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
     84    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
    8585void ?{}( thread_dtor_guard_t & this,
    8686                T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
     
    161161//-----------------------------------------------------------------------------
    162162forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
    163     | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
     163    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
    164164T & join( T & this ) {
    165165        thread_dtor_guard_t guard = { this, defaultResumptionHandler };
Note: See TracChangeset for help on using the changeset viewer.