summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2014-10-29 23:14:53 +0000
committerEric Fiselier <eric@efcs.ca>2014-10-29 23:14:53 +0000
commitfd465fe5b5165d390a1de7a8d168b02a2c2535d3 (patch)
treeb0117fa4206bc39968f053c418a767b19d2f5c34 /libcxx/src
parent76b08d584bd8a72d2420cac7f3e306abaa2cb36c (diff)
downloadbcm5719-llvm-fd465fe5b5165d390a1de7a8d168b02a2c2535d3.tar.gz
bcm5719-llvm-fd465fe5b5165d390a1de7a8d168b02a2c2535d3.zip
libcxxrt now implements bad_array_new_length and need to gaurd against multiple defines. Patch from Baptiste Daroussin.
llvm-svn: 220882
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/new.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp
index 3b7c34138df..2fb6e7fa8a4 100644
--- a/libcxx/src/new.cpp
+++ b/libcxx/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