Changeset 2a301ff for libcfa/src/exception.h

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• libcfa/src/exception.h (modified) (1 diff)

libcfa/src/exception.h

@@ -50 +50 @@
 void __cfaehm_rethrow_terminate() __attribute__((noreturn));
 void __cfaehm_throw_resume(exception_t * except, void (*)(exception_t *));
+
+// Used in non-local ehm (see coroutine.cfa)
+void __cfaehm_allocate_exception( exception_t * except );
+void __cfaehm_begin_unwind(void(*defaultHandler)(exception_t *));
+
 
 // Function catches termination exceptions.