More string fixes for noexcept cases. Apparently I didn't get them all in r258281.

llvm-svn: 258291
This commit is contained in:
Marshall Clow 2016-01-20 05:41:24 +00:00
parent 79de17d3af
commit e612a8877a
5 changed files with 9 additions and 1 deletions

View File

@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
//
// XFAIL: libcpp-no-exceptions
// <iterator>
// __libcpp_is_trivial_iterator<Tp>

View File

@ -27,6 +27,7 @@ test(S s, It first, It last, S expected)
assert(s == expected);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
template <class S, class It>
void
test_exceptions(S s, It first, It last)
@ -40,6 +41,7 @@ test_exceptions(S s, It first, It last)
assert(s.__invariants());
assert(s == aCopy);
}
#endif
int main()
{

View File

@ -27,6 +27,7 @@ test(S s, It first, It last, S expected)
assert(s == expected);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
template <class S, class It>
void
test_exceptions(S s, It first, It last)
@ -40,6 +41,7 @@ test_exceptions(S s, It first, It last)
assert(s.__invariants());
assert(s == aCopy);
}
#endif
int main()
{

View File

@ -33,6 +33,7 @@ test(S s, typename S::difference_type pos, It first, It last, S expected)
assert(s == expected);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
template <class S, class It>
void
test_exceptions(S s, typename S::difference_type pos, It first, It last)
@ -47,6 +48,7 @@ test_exceptions(S s, typename S::difference_type pos, It first, It last)
assert(s.__invariants());
assert(s == aCopy);
}
#endif
int main()
{

View File

@ -35,6 +35,7 @@ test(S s, typename S::size_type pos1, typename S::size_type n1, It f, It l, S ex
assert(s.size() == old_size - xlen + rlen);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
template <class S, class It>
void
test_exceptions(S s, typename S::size_type pos1, typename S::size_type n1, It f, It l)
@ -50,6 +51,7 @@ test_exceptions(S s, typename S::size_type pos1, typename S::size_type n1, It f,
assert(s.__invariants());
assert(s == aCopy);
}
#endif
const char* str = "12345678901234567890";