diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-01-15 21:17:36 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-01-15 21:17:36 +0000 |
| commit | d72607e9e28bcdeca1cb370dd3bf119c7853576f (patch) | |
| tree | c7ef11e9501df78a928c64bb92aa05baf56f5808 /contrib/libc++/src/new.cpp | |
| parent | f7e6516a1f4099194f051c570a3301dae90729da (diff) | |
| parent | f857581820d15e410e9945d2fcd5f7163be25a96 (diff) | |
Notes
Diffstat (limited to 'contrib/libc++/src/new.cpp')
| -rw-r--r-- | contrib/libc++/src/new.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/libc++/src/new.cpp b/contrib/libc++/src/new.cpp index c179db1060ef..a88d4cc7c249 100644 --- a/contrib/libc++/src/new.cpp +++ b/contrib/libc++/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__ @@ -200,6 +200,12 @@ 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* @@ -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 |