From 111a0cf771f31b0fdae5d6e0e7cbd3277e702172 Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 1 Feb 2015 01:42:38 +0000 Subject: MFC r273434 (by bapt): 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 --- contrib/libc++/src/new.cpp | 4 ++-- 1 file 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 { -- cgit v1.1