Ignore:
Timestamp:
Oct 7, 2020, 5:10:45 PM (5 years ago)
Author:
Fangren Yu <f37yu@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
490fb92e, 69c5c00
Parents:
2fb35df (diff), 848439f (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 into master

Location:
libcfa/src/concurrency/clib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/clib/cfathread.cfa

    r2fb35df r41b8ea4  
    3434extern "C" {
    3535        //--------------------
    36         // Basic thread managenemt
     36        // Basic thread management
    3737        CRunner * cfathread_create( void (*main)( CRunner * ) ) {
    3838                return new( main );
     
    4444
    4545        void cfathread_park( void ) {
    46                 park( __cfaabi_dbg_ctx );
     46                park();
    4747        }
    4848
    4949        void cfathread_unpark( CRunner * thrd ) {
    50                 unpark( *thrd __cfaabi_dbg_ctx2 );
     50                unpark( *thrd );
    5151        }
    5252
  • libcfa/src/concurrency/clib/cfathread.h

    r2fb35df r41b8ea4  
    1717#include "invoke.h"
    1818
    19 #if defined(__cforall) || defined(__cpluplus)
     19#if defined(__cforall) || defined(__cplusplus)
    2020extern "C" {
    2121#endif
     
    3939
    4040
    41 #if defined(__cforall) || defined(__cpluplus)
     41#if defined(__cforall) || defined(__cplusplus)
    4242}
    4343#endif
Note: See TracChangeset for help on using the changeset viewer.