From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 40AC7385842B; Tue, 12 Oct 2021 18:09:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40AC7385842B MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-9126] libstdc++: Implement LWG 3546 changes to common_iterator X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 3c2397242a051eaf1f9fc9797142ecf7b00256b8 X-Git-Newrev: bc6059e257cfef37553bca1b1f0d2ef351ea766a Message-Id: <20211012180901.40AC7385842B@sourceware.org> Date: Tue, 12 Oct 2021 18:09:01 +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: Tue, 12 Oct 2021 18:09:01 -0000 https://gcc.gnu.org/g:bc6059e257cfef37553bca1b1f0d2ef351ea766a commit r11-9126-gbc6059e257cfef37553bca1b1f0d2ef351ea766a Author: Patrick Palka Date: Fri Jun 18 20:50:13 2021 -0400 libstdc++: Implement LWG 3546 changes to common_iterator libstdc++-v3/ChangeLog: * include/bits/stl_iterator.h (__detail::__common_iter_use_postfix_proxy): Add move_constructible constraint as per LWG 3546. (common_iterator::__postfix_proxy): Adjust initializer of _M_keep as per LWG 3546. (cherry picked from commit 4123650bd0ae53153142949ab5305eb48ec86390) Diff: --- libstdc++-v3/include/bits/stl_iterator.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 8768624b7d1..f7309e6bca8 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -1683,7 +1683,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template concept __common_iter_use_postfix_proxy = (!requires (_It& __i) { { *__i++ } -> __can_reference; }) - && constructible_from, iter_reference_t<_It>>; + && constructible_from, iter_reference_t<_It>> + && move_constructible>; } // namespace __detail /// An iterator/sentinel adaptor for representing a non-common range. @@ -1726,7 +1727,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION iter_value_t<_It> _M_keep; __postfix_proxy(iter_reference_t<_It>&& __x) - : _M_keep(std::move(__x)) { } + : _M_keep(std::forward>(__x)) { } friend class common_iterator;