public inbox for gcc-bugs@sourceware.org
help / color / mirror / Atom feed
From: "redi at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug libstdc++/100070] Standard library container iterator-pair constructors should check C++20 iterator concepts
Date: Wed, 14 Apr 2021 11:23:08 +0000	[thread overview]
Message-ID: <bug-100070-4-H2JsVPh0EJ@http.gcc.gnu.org/bugzilla/> (raw)
In-Reply-To: <bug-100070-4@http.gcc.gnu.org/bugzilla/>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100070

--- Comment #6 from Jonathan Wakely <redi at gcc dot gnu.org> ---
I'm not sure we should make std::__iterator_category just return
std::__detail::__iter_concept, because that has a fallback of
random_access_iterator_tag and I keep forgetting why that is. And I don't think
it's what we want here.

So just:

--- a/libstdc++-v3/include/bits/stl_iterator_base_types.h
+++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h
@@ -236,7 +236,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     inline _GLIBCXX_CONSTEXPR
     typename iterator_traits<_Iter>::iterator_category
     __iterator_category(const _Iter&)
-    { return typename iterator_traits<_Iter>::iterator_category(); }
+    {
+#if __cpp_lib_concepts
+      if constexpr (random_access_iterator<_Iter>)
+       return random_access_iterator_tag{};
+      else if constexpr (bidirectional_iterator<_Iter>)
+       return bidirectional_iterator_tag{};
+      else if constexpr (forward_iterator<_Iter>)
+       return forward_iterator_tag{};
+      else
+#endif
+      return typename iterator_traits<_Iter>::iterator_category();
+    }

   ///@}

  parent reply	other threads:[~2021-04-14 11:23 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-13 21:34 [Bug c++/100070] New: " barry.revzin at gmail dot com
2021-04-13 21:41 ` [Bug libstdc++/100070] " redi at gcc dot gnu.org
2021-04-13 21:48 ` redi at gcc dot gnu.org
2021-04-13 22:11 ` redi at gcc dot gnu.org
2021-04-13 22:15 ` redi at gcc dot gnu.org
2021-04-14 11:09 ` redi at gcc dot gnu.org
2021-04-14 11:10 ` redi at gcc dot gnu.org
2021-04-14 11:23 ` redi at gcc dot gnu.org [this message]
2021-04-14 16:41 ` redi at gcc dot gnu.org
2021-04-14 17:34 ` ppalka at gcc dot gnu.org
2021-10-12 21:50 ` ppalka at gcc dot gnu.org
2021-10-12 22:56 ` redi at gcc dot gnu.org
2022-04-22 17:33 ` redi at gcc dot gnu.org

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=bug-100070-4-H2JsVPh0EJ@http.gcc.gnu.org/bugzilla/ \
    --to=gcc-bugzilla@gcc.gnu.org \
    --cc=gcc-bugs@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: link
Be 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).