diff options
| author | Patrick Palka <ppalka@redhat.com> | 2021-06-18 20:50:13 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2021-06-18 20:50:13 -0400 |
| commit | 4123650bd0ae53153142949ab5305eb48ec86390 (patch) | |
| tree | 1e13877c96af2ce88d49fb9c54081670a40b5713 | |
| parent | c5581d4842efff98060c6caf270c6f6c55e9888a (diff) | |
| download | gcc-4123650bd0ae53153142949ab5305eb48ec86390.zip gcc-4123650bd0ae53153142949ab5305eb48ec86390.tar.gz gcc-4123650bd0ae53153142949ab5305eb48ec86390.tar.bz2 | |
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.
| -rw-r--r-- | libstdc++-v3/include/bits/stl_iterator.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 6ec046b..7fe727d 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; |