public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Tamar Christina <tnfchris@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ARM/heads/arm-perf-staging)] libstdc++: Support N3644 "Null Forward Iterators" for testsuite iterators Date: Fri, 17 Jul 2020 13:26:42 +0000 (GMT) [thread overview] Message-ID: <20200717132642.A61883A73817@sourceware.org> (raw) https://gcc.gnu.org/g:e94f2542305ccb5c4a3c4e5e8212713747623417 commit e94f2542305ccb5c4a3c4e5e8212713747623417 Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Feb 27 13:01:14 2020 +0000 libstdc++: Support N3644 "Null Forward Iterators" for testsuite iterators Comparing value-initialized forward_iterator_wrapper<T> objects fails an assertion, but should be valid in C++14 and later. * testsuite/util/testsuite_iterators.h (forward_iterator_wrapper): Add equality comparisons that support value-initialized iterators. Diff: --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/testsuite/util/testsuite_iterators.h | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0df7126f7c9..946459c3cb8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2020-02-27 Jonathan Wakely <jwakely@redhat.com> + * testsuite/util/testsuite_iterators.h (forward_iterator_wrapper): Add + equality comparisons that support value-initialized iterators. + * include/bits/boost_concept_check.h (__function_requires): Add _GLIBCXX14_CONSTEXPR. * testsuite/25_algorithms/min/concept_checks.cc: New test. diff --git a/libstdc++-v3/testsuite/util/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h index 7b7093919b7..417dff23c50 100644 --- a/libstdc++-v3/testsuite/util/testsuite_iterators.h +++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h @@ -337,6 +337,26 @@ namespace __gnu_test ++*this; return tmp; } + +#if __cplusplus >= 201402L + bool + operator==(const forward_iterator_wrapper& it) const noexcept + { + // Since C++14 value-initialized forward iterators are comparable. + if (this->SharedInfo == nullptr || it.SharedInfo == nullptr) + return this->SharedInfo == it.SharedInfo && this->ptr == it.ptr; + + const input_iterator_wrapper<T>& base_this = *this; + const input_iterator_wrapper<T>& base_that = it; + return base_this == base_that; + } + + bool + operator!=(const forward_iterator_wrapper& it) const noexcept + { + return !(*this == it); + } +#endif }; /**
reply other threads:[~2020-07-17 13:26 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=20200717132642.A61883A73817@sourceware.org \ --to=tnfchris@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).