Skip to content

Commit 604c092

Browse files
committed
[libc++] Reword std::advance assertion message for consistency with ranges::advance
As brought up in llvm#133276.
1 parent d05ab11 commit 604c092

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

libcxx/include/__iterator/advance.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 void advance(_InputIter& __i
6666
typedef typename iterator_traits<_InputIter>::difference_type _Difference;
6767
_Difference __n = static_cast<_Difference>(std::__convert_to_integral(__orig_n));
6868
_LIBCPP_ASSERT_PEDANTIC(__has_bidirectional_iterator_category<_InputIter>::value || __n >= 0,
69-
"Attempt to advance(it, n) with negative n on a non-bidirectional iterator");
69+
"std::advance: Can only pass a negative `n` with a bidirectional_iterator.");
7070
std::__advance(__i, __n, typename iterator_traits<_InputIter>::iterator_category());
7171
}
7272

libcxx/test/libcxx/iterators/assert.advance.pass.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ int main(int, char**) {
3131
forward_iterator<int *> it(a+1);
3232
std::advance(it, 1); // should work fine
3333
std::advance(it, 0); // should work fine
34-
TEST_LIBCPP_ASSERT_FAILURE(std::advance(it, -1), "Attempt to advance(it, n) with negative n on a non-bidirectional iterator");
34+
TEST_LIBCPP_ASSERT_FAILURE(std::advance(it, -1), "std::advance: Can only pass a negative `n` with a bidirectional_iterator.");
3535

3636
return 0;
3737
}

libcxx/test/libcxx/iterators/assert.next.pass.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ int main(int, char**) {
2525
forward_iterator<int *> it(a+1);
2626
(void)std::next(it, 1); // should work fine
2727
(void)std::next(it, 0); // should work fine
28-
TEST_LIBCPP_ASSERT_FAILURE(std::next(it, -1), "Attempt to advance(it, n) with negative n on a non-bidirectional iterator");
28+
TEST_LIBCPP_ASSERT_FAILURE(std::next(it, -1), "std::advance: Can only pass a negative `n` with a bidirectional_iterator.");
2929

3030
return 0;
3131
}

libcxx/test/libcxx/iterators/assert.prev.pass.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ int main(int, char**) {
3131
forward_iterator<int *> it(a+1);
3232
(void)std::prev(it, -1); // should work fine
3333
(void)std::prev(it, 0); // should work fine
34-
TEST_LIBCPP_ASSERT_FAILURE(std::prev(it, 1), "Attempt to advance(it, n) with negative n on a non-bidirectional iterator");
34+
TEST_LIBCPP_ASSERT_FAILURE(std::prev(it, 1), "std::advance: Can only pass a negative `n` with a bidirectional_iterator.");
3535

3636
return 0;
3737
}

0 commit comments

Comments
 (0)