summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/strings/basic.string/string.capacity
diff options
context:
space:
mode:
authorRoger Ferrer Ibanez <roger.ferreribanez@arm.com>2016-11-24 11:28:02 +0000
committerRoger Ferrer Ibanez <roger.ferreribanez@arm.com>2016-11-24 11:28:02 +0000
commitd056b5be51bbbcaa4b38b6468c4946125178ddba (patch)
tree1f8226832a2f12fe4c412ceb79d8e7acdcb1b1da /libcxx/test/std/strings/basic.string/string.capacity
parent11b63cd309630808d92c84dd93d14aeaec7fc2fe (diff)
downloadbcm5719-llvm-d056b5be51bbbcaa4b38b6468c4946125178ddba.tar.gz
bcm5719-llvm-d056b5be51bbbcaa4b38b6468c4946125178ddba.zip
Reverting wrong diff
I managed to confuse me with two reviews of the same thing and ended commiting the wrong one. llvm-svn: 287868
Diffstat (limited to 'libcxx/test/std/strings/basic.string/string.capacity')
-rw-r--r--libcxx/test/std/strings/basic.string/string.capacity/capacity.pass.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.capacity/capacity.pass.cpp b/libcxx/test/std/strings/basic.string/string.capacity/capacity.pass.cpp
index 79fbd2e9632..4b09c096792 100644
--- a/libcxx/test/std/strings/basic.string/string.capacity/capacity.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.capacity/capacity.pass.cpp
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+// XFAIL: libcpp-no-exceptions
// <string>
// size_type capacity() const;
@@ -17,27 +18,21 @@
#include "test_allocator.h"
#include "min_allocator.h"
-#include "test_macros.h"
-
template <class S>
void
test(S s)
{
S::allocator_type::throw_after = 0;
-#ifndef TEST_HAS_NO_EXCEPTIONS
try
-#endif
{
while (s.size() < s.capacity())
s.push_back(typename S::value_type());
assert(s.size() == s.capacity());
}
-#ifndef TEST_HAS_NO_EXCEPTIONS
catch (...)
{
assert(false);
}
-#endif
S::allocator_type::throw_after = INT_MAX;
}
OpenPOWER on IntegriCloud