summaryrefslogtreecommitdiffstats
path: root/contrib/libc++
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-02-01 02:29:58 +0000
committerdim <dim@FreeBSD.org>2015-02-01 02:29:58 +0000
commit2ccbfd1b8e87d9e16738583f1cb19868ea5ad479 (patch)
treea0f122f4b76eb51437a7dd525aaf7fc88d4f887f /contrib/libc++
parent111a0cf771f31b0fdae5d6e0e7cbd3277e702172 (diff)
downloadFreeBSD-src-2ccbfd1b8e87d9e16738583f1cb19868ea5ad479.zip
FreeBSD-src-2ccbfd1b8e87d9e16738583f1cb19868ea5ad479.tar.gz
Revert r278017 (MFC of r273381 and r276417) and r278018 (MFC of r273434)
until I can figure out why it leads to link failures in some scenarios.
Diffstat (limited to 'contrib/libc++')
-rw-r--r--contrib/libc++/src/new.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libc++/src/new.cpp b/contrib/libc++/src/new.cpp
index c179db1..f4998cf 100644
--- a/contrib/libc++/src/new.cpp
+++ b/contrib/libc++/src/new.cpp
@@ -192,6 +192,8 @@ bad_alloc::what() const _NOEXCEPT
#endif // !__GLIBCXX__
+#endif //LIBCXXRT
+
bad_array_new_length::bad_array_new_length() _NOEXCEPT
{
}
@@ -200,8 +202,6 @@ bad_array_new_length::~bad_array_new_length() _NOEXCEPT
{
}
-#endif //LIBCXXRT
-
const char*
bad_array_length::what() const _NOEXCEPT
{
OpenPOWER on IntegriCloud