aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2023-03-14 16:44:30 -0400
committerPatrick Palka <ppalka@redhat.com>2023-03-14 16:44:30 -0400
commitf2e7dd8b023b8de30af608afd68e0ecefa5c1de6 (patch)
tree374f40f669575694fa234f5b8dade5c2cb33680d
parent19c5dfc29d83101e415590e778b99e7c37d9b730 (diff)
downloadgcc-f2e7dd8b023b8de30af608afd68e0ecefa5c1de6.zip
gcc-f2e7dd8b023b8de30af608afd68e0ecefa5c1de6.tar.gz
gcc-f2e7dd8b023b8de30af608afd68e0ecefa5c1de6.tar.bz2
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.
-rw-r--r--libstdc++-v3/include/bits/ranges_util.h16
-rw-r--r--libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc33
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 e4643e3..880a0ce 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 0000000..96ee708
--- /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();
+}