diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2016-01-20 05:41:24 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2016-01-20 05:41:24 +0000 |
| commit | e612a8877a8370250c66f792f6f976aa546196ff (patch) | |
| tree | 5276b4368db7b636c6f2844f5c96a51cd4f38a5a | |
| parent | 79de17d3af0b3f6d0fdd0baa4f41d5ac50ccd6d7 (diff) | |
| download | bcm5719-llvm-e612a8877a8370250c66f792f6f976aa546196ff.tar.gz bcm5719-llvm-e612a8877a8370250c66f792f6f976aa546196ff.zip | |
More string fixes for noexcept cases. Apparently I didn't get them all in r258281.
llvm-svn: 258291
5 files changed, 9 insertions, 1 deletions
diff --git a/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp b/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp index 591782b5dd4..f039ced7c7a 100644 --- a/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp +++ b/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// // - +// XFAIL: libcpp-no-exceptions // <iterator> // __libcpp_is_trivial_iterator<Tp> diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp index d0e34597d43..36daadf839f 100644 --- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp @@ -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() { diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp index de43b408f14..1d138531154 100644 --- a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp @@ -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() { diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp index 3128569f957..c4529c79743 100644 --- a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp @@ -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() { diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp index 60f2e3fe6d0..70c713b4f90 100644 --- a/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp @@ -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"; |
