Ignore:
Timestamp:
Jun 24, 2019, 6:05:10 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
08065aa4
Parents:
64dc36e (diff), 3e2f5e3 (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/coroutine.cfa

    r64dc36e r28564382  
    9898
    9999void ^?{}(coroutine_desc& this) {
    100         if(this.state != Halted && this.state != Start) {
     100        if(this.state != Halted && this.state != Start && this.state != Primed) {
    101101                coroutine_desc * src = TL_GET( this_thread )->curr_cor;
    102102                coroutine_desc * dst = &this;
Note: See TracChangeset for help on using the changeset viewer.