Changeset bede27b for src/libcfa/concurrency/invoke.c

Timestamp:

Feb 9, 2018, 4:39:52 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

298ed08

Parents:

381fdee (diff), a722c7a (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:

fix conflicts

File:

• src/libcfa/concurrency/invoke.c (modified) (3 diffs)

src/libcfa/concurrency/invoke.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  9 14:41:56 2018
-// Update Count     : 3
+// Last Modified On : Fri Feb  9 16:37:42 2018
+// Update Count     : 5
 //
 
@@ -51 +51 @@
         //Final suspend, should never return
         __leave_coroutine();
-        abortf("Resumed dead coroutine");
+        __cabi_abort( "Resumed dead coroutine" );
 }
 
@@ -81 +81 @@
         //Final suspend, should never return
         __leave_thread_monitor( thrd );
-        abortf("Resumed dead thread");
+        __cabi_abort( "Resumed dead thread" );
 }