summaryrefslogtreecommitdiff
path: root/src/new.cpp
diff options
context:
space:
mode:
authorDavid Chisnall <theraven@FreeBSD.org>2012-03-14 14:33:36 +0000
committerDavid Chisnall <theraven@FreeBSD.org>2012-03-14 14:33:36 +0000
commitacbeab898d6a7f4036c55962a2460aab3e0eda3f (patch)
treeb7ab2afd9535ba889a65e8ef7c2bb3796920d33d /src/new.cpp
parent362d815b81e2b4b66c33b99203d821b8928607e1 (diff)
Notes
Diffstat (limited to 'src/new.cpp')
-rw-r--r--src/new.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/new.cpp b/src/new.cpp
index 1c171a871b9bd..1fb4b2da40d7d 100644
--- a/src/new.cpp
+++ b/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()