public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-10197] libstdc++: Implement LWG 3546 changes to common_iterator
@ 2021-10-12 18:37 Patrick Palka
0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2021-10-12 18:37 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:52b19e7b7262831dad9e917b2336d62f1df22684
commit r10-10197-g52b19e7b7262831dad9e917b2336d62f1df22684
Author: Patrick Palka <ppalka@redhat.com>
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 244f72d64b3..ae971ba12a1 100644
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
@@ -1633,7 +1633,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _It>
concept __common_iter_use_postfix_proxy
= (!requires (_It& __i) { { *__i++ } -> __can_reference; })
- && constructible_from<iter_value_t<_It>, iter_reference_t<_It>>;
+ && constructible_from<iter_value_t<_It>, iter_reference_t<_It>>
+ && move_constructible<iter_value_t<_It>>;
} // namespace __detail
/// An iterator/sentinel adaptor for representing a non-common range.
@@ -1676,7 +1677,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<iter_reference_t<_It>>(__x)) { }
friend class common_iterator;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-10-12 18:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12 18:37 [gcc r10-10197] libstdc++: Implement LWG 3546 changes to common_iterator Patrick Palka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).