Author: marshall
Date: Tue Jan 19 23:41:24 2016
New Revision: 258291
URL: http://llvm.org/viewvc/llvm-project?rev=258291&view=rev
Log:
More string fixes for noexcept cases. Apparently I didn't get them all in
r258281.
Modified:
libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
Modified: libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp?rev=258291&r1=258290&r2=258291&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/strings/iterators.exceptions.pass.cpp Tue Jan 19
23:41:24 2016
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
//
-
+// XFAIL: libcpp-no-exceptions
// <iterator>
// __libcpp_is_trivial_iterator<Tp>
Modified:
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp?rev=258291&r1=258290&r2=258291&view=diff
==============================================================================
---
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
(original)
+++
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
Tue Jan 19 23:41:24 2016
@@ -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()
{
Modified:
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp?rev=258291&r1=258290&r2=258291&view=diff
==============================================================================
---
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
(original)
+++
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
Tue Jan 19 23:41:24 2016
@@ -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()
{
Modified:
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp?rev=258291&r1=258290&r2=258291&view=diff
==============================================================================
---
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
(original)
+++
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
Tue Jan 19 23:41:24 2016
@@ -33,6 +33,7 @@ test(S s, typename S::difference_type po
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::differe
assert(s.__invariants());
assert(s == aCopy);
}
+#endif
int main()
{
Modified:
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp?rev=258291&r1=258290&r2=258291&view=diff
==============================================================================
---
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
(original)
+++
libcxx/trunk/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
Tue Jan 19 23:41:24 2016
@@ -35,6 +35,7 @@ test(S s, typename S::size_type pos1, ty
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_ty
assert(s.__invariants());
assert(s == aCopy);
}
+#endif
const char* str = "12345678901234567890";
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
