diff options
| author | Patrick Palka <ppalka@redhat.com> | 2023-04-12 13:04:36 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2023-04-12 13:04:36 -0400 |
| commit | aa65771427d32299cffecea64cbb766411aa8faf (patch) | |
| tree | ca22b0a9b356596319f9b9315784b7f8075abbfc | |
| parent | 13669111e7219ed1f71b2079c7b5794c11f6e3ce (diff) | |
| download | gcc-aa65771427d32299cffecea64cbb766411aa8faf.zip gcc-aa65771427d32299cffecea64cbb766411aa8faf.tar.gz gcc-aa65771427d32299cffecea64cbb766411aa8faf.tar.bz2 | |
libstdc++: Implement LWG 3904 change to lazy_split_view's iterator
libstdc++-v3/ChangeLog:
* include/std/ranges (lazy_split_view::_OuterIter::_OuterIter):
Propagate _M_trailing_empty in the const-converting constructor
as per LWG 3904.
* testsuite/std/ranges/adaptors/adjacent/1.cc (test04): Correct
assertion.
* testsuite/std/ranges/adaptors/lazy_split.cc (test12): New test.
| -rw-r--r-- | libstdc++-v3/include/std/ranges | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc | 16 |
3 files changed, 19 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index ba71976d..c215281 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3209,7 +3209,8 @@ namespace views::__adaptor _OuterIter(_OuterIter<!_Const> __i) requires _Const && convertible_to<iterator_t<_Vp>, iterator_t<_Base>> - : _M_parent(__i._M_parent), _M_current(std::move(__i._M_current)) + : _M_parent(__i._M_parent), _M_current(std::move(__i._M_current)), + _M_trailing_empty(__i._M_trailing_empty) { } constexpr value_type diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc index 443c1fb..19640ab 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc @@ -107,7 +107,7 @@ test04() // PR libstdc++/106798 auto r = views::single(0) | views::lazy_split(0) | views::pairwise; decltype(ranges::cend(r)) s = r.end(); - VERIFY( r.begin() == s ); + VERIFY( r.begin() != s ); return true; } diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc index 9df6b3b..4e5c0dc 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc @@ -22,6 +22,7 @@ #include <ranges> #include <string> #include <string_view> +#include <utility> #include <vector> #include <testsuite_hooks.h> #include <testsuite_iterators.h> @@ -218,6 +219,20 @@ test11() static_assert(ranges::distance(views::lazy_split("text"sv, ""sv)) == 4); } +constexpr bool +test12() +{ + // LWG 3904 + auto r = views::single(0) | views::lazy_split(0); + auto i = r.begin(); + ++i; + VERIFY( i != r.end() ); + decltype(std::as_const(r).begin()) j = i; + VERIFY( j != r.end() ); + + return true; +} + int main() { @@ -232,4 +247,5 @@ main() test09(); test10(); test11(); + static_assert(test12()); } |