Commit 6aa2ca21 by Patrick Palka

libstdc++: Add missing friend declaration to join_view::_Sentinel

The converting constructor of join_view::_Sentinel<true> needs to be able to
access the private members of join_view::_Sentinel<false>.

libstdc++-v3/ChangeLog:

	* include/std/ranges (join_view::_Sentinel<_Const>): Befriend
	join_view::_Sentinel<!_Const>.
	* testsuite/std/ranges/adaptors/join.cc: Augment test.
parent 6d082cd9
2020-03-06 Patrick Palka <ppalka@redhat.com> 2020-03-06 Patrick Palka <ppalka@redhat.com>
* include/std/ranges (join_view::_Sentinel<_Const>): Befriend
join_view::_Sentinel<!_Const>.
* testsuite/std/ranges/adaptors/join.cc: Augment test.
PR libstdc++/93978 PR libstdc++/93978
* include/bits/range_access.h (__cust_access::_Empty::operator()): * include/bits/range_access.h (__cust_access::_Empty::operator()):
Declare return type to be bool instead of auto. Declare return type to be bool instead of auto.
......
...@@ -2592,6 +2592,8 @@ namespace views ...@@ -2592,6 +2592,8 @@ namespace views
friend constexpr bool friend constexpr bool
operator==(const _Iterator<_Const>& __x, const _Sentinel& __y) operator==(const _Iterator<_Const>& __x, const _Sentinel& __y)
{ return __y.__equal(__x); } { return __y.__equal(__x); }
friend _Sentinel<!_Const>;
}; };
_Vp _M_base = _Vp(); _Vp _M_base = _Vp();
......
...@@ -101,6 +101,28 @@ test05() ...@@ -101,6 +101,28 @@ test05()
VERIFY( i == v.end() ); VERIFY( i == v.end() );
} }
void
test06()
{
std::vector<std::string> x = {""};
auto i = std::counted_iterator(x.begin(), 1);
auto r = ranges::subrange{i, std::default_sentinel};
auto v = r | views::transform(std::identity{}) | views::join;
// Verify that _Iterator<false> is implicitly convertible to _Iterator<true>.
static_assert(!std::same_as<decltype(ranges::begin(v)),
decltype(ranges::cbegin(v))>);
auto a = ranges::cbegin(v);
a = ranges::begin(v);
// Verify that _Sentinel<false> is implicitly convertible to _Sentinel<true>.
static_assert(!ranges::common_range<decltype(v)>);
static_assert(!std::same_as<decltype(ranges::end(v)),
decltype(ranges::cend(v))>);
auto b = ranges::cend(v);
b = ranges::end(v);
}
int int
main() main()
{ {
...@@ -109,4 +131,5 @@ main() ...@@ -109,4 +131,5 @@ main()
test03(); test03();
test04(); test04();
test05(); test05();
test06();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment