diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-07-26 02:04:22 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-07-26 02:04:22 +0000 |
| commit | 535a86c3f8324a5d8034d09d2a24defd49420559 (patch) | |
| tree | 51612745a55b73e021bf68800653746e19cc6c4d /libcxx/include/exception | |
| parent | cdc3987ca8ee01fc02f4d7cb59885082ae559a0e (diff) | |
| download | bcm5719-llvm-535a86c3f8324a5d8034d09d2a24defd49420559.tar.gz bcm5719-llvm-535a86c3f8324a5d8034d09d2a24defd49420559.zip | |
libc++: switch from using _ATTRIBUTE(noreturn) (which conflicts with a
platform-provided macro on some systems) to _LIBCPP_NORETURN.
llvm-svn: 160773
Diffstat (limited to 'libcxx/include/exception')
| -rw-r--r-- | libcxx/include/exception | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libcxx/include/exception b/libcxx/include/exception index f7c3b70b00e..2f527d90d51 100644 --- a/libcxx/include/exception +++ b/libcxx/include/exception @@ -107,19 +107,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_NORETURN _LIBCPP_VISIBLE void unexpected(); 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_NORETURN _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); +_LIBCPP_NORETURN void rethrow_exception(exception_ptr); class _LIBCPP_VISIBLE exception_ptr { @@ -143,7 +143,7 @@ public: {return !(__x == __y);} friend exception_ptr current_exception() _NOEXCEPT; - _ATTRIBUTE(noreturn) friend void rethrow_exception(exception_ptr); + _LIBCPP_NORETURN friend void rethrow_exception(exception_ptr); }; template<class _Ep> @@ -174,7 +174,7 @@ public: virtual ~nested_exception() _NOEXCEPT; // access functions - _ATTRIBUTE(noreturn) void rethrow_nested() const; + _LIBCPP_NORETURN void rethrow_nested() const; _LIBCPP_INLINE_VISIBILITY exception_ptr nested_ptr() const _NOEXCEPT {return __ptr_;} }; @@ -187,7 +187,7 @@ struct __nested }; template <class _Tp> -_ATTRIBUTE(noreturn) +_LIBCPP_NORETURN void #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES throw_with_nested(_Tp&& __t, typename enable_if< @@ -206,7 +206,7 @@ throw_with_nested (_Tp& __t, typename enable_if< } template <class _Tp> -_ATTRIBUTE(noreturn) +_LIBCPP_NORETURN void #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES throw_with_nested(_Tp&& __t, typename enable_if< |
