diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-09-25 20:50:05 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-09-25 20:50:05 -0700 |
| commit | 989ef1a194dfab120b73d434ff7738a9038bcdc6 (patch) | |
| tree | ca50f18874f93c24898e7caad6bea52aeee0a258 /system/include/libcxx/exception | |
| parent | f75ea0e4774fcb0f5dba220185ac70fadce1d51c (diff) | |
header fixes and additions
Diffstat (limited to 'system/include/libcxx/exception')
| -rw-r--r-- | system/include/libcxx/exception | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/system/include/libcxx/exception b/system/include/libcxx/exception index f418575c..5b1db9b6 100644 --- a/system/include/libcxx/exception +++ b/system/include/libcxx/exception @@ -105,19 +105,19 @@ public: typedef void (*unexpected_handler)(); _LIBCPP_VISIBLE unexpected_handler set_unexpected(unexpected_handler) _NOEXCEPT; _LIBCPP_VISIBLE unexpected_handler get_unexpected() _NOEXCEPT; -_ATTRIBUTE(noreturn) _LIBCPP_VISIBLE void unexpected(); +_LIBCPP_VISIBLE void unexpected(); /* XXX Emscripten: remove _ATTRIBUTE(noreturn), here and two places below */ typedef void (*terminate_handler)(); _LIBCPP_VISIBLE terminate_handler set_terminate(terminate_handler) _NOEXCEPT; _LIBCPP_VISIBLE terminate_handler get_terminate() _NOEXCEPT; -_ATTRIBUTE(noreturn) _LIBCPP_VISIBLE void terminate() _NOEXCEPT; +_LIBCPP_VISIBLE void terminate() _NOEXCEPT; _LIBCPP_VISIBLE bool uncaught_exception() _NOEXCEPT; class exception_ptr; exception_ptr current_exception() _NOEXCEPT; -_ATTRIBUTE(noreturn) void rethrow_exception(exception_ptr); +void rethrow_exception(exception_ptr); class _LIBCPP_VISIBLE exception_ptr { @@ -141,7 +141,7 @@ public: {return !(__x == __y);} friend exception_ptr current_exception() _NOEXCEPT; - _ATTRIBUTE(noreturn) friend void rethrow_exception(exception_ptr); + friend void rethrow_exception(exception_ptr); }; template<class _E> @@ -172,7 +172,7 @@ public: virtual ~nested_exception() _NOEXCEPT; // access functions - _ATTRIBUTE(noreturn) void rethrow_nested() const; + void rethrow_nested() const; _LIBCPP_INLINE_VISIBILITY exception_ptr nested_ptr() const _NOEXCEPT {return __ptr_;} }; @@ -185,7 +185,6 @@ struct __nested }; template <class _Tp> -_ATTRIBUTE(noreturn) void #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES throw_with_nested(_Tp&& __t, typename enable_if< @@ -204,7 +203,6 @@ throw_with_nested (_Tp& __t, typename enable_if< } template <class _Tp> -_ATTRIBUTE(noreturn) void #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES throw_with_nested(_Tp&& __t, typename enable_if< |