Changeset e9e4e9ee for src/libcfa/concurrency/threads

Timestamp:

Jan 19, 2017, 11:04:27 AM (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:

2175062

Parents:

5ebb2fbc (diff), 68e6031 (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) (2 diffs)

src/libcfa/concurrency/threads

@@ -28 +28 @@
 // Anything that is resumed is a coroutine.
 trait is_thread(dtype T /*| sized(T)*/) {
-      void co_main(T* this);
+      void main(T* this);
       thread_h* get_thread(T* this);
         /*void ?{}(T*);
@@ -37 +37 @@
 static inline coroutine* get_coroutine(T* this) {
         return &get_thread(this)->c;
+}
+
+static inline coroutine* get_coroutine(thread_h* this) {
+        return &this->c;
 }