diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-02-27 13:01:14 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-02-27 13:01:14 +0000 |
| commit | e94f2542305ccb5c4a3c4e5e8212713747623417 (patch) | |
| tree | 985acfb39988bc86e81209a63d6cb410ac6a316e /libstdc++-v3 | |
| parent | e431546ff9f1367538ed1307a1c98fa32fec7a8a (diff) | |
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.
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_iterators.h | 20 |
2 files changed, 23 insertions, 0 deletions
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 }; /** |