From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1984) id 83E3739FE80A; Fri, 17 Jul 2020 13:29:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83E3739FE80A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1594992565; bh=nXRL3MmAo9TwWx5+B+ujM+DXcpiNI+SVofIpj5QtLp4=; h=From:To:Subject:Date:From; b=XUNa3LojVzu8aISGdGIM+d51QllXJzlM3Oh7B0MxpvwbICjNHQZkEGbEeTdkiJhBH LjpeDv2aTKUGCcLgZ12JvkkHuWx4T3jD0bf8OC/DdtPiAfN52ZBS5uCqR5SwJGNXn5 l9yG0+vjTfCgX4D7Q71Hf/JD4oKFpE03b7vqfNw4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tamar Christina To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ARM/heads/arm-struct-reorg-wip)] libstdc++: Add missing friend declaration to join_view::_Sentinel X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/vendors/ARM/heads/arm-struct-reorg-wip X-Git-Oldrev: 6d082cd90131a9c0ce3142217e84194a5bf0de27 X-Git-Newrev: 6aa2ca21a442a775b7daf214b8c10fce8522ccda Message-Id: <20200717132925.83E3739FE80A@sourceware.org> Date: Fri, 17 Jul 2020 13:29:25 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jul 2020 13:29:25 -0000 https://gcc.gnu.org/g:6aa2ca21a442a775b7daf214b8c10fce8522ccda commit 6aa2ca21a442a775b7daf214b8c10fce8522ccda Author: Patrick Palka Date: Thu Mar 5 11:19:17 2020 -0500 libstdc++: Add missing friend declaration to join_view::_Sentinel The converting constructor of join_view::_Sentinel needs to be able to access the private members of join_view::_Sentinel. libstdc++-v3/ChangeLog: * include/std/ranges (join_view::_Sentinel<_Const>): Befriend join_view::_Sentinel. * testsuite/std/ranges/adaptors/join.cc: Augment test. Diff: --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/include/std/ranges | 2 ++ libstdc++-v3/testsuite/std/ranges/adaptors/join.cc | 23 ++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b2e995b4daf..b3e8b9a25d2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2020-03-06 Patrick Palka + * include/std/ranges (join_view::_Sentinel<_Const>): Befriend + join_view::_Sentinel. + * 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. diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index c71cf918cfc..eb54b110c04 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -2592,6 +2592,8 @@ namespace views friend constexpr bool operator==(const _Iterator<_Const>& __x, const _Sentinel& __y) { return __y.__equal(__x); } + + friend _Sentinel; }; _Vp _M_base = _Vp(); diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc index d3e652da009..142c9feddcd 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc @@ -101,6 +101,28 @@ test05() VERIFY( i == v.end() ); } +void +test06() +{ + std::vector 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 is implicitly convertible to _Iterator. + static_assert(!std::same_as); + auto a = ranges::cbegin(v); + a = ranges::begin(v); + + // Verify that _Sentinel is implicitly convertible to _Sentinel. + static_assert(!ranges::common_range); + static_assert(!std::same_as); + auto b = ranges::cend(v); + b = ranges::end(v); +} + int main() { @@ -109,4 +131,5 @@ main() test03(); test04(); test05(); + test06(); }