diff options
Diffstat (limited to 'libcxx/src/exception.cpp')
-rw-r--r-- | libcxx/src/exception.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index 42d0721c5ac..b0efda648e5 100644 --- a/libcxx/src/exception.cpp +++ b/libcxx/src/exception.cpp @@ -24,13 +24,13 @@ #endif // __APPLE__ std::unexpected_handler -std::set_unexpected(std::unexpected_handler func) throw() +std::set_unexpected(std::unexpected_handler func) _NOEXCEPT { return __sync_lock_test_and_set(&__unexpected_handler, func); } std::unexpected_handler -std::get_unexpected() throw() +std::get_unexpected() _NOEXCEPT { return __sync_fetch_and_add(&__unexpected_handler, (std::unexpected_handler)0); } @@ -45,13 +45,13 @@ std::unexpected() } std::terminate_handler -std::set_terminate(std::terminate_handler func) throw() +std::set_terminate(std::terminate_handler func) _NOEXCEPT { return __sync_lock_test_and_set(&__terminate_handler, func); } std::terminate_handler -std::get_terminate() throw() +std::get_terminate() _NOEXCEPT { return __sync_fetch_and_add(&__terminate_handler, (std::terminate_handler)0); } @@ -76,7 +76,7 @@ std::terminate() _NOEXCEPT #endif // _LIBCPP_NO_EXCEPTIONS } -bool std::uncaught_exception() throw() +bool std::uncaught_exception() _NOEXCEPT { #if __APPLE__ // on Darwin, there is a helper function so __cxa_get_globals is private @@ -93,25 +93,25 @@ bool std::uncaught_exception() throw() namespace std { -exception::~exception() throw() +exception::~exception() _NOEXCEPT { } -bad_exception::~bad_exception() throw() +bad_exception::~bad_exception() _NOEXCEPT { } -const char* exception::what() const throw() +const char* exception::what() const _NOEXCEPT { return "std::exception"; } -const char* bad_exception::what() const throw() +const char* bad_exception::what() const _NOEXCEPT { return "std::bad_exception"; } -exception_ptr::~exception_ptr() +exception_ptr::~exception_ptr() _NOEXCEPT { #if __APPLE__ __cxxabiapple::__cxa_decrement_exception_refcount(__ptr_); @@ -121,7 +121,7 @@ exception_ptr::~exception_ptr() #endif // __APPLE__ } -exception_ptr::exception_ptr(const exception_ptr& other) +exception_ptr::exception_ptr(const exception_ptr& other) _NOEXCEPT : __ptr_(other.__ptr_) { #if __APPLE__ @@ -132,7 +132,7 @@ exception_ptr::exception_ptr(const exception_ptr& other) #endif // __APPLE__ } -exception_ptr& exception_ptr::operator=(const exception_ptr& other) +exception_ptr& exception_ptr::operator=(const exception_ptr& other) _NOEXCEPT { #if __APPLE__ if (__ptr_ != other.__ptr_) @@ -148,12 +148,12 @@ exception_ptr& exception_ptr::operator=(const exception_ptr& other) #endif // __APPLE__ } -nested_exception::nested_exception() +nested_exception::nested_exception() _NOEXCEPT : __ptr_(current_exception()) { } -nested_exception::~nested_exception() +nested_exception::~nested_exception() _NOEXCEPT { } @@ -168,7 +168,7 @@ nested_exception::rethrow_nested() const } // std -std::exception_ptr std::current_exception() +std::exception_ptr std::current_exception() _NOEXCEPT { #if __APPLE__ // be nicer if there was a constructor that took a ptr, then |