Ignore:
Timestamp:
Mar 16, 2021, 11:14:28 AM (7 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
386af65
Parents:
a196885 (diff), 05e29f0 (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/clib/cfathread.cfa

    ra196885 rcc18e17  
    115115        int cfathread_join( cfathread_t thrd, void ** retval ) {
    116116                void * ret = join( *thrd ).ret;
    117                 delete( thrd );
     117                ^( *thrd ){};
     118                free(thrd);
    118119                if(retval) {
    119120                        *retval = ret;
     
    250251        }
    251252
    252         void cfathread_suspendFD(int) {
    253                 abort | "Suspending File Descriptors is not supported";
    254         }
    255 
    256         void cfathread_resumeFD (int) {
    257                 abort | "Resuming File Descriptors is not supported";
    258         }
    259 
    260 }
     253}
Note: See TracChangeset for help on using the changeset viewer.