mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-10 13:31:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Patrick Palka 2020-03-05 11:19:17 -05:00
parent 6d082cd901
commit 6aa2ca21a4
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,9 @@
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
* include/bits/range_access.h (__cust_access::_Empty::operator()):
Declare return type to be bool instead of auto.

2
libstdc++-v3/include/std/ranges
View File

@ -2592,6 +2592,8 @@ namespace views
friend constexpr bool
operator==(const _Iterator<_Const>& __x, const _Sentinel& __y)
{ return __y.__equal(__x); }
friend _Sentinel<!_Const>;
};
_Vp _M_base = _Vp();

23
libstdc++-v3/testsuite/std/ranges/adaptors/join.cc
View File

@ -101,6 +101,28 @@ test05()
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
main()
{
@ -109,4 +131,5 @@ main()
test03();
test04();
test05();
test06();
}