diff options
Diffstat (limited to 'src/cxa_handlers.cpp')
| -rw-r--r-- | src/cxa_handlers.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/cxa_handlers.cpp b/src/cxa_handlers.cpp index 97f1347..3150c0a 100644 --- a/src/cxa_handlers.cpp +++ b/src/cxa_handlers.cpp @@ -17,18 +17,15 @@ #include "cxxabi.h" #include "cxa_handlers.hpp" #include "cxa_exception.hpp" -#include "cxa_default_handlers.hpp" #include "private_typeinfo.h" -std::new_handler __cxa_new_handler = 0; - namespace std { unexpected_handler get_unexpected() _NOEXCEPT { - return __cxxabiapple::__cxa_unexpected_handler; + return __cxa_unexpected_handler; } __attribute__((visibility("hidden"), noreturn)) @@ -50,7 +47,7 @@ unexpected() terminate_handler get_terminate() _NOEXCEPT { - return __cxxabiapple::__cxa_terminate_handler; + return __cxa_terminate_handler; } __attribute__((visibility("hidden"), noreturn)) @@ -98,16 +95,18 @@ terminate() _NOEXCEPT __terminate(get_terminate()); } +new_handler __cxa_new_handler = 0; + new_handler set_new_handler(new_handler handler) _NOEXCEPT { - return __sync_swap(&__cxxabiapple::__cxa_new_handler, handler); + return __sync_swap(&__cxa_new_handler, handler); } new_handler get_new_handler() _NOEXCEPT { - return __cxxabiapple::__cxa_new_handler; + return __cxa_new_handler; } } // std |