Ignore:
Timestamp:
Jan 16, 2019, 3:56:30 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer
Children:
528ccc8
Parents:
c802eb88 (diff), c47ca77 (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' into jenkins-sandbox

File:
1 edited

Legend:

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

    rc802eb88 rc3e1c9e  
    8383
    8484void ^?{}(coroutine_desc& this) {
    85       if(this.state != Halted) {
     85      if(this.state != Halted && this.state != Start) {
    8686            coroutine_desc * src = TL_GET( this_coroutine );
    8787            coroutine_desc * dst = &this;
Note: See TracChangeset for help on using the changeset viewer.