summaryrefslogtreecommitdiffstats
path: root/contrib/libc++/src/new.cpp
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2012-03-14 14:40:22 +0000
committertheraven <theraven@FreeBSD.org>2012-03-14 14:40:22 +0000
commiteccfeea8a5f95c5484d846fba96de60c97d00c2c (patch)
treed9a45c8129e1de9dfacd43f81cfb6e078d747f65 /contrib/libc++/src/new.cpp
parentff1fc6fb5cf6febb3683f7cb3824ab6b4d7ad43f (diff)
downloadFreeBSD-src-eccfeea8a5f95c5484d846fba96de60c97d00c2c.zip
FreeBSD-src-eccfeea8a5f95c5484d846fba96de60c97d00c2c.tar.gz
Import a slightly newer libc++, with some bugs fixed that were found by running
the test suite on FreeBSD. Approved by: dim (mentor)
Diffstat (limited to 'contrib/libc++/src/new.cpp')
-rw-r--r--contrib/libc++/src/new.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/contrib/libc++/src/new.cpp b/contrib/libc++/src/new.cpp
index 1c171a8..1fb4b2d 100644
--- a/contrib/libc++/src/new.cpp
+++ b/contrib/libc++/src/new.cpp
@@ -24,8 +24,6 @@
static std::new_handler __new_handler;
#endif
-#if !defined (LIBCXXRT) // && !defined(_LIBCPPABI_VERSION)
-
// Implement all new and delete operators as weak definitions
// in this shared library, so that they can be overriden by programs
// that define non-weak copies of the functions.
@@ -134,8 +132,6 @@ operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
::operator delete[](ptr);
}
-#endif // !_LIBCPPABI_VERSION && !LIBCXXRT
-
namespace std
{
@@ -171,6 +167,8 @@ bad_alloc::what() const _NOEXCEPT
return "std::bad_alloc";
}
+#endif //LIBCXXRT
+
bad_array_new_length::bad_array_new_length() _NOEXCEPT
{
}
@@ -186,7 +184,6 @@ bad_array_new_length::what() const _NOEXCEPT
}
#endif
-#endif //LIBCXXRT
void
__throw_bad_alloc()
OpenPOWER on IntegriCloud