summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-12-21 23:32:11 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-12-21 23:32:11 +0000
commit1b0aed9312dca7ffd27522864b9101ca816112b1 (patch)
tree618fd96db96d4d837a086926a1e25ed86a576ebf /include
parent4a6e1033ec6cb5648593424fa9e19689668f15a8 (diff)
Added __cxa_increment_exception_refcount, __cxa_decrement_exception_refcount, __cxa_current_primary_exception, __cxa_rethrow_primary_exception
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@147106 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r--include/cxxabi.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/include/cxxabi.h b/include/cxxabi.h
index 933ff21..6d04555 100644
--- a/include/cxxabi.h
+++ b/include/cxxabi.h
@@ -155,24 +155,6 @@ extern char* __cxa_demangle(const char* mangled_name,
size_t* length,
int* status);
- } // extern "C"
-} // namespace __cxxabiv1
-namespace abi = __cxxabiv1;
-
-
-
-
-
-// Below are Apple extensions to support implementing C++ ABI in a seperate dylib
-namespace __cxxabiapple {
- extern "C" {
-
-// Apple additions to support multiple STL stacks that share common
-// terminate, unexpected, and new handlers
-extern void (*__cxa_terminate_handler)();
-extern void (*__cxa_unexpected_handler)();
-extern void (*__cxa_new_handler)();
-
// Apple additions to support C++ 0x exception_ptr class
// These are primitives to wrap a smart pointer around an exception object
extern void * __cxa_current_primary_exception() throw();
@@ -185,6 +167,7 @@ extern bool __cxa_uncaught_exception() throw();
} // extern "C"
} // namespace __cxxabiv1
+namespace abi = __cxxabiv1;
#endif // __cplusplus