public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-3935] libstdc++: Specialize std::pointer_traits<__normal_iterator<I, C>> Date: Tue, 28 Sep 2021 19:24:31 +0000 (GMT) [thread overview] Message-ID: <20210928192431.5E9EF3858D39@sourceware.org> (raw) https://gcc.gnu.org/g:82626be2d633a9802a8b08727ef51c627e37fee5 commit r12-3935-g82626be2d633a9802a8b08727ef51c627e37fee5 Author: Jonathan Wakely <jwakely@redhat.com> Date: Tue Sep 28 15:26:46 2021 +0100 libstdc++: Specialize std::pointer_traits<__normal_iterator<I,C>> This allows std::__to_address to be used with __normal_iterator in C++11/14/17 modes. Without the partial specialization the deduced pointer_traits::element_type is incorrect, and so the return type of __to_address is wrong. A similar partial specialization is probably needed for __gnu_debug::_Safe_iterator. Signed-off-by: Jonathan Wakely <jwakely@redhat.com> libstdc++-v3/ChangeLog: * include/bits/stl_iterator.h (pointer_traits): Define partial specialization for __normal_iterator. * testsuite/24_iterators/normal_iterator/to_address.cc: New test. Diff: --- libstdc++-v3/include/bits/stl_iterator.h | 28 ++++++++++++++++++++++ .../24_iterators/normal_iterator/to_address.cc | 6 +++++ 2 files changed, 34 insertions(+) diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index c5b02408c1c..004d767224d 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -1285,6 +1285,34 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return __it.base(); } #if __cplusplus >= 201103L + + // Need to specialize pointer_traits because the primary template will + // deduce element_type of __normal_iterator<T*, C> as T* rather than T. + template<typename _Iterator, typename _Container> + struct pointer_traits<__gnu_cxx::__normal_iterator<_Iterator, _Container>> + { + private: + using _Base = pointer_traits<_Iterator>; + + public: + using element_type = typename _Base::element_type; + using pointer = __gnu_cxx::__normal_iterator<_Iterator, _Container>; + using difference_type = typename _Base::difference_type; + + template<typename _Tp> + using rebind = __gnu_cxx::__normal_iterator<_Tp, _Container>; + + static pointer + pointer_to(element_type& __e) noexcept + { return pointer(_Base::pointer_to(__e)); } + +#if __cplusplus >= 202002L + static element_type* + to_address(pointer __p) noexcept + { return __p.base(); } +#endif + }; + /** * @addtogroup iterators * @{ diff --git a/libstdc++-v3/testsuite/24_iterators/normal_iterator/to_address.cc b/libstdc++-v3/testsuite/24_iterators/normal_iterator/to_address.cc new file mode 100644 index 00000000000..510d627435f --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/normal_iterator/to_address.cc @@ -0,0 +1,6 @@ +// { dg-do compile { target { c++11 } } } +#include <string> +#include <memory> + +char* p = std::__to_address(std::string("1").begin()); +const char* q = std::__to_address(std::string("2").cbegin());
reply other threads:[~2021-09-28 19:24 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210928192431.5E9EF3858D39@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).