]> git.ipfire.org Git - thirdparty/gcc.git/commit
libstdc++: Simplify __normal_iterator converting constructor
authorJonathan Wakely <jwakely@redhat.com>
Thu, 6 May 2021 12:44:36 +0000 (13:44 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Fri, 1 Oct 2021 19:34:48 +0000 (20:34 +0100)
commitfb4d55ef61ca3191ec946d4d41e0e715f4cc4197
treebb8483706c5a4ceb0663a4c79dc4e087c253dfd6
parent10b6d89baddd86139480ba902f491903fcb464a6
libstdc++: Simplify __normal_iterator converting constructor

This uses C++11 features to simplify the definition of the
__normal_iterator constructor that allows converting from iterator to
const_iterator. The previous definition relied on _Container::pointer
which is present in std::vector and std::basic_string, but is not
actually part of the container requirements.

Removing the use of _Container::pointer and defining it in terms of
is_convertible allows __normal_iterator to be used with new container
types which do not define a pointer member. Specifically, this will
allow it to be used in std::basic_stacktrace.

In theory this will enable some conversions which were not previously
permitted, for example __normal_iterator<volatile T*, vector<T>> can
now be converted to __normal_iterator<const volatile T*, vector<T>>.
In practice this doesn't matter because the library never uses such
types.  In any case, allowing those conversions is consistent with
the corresponding constructors of std::reverse_iterator and
std::move_iterator.

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:

* include/bits/stl_iterator.h (__normal_iterator): Simplify
converting constructor and do not require _Container::pointer.
libstdc++-v3/include/bits/stl_iterator.h