From 3fdac97f2a96f75b82dc490f8bf9d4a13bd49a05 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Wed, 29 Oct 2014 23:14:53 +0000 Subject: [PATCH] libcxxrt now implements bad_array_new_length and need to gaurd against multiple defines. Patch from Baptiste Daroussin. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@220882 91177308-0d34-0410-b5e6-96231b3b80d8 --- src/new.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/new.cpp b/src/new.cpp index 3b7c3413..2fb6e7fa 100644 --- a/src/new.cpp +++ b/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 {