Skip to content

Commit f0d152d

Browse files
some fixes
1 parent 3ae866a commit f0d152d

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

libcxx/include/__ranges/concat_view.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,9 @@ class concat_view<_Views...>::__iterator {
402402
requires(equality_comparable<iterator_t<__maybe_const<_Const, _Views>>> && ...)
403403
{
404404
_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
405-
!__it_.valueless_by_exception(), "Trying to convert from a valueless iterator of concat_view.");
405+
!__x.__it_.valueless_by_exception(), "Trying to convert from a valueless iterator of concat_view.");
406+
_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
407+
!__y.__it_.valueless_by_exception(), "Trying to convert from a valueless iterator of concat_view.");
406408
return __x.__it_ == __y.__it_;
407409
}
408410

@@ -470,7 +472,7 @@ class concat_view<_Views...>::__iterator {
470472

471473
_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __it, default_sentinel_t) {
472474
_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
473-
!__it_.valueless_by_exception(), "Trying to convert from a valueless iterator of concat_view.");
475+
!__it.__it_.valueless_by_exception(), "Trying to convert from a valueless iterator of concat_view.");
474476
constexpr auto __last_idx = sizeof...(_Views) - 1;
475477
return __it.__it_.index() == __last_idx &&
476478
std::__unchecked_get<__last_idx>(__it.__it_) == ranges::end(std::get<__last_idx>(__it.__parent_->__views_));
@@ -505,7 +507,9 @@ class concat_view<_Views...>::__iterator {
505507
(three_way_comparable<__maybe_const<_Const, _Views>> && ...))
506508
{
507509
_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
508-
!__it_.valueless_by_exception(), "Trying to convert from a valueless iterator of concat_view.");
510+
!__x.__it_.valueless_by_exception(), "Trying to convert from a valueless iterator of concat_view.");
511+
_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
512+
!__y.__it_.valueless_by_exception(), "Trying to convert from a valueless iterator of concat_view.");
509513
return __x.__it_ <=> __y.__it_;
510514
}
511515

0 commit comments

Comments
 (0)