From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id E940C383D02B; Sat, 19 Jun 2021 00:51:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E940C383D02B 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 r12-1658] libstdc++: Implement LWG 3546 changes to common_iterator X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: c5581d4842efff98060c6caf270c6f6c55e9888a X-Git-Newrev: 4123650bd0ae53153142949ab5305eb48ec86390 Message-Id: <20210619005116.E940C383D02B@sourceware.org> Date: Sat, 19 Jun 2021 00:51:16 +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: Sat, 19 Jun 2021 00:51:17 -0000 https://gcc.gnu.org/g:4123650bd0ae53153142949ab5305eb48ec86390 commit r12-1658-g4123650bd0ae53153142949ab5305eb48ec86390 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. 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 6ec046b597b..7fe727d8093 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -1672,7 +1672,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. @@ -1715,7 +1716,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;