public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-6672] libstdc++: Implement LWG 3715 changes to view_interface::empty
@ 2023-03-14 20:46 Patrick Palka
0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2023-03-14 20:46 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:f2e7dd8b023b8de30af608afd68e0ecefa5c1de6
commit r13-6672-gf2e7dd8b023b8de30af608afd68e0ecefa5c1de6
Author: Patrick Palka <ppalka@redhat.com>
Date: Tue Mar 14 16:44:30 2023 -0400
libstdc++: Implement LWG 3715 changes to view_interface::empty
libstdc++-v3/ChangeLog:
* include/bits/ranges_util.h (view_interface::empty): Add
preferred overloads that use ranges::size when the range is
sized as per LWG 3715.
* testsuite/std/ranges/adaptors/lwg3715.cc: New test.
Diff:
---
libstdc++-v3/include/bits/ranges_util.h | 16 +++++++++--
.../testsuite/std/ranges/adaptors/lwg3715.cc | 33 ++++++++++++++++++++++
2 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/include/bits/ranges_util.h b/libstdc++-v3/include/bits/ranges_util.h
index e4643e31a20..880a0ce0143 100644
--- a/libstdc++-v3/include/bits/ranges_util.h
+++ b/libstdc++-v3/include/bits/ranges_util.h
@@ -97,15 +97,27 @@ namespace ranges
constexpr bool
empty()
noexcept(noexcept(_S_empty(_M_derived())))
- requires forward_range<_Derived>
+ requires forward_range<_Derived> && (!sized_range<_Derived>)
{ return _S_empty(_M_derived()); }
+ constexpr bool
+ empty()
+ noexcept(noexcept(ranges::size(_M_derived()) == 0))
+ requires sized_range<_Derived>
+ { return ranges::size(_M_derived()) == 0; }
+
constexpr bool
empty() const
noexcept(noexcept(_S_empty(_M_derived())))
- requires forward_range<const _Derived>
+ requires forward_range<const _Derived> && (!sized_range<const _Derived>)
{ return _S_empty(_M_derived()); }
+ constexpr bool
+ empty() const
+ noexcept(noexcept(ranges::size(_M_derived()) == 0))
+ requires sized_range<const _Derived>
+ { return ranges::size(_M_derived()) == 0; }
+
constexpr explicit
operator bool() noexcept(noexcept(ranges::empty(_M_derived())))
requires requires { ranges::empty(_M_derived()); }
diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc
new file mode 100644
index 00000000000..96ee7087be0
--- /dev/null
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc
@@ -0,0 +1,33 @@
+// { dg-options "-std=gnu++23" }
+// { dg-do run { target c++23 } }
+
+// Verify LWG 3715 changes.
+
+#include <ranges>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+ std::istringstream ints("0 1 2 3 4");
+ auto i = std::views::istream<int>(ints);
+ auto r4 = std::views::counted(i.begin(), 4) | std::views::chunk(2);
+ VERIFY( !r4.empty() );
+}
+
+void
+test02()
+{
+ std::istringstream ints("0 1 2 3 4");
+ auto i = std::views::istream<int>(ints);
+ auto r0 = std::views::counted(i.begin(), 0) | std::views::chunk(2);
+ VERIFY( r0.empty() );
+}
+
+int
+main()
+{
+ test01();
+ test02();
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-03-14 20:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-14 20:46 [gcc r13-6672] libstdc++: Implement LWG 3715 changes to view_interface::empty Patrick Palka
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).