[libcxx-commits] [PATCH] D101371: [libcxx][ranges] Fix tests for stdlib types that conform to sized_sentinel_for.

[Zoe Carver via Phabricator via libcxx-commits]

zoecarver created this revision.
zoecarver added a reviewer: cjdb.
zoecarver requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D101371

Files:
  libcxx/test/std/containers/associative/map/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/associative/multimap/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/associative/multiset/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/associative/set/iterator_concept_conformance.compile.pass.cpp


Index: libcxx/test/std/containers/associative/set/iterator_concept_conformance.compile.pass.cpp
===================================================================
--- libcxx/test/std/containers/associative/set/iterator_concept_conformance.compile.pass.cpp
+++ libcxx/test/std/containers/associative/set/iterator_concept_conformance.compile.pass.cpp
@@ -44,7 +44,7 @@
 static_assert(std::sentinel_for<const_iterator, const_iterator>);
 static_assert(!std::sentinel_for<const_iterator, reverse_iterator>);
 static_assert(!std::sentinel_for<const_iterator, const_reverse_iterator>);
-static_assert(!std::sized_sentinel_for<iterator, iterator>);
-static_assert(!std::sized_sentinel_for<iterator, const_iterator>);
-static_assert(!std::sized_sentinel_for<iterator, reverse_iterator>);
-static_assert(!std::sized_sentinel_for<iterator, const_reverse_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, const_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, reverse_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, const_reverse_iterator>);
Index: libcxx/test/std/containers/associative/multiset/iterator_concept_conformance.compile.pass.cpp
===================================================================
--- libcxx/test/std/containers/associative/multiset/iterator_concept_conformance.compile.pass.cpp
+++ libcxx/test/std/containers/associative/multiset/iterator_concept_conformance.compile.pass.cpp
@@ -42,7 +42,7 @@
 static_assert(std::sentinel_for<const_iterator, iterator>);
 static_assert(!std::sentinel_for<const_iterator, reverse_iterator>);
 static_assert(!std::sentinel_for<const_iterator, const_reverse_iterator>);
-static_assert(!std::sized_sentinel_for<iterator, iterator>);
-static_assert(!std::sized_sentinel_for<iterator, const_iterator>);
-static_assert(!std::sized_sentinel_for<iterator, reverse_iterator>);
-static_assert(!std::sized_sentinel_for<iterator, const_reverse_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, const_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, reverse_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, const_reverse_iterator>);
Index: libcxx/test/std/containers/associative/multimap/iterator_concept_conformance.compile.pass.cpp
===================================================================
--- libcxx/test/std/containers/associative/multimap/iterator_concept_conformance.compile.pass.cpp
+++ libcxx/test/std/containers/associative/multimap/iterator_concept_conformance.compile.pass.cpp
@@ -44,7 +44,7 @@
 static_assert(std::sentinel_for<const_iterator, const_iterator>);
 static_assert(!std::sentinel_for<const_iterator, reverse_iterator>);
 static_assert(!std::sentinel_for<const_iterator, const_reverse_iterator>);
-static_assert(std::sentinel_for<iterator, iterator>);
-static_assert(std::sentinel_for<iterator, const_iterator>);
-static_assert(!std::sentinel_for<iterator, reverse_iterator>);
-static_assert(!std::sentinel_for<iterator, const_reverse_iterator>);
+static_assert(std::sized_sentinel_for<const_iterator, iterator>);
+static_assert(std::sized_sentinel_for<const_iterator, const_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, reverse_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, const_reverse_iterator>);
Index: libcxx/test/std/containers/associative/map/iterator_concept_conformance.compile.pass.cpp
===================================================================
--- libcxx/test/std/containers/associative/map/iterator_concept_conformance.compile.pass.cpp
+++ libcxx/test/std/containers/associative/map/iterator_concept_conformance.compile.pass.cpp
@@ -44,7 +44,7 @@
 static_assert(std::sentinel_for<const_iterator, const_iterator>);
 static_assert(!std::sentinel_for<const_iterator, reverse_iterator>);
 static_assert(!std::sentinel_for<const_iterator, const_reverse_iterator>);
-static_assert(std::sentinel_for<iterator, iterator>);
-static_assert(std::sentinel_for<iterator, const_iterator>);
-static_assert(!std::sentinel_for<iterator, reverse_iterator>);
-static_assert(!std::sentinel_for<iterator, const_reverse_iterator>);
+static_assert(std::sized_sentinel_for<const_iterator, iterator>);
+static_assert(std::sized_sentinel_for<const_iterator, const_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, reverse_iterator>);
+static_assert(!std::sized_sentinel_for<const_iterator, const_reverse_iterator>);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D101371.340868.patch
Type: text/x-patch
Size: 4596 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210427/78cb9d2c/attachment.bin>