[gcc r12-1658] libstdc++: Implement LWG 3546 changes to common_iterator
Patrick Palka
ppalka@gcc.gnu.org
Sat Jun 19 00:51:16 GMT 2021
https://gcc.gnu.org/g:4123650bd0ae53153142949ab5305eb48ec86390
commit r12-1658-g4123650bd0ae53153142949ab5305eb48ec86390
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.
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<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.
@@ -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<iter_reference_t<_It>>(__x)) { }
friend class common_iterator;
More information about the Libstdc++-cvs
mailing list