OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Fix bug in iterator_traits<common_iterator<S,I>>

Browse Source 
The wrong type was being used in the __common_iter_has_arrow constraint,
creating a circular dependency where the iterator_traits specialization
was needed before it was complete. The correct parameter for the
__common_iter_has_arrow concept is the first template argument of  the
common_iterator, not the common_iterator itself.

	* include/bits/stl_iterator.h (__detail::__common_iter_ptr): Change
	to take parameters of common_iterator, instead of the common_iterator
	type itself. Fix argument for __common_iter_has_arrow constraint.
	(iterator_traits<common_iterator<I, S>>::pointer): Adjust.
This commit is contained in:
Jonathan Wakely 2020-02-07 16:46:42 +00:00
parent 6fa476f6e1
commit d222d8ec3c
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2020-02-07 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_iterator.h (__detail::__common_iter_ptr): Change
to take parameters of common_iterator, instead of the common_iterator
type itself. Fix argument for __common_iter_has_arrow constraint.
(iterator_traits<common_iterator<I, S>>::pointer): Adjust.
2020-02-07 Jonathan Wakely <jwakely@redhat.com> 2020-02-07 Jonathan Wakely <jwakely@redhat.com>
* include/std/ranges (iota_view): Add braces to prevent -Wempty-body * include/std/ranges (iota_view): Add braces to prevent -Wempty-body

16
libstdc++-v3/include/bits/stl_iterator.h
View File

@ -1738,17 +1738,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail namespace __detail
{ {
// FIXME: This has to be at namespace-scope because of PR 92103. // FIXME: This has to be at namespace-scope because of PR 92103.
template<typename _Iter> template<typename _It, typename _Sent>
struct __common_iter_ptr struct __common_iter_ptr
{ {
using type = void; using type = void;
}; };
template<typename _Iter> template<typename _It, typename _Sent>
requires __detail::__common_iter_has_arrow<_Iter> requires __detail::__common_iter_has_arrow<_It>
struct __common_iter_ptr<_Iter> struct __common_iter_ptr<_It, _Sent>
{ {
using type = decltype(std::declval<const _Iter&>().operator->()); using common_iterator = std::common_iterator<_It, _Sent>;
using type
= decltype(std::declval<const common_iterator&>().operator->());
}; };
} // namespace __detail } // namespace __detail
@ -1762,8 +1765,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
forward_iterator_tag, input_iterator_tag>; forward_iterator_tag, input_iterator_tag>;
using value_type = iter_value_t<_It>; using value_type = iter_value_t<_It>;
using difference_type = iter_difference_t<_It>; using difference_type = iter_difference_t<_It>;
using pointer = typename using pointer = typename __detail::__common_iter_ptr<_It, _Sent>::type;
__detail::__common_iter_ptr<common_iterator<_It, _Sent>>::type;
using reference = iter_reference_t<_It>; using reference = iter_reference_t<_It>;
}; };