Fix new/delete exception specifications to match libc++ after r290845
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@290847 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/src/cxa_new_delete.cpp b/src/cxa_new_delete.cpp
index 7a2c864..7609d76 100644
--- a/src/cxa_new_delete.cpp
+++ b/src/cxa_new_delete.cpp
@@ -14,6 +14,11 @@
#include <new>
#include <cstdlib>
+#if !defined(_THROW_BAD_ALLOC) || !defined(_NOEXCEPT)
+#error _THROW_BAD_ALLOC and _NOEXCEPT libc++ macros must already be defined \
+ by libc++.
+#endif
+
/*
[new.delete.single]
@@ -33,10 +38,7 @@
*/
__attribute__((__weak__, __visibility__("default")))
void *
-operator new(std::size_t size)
-#if !__has_feature(cxx_noexcept)
- throw(std::bad_alloc)
-#endif
+operator new(std::size_t size) _THROW_BAD_ALLOC
{
if (size == 0)
size = 1;
@@ -70,12 +72,7 @@
*/
__attribute__((__weak__, __visibility__("default")))
void*
-operator new(size_t size, const std::nothrow_t&)
-#if __has_feature(cxx_noexcept)
- noexcept
-#else
- throw()
-#endif
+operator new(size_t size, const std::nothrow_t&) _NOEXCEPT
{
void* p = 0;
#ifndef _LIBCXXABI_NO_EXCEPTIONS
@@ -99,10 +96,7 @@
*/
__attribute__((__weak__, __visibility__("default")))
void*
-operator new[](size_t size)
-#if !__has_feature(cxx_noexcept)
- throw(std::bad_alloc)
-#endif
+operator new[](size_t size) _THROW_BAD_ALLOC
{
return ::operator new(size);
}
@@ -115,12 +109,7 @@
*/
__attribute__((__weak__, __visibility__("default")))
void*
-operator new[](size_t size, const std::nothrow_t&)
-#if __has_feature(cxx_noexcept)
- noexcept
-#else
- throw()
-#endif
+operator new[](size_t size, const std::nothrow_t&) _NOEXCEPT
{
void* p = 0;
#ifndef _LIBCXXABI_NO_EXCEPTIONS
@@ -145,12 +134,7 @@
*/
__attribute__((__weak__, __visibility__("default")))
void
-operator delete(void* ptr)
-#if __has_feature(cxx_noexcept)
- noexcept
-#else
- throw()
-#endif
+operator delete(void* ptr) _NOEXCEPT
{
if (ptr)
std::free(ptr);
@@ -163,12 +147,7 @@
*/
__attribute__((__weak__, __visibility__("default")))
void
-operator delete(void* ptr, const std::nothrow_t&)
-#if __has_feature(cxx_noexcept)
- noexcept
-#else
- throw()
-#endif
+operator delete(void* ptr, const std::nothrow_t&) _NOEXCEPT
{
::operator delete(ptr);
}
@@ -180,12 +159,7 @@
*/
__attribute__((__weak__, __visibility__("default")))
void
-operator delete[] (void* ptr)
-#if __has_feature(cxx_noexcept)
- noexcept
-#else
- throw()
-#endif
+operator delete[] (void* ptr) _NOEXCEPT
{
::operator delete(ptr);
}
@@ -197,12 +171,7 @@
*/
__attribute__((__weak__, __visibility__("default")))
void
-operator delete[] (void* ptr, const std::nothrow_t&)
-#if __has_feature(cxx_noexcept)
- noexcept
-#else
- throw()
-#endif
+operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
{
::operator delete[](ptr);
}