[libc++] Remove cpp17_input_iterator.h

Reviewed By: Quuxplusone, #libc Spies: libcxx-commits Differential Revision: https://reviews.llvm.org/D119881
llvm · Feb 16, 2022 · f75f171 · f75f171
1 parent 2c58cde
commit f75f171
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 46 deletions.
diff --git a/libcxx/test/std/strings/basic.string/cpp17_input_iterator.h b/libcxx/test/std/strings/basic.string/cpp17_input_iterator.h
diff --git a/libcxx/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp
@@ -20,7 +20,7 @@
 
 #include "test_macros.h"
 #include "test_allocator.h"
-#include "../cpp17_input_iterator.h"
+#include "test_iterators.h"
 #include "min_allocator.h"
 
 template <class It>
@@ -34,8 +34,11 @@ test(It first, It last)
     LIBCPP_ASSERT(s2.__invariants());
     assert(s2.size() == static_cast<std::size_t>(std::distance(first, last)));
     unsigned i = 0;
-    for (It it = first; it != last; ++it, ++i)
+    for (It it = first; it != last;) {
         assert(s2[i] == *it);
+        ++it;
+        ++i;
+    }
     assert(s2.get_allocator() == A());
     assert(s2.capacity() >= s2.size());
 }
@@ -50,8 +53,11 @@ test(It first, It last, const A& a)
     LIBCPP_ASSERT(s2.__invariants());
     assert(s2.size() == static_cast<std::size_t>(std::distance(first, last)));
     unsigned i = 0;
-    for (It it = first; it != last; ++it, ++i)
+    for (It it = first; it != last;) {
         assert(s2[i] == *it);
+        ++it;
+        ++i;
+    }
     assert(s2.get_allocator() == a);
     assert(s2.capacity() >= s2.size());
 }

diff --git a/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp
@@ -31,7 +31,6 @@
 
 #include "test_macros.h"
 #include "test_allocator.h"
-#include "../cpp17_input_iterator.h"
 #include "min_allocator.h"
 
 bool test() {

diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.pass.cpp
@@ -33,7 +33,6 @@
 
 #include "test_macros.h"
 #include "test_allocator.h"
-#include "../cpp17_input_iterator.h"
 #include "min_allocator.h"
 
 bool test() {

diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.pass.cpp
@@ -37,7 +37,6 @@
 
 #include "test_macros.h"
 #include "test_allocator.h"
-#include "../cpp17_input_iterator.h"
 #include "min_allocator.h"
 
 bool test() {