Changeset 981bdc6 for src/libcfa/concurrency/threads

Timestamp:

Jan 12, 2017, 2:05:49 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

f3b0a07

Parents:

2298a7b8 (diff), 3fe34ae (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:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/concurrency/threads (modified) (4 diffs)

src/libcfa/concurrency/threads

@@ -14 +14 @@
 // Update Count     : 0
 //
-
-#ifdef __CFORALL__
 
 #ifndef THREADS_H
@@ -75 +73 @@
       coroutine* src = this_coroutine();                // optimization
 
-        assertf( src->last != 0, 
+        assertf( src->last != 0,
                 "Attempt to suspend coroutine %.256s (%p) that has never been resumed.\n"
                 "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
                 src->name, src );
-        assertf( src->last->notHalted, 
+        assertf( src->last->notHalted,
                 "Attempt by coroutine %.256s (%p) to suspend back to terminated coroutine %.256s (%p).\n"
                 "Possible cause is terminated coroutine's main routine has already returned.",
@@ -100 +98 @@
       // not resuming self ?
         if ( src != dst ) {
-                assertf( dst->notHalted , 
+                assertf( dst->notHalted ,
                         "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
                         "Possible cause is terminated coroutine's main routine has already returned.",
@@ -115 +113 @@
 #endif //THREADS_H
 
-#else
-#include_next <thread>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //