diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-01-07 21:08:01 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-01-07 21:08:01 +0000 |
| commit | f857581820d15e410e9945d2fcd5f7163be25a96 (patch) | |
| tree | 41f38760e19d47a9e21d0f64ece2bddaaab8aaf7 /src/new.cpp | |
| parent | a5b2dbc259e289ea23fe9aebb34eba2c1dc7fefb (diff) | |
Notes
Diffstat (limited to 'src/new.cpp')
| -rw-r--r-- | src/new.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/new.cpp b/src/new.cpp index f4998cfb2a472..a88d4cc7c2492 100644 --- a/src/new.cpp +++ b/src/new.cpp @@ -17,7 +17,7 @@ #define __has_include(inc) 0 #endif -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(LIBCXXRT) #include <cxxabi.h> #ifndef _LIBCPPABI_VERSION @@ -167,7 +167,7 @@ set_new_handler(new_handler handler) _NOEXCEPT new_handler get_new_handler() _NOEXCEPT { - return __sync_fetch_and_add(&__new_handler, (new_handler)0); + return __sync_fetch_and_add(&__new_handler, nullptr); } #endif // !__GLIBCXX__ @@ -192,8 +192,6 @@ bad_alloc::what() const _NOEXCEPT #endif // !__GLIBCXX__ -#endif //LIBCXXRT - bad_array_new_length::bad_array_new_length() _NOEXCEPT { } @@ -203,6 +201,14 @@ bad_array_new_length::~bad_array_new_length() _NOEXCEPT } const char* +bad_array_new_length::what() const _NOEXCEPT +{ + return "bad_array_new_length"; +} + +#endif //LIBCXXRT + +const char* bad_array_length::what() const _NOEXCEPT { return "bad_array_length"; @@ -216,12 +222,6 @@ bad_array_length::~bad_array_length() _NOEXCEPT { } -const char* -bad_array_new_length::what() const _NOEXCEPT -{ - return "bad_array_new_length"; -} - #endif // _LIBCPPABI_VERSION #ifndef LIBSTDCXX |