summaryrefslogtreecommitdiffstats
path: root/contrib/libc++
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-10-21 21:49:06 +0000
committerbapt <bapt@FreeBSD.org>2014-10-21 21:49:06 +0000
commitaf449b2b721af52b6671674857bca812e30f3f8a (patch)
tree5165cd1c9cb1179f780588acbb53d3976a9c0266 /contrib/libc++
parent6c315b7c4ea5758f5a26476bba86845c8c9f2fae (diff)
downloadFreeBSD-src-af449b2b721af52b6671674857bca812e30f3f8a.zip
FreeBSD-src-af449b2b721af52b6671674857bca812e30f3f8a.tar.gz
Do not define bad_array_new_length::bad_array_new_length in libc++ anymore
when used in combinaison with libcxxrt since it is now defined there already. This fixes building world
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 f4998cf..c179db1 100644
--- a/contrib/libc++/src/new.cpp
+++ b/contrib/libc++/src/new.cpp
@@ -192,8 +192,6 @@ bad_alloc::what() const _NOEXCEPT
#endif // !__GLIBCXX__
-#endif //LIBCXXRT
-
bad_array_new_length::bad_array_new_length() _NOEXCEPT
{
}
@@ -202,6 +200,8 @@ bad_array_new_length::~bad_array_new_length() _NOEXCEPT
{
}
+#endif //LIBCXXRT
+
const char*
bad_array_length::what() const _NOEXCEPT
{
OpenPOWER on IntegriCloud