diff options
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/new.cpp | 4 | ||||
| -rw-r--r-- | libcxx/src/stdexcept.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp index f24014d22df..fa0331a8b71 100644 --- a/libcxx/src/new.cpp +++ b/libcxx/src/new.cpp @@ -224,6 +224,8 @@ bad_array_new_length::what() const _NOEXCEPT #endif // _LIBCPPABI_VERSION +#ifndef LIBSTDCXX + void __throw_bad_alloc() { @@ -232,4 +234,6 @@ __throw_bad_alloc() #endif } +#endif // !LIBSTDCXX + } // std diff --git a/libcxx/src/stdexcept.cpp b/libcxx/src/stdexcept.cpp index 9ef78aac60d..a4207d6058f 100644 --- a/libcxx/src/stdexcept.cpp +++ b/libcxx/src/stdexcept.cpp @@ -127,7 +127,7 @@ logic_error::operator=(const logic_error& le) _NOEXCEPT return *this; } -#ifndef _LIBCPPABI_VERSION +#if !defined(_LIBCPPABI_VERSION) && !defined(LIBSTDCXX) logic_error::~logic_error() _NOEXCEPT { @@ -171,7 +171,7 @@ runtime_error::operator=(const runtime_error& le) _NOEXCEPT return *this; } -#ifndef _LIBCPPABI_VERSION +#if !defined(_LIBCPPABI_VERSION) && !defined(LIBSTDCXX) runtime_error::~runtime_error() _NOEXCEPT { |
