commit cabd39222cf42c7c9e0ea6c1ba9580f760014dc1
author Richard Smith <richard-llvm@metafoo.co.uk> Thu Jul 26 02:04:22 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu Jul 26 02:04:22 2012 +0000
tree 2abfa4fd47432fa8ae3abd6fb73768a39eb762a5
parent ab50007bf3f6b7a9e751795d66afcdc9e1525b6f

libc++: switch from using _ATTRIBUTE(noreturn) (which conflicts with a
platform-provided macro on some systems) to _LIBCPP_NORETURN.

llvm-svn: 160773
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 535a86c3f8324a5d8034d09d2a24defd49420559

src/exception.cpp

diff --git a/src/exception.cpp b/src/exception.cpp
index a8ddcc4..0dbb660 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -56,7 +56,7 @@
     return __sync_fetch_and_add(&__unexpected_handler, (unexpected_handler)0);
 }
 
-_ATTRIBUTE(noreturn)
+_LIBCPP_NORETURN
 void
 unexpected()
 {
@@ -77,7 +77,7 @@
     return __sync_fetch_and_add(&__terminate_handler, (terminate_handler)0);
 }
 
-_ATTRIBUTE(noreturn)
+_LIBCPP_NORETURN
 void
 terminate() _NOEXCEPT
 {
@@ -184,7 +184,7 @@
 {
 }
 
-_ATTRIBUTE(noreturn)
+_LIBCPP_NORETURN
 void
 nested_exception::rethrow_nested() const
 {
@@ -209,7 +209,7 @@
 #endif  // __APPLE__
 }
 
-_ATTRIBUTE(noreturn)
+_LIBCPP_NORETURN
 void rethrow_exception(exception_ptr p)
 {
 #if HAVE_DEPENDENT_EH_ABI