maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Reverting wrong diff 

I managed to confuse me with two reviews of the same thing and ended commiting the wrong one.

llvm-svn: 287868
This commit is contained in:
Roger Ferrer Ibanez 2016-11-24 11:28:02 +00:00
parent 11b63cd309
commit d056b5be51
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libcxx/test/std/strings/basic.string/string.capacity/capacity.pass.cpp
View File

@ -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;
}

9
libcxx/test/std/strings/basic.string/string.ops/string_substr/substr.pass.cpp
View File

@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
// XFAIL: libcpp-no-exceptions
// <string>
// basic_string substr(size_type pos = 0, size_type n = npos) const;
@ -23,27 +24,19 @@ template <class S>
void
test(const S& s, typename S::size_type pos, typename S::size_type n)
{
#ifndef TEST_HAS_NO_EXCEPTIONS
try
#else
if (pos <= s.size())
#endif
{
S str = s.substr(pos, n);
LIBCPP_ASSERT(str.__invariants());
#ifndef TEST_HAS_NO_EXCEPTIONS
assert(pos <= s.size());
#endif
typename S::size_type rlen = std::min(n, s.size() - pos);
assert(str.size() == rlen);
assert(S::traits_type::compare(s.data()+pos, str.data(), rlen) == 0);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
catch (std::out_of_range&)
{
assert(pos > s.size());
}
#endif
}
int main()