[libcxx-commits] [libcxx] 773ae44 - [libcxx][nfc] prefixes test type `input_iterator` with `cpp17_`
Christopher Di Bella via libcxx-commits
libcxx-commits at lists.llvm.org
Sat May 1 22:03:18 PDT 2021
Author: Christopher Di Bella
Date: 2021-05-02T05:02:59Z
New Revision: 773ae4412468433c134e668b4047c94f4599e0fd
URL: https://github.com/llvm/llvm-project/commit/773ae4412468433c134e668b4047c94f4599e0fd
DIFF: https://github.com/llvm/llvm-project/commit/773ae4412468433c134e668b4047c94f4599e0fd.diff
LOG: [libcxx][nfc] prefixes test type `input_iterator` with `cpp17_`
C++20 revised the definition of what it means to be an iterator. While
all _Cpp17InputIterators_ satisfy `std::input_iterator`, the reverse
isn't true. D100271 introduces a new test adaptor to accommodate this
new definition (`cpp20_input_iterator`).
In order to help readers immediately distinguish which input iterator
adaptor is _Cpp17InputIterator_, the current `input_iterator` adaptor
has been prefixed with `cpp17_`.
Differential Revision: https://reviews.llvm.org/D101242
Added:
libcxx/test/std/strings/basic.string/cpp17_input_iterator.h
Modified:
libcxx/benchmarks/filesystem.bench.cpp
libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp
libcxx/test/libcxx/containers/sequences/vector/asan.pass.cpp
libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp
libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.stable.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each_n.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.fail.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
libcxx/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp
libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
libcxx/test/std/containers/associative/set/insert_iter_iter.pass.cpp
libcxx/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp
libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
libcxx/test/std/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
libcxx/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
libcxx/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp
libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
libcxx/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
libcxx/test/std/containers/sequences/vector/vector.cons/assign_iter_iter.pass.cpp
libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp
libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
libcxx/test/std/containers/unord/unord.multiset/insert_range.pass.cpp
libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/test/std/containers/unord/unord.set/insert_range.pass.cpp
libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp
libcxx/test/std/iterators/iterator.primitives/iterator.operations/advance.pass.cpp
libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
libcxx/test/std/iterators/iterator.primitives/iterator.operations/next.pass.cpp
libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
libcxx/test/std/iterators/iterator.primitives/iterator.traits/iter_reference_t.compile.pass.cpp
libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
libcxx/test/std/numerics/numeric.ops/accumulate/accumulate.pass.cpp
libcxx/test/std/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan.pass.cpp
libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan_init_op.pass.cpp
libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan.pass.cpp
libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op.pass.cpp
libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op_init.pass.cpp
libcxx/test/std/numerics/numeric.ops/inner.product/inner_product.pass.cpp
libcxx/test/std/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp
libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp
libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp
libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp
libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp
libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp
libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_init_bop_uop.pass.cpp
libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init.pass.cpp
libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init_op_op.pass.cpp
libcxx/test/std/ranges/range.range/helper_aliases.compile.pass.cpp
libcxx/test/std/ranges/range.range/iterator_t.compile.pass.cpp
libcxx/test/std/ranges/range.range/range.compile.pass.cpp
libcxx/test/std/ranges/range.range/sentinel_t.compile.pass.cpp
libcxx/test/std/ranges/range.refinements/common_range.compile.pass.cpp
libcxx/test/std/ranges/range.refinements/input_range.compile.pass.cpp
libcxx/test/std/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp
libcxx/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp
libcxx/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp
libcxx/test/std/strings/basic.string/string.cons/string_view_deduction.pass.cpp
libcxx/test/std/strings/basic.string/string.cons/string_view_size_size_deduction.pass.cpp
libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
libcxx/test/support/test_iterators.h
libcxx/test/support/test_range.h
Removed:
libcxx/test/std/strings/basic.string/input_iterator.h
################################################################################
diff --git a/libcxx/benchmarks/filesystem.bench.cpp b/libcxx/benchmarks/filesystem.bench.cpp
index 64314ac5ab04b..95aecd50473fd 100644
--- a/libcxx/benchmarks/filesystem.bench.cpp
+++ b/libcxx/benchmarks/filesystem.bench.cpp
@@ -62,7 +62,7 @@ void BM_PathConstructIter(benchmark::State &st, GenInputs gen) {
}
template <class GenInputs>
void BM_PathConstructInputIter(benchmark::State &st, GenInputs gen) {
- BM_PathConstructIter<input_iterator>(st, gen);
+ BM_PathConstructIter<cpp17_input_iterator>(st, gen);
}
template <class GenInputs>
void BM_PathConstructForwardIter(benchmark::State &st, GenInputs gen) {
diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp
index 71eff01d14b99..46b0281116ef8 100644
--- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp
@@ -30,8 +30,8 @@ int main(int, char**)
int a[] = {1, 2, 3, 4, 5};
const int N = sizeof(a)/sizeof(a[0]);
std::list<int>::iterator i = v.insert(next(v2.cbegin(), 10),
- input_iterator<const int*>(a),
- input_iterator<const int*>(a+N));
+ cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(a+N));
assert(false);
}
diff --git a/libcxx/test/libcxx/containers/sequences/vector/asan.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/asan.pass.cpp
index a89c82213182d..40275f58cb32c 100644
--- a/libcxx/test/libcxx/containers/sequences/vector/asan.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/asan.pass.cpp
@@ -42,7 +42,7 @@ int main(int, char**)
#endif
{
- typedef input_iterator<int*> MyInputIter;
+ typedef cpp17_input_iterator<int*> MyInputIter;
// Sould not trigger ASan.
std::vector<int> v;
v.reserve(1);
diff --git a/libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp b/libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp
index c62dfcf1ea27e..7e158648cd85c 100644
--- a/libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp
+++ b/libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp
@@ -63,8 +63,8 @@ struct MakeTestType {
using const_cstr_type = const CharT*;
using array_type = CharT[25];
using const_array_type = const CharT[25];
- using iter_type = input_iterator<CharT*>;
- using bad_iter_type = input_iterator<signed char*>;
+ using iter_type = cpp17_input_iterator<CharT*>;
+ using bad_iter_type = cpp17_input_iterator<signed char*>;
template <class TestT>
static void AssertPathable() {
diff --git a/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp b/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp
index 2ea592338a0b7..06d8c38eb2243 100644
--- a/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp
+++ b/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp
@@ -192,7 +192,7 @@ int main(int, char**)
// iterators in the libc++ test suite
static_assert((!std::__is_cpp17_contiguous_iterator<output_iterator <char *> >::value), "");
- static_assert((!std::__is_cpp17_contiguous_iterator<input_iterator <char *> >::value), "");
+ static_assert((!std::__is_cpp17_contiguous_iterator<cpp17_input_iterator <char *> >::value), "");
static_assert((!std::__is_cpp17_contiguous_iterator<forward_iterator <char *> >::value), "");
static_assert((!std::__is_cpp17_contiguous_iterator<bidirectional_iterator<char *> >::value), "");
static_assert((!std::__is_cpp17_contiguous_iterator<random_access_iterator<char *> >::value), "");
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
index b8d880d09526e..bb171d59b8c29 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
@@ -39,11 +39,11 @@ test_copy()
TEST_CONSTEXPR_CXX20 bool
test()
{
- test_copy<input_iterator<const int*>, output_iterator<int*> >();
- test_copy<input_iterator<const int*>, forward_iterator<int*> >();
- test_copy<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test_copy<input_iterator<const int*>, random_access_iterator<int*> >();
- test_copy<input_iterator<const int*>, int*>();
+ test_copy<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test_copy<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test_copy<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test_copy<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test_copy<cpp17_input_iterator<const int*>, int*>();
test_copy<forward_iterator<const int*>, output_iterator<int*> >();
test_copy<forward_iterator<const int*>, forward_iterator<int*> >();
@@ -70,7 +70,7 @@ test()
test_copy<const int*, int*>();
#if TEST_STD_VER > 17
- test_copy<input_iterator<const int*>, contiguous_iterator<int*>>();
+ test_copy<cpp17_input_iterator<const int*>, contiguous_iterator<int*>>();
test_copy<forward_iterator<const int*>, contiguous_iterator<int*>>();
test_copy<bidirectional_iterator<const int*>, contiguous_iterator<int*>>();
test_copy<random_access_iterator<const int*>, contiguous_iterator<int*>>();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
index a5e971ceb6401..acb1e00260251 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
@@ -44,36 +44,36 @@ test_copy_if()
TEST_CONSTEXPR_CXX20 bool
test()
{
- test_copy_if<input_iterator<const int*>, output_iterator<int*> >();
- test_copy_if<input_iterator<const int*>, input_iterator<int*> >();
- test_copy_if<input_iterator<const int*>, forward_iterator<int*> >();
- test_copy_if<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test_copy_if<input_iterator<const int*>, random_access_iterator<int*> >();
- test_copy_if<input_iterator<const int*>, int*>();
+ test_copy_if<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test_copy_if<cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test_copy_if<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test_copy_if<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test_copy_if<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test_copy_if<cpp17_input_iterator<const int*>, int*>();
test_copy_if<forward_iterator<const int*>, output_iterator<int*> >();
- test_copy_if<forward_iterator<const int*>, input_iterator<int*> >();
+ test_copy_if<forward_iterator<const int*>, cpp17_input_iterator<int*> >();
test_copy_if<forward_iterator<const int*>, forward_iterator<int*> >();
test_copy_if<forward_iterator<const int*>, bidirectional_iterator<int*> >();
test_copy_if<forward_iterator<const int*>, random_access_iterator<int*> >();
test_copy_if<forward_iterator<const int*>, int*>();
test_copy_if<bidirectional_iterator<const int*>, output_iterator<int*> >();
- test_copy_if<bidirectional_iterator<const int*>, input_iterator<int*> >();
+ test_copy_if<bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
test_copy_if<bidirectional_iterator<const int*>, forward_iterator<int*> >();
test_copy_if<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
test_copy_if<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
test_copy_if<bidirectional_iterator<const int*>, int*>();
test_copy_if<random_access_iterator<const int*>, output_iterator<int*> >();
- test_copy_if<random_access_iterator<const int*>, input_iterator<int*> >();
+ test_copy_if<random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
test_copy_if<random_access_iterator<const int*>, forward_iterator<int*> >();
test_copy_if<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
test_copy_if<random_access_iterator<const int*>, random_access_iterator<int*> >();
test_copy_if<random_access_iterator<const int*>, int*>();
test_copy_if<const int*, output_iterator<int*> >();
- test_copy_if<const int*, input_iterator<int*> >();
+ test_copy_if<const int*, cpp17_input_iterator<int*> >();
test_copy_if<const int*, forward_iterator<int*> >();
test_copy_if<const int*, bidirectional_iterator<int*> >();
test_copy_if<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
index 48c2fd7c9ff0e..df75e75914e51 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
@@ -42,36 +42,36 @@ test_copy_n()
TEST_CONSTEXPR_CXX20 bool
test()
{
- test_copy_n<input_iterator<const int*>, output_iterator<int*> >();
- test_copy_n<input_iterator<const int*>, input_iterator<int*> >();
- test_copy_n<input_iterator<const int*>, forward_iterator<int*> >();
- test_copy_n<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test_copy_n<input_iterator<const int*>, random_access_iterator<int*> >();
- test_copy_n<input_iterator<const int*>, int*>();
+ test_copy_n<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test_copy_n<cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test_copy_n<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test_copy_n<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test_copy_n<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test_copy_n<cpp17_input_iterator<const int*>, int*>();
test_copy_n<forward_iterator<const int*>, output_iterator<int*> >();
- test_copy_n<forward_iterator<const int*>, input_iterator<int*> >();
+ test_copy_n<forward_iterator<const int*>, cpp17_input_iterator<int*> >();
test_copy_n<forward_iterator<const int*>, forward_iterator<int*> >();
test_copy_n<forward_iterator<const int*>, bidirectional_iterator<int*> >();
test_copy_n<forward_iterator<const int*>, random_access_iterator<int*> >();
test_copy_n<forward_iterator<const int*>, int*>();
test_copy_n<bidirectional_iterator<const int*>, output_iterator<int*> >();
- test_copy_n<bidirectional_iterator<const int*>, input_iterator<int*> >();
+ test_copy_n<bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
test_copy_n<bidirectional_iterator<const int*>, forward_iterator<int*> >();
test_copy_n<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
test_copy_n<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
test_copy_n<bidirectional_iterator<const int*>, int*>();
test_copy_n<random_access_iterator<const int*>, output_iterator<int*> >();
- test_copy_n<random_access_iterator<const int*>, input_iterator<int*> >();
+ test_copy_n<random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
test_copy_n<random_access_iterator<const int*>, forward_iterator<int*> >();
test_copy_n<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
test_copy_n<random_access_iterator<const int*>, random_access_iterator<int*> >();
test_copy_n<random_access_iterator<const int*>, int*>();
test_copy_n<const int*, output_iterator<int*> >();
- test_copy_n<const int*, input_iterator<int*> >();
+ test_copy_n<const int*, cpp17_input_iterator<int*> >();
test_copy_n<const int*, forward_iterator<int*> >();
test_copy_n<const int*, bidirectional_iterator<int*> >();
test_copy_n<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
index 9704438c80d4f..d50810294166b 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
@@ -63,11 +63,11 @@ test1()
int main(int, char**)
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
@@ -94,11 +94,11 @@ int main(int, char**)
test<const int*, int*>();
#if TEST_STD_VER >= 11
- test1<input_iterator<std::unique_ptr<int>*>, output_iterator<std::unique_ptr<int>*> >();
- test1<input_iterator<std::unique_ptr<int>*>, forward_iterator<std::unique_ptr<int>*> >();
- test1<input_iterator<std::unique_ptr<int>*>, bidirectional_iterator<std::unique_ptr<int>*> >();
- test1<input_iterator<std::unique_ptr<int>*>, random_access_iterator<std::unique_ptr<int>*> >();
- test1<input_iterator<std::unique_ptr<int>*>, std::unique_ptr<int>*>();
+ test1<cpp17_input_iterator<std::unique_ptr<int>*>, output_iterator<std::unique_ptr<int>*> >();
+ test1<cpp17_input_iterator<std::unique_ptr<int>*>, forward_iterator<std::unique_ptr<int>*> >();
+ test1<cpp17_input_iterator<std::unique_ptr<int>*>, bidirectional_iterator<std::unique_ptr<int>*> >();
+ test1<cpp17_input_iterator<std::unique_ptr<int>*>, random_access_iterator<std::unique_ptr<int>*> >();
+ test1<cpp17_input_iterator<std::unique_ptr<int>*>, std::unique_ptr<int>*>();
test1<forward_iterator<std::unique_ptr<int>*>, output_iterator<std::unique_ptr<int>*> >();
test1<forward_iterator<std::unique_ptr<int>*>, forward_iterator<std::unique_ptr<int>*> >();
@@ -126,7 +126,7 @@ int main(int, char**)
#endif // TEST_STD_VER >= 11
#if TEST_STD_VER > 17
- test<input_iterator<const int*>, contiguous_iterator<int*>>();
+ test<cpp17_input_iterator<const int*>, contiguous_iterator<int*>>();
test<forward_iterator<const int*>, contiguous_iterator<int*>>();
test<bidirectional_iterator<const int*>, contiguous_iterator<int*>>();
test<random_access_iterator<const int*>, contiguous_iterator<int*>>();
@@ -138,7 +138,7 @@ int main(int, char**)
test<contiguous_iterator<const int*>, int*>();
test<contiguous_iterator<const int*>, contiguous_iterator<int*>>();
- test1<input_iterator<std::unique_ptr<int>*>, contiguous_iterator<std::unique_ptr<int>*>>();
+ test1<cpp17_input_iterator<std::unique_ptr<int>*>, contiguous_iterator<std::unique_ptr<int>*>>();
test1<forward_iterator<std::unique_ptr<int>*>, contiguous_iterator<std::unique_ptr<int>*>>();
test1<bidirectional_iterator<std::unique_ptr<int>*>, contiguous_iterator<std::unique_ptr<int>*>>();
test1<random_access_iterator<std::unique_ptr<int>*>, contiguous_iterator<std::unique_ptr<int>*>>();
@@ -150,42 +150,42 @@ int main(int, char**)
test1<contiguous_iterator<std::unique_ptr<int>*>, std::unique_ptr<int>*>();
test1<contiguous_iterator<std::unique_ptr<int>*>, contiguous_iterator<std::unique_ptr<int>*>>();
- static_assert(test<input_iterator<const int*>, input_iterator<int*> >());
- static_assert(test<input_iterator<const int*>, forward_iterator<int*> >());
- static_assert(test<input_iterator<const int*>, bidirectional_iterator<int*> >());
- static_assert(test<input_iterator<const int*>, random_access_iterator<int*> >());
- static_assert(test<input_iterator<const int*>, contiguous_iterator<int*> >());
- static_assert(test<input_iterator<const int*>, int*>());
+ static_assert(test<cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >());
+ static_assert(test<cpp17_input_iterator<const int*>, forward_iterator<int*> >());
+ static_assert(test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >());
+ static_assert(test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >());
+ static_assert(test<cpp17_input_iterator<const int*>, contiguous_iterator<int*> >());
+ static_assert(test<cpp17_input_iterator<const int*>, int*>());
- static_assert(test<forward_iterator<const int*>, input_iterator<int*> >());
+ static_assert(test<forward_iterator<const int*>, cpp17_input_iterator<int*> >());
static_assert(test<forward_iterator<const int*>, forward_iterator<int*> >());
static_assert(test<forward_iterator<const int*>, bidirectional_iterator<int*> >());
static_assert(test<forward_iterator<const int*>, random_access_iterator<int*> >());
static_assert(test<forward_iterator<const int*>, contiguous_iterator<int*> >());
static_assert(test<forward_iterator<const int*>, int*>());
- static_assert(test<bidirectional_iterator<const int*>, input_iterator<int*> >());
+ static_assert(test<bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >());
static_assert(test<bidirectional_iterator<const int*>, forward_iterator<int*> >());
static_assert(test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >());
static_assert(test<bidirectional_iterator<const int*>, random_access_iterator<int*> >());
static_assert(test<bidirectional_iterator<const int*>, contiguous_iterator<int*> >());
static_assert(test<bidirectional_iterator<const int*>, int*>());
- static_assert(test<random_access_iterator<const int*>, input_iterator<int*> >());
+ static_assert(test<random_access_iterator<const int*>, cpp17_input_iterator<int*> >());
static_assert(test<random_access_iterator<const int*>, forward_iterator<int*> >());
static_assert(test<random_access_iterator<const int*>, bidirectional_iterator<int*> >());
static_assert(test<random_access_iterator<const int*>, random_access_iterator<int*> >());
static_assert(test<random_access_iterator<const int*>, contiguous_iterator<int*> >());
static_assert(test<random_access_iterator<const int*>, int*>());
- static_assert(test<contiguous_iterator<const int*>, input_iterator<int*> >());
+ static_assert(test<contiguous_iterator<const int*>, cpp17_input_iterator<int*> >());
static_assert(test<contiguous_iterator<const int*>, forward_iterator<int*> >());
static_assert(test<contiguous_iterator<const int*>, bidirectional_iterator<int*> >());
static_assert(test<contiguous_iterator<const int*>, random_access_iterator<int*> >());
static_assert(test<contiguous_iterator<const int*>, contiguous_iterator<int*> >());
static_assert(test<contiguous_iterator<const int*>, int*>());
- static_assert(test<const int*, input_iterator<int*> >());
+ static_assert(test<const int*, cpp17_input_iterator<int*> >());
static_assert(test<const int*, forward_iterator<int*> >());
static_assert(test<const int*, bidirectional_iterator<int*> >());
static_assert(test<const int*, random_access_iterator<int*> >());
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
index 831fcf16c0289..f5a0ff0b27dad 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
@@ -39,8 +39,8 @@ int main(int, char**) {
{
const int ia[] = {1, 2, 3, 4, 5, 6};
unary_counting_predicate<is_odd, int> pred((is_odd()));
- assert(!std::is_partitioned(input_iterator<const int *>(std::begin(ia)),
- input_iterator<const int *>(std::end(ia)),
+ assert(!std::is_partitioned(cpp17_input_iterator<const int *>(std::begin(ia)),
+ cpp17_input_iterator<const int *>(std::end(ia)),
std::ref(pred)));
assert(static_cast<std::ptr
diff _t>(pred.count()) <=
std::distance(std::begin(ia), std::end(ia)));
@@ -48,8 +48,8 @@ int main(int, char**) {
{
const int ia[] = {1, 3, 5, 2, 4, 6};
unary_counting_predicate<is_odd, int> pred((is_odd()));
- assert(std::is_partitioned(input_iterator<const int *>(std::begin(ia)),
- input_iterator<const int *>(std::end(ia)),
+ assert(std::is_partitioned(cpp17_input_iterator<const int *>(std::begin(ia)),
+ cpp17_input_iterator<const int *>(std::end(ia)),
std::ref(pred)));
assert(static_cast<std::ptr
diff _t>(pred.count()) <=
std::distance(std::begin(ia), std::end(ia)));
@@ -57,8 +57,8 @@ int main(int, char**) {
{
const int ia[] = {2, 4, 6, 1, 3, 5};
unary_counting_predicate<is_odd, int> pred((is_odd()));
- assert(!std::is_partitioned(input_iterator<const int *>(std::begin(ia)),
- input_iterator<const int *>(std::end(ia)),
+ assert(!std::is_partitioned(cpp17_input_iterator<const int *>(std::begin(ia)),
+ cpp17_input_iterator<const int *>(std::end(ia)),
std::ref(pred)));
assert(static_cast<std::ptr
diff _t>(pred.count()) <=
std::distance(std::begin(ia), std::end(ia)));
@@ -66,8 +66,8 @@ int main(int, char**) {
{
const int ia[] = {1, 3, 5, 2, 4, 6, 7};
unary_counting_predicate<is_odd, int> pred((is_odd()));
- assert(!std::is_partitioned(input_iterator<const int *>(std::begin(ia)),
- input_iterator<const int *>(std::end(ia)),
+ assert(!std::is_partitioned(cpp17_input_iterator<const int *>(std::begin(ia)),
+ cpp17_input_iterator<const int *>(std::end(ia)),
std::ref(pred)));
assert(static_cast<std::ptr
diff _t>(pred.count()) <=
std::distance(std::begin(ia), std::end(ia)));
@@ -75,8 +75,8 @@ int main(int, char**) {
{
const int ia[] = {1, 3, 5, 2, 4, 6, 7};
unary_counting_predicate<is_odd, int> pred((is_odd()));
- assert(std::is_partitioned(input_iterator<const int *>(std::begin(ia)),
- input_iterator<const int *>(std::begin(ia)),
+ assert(std::is_partitioned(cpp17_input_iterator<const int *>(std::begin(ia)),
+ cpp17_input_iterator<const int *>(std::begin(ia)),
std::ref(pred)));
assert(static_cast<std::ptr
diff _t>(pred.count()) <=
std::distance(std::begin(ia), std::begin(ia)));
@@ -84,8 +84,8 @@ int main(int, char**) {
{
const int ia[] = {1, 3, 5, 7, 9, 11, 2};
unary_counting_predicate<is_odd, int> pred((is_odd()));
- assert(std::is_partitioned(input_iterator<const int *>(std::begin(ia)),
- input_iterator<const int *>(std::end(ia)),
+ assert(std::is_partitioned(cpp17_input_iterator<const int *>(std::begin(ia)),
+ cpp17_input_iterator<const int *>(std::end(ia)),
std::ref(pred)));
assert(static_cast<std::ptr
diff _t>(pred.count()) <=
std::distance(std::begin(ia), std::end(ia)));
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
index 2671363465410..77401872d98bb 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
@@ -50,8 +50,8 @@ int main(int, char**)
int r1[10] = {0};
int r2[10] = {0};
typedef std::pair<output_iterator<int*>, int*> P;
- P p = std::partition_copy(input_iterator<const int*>(std::begin(ia)),
- input_iterator<const int*>(std::end(ia)),
+ P p = std::partition_copy(cpp17_input_iterator<const int*>(std::begin(ia)),
+ cpp17_input_iterator<const int*>(std::end(ia)),
output_iterator<int*>(r1), r2, is_odd());
assert(p.first.base() == r1 + 4);
assert(r1[0] == 1);
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp
index 4d03646d83feb..29ff2d81af736 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp
@@ -39,7 +39,7 @@ int main(int, char**) {
// expected-error-re at algorithm:* {{static_assert failed{{( due to requirement '.*')?}} "SampleIterator must meet the requirements of RandomAccessIterator"}}
// expected-error at algorithm:* 2 {{does not provide a subscript operator}}
// expected-error at algorithm:* {{invalid operands}}
- test<input_iterator<int *>, output_iterator<int *> >();
+ test<cpp17_input_iterator<int *>, output_iterator<int *> >();
return 0;
}
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
index d18f9ec453381..8a86aa6b369cd 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
@@ -137,23 +137,23 @@ void test_small_population() {
}
int main(int, char**) {
- test<input_iterator, int, random_access_iterator, int>();
+ test<cpp17_input_iterator, int, random_access_iterator, int>();
test<forward_iterator, int, output_iterator, int>();
test<forward_iterator, int, random_access_iterator, int>();
- test<input_iterator, int, random_access_iterator, double>();
+ test<cpp17_input_iterator, int, random_access_iterator, double>();
test<forward_iterator, int, output_iterator, double>();
test<forward_iterator, int, random_access_iterator, double>();
- test_empty_population<input_iterator, int, random_access_iterator, int>();
+ test_empty_population<cpp17_input_iterator, int, random_access_iterator, int>();
test_empty_population<forward_iterator, int, output_iterator, int>();
test_empty_population<forward_iterator, int, random_access_iterator, int>();
- test_empty_sample<input_iterator, int, random_access_iterator, int>();
+ test_empty_sample<cpp17_input_iterator, int, random_access_iterator, int>();
test_empty_sample<forward_iterator, int, output_iterator, int>();
test_empty_sample<forward_iterator, int, random_access_iterator, int>();
- test_small_population<input_iterator, int, random_access_iterator, int>();
+ test_small_population<cpp17_input_iterator, int, random_access_iterator, int>();
test_small_population<forward_iterator, int, output_iterator, int>();
test_small_population<forward_iterator, int, random_access_iterator, int>();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.stable.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.stable.pass.cpp
index 22dec71613ca8..aaf081af9c6ce 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.stable.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.stable.pass.cpp
@@ -51,7 +51,7 @@ void test_stability(bool expect_stable) {
int main(int, char**) {
test_stability<forward_iterator<int *>, output_iterator<int *> >(true);
- test_stability<input_iterator<int *>, random_access_iterator<int *> >(false);
+ test_stability<cpp17_input_iterator<int *>, random_access_iterator<int *> >(false);
return 0;
}
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
index 37d5759f833c5..9011a557a8655 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
@@ -52,11 +52,11 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
index 01b382ba004d7..b7a433d5645c0 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
@@ -57,11 +57,11 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
index da3fabf406b16..e4dd3bd6d8cb1 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
@@ -56,11 +56,11 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
index 26cbd705f49b8..e7c16f40d9243 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
@@ -60,11 +60,11 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
index ca7287bf24ba2..77e444b790f30 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
@@ -58,176 +58,176 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, input_iterator<const int*>, input_iterator<int*> >();
- test<input_iterator<const int*>, input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, input_iterator<const int*>, int*>();
-
- test<input_iterator<const int*>, forward_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*>, input_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*>, int*>();
-
- test<input_iterator<const int*>, bidirectional_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*>, input_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*>, int*>();
-
- test<input_iterator<const int*>, random_access_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*>, input_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*>, int*>();
-
- test<input_iterator<const int*>, const int*, output_iterator<int*> >();
- test<input_iterator<const int*>, const int*, input_iterator<int*> >();
- test<input_iterator<const int*>, const int*, forward_iterator<int*> >();
- test<input_iterator<const int*>, const int*, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, const int*, random_access_iterator<int*> >();
- test<input_iterator<const int*>, const int*, int*>();
-
- test<forward_iterator<const int*>, input_iterator<const int*>, output_iterator<int*> >();
- test<forward_iterator<const int*>, input_iterator<const int*>, input_iterator<int*> >();
- test<forward_iterator<const int*>, input_iterator<const int*>, forward_iterator<int*> >();
- test<forward_iterator<const int*>, input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<forward_iterator<const int*>, input_iterator<const int*>, random_access_iterator<int*> >();
- test<forward_iterator<const int*>, input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, int*>();
+
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, int*>();
+
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, int*>();
+
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, int*>();
+
+ test<cpp17_input_iterator<const int*>, const int*, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, const int*, cpp17_input_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, const int*, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, const int*, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, const int*, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, const int*, int*>();
+
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, forward_iterator<const int*>, output_iterator<int*> >();
- test<forward_iterator<const int*>, forward_iterator<const int*>, input_iterator<int*> >();
+ test<forward_iterator<const int*>, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*>, forward_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*>, bidirectional_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*>, random_access_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*>, int*>();
test<forward_iterator<const int*>, bidirectional_iterator<const int*>, output_iterator<int*> >();
- test<forward_iterator<const int*>, bidirectional_iterator<const int*>, input_iterator<int*> >();
+ test<forward_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*>, forward_iterator<int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*>, int*>();
test<forward_iterator<const int*>, random_access_iterator<const int*>, output_iterator<int*> >();
- test<forward_iterator<const int*>, random_access_iterator<const int*>, input_iterator<int*> >();
+ test<forward_iterator<const int*>, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*>, forward_iterator<int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*>, random_access_iterator<int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*>, int*>();
test<forward_iterator<const int*>, const int*, output_iterator<int*> >();
- test<forward_iterator<const int*>, const int*, input_iterator<int*> >();
+ test<forward_iterator<const int*>, const int*, cpp17_input_iterator<int*> >();
test<forward_iterator<const int*>, const int*, forward_iterator<int*> >();
test<forward_iterator<const int*>, const int*, bidirectional_iterator<int*> >();
test<forward_iterator<const int*>, const int*, random_access_iterator<int*> >();
test<forward_iterator<const int*>, const int*, int*>();
- test<bidirectional_iterator<const int*>, input_iterator<const int*>, output_iterator<int*> >();
- test<bidirectional_iterator<const int*>, input_iterator<const int*>, input_iterator<int*> >();
- test<bidirectional_iterator<const int*>, input_iterator<const int*>, forward_iterator<int*> >();
- test<bidirectional_iterator<const int*>, input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<bidirectional_iterator<const int*>, input_iterator<const int*>, random_access_iterator<int*> >();
- test<bidirectional_iterator<const int*>, input_iterator<const int*>, int*>();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, int*>();
test<bidirectional_iterator<const int*>, forward_iterator<const int*>, output_iterator<int*> >();
- test<bidirectional_iterator<const int*>, forward_iterator<const int*>, input_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*>, forward_iterator<int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*>, bidirectional_iterator<int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*>, random_access_iterator<int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*>, int*>();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, output_iterator<int*> >();
- test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, input_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, forward_iterator<int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, int*>();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, output_iterator<int*> >();
- test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, input_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, forward_iterator<int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, random_access_iterator<int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, int*>();
test<bidirectional_iterator<const int*>, const int*, output_iterator<int*> >();
- test<bidirectional_iterator<const int*>, const int*, input_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, const int*, cpp17_input_iterator<int*> >();
test<bidirectional_iterator<const int*>, const int*, forward_iterator<int*> >();
test<bidirectional_iterator<const int*>, const int*, bidirectional_iterator<int*> >();
test<bidirectional_iterator<const int*>, const int*, random_access_iterator<int*> >();
test<bidirectional_iterator<const int*>, const int*, int*>();
- test<random_access_iterator<const int*>, input_iterator<const int*>, output_iterator<int*> >();
- test<random_access_iterator<const int*>, input_iterator<const int*>, input_iterator<int*> >();
- test<random_access_iterator<const int*>, input_iterator<const int*>, forward_iterator<int*> >();
- test<random_access_iterator<const int*>, input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<random_access_iterator<const int*>, input_iterator<const int*>, random_access_iterator<int*> >();
- test<random_access_iterator<const int*>, input_iterator<const int*>, int*>();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, int*>();
test<random_access_iterator<const int*>, forward_iterator<const int*>, output_iterator<int*> >();
- test<random_access_iterator<const int*>, forward_iterator<const int*>, input_iterator<int*> >();
+ test<random_access_iterator<const int*>, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*>, forward_iterator<int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*>, bidirectional_iterator<int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*>, random_access_iterator<int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*>, int*>();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, output_iterator<int*> >();
- test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, input_iterator<int*> >();
+ test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, forward_iterator<int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, int*>();
test<random_access_iterator<const int*>, random_access_iterator<const int*>, output_iterator<int*> >();
- test<random_access_iterator<const int*>, random_access_iterator<const int*>, input_iterator<int*> >();
+ test<random_access_iterator<const int*>, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*>, forward_iterator<int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*>, random_access_iterator<int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*>, int*>();
test<random_access_iterator<const int*>, const int*, output_iterator<int*> >();
- test<random_access_iterator<const int*>, const int*, input_iterator<int*> >();
+ test<random_access_iterator<const int*>, const int*, cpp17_input_iterator<int*> >();
test<random_access_iterator<const int*>, const int*, forward_iterator<int*> >();
test<random_access_iterator<const int*>, const int*, bidirectional_iterator<int*> >();
test<random_access_iterator<const int*>, const int*, random_access_iterator<int*> >();
test<random_access_iterator<const int*>, const int*, int*>();
- test<const int*, input_iterator<const int*>, output_iterator<int*> >();
- test<const int*, input_iterator<const int*>, input_iterator<int*> >();
- test<const int*, input_iterator<const int*>, forward_iterator<int*> >();
- test<const int*, input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<const int*, input_iterator<const int*>, random_access_iterator<int*> >();
- test<const int*, input_iterator<const int*>, int*>();
+ test<const int*, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<const int*, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test<const int*, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<const int*, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<const int*, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<const int*, cpp17_input_iterator<const int*>, int*>();
test<const int*, forward_iterator<const int*>, output_iterator<int*> >();
- test<const int*, forward_iterator<const int*>, input_iterator<int*> >();
+ test<const int*, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
test<const int*, forward_iterator<const int*>, forward_iterator<int*> >();
test<const int*, forward_iterator<const int*>, bidirectional_iterator<int*> >();
test<const int*, forward_iterator<const int*>, random_access_iterator<int*> >();
test<const int*, forward_iterator<const int*>, int*>();
test<const int*, bidirectional_iterator<const int*>, output_iterator<int*> >();
- test<const int*, bidirectional_iterator<const int*>, input_iterator<int*> >();
+ test<const int*, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
test<const int*, bidirectional_iterator<const int*>, forward_iterator<int*> >();
test<const int*, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
test<const int*, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
test<const int*, bidirectional_iterator<const int*>, int*>();
test<const int*, random_access_iterator<const int*>, output_iterator<int*> >();
- test<const int*, random_access_iterator<const int*>, input_iterator<int*> >();
+ test<const int*, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
test<const int*, random_access_iterator<const int*>, forward_iterator<int*> >();
test<const int*, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
test<const int*, random_access_iterator<const int*>, random_access_iterator<int*> >();
test<const int*, random_access_iterator<const int*>, int*>();
test<const int*, const int*, output_iterator<int*> >();
- test<const int*, const int*, input_iterator<int*> >();
+ test<const int*, const int*, cpp17_input_iterator<int*> >();
test<const int*, const int*, forward_iterator<int*> >();
test<const int*, const int*, bidirectional_iterator<int*> >();
test<const int*, const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
index 85c3868207bcf..3a5cf3bed3a84 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
@@ -59,36 +59,36 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, input_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
- test<forward_iterator<const int*>, input_iterator<int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
test<forward_iterator<const int*>, random_access_iterator<int*> >();
test<forward_iterator<const int*>, int*>();
test<bidirectional_iterator<const int*>, output_iterator<int*> >();
- test<bidirectional_iterator<const int*>, input_iterator<int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
test<bidirectional_iterator<const int*>, int*>();
test<random_access_iterator<const int*>, output_iterator<int*> >();
- test<random_access_iterator<const int*>, input_iterator<int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
test<random_access_iterator<const int*>, forward_iterator<int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
test<random_access_iterator<const int*>, random_access_iterator<int*> >();
test<random_access_iterator<const int*>, int*>();
test<const int*, output_iterator<int*> >();
- test<const int*, input_iterator<int*> >();
+ test<const int*, cpp17_input_iterator<int*> >();
test<const int*, forward_iterator<int*> >();
test<const int*, bidirectional_iterator<int*> >();
test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
index ba533507cd98c..6271ac1751d2f 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
@@ -107,11 +107,11 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
index e8ebeaead8ccf..3d3d5f728255a 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
@@ -135,11 +135,11 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
index 126845af046e9..255cd62fd05d9 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
@@ -41,18 +41,18 @@ int main(int, char**)
{
int ia[] = {2, 4, 6, 8};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::all_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), test1()) == true);
- assert(std::all_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia), test1()) == true);
+ assert(std::all_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), test1()) == true);
+ assert(std::all_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia), test1()) == true);
}
{
const int ia[] = {2, 4, 5, 8};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::all_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), test1()) == false);
- assert(std::all_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia), test1()) == true);
+ assert(std::all_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), test1()) == false);
+ assert(std::all_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia), test1()) == true);
}
#if TEST_STD_VER > 17
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
index cdd7b8a533289..79f4438aa9abe 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
@@ -41,26 +41,26 @@ int main(int, char**)
{
int ia[] = {2, 4, 6, 8};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::any_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), test1()) == true);
- assert(std::any_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia), test1()) == false);
+ assert(std::any_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), test1()) == true);
+ assert(std::any_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia), test1()) == false);
}
{
const int ia[] = {2, 4, 5, 8};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::any_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), test1()) == true);
- assert(std::any_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia), test1()) == false);
+ assert(std::any_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), test1()) == true);
+ assert(std::any_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia), test1()) == false);
}
{
const int ia[] = {1, 3, 5, 7};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::any_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), test1()) == false);
- assert(std::any_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia), test1()) == false);
+ assert(std::any_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), test1()) == false);
+ assert(std::any_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia), test1()) == false);
}
#if TEST_STD_VER > 17
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
index d864080df8d32..1cb45cff9c6d3 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
@@ -33,12 +33,12 @@ int main(int, char**)
{
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::count(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), 2) == 3);
- assert(std::count(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), 7) == 0);
- assert(std::count(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia), 2) == 0);
+ assert(std::count(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), 2) == 3);
+ assert(std::count(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), 7) == 0);
+ assert(std::count(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia), 2) == 0);
#if TEST_STD_VER > 17
static_assert(test_constexpr());
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
index 978f5fcdbe58a..176d6b22551fb 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
@@ -40,14 +40,14 @@ int main(int, char**)
{
int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::count_if(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
+ assert(std::count_if(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa),
eq(2)) == 3);
- assert(std::count_if(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
+ assert(std::count_if(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa),
eq(7)) == 0);
- assert(std::count_if(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia),
+ assert(std::count_if(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia),
eq(2)) == 0);
#if TEST_STD_VER > 17
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
index afd57491a4021..2b13bee2a806e 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
@@ -29,7 +29,7 @@ TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {1, 3, 6, 7};
int ib[] = {1, 3};
int ic[] = {1, 3, 5, 7};
- typedef input_iterator<int*> II;
+ typedef cpp17_input_iterator<int*> II;
typedef bidirectional_iterator<int*> BI;
return !std::equal(std::begin(ia), std::end(ia), std::begin(ic))
@@ -49,35 +49,35 @@ int main(int, char**)
int ia[] = {0, 1, 2, 3, 4, 5};
const unsigned s = sizeof(ia)/sizeof(ia[0]);
int ib[s] = {0, 1, 2, 5, 4, 5};
- assert(std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ia)));
+ assert(std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ia)));
#if TEST_STD_VER >= 14
- assert(std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s)));
+ assert(std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s)));
assert(std::equal(random_access_iterator<const int*>(ia),
random_access_iterator<const int*>(ia+s),
random_access_iterator<const int*>(ia),
random_access_iterator<const int*>(ia+s)));
#endif
- assert(!std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ib)));
+ assert(!std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ib)));
#if TEST_STD_VER >= 14
- assert(!std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ib),
- input_iterator<const int*>(ib+s)));
+ assert(!std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ib),
+ cpp17_input_iterator<const int*>(ib+s)));
assert(!std::equal(random_access_iterator<const int*>(ia),
random_access_iterator<const int*>(ia+s),
random_access_iterator<const int*>(ib),
random_access_iterator<const int*>(ib+s)));
- assert(!std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s-1)));
+ assert(!std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s-1)));
assert(!std::equal(random_access_iterator<const int*>(ia),
random_access_iterator<const int*>(ia+s),
random_access_iterator<const int*>(ia),
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
index 2b9619b73ee74..8752b92d6dfa9 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
@@ -36,7 +36,7 @@ TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {1, 3, 6, 7};
int ib[] = {1, 3};
int ic[] = {1, 3, 5, 7};
- typedef input_iterator<int*> II;
+ typedef cpp17_input_iterator<int*> II;
typedef bidirectional_iterator<int*> BI;
return !std::equal(std::begin(ia), std::end(ia), std::begin(ic) , eq)
@@ -63,15 +63,15 @@ int main(int, char**)
int ia[] = {0, 1, 2, 3, 4, 5};
const unsigned s = sizeof(ia)/sizeof(ia[0]);
int ib[s] = {0, 1, 2, 5, 4, 5};
- assert(std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ia),
+ assert(std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ia),
std::equal_to<int>()));
#if TEST_STD_VER >= 14
- assert(std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
+ assert(std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
std::equal_to<int>()));
assert(std::equal(random_access_iterator<const int*>(ia),
random_access_iterator<const int*>(ia+s),
@@ -80,10 +80,10 @@ int main(int, char**)
std::equal_to<int>()));
comparison_count = 0;
- assert(!std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s-1),
+ assert(!std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s-1),
counting_equals<int>));
assert(comparison_count > 0);
comparison_count = 0;
@@ -94,15 +94,15 @@ int main(int, char**)
counting_equals<int>));
assert(comparison_count == 0);
#endif
- assert(!std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ib),
+ assert(!std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ib),
std::equal_to<int>()));
#if TEST_STD_VER >= 14
- assert(!std::equal(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
- input_iterator<const int*>(ib),
- input_iterator<const int*>(ib+s),
+ assert(!std::equal(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*>(ib),
+ cpp17_input_iterator<const int*>(ib+s),
std::equal_to<int>()));
assert(!std::equal(random_access_iterator<const int*>(ia),
random_access_iterator<const int*>(ia+s),
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
index 04468f7410382..6a76ef95353a8 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
@@ -44,27 +44,27 @@ int main(int, char**)
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
int ib[] = {1, 3, 5, 7};
const unsigned sb = sizeof(ib)/sizeof(ib[0]);
- assert(std::find_first_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
+ assert(std::find_first_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa),
forward_iterator<const int*>(ib),
forward_iterator<const int*>(ib + sb)) ==
- input_iterator<const int*>(ia+1));
+ cpp17_input_iterator<const int*>(ia+1));
int ic[] = {7};
- assert(std::find_first_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
+ assert(std::find_first_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa),
forward_iterator<const int*>(ic),
forward_iterator<const int*>(ic + 1)) ==
- input_iterator<const int*>(ia+sa));
- assert(std::find_first_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
+ cpp17_input_iterator<const int*>(ia+sa));
+ assert(std::find_first_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa),
forward_iterator<const int*>(ic),
forward_iterator<const int*>(ic)) ==
- input_iterator<const int*>(ia+sa));
- assert(std::find_first_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+sa));
+ assert(std::find_first_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia),
forward_iterator<const int*>(ic),
forward_iterator<const int*>(ic+1)) ==
- input_iterator<const int*>(ia));
+ cpp17_input_iterator<const int*>(ia));
#if TEST_STD_VER > 17
static_assert(test_constexpr());
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
index 3c32aee0e2461..0e9a6e576b85c 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
@@ -46,31 +46,31 @@ int main(int, char**)
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
int ib[] = {1, 3, 5, 7};
const unsigned sb = sizeof(ib)/sizeof(ib[0]);
- assert(std::find_first_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
+ assert(std::find_first_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa),
forward_iterator<const int*>(ib),
forward_iterator<const int*>(ib + sb),
std::equal_to<int>()) ==
- input_iterator<const int*>(ia+1));
+ cpp17_input_iterator<const int*>(ia+1));
int ic[] = {7};
- assert(std::find_first_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
+ assert(std::find_first_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa),
forward_iterator<const int*>(ic),
forward_iterator<const int*>(ic + 1),
std::equal_to<int>()) ==
- input_iterator<const int*>(ia+sa));
- assert(std::find_first_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa),
+ cpp17_input_iterator<const int*>(ia+sa));
+ assert(std::find_first_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa),
forward_iterator<const int*>(ic),
forward_iterator<const int*>(ic),
std::equal_to<int>()) ==
- input_iterator<const int*>(ia+sa));
- assert(std::find_first_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+sa));
+ assert(std::find_first_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia),
forward_iterator<const int*>(ic),
forward_iterator<const int*>(ic+1),
std::equal_to<int>()) ==
- input_iterator<const int*>(ia));
+ cpp17_input_iterator<const int*>(ia));
#if TEST_STD_VER > 17
static_assert(test_constexpr());
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
index 9dc265f18540c..c4de565ba4bf7 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
@@ -33,11 +33,11 @@ int main(int, char**)
{
int ia[] = {0, 1, 2, 3, 4, 5};
const unsigned s = sizeof(ia)/sizeof(ia[0]);
- input_iterator<const int*> r = std::find(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s), 3);
+ cpp17_input_iterator<const int*> r = std::find(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s), 3);
assert(*r == 3);
- r = std::find(input_iterator<const int*>(ia), input_iterator<const int*>(ia+s), 10);
- assert(r == input_iterator<const int*>(ia+s));
+ r = std::find(cpp17_input_iterator<const int*>(ia), cpp17_input_iterator<const int*>(ia+s), 10);
+ assert(r == cpp17_input_iterator<const int*>(ia+s));
#if TEST_STD_VER > 17
static_assert(test_constexpr());
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
index 6151a55b8f6e1..a294b5c6a2810 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
@@ -41,14 +41,14 @@ int main(int, char**)
{
int ia[] = {0, 1, 2, 3, 4, 5};
const unsigned s = sizeof(ia)/sizeof(ia[0]);
- input_iterator<const int*> r = std::find_if(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*> r = std::find_if(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
eq(3));
assert(*r == 3);
- r = std::find_if(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
+ r = std::find_if(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
eq(10));
- assert(r == input_iterator<const int*>(ia+s));
+ assert(r == cpp17_input_iterator<const int*>(ia+s));
#if TEST_STD_VER > 17
static_assert(test_constexpr());
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
index 36a7542699965..6f48da3b9b42d 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
@@ -41,14 +41,14 @@ int main(int, char**)
{
int ia[] = {0, 1, 2, 3, 4, 5};
const unsigned s = sizeof(ia)/sizeof(ia[0]);
- input_iterator<const int*> r = std::find_if_not(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
+ cpp17_input_iterator<const int*> r = std::find_if_not(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
ne(3));
assert(*r == 3);
- r = std::find_if_not(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia+s),
+ r = std::find_if_not(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia+s),
ne(10));
- assert(r == input_iterator<const int*>(ia+s));
+ assert(r == cpp17_input_iterator<const int*>(ia+s));
#if TEST_STD_VER > 17
static_assert(test_constexpr());
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each_n.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each_n.pass.cpp
index 410385d41565a..45ec2f4258812 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each_n.pass.cpp
@@ -42,7 +42,7 @@ struct for_each_test
int main(int, char**)
{
- typedef input_iterator<int*> Iter;
+ typedef cpp17_input_iterator<int*> Iter;
int ia[] = {0, 1, 2, 3, 4, 5};
const unsigned s = sizeof(ia)/sizeof(ia[0]);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
index 4d129e75578a4..d6b46554e95ec 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
@@ -41,8 +41,8 @@ int main(int, char**)
{
int ia[] = {0, 1, 2, 3, 4, 5};
const unsigned s = sizeof(ia)/sizeof(ia[0]);
- for_each_test f = std::for_each(input_iterator<int*>(ia),
- input_iterator<int*>(ia+s),
+ for_each_test f = std::for_each(cpp17_input_iterator<int*>(ia),
+ cpp17_input_iterator<int*>(ia+s),
for_each_test(0));
assert(f.count == s);
for (unsigned i = 0; i < s; ++i)
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
index f3a4fea9022da..00c1b8954ad3b 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
@@ -41,26 +41,26 @@ int main(int, char**)
{
int ia[] = {2, 4, 6, 8};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::none_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), test1()) == false);
- assert(std::none_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia), test1()) == true);
+ assert(std::none_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), test1()) == false);
+ assert(std::none_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia), test1()) == true);
}
{
const int ia[] = {2, 4, 5, 8};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::none_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), test1()) == false);
- assert(std::none_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia), test1()) == true);
+ assert(std::none_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), test1()) == false);
+ assert(std::none_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia), test1()) == true);
}
{
const int ia[] = {1, 3, 5, 7};
const unsigned sa = sizeof(ia)/sizeof(ia[0]);
- assert(std::none_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia + sa), test1()) == true);
- assert(std::none_of(input_iterator<const int*>(ia),
- input_iterator<const int*>(ia), test1()) == true);
+ assert(std::none_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia + sa), test1()) == true);
+ assert(std::none_of(cpp17_input_iterator<const int*>(ia),
+ cpp17_input_iterator<const int*>(ia), test1()) == true);
}
#if TEST_STD_VER > 17
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
index 72281b47fd77f..cc588c095ccfb 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
@@ -28,7 +28,7 @@ TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {1, 3, 6, 7};
int ib[] = {1, 3};
int ic[] = {1, 3, 5, 7};
- typedef input_iterator<int*> II;
+ typedef cpp17_input_iterator<int*> II;
typedef bidirectional_iterator<int*> BI;
auto p1 = std::mismatch(std::begin(ia), std::end(ia), std::begin(ic));
@@ -65,7 +65,7 @@ int main(int, char**)
int ib[] = {0, 1, 2, 3, 0, 1, 2, 3};
const unsigned sb = sizeof(ib)/sizeof(ib[0]); ((void)sb); // unused in C++11
- typedef input_iterator<const int*> II;
+ typedef cpp17_input_iterator<const int*> II;
typedef random_access_iterator<const int*> RAI;
assert(std::mismatch(II(ia), II(ia + sa), II(ib))
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
index 13a0d52d6deeb..bda4ec7ba5ed6 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
@@ -33,7 +33,7 @@ TEST_CONSTEXPR bool test_constexpr() {
int ia[] = {1, 3, 6, 7};
int ib[] = {1, 3};
int ic[] = {1, 3, 5, 7};
- typedef input_iterator<int*> II;
+ typedef cpp17_input_iterator<int*> II;
typedef bidirectional_iterator<int*> BI;
auto p1 = std::mismatch(std::begin(ia), std::end(ia), std::begin(ic), eq);
@@ -75,7 +75,7 @@ int main(int, char**)
int ib[] = {0, 1, 2, 3, 0, 1, 2, 3};
const unsigned sb = sizeof(ib)/sizeof(ib[0]); ((void)sb); // unused in C++11
- typedef input_iterator<const int*> II;
+ typedef cpp17_input_iterator<const int*> II;
typedef random_access_iterator<const int*> RAI;
typedef std::equal_to<int> EQ;
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
index f421bfcb8bcd2..10e45df7cf9aa 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
@@ -48,31 +48,31 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, input_iterator<const int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*> >();
- test<input_iterator<const int*>, const int*>();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, const int*>();
- test<forward_iterator<const int*>, input_iterator<const int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*> >();
test<forward_iterator<const int*>, const int*>();
- test<bidirectional_iterator<const int*>, input_iterator<const int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*> >();
test<bidirectional_iterator<const int*>, const int*>();
- test<random_access_iterator<const int*>, input_iterator<const int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*> >();
test<random_access_iterator<const int*>, const int*>();
- test<const int*, input_iterator<const int*> >();
+ test<const int*, cpp17_input_iterator<const int*> >();
test<const int*, forward_iterator<const int*> >();
test<const int*, bidirectional_iterator<const int*> >();
test<const int*, random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
index b0e0ee7d77cca..a78efaf58d7c7 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
@@ -53,31 +53,31 @@ test()
int main(int, char**)
{
- test<input_iterator<const int*>, input_iterator<const int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*> >();
- test<input_iterator<const int*>, const int*>();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, const int*>();
- test<forward_iterator<const int*>, input_iterator<const int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*> >();
test<forward_iterator<const int*>, const int*>();
- test<bidirectional_iterator<const int*>, input_iterator<const int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*> >();
test<bidirectional_iterator<const int*>, const int*>();
- test<random_access_iterator<const int*>, input_iterator<const int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*> >();
test<random_access_iterator<const int*>, const int*>();
- test<const int*, input_iterator<const int*> >();
+ test<const int*, cpp17_input_iterator<const int*> >();
test<const int*, forward_iterator<const int*> >();
test<const int*, bidirectional_iterator<const int*> >();
test<const int*, random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
index 83b88d911748b..e6ca995d976f6 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
@@ -64,7 +64,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -74,7 +74,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
index 1383986cf77b6..235f94d563e68 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
@@ -65,7 +65,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -75,7 +75,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.fail.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.fail.cpp
index 6c4c363990862..70deef30f82e9 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.fail.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.fail.cpp
@@ -22,7 +22,7 @@
int main(int, char**) {
int arr[] = {1, 2, 3};
const int *b = std::begin(arr), *e = std::end(arr);
- typedef input_iterator<const int*> Iter;
+ typedef cpp17_input_iterator<const int*> Iter;
{
// expected-error at algorithm:* {{"std::min_element requires a ForwardIterator"}}
std::min_element(Iter(b), Iter(e));
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
index 790b93c5ada55..0da113f9375ae 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
@@ -53,31 +53,31 @@ void test()
TEST_CONSTEXPR_CXX20
bool do_tests()
{
- test<input_iterator<const int*>, input_iterator<const int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*> >();
- test<input_iterator<const int*>, const int*>();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, const int*>();
- test<forward_iterator<const int*>, input_iterator<const int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*> >();
test<forward_iterator<const int*>, const int*>();
- test<bidirectional_iterator<const int*>, input_iterator<const int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*> >();
test<bidirectional_iterator<const int*>, const int*>();
- test<random_access_iterator<const int*>, input_iterator<const int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*> >();
test<random_access_iterator<const int*>, const int*>();
- test<const int*, input_iterator<const int*> >();
+ test<const int*, cpp17_input_iterator<const int*> >();
test<const int*, forward_iterator<const int*> >();
test<const int*, bidirectional_iterator<const int*> >();
test<const int*, random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
index 8c54f0df0f1c9..9fab370fac4c2 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
@@ -54,31 +54,31 @@ void test()
TEST_CONSTEXPR_CXX20
bool do_tests()
{
- test<input_iterator<const int*>, input_iterator<const int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*> >();
- test<input_iterator<const int*>, const int*>();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, const int*>();
- test<forward_iterator<const int*>, input_iterator<const int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*> >();
test<forward_iterator<const int*>, const int*>();
- test<bidirectional_iterator<const int*>, input_iterator<const int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*> >();
test<bidirectional_iterator<const int*>, const int*>();
- test<random_access_iterator<const int*>, input_iterator<const int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*> >();
test<random_access_iterator<const int*>, const int*>();
- test<const int*, input_iterator<const int*> >();
+ test<const int*, cpp17_input_iterator<const int*> >();
test<const int*, forward_iterator<const int*> >();
test<const int*, bidirectional_iterator<const int*> >();
test<const int*, random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/set_
diff erence.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/set_
diff erence.pass.cpp
index 74892901c6aa6..03a643b8fdfc0 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/set_
diff erence.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/set_
diff erence.pass.cpp
@@ -64,7 +64,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -74,7 +74,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/set_
diff erence_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/set_
diff erence_comp.pass.cpp
index 8ce83946b4046..7c5ee8252071c 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/set_
diff erence_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/set_
diff erence_comp.pass.cpp
@@ -65,7 +65,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -75,7 +75,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
index ea86e22ab9248..c900d8f1dd00f 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
@@ -62,7 +62,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -72,7 +72,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
index 0ac88f682a50a..0a2ff1fca78c6 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
@@ -63,7 +63,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -73,7 +73,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/set_symmetric_
diff erence.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/set_symmetric_
diff erence.pass.cpp
index 9df46afd69176..ee88b38ff2ca2 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/set_symmetric_
diff erence.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/set_symmetric_
diff erence.pass.cpp
@@ -64,7 +64,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -74,7 +74,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/set_symmetric_
diff erence_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/set_symmetric_
diff erence_comp.pass.cpp
index f947d185c1aa0..e872165eb6c50 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/set_symmetric_
diff erence_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/set_symmetric_
diff erence_comp.pass.cpp
@@ -65,7 +65,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -75,7 +75,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
index e8f69631162cb..59720fee62896 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
@@ -64,7 +64,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -74,7 +74,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
index 07ec934255e24..9831cff6d8f8c 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
@@ -65,7 +65,7 @@ TEST_CONSTEXPR_CXX20 void test3()
template<class T, class Iter1>
TEST_CONSTEXPR_CXX20 void test2()
{
- test3<T, Iter1, input_iterator<const T*> >();
+ test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
@@ -75,7 +75,7 @@ TEST_CONSTEXPR_CXX20 void test2()
template<class T>
TEST_CONSTEXPR_CXX20 void test1()
{
- test2<T, input_iterator<const T*> >();
+ test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
index d59c4810cca27..c1f43d26680d3 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
@@ -38,7 +38,7 @@ int main(int, char**)
P(3, 2),
};
M m;
- m.insert(input_iterator<P*>(ar), input_iterator<P*>(ar + sizeof(ar)/sizeof(ar[0])));
+ m.insert(cpp17_input_iterator<P*>(ar), cpp17_input_iterator<P*>(ar + sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 3);
assert(m.begin()->first == 1);
assert(m.begin()->second == 1);
@@ -64,7 +64,7 @@ int main(int, char**)
P(3, 2),
};
M m;
- m.insert(input_iterator<P*>(ar), input_iterator<P*>(ar + sizeof(ar)/sizeof(ar[0])));
+ m.insert(cpp17_input_iterator<P*>(ar), cpp17_input_iterator<P*>(ar + sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 3);
assert(m.begin()->first == 1);
assert(m.begin()->second == 1);
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
index 5bf2cf511f3c2..4cb508f6ae1a7 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
@@ -38,7 +38,7 @@ int main(int, char**)
P(3, 2),
};
M m;
- m.insert(input_iterator<P*>(ar), input_iterator<P*>(ar + sizeof(ar)/sizeof(ar[0])));
+ m.insert(cpp17_input_iterator<P*>(ar), cpp17_input_iterator<P*>(ar + sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 9);
assert(m.begin()->first == 1);
assert(m.begin()->second == 1);
@@ -76,7 +76,7 @@ int main(int, char**)
P(3, 2),
};
M m;
- m.insert(input_iterator<P*>(ar), input_iterator<P*>(ar + sizeof(ar)/sizeof(ar[0])));
+ m.insert(cpp17_input_iterator<P*>(ar), cpp17_input_iterator<P*>(ar + sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 9);
assert(m.begin()->first == 1);
assert(m.begin()->second == 1);
diff --git a/libcxx/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp b/libcxx/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp
index ce5bd3833dc44..1cda409a345d9 100644
--- a/libcxx/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/insert_iter_iter.pass.cpp
@@ -38,8 +38,8 @@ int main(int, char**)
3
};
M m;
- m.insert(input_iterator<const V*>(ar),
- input_iterator<const V*>(ar + sizeof(ar)/sizeof(ar[0])));
+ m.insert(cpp17_input_iterator<const V*>(ar),
+ cpp17_input_iterator<const V*>(ar + sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 9);
assert(*next(m.begin(), 0) == 1);
assert(*next(m.begin(), 1) == 1);
@@ -68,8 +68,8 @@ int main(int, char**)
3
};
M m;
- m.insert(input_iterator<const V*>(ar),
- input_iterator<const V*>(ar + sizeof(ar)/sizeof(ar[0])));
+ m.insert(cpp17_input_iterator<const V*>(ar),
+ cpp17_input_iterator<const V*>(ar + sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 9);
assert(*next(m.begin(), 0) == 1);
assert(*next(m.begin(), 1) == 1);
diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
index f71061467af4b..fa18c298fa37c 100644
--- a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
@@ -36,8 +36,8 @@ int main(int, char**)
3,
3
};
- std::multiset<V> m(input_iterator<const int*>(ar),
- input_iterator<const int*>(ar+sizeof(ar)/sizeof(ar[0])));
+ std::multiset<V> m(cpp17_input_iterator<const int*>(ar),
+ cpp17_input_iterator<const int*>(ar+sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 9);
assert(distance(m.begin(), m.end()) == 9);
assert(*next(m.begin(), 0) == 1);
@@ -65,8 +65,8 @@ int main(int, char**)
3,
3
};
- std::multiset<V, std::less<V>, min_allocator<V>> m(input_iterator<const int*>(ar),
- input_iterator<const int*>(ar+sizeof(ar)/sizeof(ar[0])));
+ std::multiset<V, std::less<V>, min_allocator<V>> m(cpp17_input_iterator<const int*>(ar),
+ cpp17_input_iterator<const int*>(ar+sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 9);
assert(distance(m.begin(), m.end()) == 9);
assert(*next(m.begin(), 0) == 1);
diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
index 82d9f4aea1c2d..4227b6b48ade4 100644
--- a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
@@ -40,8 +40,8 @@ int main(int, char**)
};
typedef test_compare<std::less<V> > C;
typedef test_allocator<V> A;
- std::multiset<V, C, A> m(input_iterator<const V*>(ar),
- input_iterator<const V*>(ar+sizeof(ar)/sizeof(ar[0])),
+ std::multiset<V, C, A> m(cpp17_input_iterator<const V*>(ar),
+ cpp17_input_iterator<const V*>(ar+sizeof(ar)/sizeof(ar[0])),
C(5), A(7));
assert(m.value_comp() == C(5));
assert(m.get_allocator() == A(7));
diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
index 9f4e9edc7387e..d276e4a36e640 100644
--- a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
@@ -36,8 +36,8 @@ int main(int, char**)
3
};
typedef test_compare<std::less<V> > C;
- std::multiset<V, C> m(input_iterator<const V*>(ar),
- input_iterator<const V*>(ar+sizeof(ar)/sizeof(ar[0])), C(5));
+ std::multiset<V, C> m(cpp17_input_iterator<const V*>(ar),
+ cpp17_input_iterator<const V*>(ar+sizeof(ar)/sizeof(ar[0])), C(5));
assert(m.value_comp() == C(5));
assert(m.size() == 9);
assert(distance(m.begin(), m.end()) == 9);
diff --git a/libcxx/test/std/containers/associative/set/insert_iter_iter.pass.cpp b/libcxx/test/std/containers/associative/set/insert_iter_iter.pass.cpp
index 2bde21aafe9fc..0e29e36d67e4a 100644
--- a/libcxx/test/std/containers/associative/set/insert_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/insert_iter_iter.pass.cpp
@@ -38,8 +38,8 @@ int main(int, char**)
3
};
M m;
- m.insert(input_iterator<const V*>(ar),
- input_iterator<const V*>(ar + sizeof(ar)/sizeof(ar[0])));
+ m.insert(cpp17_input_iterator<const V*>(ar),
+ cpp17_input_iterator<const V*>(ar + sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 3);
assert(*m.begin() == 1);
assert(*next(m.begin()) == 2);
@@ -62,8 +62,8 @@ int main(int, char**)
3
};
M m;
- m.insert(input_iterator<const V*>(ar),
- input_iterator<const V*>(ar + sizeof(ar)/sizeof(ar[0])));
+ m.insert(cpp17_input_iterator<const V*>(ar),
+ cpp17_input_iterator<const V*>(ar + sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 3);
assert(*m.begin() == 1);
assert(*next(m.begin()) == 2);
diff --git a/libcxx/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp
index 89cabff4b9082..54c48c7b00548 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/iter_iter.pass.cpp
@@ -36,8 +36,8 @@ int main(int, char**)
3,
3
};
- std::set<V> m(input_iterator<const int*>(ar),
- input_iterator<const int*>(ar+sizeof(ar)/sizeof(ar[0])));
+ std::set<V> m(cpp17_input_iterator<const int*>(ar),
+ cpp17_input_iterator<const int*>(ar+sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 3);
assert(distance(m.begin(), m.end()) == 3);
assert(*m.begin() == 1);
@@ -59,8 +59,8 @@ int main(int, char**)
3,
3
};
- std::set<V, std::less<int>, min_allocator<int>> m(input_iterator<const int*>(ar),
- input_iterator<const int*>(ar+sizeof(ar)/sizeof(ar[0])));
+ std::set<V, std::less<int>, min_allocator<int>> m(cpp17_input_iterator<const int*>(ar),
+ cpp17_input_iterator<const int*>(ar+sizeof(ar)/sizeof(ar[0])));
assert(m.size() == 3);
assert(distance(m.begin(), m.end()) == 3);
assert(*m.begin() == 1);
diff --git a/libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
index bf8b97098314c..30fa4a17e5626 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
@@ -44,8 +44,8 @@ int main(int, char**)
};
typedef test_compare<std::less<V> > C;
typedef test_allocator<V> A;
- std::set<V, C, A> m(input_iterator<const V*>(ar),
- input_iterator<const V*>(ar+sizeof(ar)/sizeof(ar[0])),
+ std::set<V, C, A> m(cpp17_input_iterator<const V*>(ar),
+ cpp17_input_iterator<const V*>(ar+sizeof(ar)/sizeof(ar[0])),
C(5), A(7));
assert(m.value_comp() == C(5));
assert(m.get_allocator() == A(7));
diff --git a/libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
index 24046ff09a80d..c1afb46821245 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
@@ -36,8 +36,8 @@ int main(int, char**)
3
};
typedef test_compare<std::less<V> > C;
- std::set<V, C> m(input_iterator<const V*>(ar),
- input_iterator<const V*>(ar+sizeof(ar)/sizeof(ar[0])), C(5));
+ std::set<V, C> m(cpp17_input_iterator<const V*>(ar),
+ cpp17_input_iterator<const V*>(ar+sizeof(ar)/sizeof(ar[0])), C(5));
assert(m.value_comp() == C(5));
assert(m.size() == 3);
assert(distance(m.begin(), m.end()) == 3);
diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
index d59943574f001..1d46453963650 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
@@ -67,7 +67,7 @@ void
testI(C& c1, const C& c2)
{
typedef typename C::const_iterator CI;
- typedef input_iterator<CI> ICI;
+ typedef cpp17_input_iterator<CI> ICI;
c1.assign(ICI(c2.begin()), ICI(c2.end()));
assert(static_cast<std::size_t>(distance(c1.begin(), c1.end())) == c1.size());
assert(c1 == c2);
@@ -128,7 +128,7 @@ void test_emplacable_concept() {
}
{
using T = EmplaceConstructibleMoveableAndAssignable<int>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
{
std::deque<T> v;
v.assign(It(arr1), It(std::end(arr1)));
diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
index 214ac8303bd73..d5e642bd4bb5e 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
@@ -55,7 +55,7 @@ void basic_test()
{
int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45};
int* an = ab + sizeof(ab)/sizeof(ab[0]);
- test(input_iterator<const int*>(ab), input_iterator<const int*>(an));
+ test(cpp17_input_iterator<const int*>(ab), cpp17_input_iterator<const int*>(an));
test(forward_iterator<const int*>(ab), forward_iterator<const int*>(an));
test(bidirectional_iterator<const int*>(ab), bidirectional_iterator<const int*>(an));
test(random_access_iterator<const int*>(ab), random_access_iterator<const int*>(an));
@@ -86,7 +86,7 @@ void test_emplacable_concept() {
}
{
using T = EmplaceConstructibleAndMoveable<int>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
{
std::deque<T> v(It(arr1), It(std::end(arr1)));
assert(v[0].copied == 0);
diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
index c72f73a9a8a2b..dc93f0e236f74 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
@@ -42,12 +42,12 @@ void basic_test()
{
int ab[] = {3, 4, 2, 8, 0, 1, 44, 34, 45, 96, 80, 1, 13, 31, 45};
int* an = ab + sizeof(ab)/sizeof(ab[0]);
- test(input_iterator<const int*>(ab), input_iterator<const int*>(an), test_allocator<int>(3));
+ test(cpp17_input_iterator<const int*>(ab), cpp17_input_iterator<const int*>(an), test_allocator<int>(3));
test(forward_iterator<const int*>(ab), forward_iterator<const int*>(an), test_allocator<int>(4));
test(bidirectional_iterator<const int*>(ab), bidirectional_iterator<const int*>(an), test_allocator<int>(5));
test(random_access_iterator<const int*>(ab), random_access_iterator<const int*>(an), test_allocator<int>(6));
#if TEST_STD_VER >= 11
- test(input_iterator<const int*>(ab), input_iterator<const int*>(an), min_allocator<int>());
+ test(cpp17_input_iterator<const int*>(ab), cpp17_input_iterator<const int*>(an), min_allocator<int>());
test(forward_iterator<const int*>(ab), forward_iterator<const int*>(an), min_allocator<int>());
test(bidirectional_iterator<const int*>(ab), bidirectional_iterator<const int*>(an), min_allocator<int>());
test(random_access_iterator<const int*>(ab), random_access_iterator<const int*>(an), min_allocator<int>());
@@ -76,7 +76,7 @@ void test_emplacable_concept() {
}
{
using T = EmplaceConstructibleAndMoveable<int>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
std::allocator<T> a;
{
std::deque<T> v(It(arr1), It(std::end(arr1)), a);
diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
index 9a5f05476d393..0e741a21134a3 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
@@ -51,7 +51,7 @@ test(int P, const C& c0, const C& c2)
{
{
typedef typename C::const_iterator CI;
- typedef input_iterator<CI> BCI;
+ typedef cpp17_input_iterator<CI> BCI;
C c1 = c0;
std::size_t c1_osize = c1.size();
CI i = c1.insert(c1.begin() + P, BCI(c2.begin()), BCI(c2.end()));
@@ -167,7 +167,7 @@ void
testI(int P, C& c1, const C& c2)
{
typedef typename C::const_iterator CI;
- typedef input_iterator<CI> ICI;
+ typedef cpp17_input_iterator<CI> ICI;
std::size_t c1_osize = c1.size();
CI i = c1.insert(c1.begin() + P, ICI(c2.begin()), ICI(c2.end()));
assert(i == c1.begin() + P);
@@ -250,7 +250,7 @@ test_move()
assert(*i == MoveOnly(j));
{
MoveOnly mo(1);
- typedef input_iterator<MoveOnly*> I;
+ typedef cpp17_input_iterator<MoveOnly*> I;
c.insert(c.end(), std::move_iterator<I>(I(&mo)), std::move_iterator<I>(I(&mo+1)));
}
j = 0;
diff --git a/libcxx/test/std/containers/sequences/deque/deque.special/copy.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
index e2df2cb84c9ca..b2a03540cf2f7 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.special/copy.pass.cpp
@@ -50,7 +50,7 @@ void testN(int start, int N)
typedef typename C::const_iterator CI;
typedef random_access_iterator<I> RAI;
typedef random_access_iterator<CI> RACI;
- typedef input_iterator<CI> ICI;
+ typedef cpp17_input_iterator<CI> ICI;
C c1 = make<C>(N, start);
C c2 = make<C>(N);
assert(std::copy(c1.cbegin(), c1.cend(), c2.begin()) == c2.end());
diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
index 989f1654449b4..552cf04434645 100644
--- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
+++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
@@ -27,7 +27,7 @@ int main(int, char**)
const T t0[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
const T t1[] = {10, 11, 12, 13};
C c(std::begin(t1), std::end(t1));
- typedef input_iterator<const T*> I;
+ typedef cpp17_input_iterator<const T*> I;
c.assign(I(std::begin(t0)), I(std::end(t0)));
int n = 0;
for (C::const_iterator i = c.cbegin(); i != c.cend(); ++i, ++n)
@@ -40,7 +40,7 @@ int main(int, char**)
const T t0[] = {10, 11, 12, 13};
const T t1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(std::begin(t1), std::end(t1));
- typedef input_iterator<const T*> I;
+ typedef cpp17_input_iterator<const T*> I;
c.assign(I(std::begin(t0)), I(std::end(t0)));
int n = 0;
for (C::const_iterator i = c.cbegin(); i != c.cend(); ++i, ++n)
@@ -54,7 +54,7 @@ int main(int, char**)
const T t0[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
const T t1[] = {10, 11, 12, 13};
C c(std::begin(t1), std::end(t1));
- typedef input_iterator<const T*> I;
+ typedef cpp17_input_iterator<const T*> I;
c.assign(I(std::begin(t0)), I(std::end(t0)));
int n = 0;
for (C::const_iterator i = c.cbegin(); i != c.cend(); ++i, ++n)
@@ -67,7 +67,7 @@ int main(int, char**)
const T t0[] = {10, 11, 12, 13};
const T t1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(std::begin(t1), std::end(t1));
- typedef input_iterator<const T*> I;
+ typedef cpp17_input_iterator<const T*> I;
c.assign(I(std::begin(t0)), I(std::end(t0)));
int n = 0;
for (C::const_iterator i = c.cbegin(); i != c.cend(); ++i, (void) ++n)
diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
index 721cbae2c513e..e8c54c84c2c59 100644
--- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
+++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
@@ -24,7 +24,7 @@ int main(int, char**)
{
typedef int T;
typedef std::forward_list<T> C;
- typedef input_iterator<const T*> I;
+ typedef cpp17_input_iterator<const T*> I;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(I(std::begin(t)), I(std::end(t)));
int n = 0;
@@ -36,7 +36,7 @@ int main(int, char**)
{
typedef int T;
typedef std::forward_list<T, min_allocator<T>> C;
- typedef input_iterator<const T*> I;
+ typedef cpp17_input_iterator<const T*> I;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(I(std::begin(t)), I(std::end(t)));
int n = 0;
diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
index 3451a6941f1ce..67712fc5e5d60 100644
--- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
+++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
@@ -27,7 +27,7 @@ int main(int, char**)
typedef int T;
typedef test_allocator<T> A;
typedef std::forward_list<T, A> C;
- typedef input_iterator<const T*> I;
+ typedef cpp17_input_iterator<const T*> I;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(I(std::begin(t)), I(std::end(t)), A(13));
int n = 0;
@@ -41,7 +41,7 @@ int main(int, char**)
typedef int T;
typedef min_allocator<T> A;
typedef std::forward_list<T, A> C;
- typedef input_iterator<const T*> I;
+ typedef cpp17_input_iterator<const T*> I;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(I(std::begin(t)), I(std::end(t)), A());
int n = 0;
diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
index 88b8bc07acd36..5414008bc8c9c 100644
--- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
+++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
@@ -25,7 +25,7 @@ int main(int, char**)
typedef int T;
typedef std::forward_list<T> C;
typedef C::iterator I;
- typedef input_iterator<const T*> J;
+ typedef cpp17_input_iterator<const T*> J;
C c;
const T t[] = {0, 1, 2, 3, 4};
I i = c.insert_after(c.cbefore_begin(), J(t), J(t));
@@ -53,7 +53,7 @@ int main(int, char**)
typedef int T;
typedef std::forward_list<T, min_allocator<T>> C;
typedef C::iterator I;
- typedef input_iterator<const T*> J;
+ typedef cpp17_input_iterator<const T*> J;
C c;
const T t[] = {0, 1, 2, 3, 4};
I i = c.insert_after(c.cbefore_begin(), J(t), J(t));
diff --git a/libcxx/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp b/libcxx/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp
index 3666f32e39195..d13696f1d0ac4 100644
--- a/libcxx/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp
+++ b/libcxx/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp
@@ -26,8 +26,8 @@ void basic_test()
{
{
int a[] = {0, 1, 2, 3};
- std::list<int> l(input_iterator<const int*>(a),
- input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])));
+ std::list<int> l(cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])));
assert(l.size() == sizeof(a)/sizeof(a[0]));
assert(std::distance(l.begin(), l.end()) == sizeof(a)/sizeof(a[0]));
int j = 0;
@@ -36,8 +36,8 @@ void basic_test()
}
{
int a[] = {0, 1, 2, 3};
- std::list<int> l(input_iterator<const int*>(a),
- input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])),
+ std::list<int> l(cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])),
std::allocator<int>());
assert(l.size() == sizeof(a)/sizeof(a[0]));
assert(std::distance(l.begin(), l.end()) == sizeof(a)/sizeof(a[0]));
@@ -48,8 +48,8 @@ void basic_test()
{
int a[] = {0, 1, 2, 3};
// Add 2 for implementations that dynamically allocate a sentinel node and container proxy.
- std::list<int, limited_allocator<int, sizeof(a)/sizeof(a[0]) + 2> > l(input_iterator<const int*>(a),
- input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])));
+ std::list<int, limited_allocator<int, sizeof(a)/sizeof(a[0]) + 2> > l(cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])));
assert(l.size() == sizeof(a)/sizeof(a[0]));
assert(std::distance(l.begin(), l.end()) == sizeof(a)/sizeof(a[0]));
int j = 0;
@@ -59,8 +59,8 @@ void basic_test()
#if TEST_STD_VER >= 11
{
int a[] = {0, 1, 2, 3};
- std::list<int, min_allocator<int>> l(input_iterator<const int*>(a),
- input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])));
+ std::list<int, min_allocator<int>> l(cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])));
assert(l.size() == sizeof(a)/sizeof(a[0]));
assert(std::distance(l.begin(), l.end()) == sizeof(a)/sizeof(a[0]));
int j = 0;
@@ -69,8 +69,8 @@ void basic_test()
}
{
int a[] = {0, 1, 2, 3};
- std::list<int, min_allocator<int>> l(input_iterator<const int*>(a),
- input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])),
+ std::list<int, min_allocator<int>> l(cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(a + sizeof(a)/sizeof(a[0])),
min_allocator<int>());
assert(l.size() == sizeof(a)/sizeof(a[0]));
assert(std::distance(l.begin(), l.end()) == sizeof(a)/sizeof(a[0]));
@@ -107,7 +107,7 @@ void test_emplacable_concept() {
}
{
using T = EmplaceConstructible<int>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
{
std::list<T> v(It(arr1), It(std::end(arr1)));
auto I = v.begin();
@@ -155,7 +155,7 @@ void test_emplacable_concept_with_alloc() {
}
{
using T = EmplaceConstructible<int>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
std::allocator<T> a;
{
std::list<T> v(It(arr1), It(std::end(arr1)), a);
@@ -195,7 +195,7 @@ void test_ctor_under_alloc() {
}
{
using C = TCT::list<>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
{
ExpectConstructGuard<int&> G(1);
C v(It(arr1), It(std::end(arr1)));
@@ -228,7 +228,7 @@ void test_ctor_under_alloc_with_alloc() {
}
{
using C = TCT::list<>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
using Alloc = typename C::allocator_type;
Alloc a;
{
diff --git a/libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
index e20f300982c91..9d236e0892d31 100644
--- a/libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
@@ -34,13 +34,13 @@ int main(int, char**)
{
bool a[] = {0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0};
bool* an = a + sizeof(a)/sizeof(a[0]);
- test<std::vector<bool> >(input_iterator<const bool*>(a), input_iterator<const bool*>(an));
+ test<std::vector<bool> >(cpp17_input_iterator<const bool*>(a), cpp17_input_iterator<const bool*>(an));
test<std::vector<bool> >(forward_iterator<const bool*>(a), forward_iterator<const bool*>(an));
test<std::vector<bool> >(bidirectional_iterator<const bool*>(a), bidirectional_iterator<const bool*>(an));
test<std::vector<bool> >(random_access_iterator<const bool*>(a), random_access_iterator<const bool*>(an));
test<std::vector<bool> >(a, an);
#if TEST_STD_VER >= 11
- test<std::vector<bool, min_allocator<bool>> >(input_iterator<const bool*>(a), input_iterator<const bool*>(an));
+ test<std::vector<bool, min_allocator<bool>> >(cpp17_input_iterator<const bool*>(a), cpp17_input_iterator<const bool*>(an));
test<std::vector<bool, min_allocator<bool>> >(forward_iterator<const bool*>(a), forward_iterator<const bool*>(an));
test<std::vector<bool, min_allocator<bool>> >(bidirectional_iterator<const bool*>(a), bidirectional_iterator<const bool*>(an));
test<std::vector<bool, min_allocator<bool>> >(random_access_iterator<const bool*>(a), random_access_iterator<const bool*>(an));
diff --git a/libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
index 2aa2b42648f20..3e4a37c3c5684 100644
--- a/libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
@@ -37,7 +37,7 @@ int main(int, char**)
bool* an = a + sizeof(a)/sizeof(a[0]);
{
std::allocator<bool> alloc;
- test<std::vector<bool> >(input_iterator<const bool*>(a), input_iterator<const bool*>(an), alloc);
+ test<std::vector<bool> >(cpp17_input_iterator<const bool*>(a), cpp17_input_iterator<const bool*>(an), alloc);
test<std::vector<bool> >(forward_iterator<const bool*>(a), forward_iterator<const bool*>(an), alloc);
test<std::vector<bool> >(bidirectional_iterator<const bool*>(a), bidirectional_iterator<const bool*>(an), alloc);
test<std::vector<bool> >(random_access_iterator<const bool*>(a), random_access_iterator<const bool*>(an), alloc);
@@ -46,7 +46,7 @@ int main(int, char**)
#if TEST_STD_VER >= 11
{
min_allocator<bool> alloc;
- test<std::vector<bool, min_allocator<bool>> >(input_iterator<const bool*>(a), input_iterator<const bool*>(an), alloc);
+ test<std::vector<bool, min_allocator<bool>> >(cpp17_input_iterator<const bool*>(a), cpp17_input_iterator<const bool*>(an), alloc);
test<std::vector<bool, min_allocator<bool>> >(forward_iterator<const bool*>(a), forward_iterator<const bool*>(an), alloc);
test<std::vector<bool, min_allocator<bool>> >(bidirectional_iterator<const bool*>(a), bidirectional_iterator<const bool*>(an), alloc);
test<std::vector<bool, min_allocator<bool>> >(random_access_iterator<const bool*>(a), random_access_iterator<const bool*>(an), alloc);
diff --git a/libcxx/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
index b9a92189169e5..05c209a2f0bde 100644
--- a/libcxx/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
@@ -26,8 +26,8 @@ int main(int, char**)
std::vector<bool> v(100);
bool a[] = {1, 0, 0, 1, 1};
const unsigned N = sizeof(a)/sizeof(a[0]);
- std::vector<bool>::iterator i = v.insert(v.cbegin() + 10, input_iterator<const bool*>(a),
- input_iterator<const bool*>(a+N));
+ std::vector<bool>::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator<const bool*>(a),
+ cpp17_input_iterator<const bool*>(a+N));
assert(v.size() == 100 + N);
assert(i == v.begin() + 10);
std::size_t j;
@@ -96,8 +96,8 @@ int main(int, char**)
std::vector<bool, min_allocator<bool>> v(100);
bool a[] = {1, 0, 0, 1, 1};
const unsigned N = sizeof(a)/sizeof(a[0]);
- std::vector<bool, min_allocator<bool>>::iterator i = v.insert(v.cbegin() + 10, input_iterator<const bool*>(a),
- input_iterator<const bool*>(a+N));
+ std::vector<bool, min_allocator<bool>>::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator<const bool*>(a),
+ cpp17_input_iterator<const bool*>(a+N));
assert(v.size() == 100 + N);
assert(i == v.begin() + 10);
std::size_t j;
diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/assign_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/assign_iter_iter.pass.cpp
index 5b2a6d1f08f63..0a122aea1f369 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.cons/assign_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.cons/assign_iter_iter.pass.cpp
@@ -45,7 +45,7 @@ void test_emplaceable_concept() {
}
{
using T = EmplaceConstructibleMoveableAndAssignable<int>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
{
std::vector<T> v;
v.assign(It(arr1), It(std::end(arr1)));
diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
index 3b43a89fa457b..91aee1d352aed 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
@@ -38,8 +38,8 @@ void test(Iterator first, Iterator last) {
static void basic_test_cases() {
int a[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4, 3, 1, 0};
int* an = a + sizeof(a) / sizeof(a[0]);
- test<std::vector<int> >(input_iterator<const int*>(a),
- input_iterator<const int*>(an));
+ test<std::vector<int> >(cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(an));
test<std::vector<int> >(forward_iterator<const int*>(a),
forward_iterator<const int*>(an));
test<std::vector<int> >(bidirectional_iterator<const int*>(a),
@@ -49,7 +49,7 @@ static void basic_test_cases() {
test<std::vector<int> >(a, an);
test<std::vector<int, limited_allocator<int, 63> > >(
- input_iterator<const int*>(a), input_iterator<const int*>(an));
+ cpp17_input_iterator<const int*>(a), cpp17_input_iterator<const int*>(an));
// Add 1 for implementations that dynamically allocate a container proxy.
test<std::vector<int, limited_allocator<int, 18 + 1> > >(
forward_iterator<const int*>(a), forward_iterator<const int*>(an));
@@ -61,8 +61,8 @@ static void basic_test_cases() {
random_access_iterator<const int*>(an));
test<std::vector<int, limited_allocator<int, 18 + 1> > >(a, an);
#if TEST_STD_VER >= 11
- test<std::vector<int, min_allocator<int> > >(input_iterator<const int*>(a),
- input_iterator<const int*>(an));
+ test<std::vector<int, min_allocator<int> > >(cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(an));
test<std::vector<int, min_allocator<int> > >(
forward_iterator<const int*>(a), forward_iterator<const int*>(an));
test<std::vector<int, min_allocator<int> > >(
@@ -95,7 +95,7 @@ void emplaceable_concept_tests() {
}
{
using T = EmplaceConstructibleAndMoveInsertable<int>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
{
std::vector<T> v(It(arr1), It(std::end(arr1)));
assert(v[0].copied == 0);
@@ -132,7 +132,7 @@ void test_ctor_under_alloc() {
}
{
using C = TCT::vector<>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
{
ExpectConstructGuard<int&> G(1);
C v(It(arr1), It(std::end(arr1)));
diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
index 3a97b43b7e042..ff68c56ac671e 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
@@ -54,8 +54,8 @@ void basic_tests() {
int a[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4, 3, 1, 0};
int* an = a + sizeof(a) / sizeof(a[0]);
std::allocator<int> alloc;
- test<std::vector<int> >(input_iterator<const int*>(a),
- input_iterator<const int*>(an), alloc);
+ test<std::vector<int> >(cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(an), alloc);
test<std::vector<int> >(forward_iterator<const int*>(a),
forward_iterator<const int*>(an), alloc);
test<std::vector<int> >(bidirectional_iterator<const int*>(a),
@@ -70,7 +70,7 @@ void basic_tests() {
int* an = a + sizeof(a) / sizeof(a[0]);
min_allocator<int> alloc;
test<std::vector<int, min_allocator<int> > >(
- input_iterator<const int*>(a), input_iterator<const int*>(an), alloc);
+ cpp17_input_iterator<const int*>(a), cpp17_input_iterator<const int*>(an), alloc);
test<std::vector<int, min_allocator<int> > >(
forward_iterator<const int*>(a), forward_iterator<const int*>(an),
alloc);
@@ -108,7 +108,7 @@ void emplaceable_concept_tests() {
}
{
using T = EmplaceConstructibleAndMoveInsertable<int>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
using Alloc = std::allocator<T>;
Alloc a;
{
@@ -147,7 +147,7 @@ void test_ctor_under_alloc() {
}
{
using C = TCT::vector<>;
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
using Alloc = typename C::allocator_type;
Alloc a;
{
diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
index 413030dce600f..19475c3d07e84 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
@@ -33,8 +33,8 @@ int main(int, char**)
V v(100);
int a[] = {1, 2, 3, 4, 5};
const int N = sizeof(a)/sizeof(a[0]);
- V::iterator i = v.insert(v.cbegin() + 10, input_iterator<const int*>(a),
- input_iterator<const int*>(a+N));
+ V::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(a+N));
assert(v.size() == 100 + N);
assert(is_contiguous_container_asan_correct(v));
assert(i == v.begin() + 10);
@@ -107,8 +107,8 @@ int main(int, char**)
V v(100);
int a[] = {1, 2, 3, 4, 5};
const int N = sizeof(a)/sizeof(a[0]);
- V::iterator i = v.insert(v.cbegin() + 10, input_iterator<const int*>(a),
- input_iterator<const int*>(a+N));
+ V::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(a+N));
assert(v.size() == 100 + N);
assert(is_contiguous_container_asan_correct(v));
assert(i == v.begin() + 10);
@@ -144,8 +144,8 @@ int main(int, char**)
V v(100);
int a[] = {1, 2, 3, 4, 5};
const int N = sizeof(a)/sizeof(a[0]);
- V::iterator i = v.insert(v.cbegin() + 10, input_iterator<const int*>(a),
- input_iterator<const int*>(a+N));
+ V::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator<const int*>(a),
+ cpp17_input_iterator<const int*>(a+N));
assert(v.size() == 100 + N);
assert(is_contiguous_container_asan_correct(v));
assert(i == v.begin() + 10);
@@ -179,7 +179,7 @@ int main(int, char**)
{
std::vector<adl::S> s;
- s.insert(s.end(), input_iterator<adl::S*>(), input_iterator<adl::S*>());
+ s.insert(s.end(), cpp17_input_iterator<adl::S*>(), cpp17_input_iterator<adl::S*>());
}
return 0;
diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
index a6d87150846fb..f3474115fe3a4 100644
--- a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
@@ -48,7 +48,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.bucket_count() >= 5);
assert(c.size() == 4);
assert(c.at(1) == "one");
@@ -82,7 +82,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.bucket_count() >= 5);
assert(c.size() == 4);
assert(c.at(1) == "one");
@@ -116,7 +116,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(arr), input_iterator<P*>(arr + sizeof(arr)/sizeof(arr[0])), 14);
+ C c(cpp17_input_iterator<P*>(arr), cpp17_input_iterator<P*>(arr + sizeof(arr)/sizeof(arr[0])), 14);
assert(c.bucket_count() >= 14);
assert(c.size() == 4);
assert(c.at(1) == "one");
@@ -150,7 +150,7 @@ int main(int, char**)
};
HF hf(42);
A a(43);
- C c(input_iterator<P*>(arr), input_iterator<P*>(arr + sizeof(arr)/sizeof(arr[0])), 14, hf, a);
+ C c(cpp17_input_iterator<P*>(arr), cpp17_input_iterator<P*>(arr + sizeof(arr)/sizeof(arr[0])), 14, hf, a);
assert(c.bucket_count() >= 14);
assert(c.size() == 4);
assert(c.at(1) == "one");
diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
index 66e0ac3a7698b..6c7d50cda045c 100644
--- a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
@@ -48,7 +48,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
10
);
LIBCPP_ASSERT(c.bucket_count() == 11);
@@ -84,7 +84,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
10
);
LIBCPP_ASSERT(c.bucket_count() == 11);
diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
index 62a590736bf78..eb94ca9b69050 100644
--- a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
@@ -49,7 +49,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8)
);
@@ -86,7 +86,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8)
);
diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
index 70e391d466383..3d5cb2ae34831 100644
--- a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
@@ -49,7 +49,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9)
@@ -87,7 +87,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9)
diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
index 1f29c5414ead5..6527ec7757037 100644
--- a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -50,7 +50,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
@@ -89,7 +89,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
@@ -128,7 +128,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp
index ac83319554736..342ff584f6450 100644
--- a/libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/insert_range.pass.cpp
@@ -38,7 +38,7 @@ int main(int, char**)
P(2, "four"),
};
C c;
- c.insert(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ c.insert(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.size() == 4);
assert(c.at(1) == "one");
assert(c.at(2) == "two");
@@ -60,7 +60,7 @@ int main(int, char**)
P(2, "four"),
};
C c;
- c.insert(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ c.insert(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.size() == 4);
assert(c.at(1) == "one");
assert(c.at(2) == "two");
diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
index 9c11caa31cc41..a6055720aa222 100644
--- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
@@ -50,7 +50,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.bucket_count() >= 7);
assert(c.size() == 6);
typedef std::pair<C::const_iterator, C::const_iterator> Eq;
@@ -101,7 +101,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.bucket_count() >= 7);
assert(c.size() == 6);
typedef std::pair<C::const_iterator, C::const_iterator> Eq;
@@ -153,7 +153,7 @@ int main(int, char**)
P(2, "four"),
};
A a(42);
- C c(input_iterator<P*>(arr), input_iterator<P*>(arr + sizeof(arr)/sizeof(arr[0])), 14, a);
+ C c(cpp17_input_iterator<P*>(arr), cpp17_input_iterator<P*>(arr + sizeof(arr)/sizeof(arr[0])), 14, a);
assert(c.bucket_count() >= 14);
assert(c.size() == 6);
typedef std::pair<C::const_iterator, C::const_iterator> Eq;
@@ -206,7 +206,7 @@ int main(int, char**)
};
A a(42);
HF hf (43);
- C c(input_iterator<P*>(arr), input_iterator<P*>(arr + sizeof(arr)/sizeof(arr[0])), 12, hf, a );
+ C c(cpp17_input_iterator<P*>(arr), cpp17_input_iterator<P*>(arr + sizeof(arr)/sizeof(arr[0])), 12, hf, a );
assert(c.bucket_count() >= 12);
assert(c.size() == 6);
typedef std::pair<C::const_iterator, C::const_iterator> Eq;
diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
index 3a7bfd19e2092..a670895a526e2 100644
--- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
@@ -50,7 +50,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
10
);
LIBCPP_ASSERT(c.bucket_count() == 11);
@@ -103,7 +103,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
10
);
LIBCPP_ASSERT(c.bucket_count() == 11);
diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
index 1adc8231b4d40..39fe55d7038ee 100644
--- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
@@ -51,7 +51,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8)
);
@@ -105,7 +105,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8)
);
diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
index 5bc0f8ac0c460..d93a063873b89 100644
--- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
@@ -51,7 +51,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9)
@@ -106,7 +106,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9)
diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
index 7cb79086b511b..f20f8f13bf3db 100644
--- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -52,7 +52,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
@@ -108,7 +108,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
@@ -164,7 +164,7 @@ int main(int, char**)
P(1, "four"),
P(2, "four"),
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
index 55067be7ca89f..519ed7a7bf20e 100644
--- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
@@ -41,7 +41,7 @@ int main(int, char**)
P(2, "four"),
};
C c;
- c.insert(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ c.insert(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.size() == 6);
typedef std::pair<C::iterator, C::iterator> Eq;
Eq eq = c.equal_range(1);
@@ -83,7 +83,7 @@ int main(int, char**)
P(2, "four"),
};
C c;
- c.insert(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ c.insert(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.size() == 6);
typedef std::pair<C::iterator, C::iterator> Eq;
Eq eq = c.equal_range(1);
diff --git a/libcxx/test/std/containers/unord/unord.multiset/insert_range.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/insert_range.pass.cpp
index a3a97494aabb6..f893a9dfd0912 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/insert_range.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/insert_range.pass.cpp
@@ -37,7 +37,7 @@ int main(int, char**)
P(2)
};
C c;
- c.insert(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ c.insert(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.size() == 6);
assert(c.count(1) == 2);
assert(c.count(2) == 2);
@@ -59,7 +59,7 @@ int main(int, char**)
P(2)
};
C c;
- c.insert(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ c.insert(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.size() == 6);
assert(c.count(1) == 2);
assert(c.count(2) == 2);
diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
index 953e702a68245..23a2e07ecfdc6 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.bucket_count() >= 7);
assert(c.size() == 6);
assert(c.count(1) == 2);
@@ -79,7 +79,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.bucket_count() >= 7);
assert(c.size() == 6);
assert(c.count(1) == 2);
@@ -112,7 +112,7 @@ int main(int, char**)
T(2)
};
A a(42);
- C c(input_iterator<T*>(arr), input_iterator<T*>(arr + sizeof(arr)/sizeof(arr[0])), 12, a);
+ C c(cpp17_input_iterator<T*>(arr), cpp17_input_iterator<T*>(arr + sizeof(arr)/sizeof(arr[0])), 12, a);
assert(c.bucket_count() >= 12);
assert(c.size() == 6);
assert(c.count(1) == 2);
@@ -146,7 +146,7 @@ int main(int, char**)
};
HF hf(43);
A a(42);
- C c(input_iterator<T*>(arr), input_iterator<T*>(arr + sizeof(arr)/sizeof(arr[0])), 16, hf, a);
+ C c(cpp17_input_iterator<T*>(arr), cpp17_input_iterator<T*>(arr + sizeof(arr)/sizeof(arr[0])), 16, hf, a);
assert(c.bucket_count() >= 16);
assert(c.size() == 6);
assert(c.count(1) == 2);
diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
index 2b7e911cd8f39..057334c158d8c 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7
);
LIBCPP_ASSERT(c.bucket_count() == 7);
@@ -81,7 +81,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7
);
LIBCPP_ASSERT(c.bucket_count() == 7);
diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
index 1b394413041c5..abf21780e266c 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8)
);
@@ -83,7 +83,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8)
);
diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
index d83555f57e6f7..829cf909d50b4 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9)
@@ -84,7 +84,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9)
diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
index 10c69c27ab8b6..d1b625daab0b6 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -48,7 +48,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
@@ -86,7 +86,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
diff --git a/libcxx/test/std/containers/unord/unord.set/insert_range.pass.cpp b/libcxx/test/std/containers/unord/unord.set/insert_range.pass.cpp
index 164a88120d0ca..451ee6767100a 100644
--- a/libcxx/test/std/containers/unord/unord.set/insert_range.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/insert_range.pass.cpp
@@ -37,7 +37,7 @@ int main(int, char**)
P(2)
};
C c;
- c.insert(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ c.insert(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.size() == 4);
assert(c.count(1) == 1);
assert(c.count(2) == 1);
@@ -59,7 +59,7 @@ int main(int, char**)
P(2)
};
C c;
- c.insert(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ c.insert(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.size() == 4);
assert(c.count(1) == 1);
assert(c.count(2) == 1);
diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
index dfa46ec568653..d323468710c29 100644
--- a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.bucket_count() >= 5);
assert(c.size() == 4);
assert(c.count(1) == 1);
@@ -79,7 +79,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])));
assert(c.bucket_count() >= 5);
assert(c.size() == 4);
assert(c.count(1) == 1);
@@ -112,7 +112,7 @@ int main(int, char**)
T(2)
};
A a(42);
- C c(input_iterator<T*>(arr), input_iterator<T*>(arr + sizeof(arr)/sizeof(arr[0])), 12, a);
+ C c(cpp17_input_iterator<T*>(arr), cpp17_input_iterator<T*>(arr + sizeof(arr)/sizeof(arr[0])), 12, a);
assert(c.bucket_count() >= 12);
assert(c.size() == 4);
assert(c.count(1) == 1);
@@ -146,7 +146,7 @@ int main(int, char**)
};
HF hf(43);
A a(42);
- C c(input_iterator<T*>(arr), input_iterator<T*>(arr + sizeof(arr)/sizeof(arr[0])), 16, hf, a);
+ C c(cpp17_input_iterator<T*>(arr), cpp17_input_iterator<T*>(arr + sizeof(arr)/sizeof(arr[0])), 16, hf, a);
assert(c.bucket_count() >= 16);
assert(c.size() == 4);
assert(c.count(1) == 1);
diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
index 1115044e02227..f6f1e3ba8d3aa 100644
--- a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7
);
LIBCPP_ASSERT(c.bucket_count() == 7);
@@ -81,7 +81,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7
);
LIBCPP_ASSERT(c.bucket_count() == 7);
diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
index 2acbb2d18fa08..6c50df5f0e302 100644
--- a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8)
);
@@ -83,7 +83,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8)
);
diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
index 245e124760863..932823e53993d 100644
--- a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
@@ -47,7 +47,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9)
@@ -84,7 +84,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9)
diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
index 002466496763c..3db984819fa77 100644
--- a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
@@ -48,7 +48,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
@@ -86,7 +86,7 @@ int main(int, char**)
P(1),
P(2)
};
- C c(input_iterator<P*>(a), input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
+ C c(cpp17_input_iterator<P*>(a), cpp17_input_iterator<P*>(a + sizeof(a)/sizeof(a[0])),
7,
test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9),
diff --git a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp
index bf9add9a13bc6..44604d47f17e0 100644
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp
@@ -75,8 +75,8 @@ int main(int, char**) {
test('X', chars, chars+10, "0X1X2X3X4X5X6X7X8X9");
test('x', ints, ints+10, "10x11x12x13x14x15x16x17x18x19");
- test('X', input_iterator<const char*>(chars), input_iterator<const char*>(chars+10), "0X1X2X3X4X5X6X7X8X9");
- test('x', input_iterator<const int*>(ints), input_iterator<const int*>(ints+10), "10x11x12x13x14x15x16x17x18x19");
+ test('X', cpp17_input_iterator<const char*>(chars), cpp17_input_iterator<const char*>(chars+10), "0X1X2X3X4X5X6X7X8X9");
+ test('x', cpp17_input_iterator<const int*>(ints), cpp17_input_iterator<const int*>(ints+10), "10x11x12x13x14x15x16x17x18x19");
test('X', forward_iterator<const char*>(chars), forward_iterator<const char*>(chars+10), "0X1X2X3X4X5X6X7X8X9");
test('x', forward_iterator<const int*>(ints), forward_iterator<const int*>(ints+10), "10x11x12x13x14x15x16x17x18x19");
test('X', random_access_iterator<const char*>(chars), random_access_iterator<const char*>(chars+10), "0X1X2X3X4X5X6X7X8X9");
@@ -101,8 +101,8 @@ int main(int, char**) {
const int ints [] = { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
test(L'X', chars, chars+10, L"0X1X2X3X4X5X6X7X8X9");
test(L'x', ints, ints+10, L"10x11x12x13x14x15x16x17x18x19");
- test(L'X', input_iterator<const wchar_t*>(chars), input_iterator<const wchar_t*>(chars+10), L"0X1X2X3X4X5X6X7X8X9");
- test(L'x', input_iterator<const int*>(ints), input_iterator<const int*>(ints+10), L"10x11x12x13x14x15x16x17x18x19");
+ test(L'X', cpp17_input_iterator<const wchar_t*>(chars), cpp17_input_iterator<const wchar_t*>(chars+10), L"0X1X2X3X4X5X6X7X8X9");
+ test(L'x', cpp17_input_iterator<const int*>(ints), cpp17_input_iterator<const int*>(ints+10), L"10x11x12x13x14x15x16x17x18x19");
test(L'X', forward_iterator<const wchar_t*>(chars), forward_iterator<const wchar_t*>(chars+10), L"0X1X2X3X4X5X6X7X8X9");
test(L'x', forward_iterator<const int*>(ints), forward_iterator<const int*>(ints+10), L"10x11x12x13x14x15x16x17x18x19");
test(L'X', random_access_iterator<const wchar_t*>(chars), random_access_iterator<const wchar_t*>(chars+10), L"0X1X2X3X4X5X6X7X8X9");
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
index 10f0cf44fcbb2..d9701a321bcf4 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
@@ -128,7 +128,7 @@ void doAppendSourceAllocTest(AppendOperatorTestcase const& TC)
using Ptr = CharT const*;
using Str = std::basic_string<CharT>;
using StrView = std::basic_string_view<CharT>;
- using InputIter = input_iterator<Ptr>;
+ using InputIter = cpp17_input_iterator<Ptr>;
const Ptr L = TC.lhs;
Str RShort = (Ptr)TC.rhs;
@@ -235,7 +235,7 @@ void doAppendSourceTest(AppendOperatorTestcase const& TC)
using Ptr = CharT const*;
using Str = std::basic_string<CharT>;
using StrView = std::basic_string_view<CharT>;
- using InputIter = input_iterator<Ptr>;
+ using InputIter = cpp17_input_iterator<Ptr>;
const Ptr L = TC.lhs;
const Ptr R = TC.rhs;
const Ptr E = TC.expected_result();
@@ -341,7 +341,7 @@ void test_sfinae()
static_assert(has_append<It>(), "");
}
{
- using It = input_iterator<const char*>;
+ using It = cpp17_input_iterator<const char*>;
static_assert(has_append<It>(), "");
}
{
@@ -352,7 +352,7 @@ void test_sfinae()
using reference = const char&;
using
diff erence_type = std::ptr
diff _t;
};
- using It = input_iterator<const char*, Traits>;
+ using It = cpp17_input_iterator<const char*, Traits>;
static_assert(has_append<It>(), "");
}
{
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
index 405e899af6882..def6c43eb6597 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
@@ -137,7 +137,7 @@ void RunTestCase(MultiStringType const& MS) {
//////////////////////////////////////////////////////////////////////////////
// Iterators
{
- using It = input_iterator<const CharT*>;
+ using It = cpp17_input_iterator<const CharT*>;
path p; PathReserve(p, Size + 1);
It it(TestPath);
{
@@ -150,7 +150,7 @@ void RunTestCase(MultiStringType const& MS) {
assert(p.string<CharT>() == TestPath);
}
{
- using It = input_iterator<const CharT*>;
+ using It = cpp17_input_iterator<const CharT*>;
path p; PathReserve(p, Size + 1);
It it(TestPath);
{
@@ -161,7 +161,7 @@ void RunTestCase(MultiStringType const& MS) {
assert(p.string<CharT>() == TestPath);
}
{
- using It = input_iterator<const CharT*>;
+ using It = cpp17_input_iterator<const CharT*>;
path p; PathReserve(p, Size + 1);
It it(TestPath);
It e(TestPathEnd);
@@ -189,7 +189,7 @@ void test_sfinae() {
static_assert(has_assign<It>(), "");
}
{
- using It = input_iterator<const char*>;
+ using It = cpp17_input_iterator<const char*>;
static_assert(std::is_assignable<path, It>::value, "");
static_assert(has_assign<It>(), "");
}
@@ -201,7 +201,7 @@ void test_sfinae() {
using reference = const char&;
using
diff erence_type = std::ptr
diff _t;
};
- using It = input_iterator<const char*, Traits>;
+ using It = cpp17_input_iterator<const char*, Traits>;
static_assert(std::is_assignable<path, It>::value, "");
static_assert(has_assign<It>(), "");
}
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
index b57ee21a7cea8..221c4c464e6ce 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
@@ -90,7 +90,7 @@ void doConcatSourceAllocTest(ConcatOperatorTestcase const& TC)
using Ptr = CharT const*;
using Str = std::basic_string<CharT>;
using StrView = std::basic_string_view<CharT>;
- using InputIter = input_iterator<Ptr>;
+ using InputIter = cpp17_input_iterator<Ptr>;
const Ptr L = TC.lhs;
const Ptr R = TC.rhs;
@@ -177,7 +177,7 @@ void doConcatSourceTest(ConcatOperatorTestcase const& TC)
using Ptr = CharT const*;
using Str = std::basic_string<CharT>;
using StrView = std::basic_string_view<CharT>;
- using InputIter = input_iterator<Ptr>;
+ using InputIter = cpp17_input_iterator<Ptr>;
const Ptr L = TC.lhs;
const Ptr R = TC.rhs;
const Ptr E = TC.expect;
@@ -307,7 +307,7 @@ void test_sfinae() {
static_assert(has_concat<It>(), "");
}
{
- using It = input_iterator<const char*>;
+ using It = cpp17_input_iterator<const char*>;
static_assert(has_concat<It>(), "");
}
{
@@ -318,7 +318,7 @@ void test_sfinae() {
using reference = const char&;
using
diff erence_type = std::ptr
diff _t;
};
- using It = input_iterator<const char*, Traits>;
+ using It = cpp17_input_iterator<const char*, Traits>;
static_assert(has_concat<It>(), "");
}
{
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp
index d0ebf5a1cab4e..f689769e302f3 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp
@@ -68,13 +68,13 @@ void RunTestCaseImpl(MultiStringType const& MS, Args... args) {
}
// Iterators
{
- using It = input_iterator<const CharT*>;
+ using It = cpp17_input_iterator<const CharT*>;
path p(It{TestPath}, args...);
assert(p.native() == Expect);
assert(p.string<CharT>() == TestPath);
}
{
- using It = input_iterator<const CharT*>;
+ using It = cpp17_input_iterator<const CharT*>;
path p(It{TestPath}, It{TestPathEnd}, args...);
assert(p.native() == Expect);
assert(p.string<CharT>() == TestPath);
@@ -99,7 +99,7 @@ void test_sfinae() {
static_assert(std::is_constructible<path, It>::value, "");
}
{
- using It = input_iterator<const char*>;
+ using It = cpp17_input_iterator<const char*>;
static_assert(std::is_constructible<path, It>::value, "");
}
{
@@ -110,7 +110,7 @@ void test_sfinae() {
using reference = const char&;
using
diff erence_type = std::ptr
diff _t;
};
- using It = input_iterator<const char*, Traits>;
+ using It = cpp17_input_iterator<const char*, Traits>;
static_assert(std::is_constructible<path, It>::value, "");
}
{
diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.operations/advance.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.operations/advance.pass.cpp
index 75b86e3d3e898..6a0688baa7791 100644
--- a/libcxx/test/std/iterators/iterator.primitives/iterator.operations/advance.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/iterator.operations/advance.pass.cpp
@@ -43,7 +43,7 @@ TEST_CONSTEXPR_CXX17 bool tests()
{
const char* s = "1234567890";
typedef std::iterator_traits<const char*>::
diff erence_type Distance;
- check_advance<Distance>(input_iterator<const char*>(s), 10, input_iterator<const char*>(s+10));
+ check_advance<Distance>(cpp17_input_iterator<const char*>(s), 10, cpp17_input_iterator<const char*>(s+10));
check_advance<Distance>(forward_iterator<const char*>(s), 10, forward_iterator<const char*>(s+10));
check_advance<Distance>(bidirectional_iterator<const char*>(s+5), 5, bidirectional_iterator<const char*>(s+10));
check_advance<Distance>(bidirectional_iterator<const char*>(s+5), -5, bidirectional_iterator<const char*>(s));
@@ -53,7 +53,7 @@ TEST_CONSTEXPR_CXX17 bool tests()
check_advance<Distance>(s+5, -5, s);
// Also check with other distance types
- check_advance<std::size_t>(input_iterator<const char*>(s), 10u, input_iterator<const char*>(s+10));
+ check_advance<std::size_t>(cpp17_input_iterator<const char*>(s), 10u, cpp17_input_iterator<const char*>(s+10));
check_advance<std::size_t>(forward_iterator<const char*>(s), 10u, forward_iterator<const char*>(s+10));
check_advance<std::size_t>(bidirectional_iterator<const char*>(s), 10u, bidirectional_iterator<const char*>(s+10));
check_advance<std::size_t>(random_access_iterator<const char*>(s), 10u, random_access_iterator<const char*>(s+10));
diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
index a86c787eecd83..13caefff92365 100644
--- a/libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
@@ -35,7 +35,7 @@ void check_distance(It first, It last, typename std::iterator_traits<It>::
diff er
TEST_CONSTEXPR_CXX17 bool tests()
{
const char* s = "1234567890";
- check_distance(input_iterator<const char*>(s), input_iterator<const char*>(s+10), 10);
+ check_distance(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), 10);
check_distance(forward_iterator<const char*>(s), forward_iterator<const char*>(s+10), 10);
check_distance(bidirectional_iterator<const char*>(s), bidirectional_iterator<const char*>(s+10), 10);
check_distance(random_access_iterator<const char*>(s), random_access_iterator<const char*>(s+10), 10);
diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.operations/next.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.operations/next.pass.cpp
index a0898d48ad0e5..bc34e75d818ae 100644
--- a/libcxx/test/std/iterators/iterator.primitives/iterator.operations/next.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/iterator.operations/next.pass.cpp
@@ -42,7 +42,7 @@ check_next_1(It it, It result)
TEST_CONSTEXPR_CXX17 bool tests()
{
const char* s = "1234567890";
- check_next_n(input_iterator<const char*>(s), 10, input_iterator<const char*>(s+10));
+ check_next_n(cpp17_input_iterator<const char*>(s), 10, cpp17_input_iterator<const char*>(s+10));
check_next_n(forward_iterator<const char*>(s), 10, forward_iterator<const char*>(s+10));
check_next_n(bidirectional_iterator<const char*>(s), 10, bidirectional_iterator<const char*>(s+10));
check_next_n(bidirectional_iterator<const char*>(s+10), -10, bidirectional_iterator<const char*>(s));
@@ -50,7 +50,7 @@ TEST_CONSTEXPR_CXX17 bool tests()
check_next_n(random_access_iterator<const char*>(s+10), -10, random_access_iterator<const char*>(s));
check_next_n(s, 10, s+10);
- check_next_1(input_iterator<const char*>(s), input_iterator<const char*>(s+1));
+ check_next_1(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1));
check_next_1(forward_iterator<const char*>(s), forward_iterator<const char*>(s+1));
check_next_1(bidirectional_iterator<const char*>(s), bidirectional_iterator<const char*>(s+1));
check_next_1(random_access_iterator<const char*>(s), random_access_iterator<const char*>(s+1));
diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
index 77f4183919052..701ea8e5b6c78 100644
--- a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
@@ -611,7 +611,7 @@ static_assert(!has_iterator_concept_v<LegacyRandomAccessSpecializedTraits>);
// Other test iterators.
-using InputTestItereatorTraits = std::iterator_traits<input_iterator<int*> >;
+using InputTestItereatorTraits = std::iterator_traits<cpp17_input_iterator<int*> >;
static_assert(std::same_as<InputTestItereatorTraits::iterator_category,
std::input_iterator_tag>);
static_assert(std::same_as<InputTestItereatorTraits::value_type, int>);
diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/iter_reference_t.compile.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/iter_reference_t.compile.pass.cpp
index 2c45e9a7efe51..117472fceac76 100644
--- a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/iter_reference_t.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/iter_reference_t.compile.pass.cpp
@@ -18,7 +18,7 @@
#include "test_iterators.h"
-static_assert(std::same_as<std::iter_reference_t<input_iterator<int*> >, int&>);
+static_assert(std::same_as<std::iter_reference_t<cpp17_input_iterator<int*> >, int&>);
static_assert(std::same_as<std::iter_reference_t<forward_iterator<int*> >, int&>);
static_assert(std::same_as<std::iter_reference_t<bidirectional_iterator<int*> >, int&>);
static_assert(std::same_as<std::iter_reference_t<random_access_iterator<int*> >, int&>);
diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
index 3a3e29a152e2a..38162be8605df 100644
--- a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
@@ -17,7 +17,7 @@
#include "test_iterators.h"
-static_assert(std::input_iterator<input_iterator<int*> >);
+static_assert(std::input_iterator<cpp17_input_iterator<int*> >);
static_assert(std::input_iterator<cpp20_input_iterator<int*> >);
struct no_explicit_iter_concept {
diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp
index b5d57edefdff0..6a2d4535e4663 100644
--- a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp
@@ -22,10 +22,10 @@ static_assert(std::input_or_output_iterator<int const*>);
static_assert(std::input_or_output_iterator<int volatile*>);
static_assert(std::input_or_output_iterator<int const volatile*>);
-static_assert(std::input_or_output_iterator<input_iterator<int*> >);
-static_assert(std::input_or_output_iterator<input_iterator<int const*> >);
-static_assert(std::input_or_output_iterator<input_iterator<int volatile*> >);
-static_assert(std::input_or_output_iterator<input_iterator<int const volatile*> >);
+static_assert(std::input_or_output_iterator<cpp17_input_iterator<int*> >);
+static_assert(std::input_or_output_iterator<cpp17_input_iterator<int const*> >);
+static_assert(std::input_or_output_iterator<cpp17_input_iterator<int volatile*> >);
+static_assert(std::input_or_output_iterator<cpp17_input_iterator<int const volatile*> >);
static_assert(std::input_or_output_iterator<forward_iterator<int*> >);
static_assert(std::input_or_output_iterator<forward_iterator<int const*> >);
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
index b7c6b6bd43108..1cf0a6730600e 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
@@ -34,7 +34,7 @@ int main(int, char**)
{
{
char s[] = "1234567890";
- test(input_iterator<char*>(s+5));
+ test(cpp17_input_iterator<char*>(s+5));
test(forward_iterator<char*>(s+5));
test(bidirectional_iterator<char*>(s+5));
test(random_access_iterator<char*>(s+5));
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp
index ecf8f90ea1e9f..933dc68e61d78 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp
@@ -35,8 +35,8 @@ test(It l, It r, bool x)
int main(int, char**)
{
char s[] = "1234567890";
- test(input_iterator<char*>(s), input_iterator<char*>(s), true);
- test(input_iterator<char*>(s), input_iterator<char*>(s+1), false);
+ test(cpp17_input_iterator<char*>(s), cpp17_input_iterator<char*>(s), true);
+ test(cpp17_input_iterator<char*>(s), cpp17_input_iterator<char*>(s+1), false);
test(forward_iterator<char*>(s), forward_iterator<char*>(s), true);
test(forward_iterator<char*>(s), forward_iterator<char*>(s+1), false);
test(bidirectional_iterator<char*>(s), bidirectional_iterator<char*>(s), true);
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp
index 01a7195d4d647..808ea7b8d267b 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp
@@ -35,8 +35,8 @@ test(It l, It r, bool x)
int main(int, char**)
{
char s[] = "1234567890";
- test(input_iterator<char*>(s), input_iterator<char*>(s), false);
- test(input_iterator<char*>(s), input_iterator<char*>(s+1), true);
+ test(cpp17_input_iterator<char*>(s), cpp17_input_iterator<char*>(s), false);
+ test(cpp17_input_iterator<char*>(s), cpp17_input_iterator<char*>(s+1), true);
test(forward_iterator<char*>(s), forward_iterator<char*>(s), false);
test(forward_iterator<char*>(s), forward_iterator<char*>(s+1), true);
test(bidirectional_iterator<char*>(s), bidirectional_iterator<char*>(s), false);
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp
index 7f31920f76a9a..189dee3b1d740 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp
@@ -38,7 +38,7 @@ int main(int, char**)
{
Derived d;
- test<input_iterator<Base*> >(input_iterator<Derived*>(&d));
+ test<cpp17_input_iterator<Base*> >(cpp17_input_iterator<Derived*>(&d));
test<forward_iterator<Base*> >(forward_iterator<Derived*>(&d));
test<bidirectional_iterator<Base*> >(bidirectional_iterator<Derived*>(&d));
test<random_access_iterator<const Base*> >(random_access_iterator<Derived*>(&d));
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp
index 6dfa0d09db902..40a9e7f1ae894 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp
@@ -29,7 +29,7 @@ test()
int main(int, char**)
{
- test<input_iterator<char*> >();
+ test<cpp17_input_iterator<char*> >();
test<forward_iterator<char*> >();
test<bidirectional_iterator<char*> >();
test<random_access_iterator<char*> >();
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
index bed97700e7cbc..64c1a43bd6e0e 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
@@ -31,7 +31,7 @@ test(It i)
int main(int, char**)
{
char s[] = "123";
- test(input_iterator<char*>(s));
+ test(cpp17_input_iterator<char*>(s));
test(forward_iterator<char*>(s));
test(bidirectional_iterator<char*>(s));
test(random_access_iterator<char*>(s));
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp
index e2269073aef47..a33bb08fa0979 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp
@@ -44,9 +44,9 @@ int main(int, char**)
{
char s[] = "123";
#if TEST_STD_VER > 17
- test_single_pass(input_iterator<char*>(s), input_iterator<char*>(s + 1));
+ test_single_pass(cpp17_input_iterator<char*>(s), cpp17_input_iterator<char*>(s + 1));
#else
- test(input_iterator<char*>(s), input_iterator<char*>(s+1));
+ test(cpp17_input_iterator<char*>(s), cpp17_input_iterator<char*>(s+1));
#endif
test(forward_iterator<char*>(s), forward_iterator<char*>(s+1));
test(bidirectional_iterator<char*>(s), bidirectional_iterator<char*>(s+1));
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp
index 101f5cdbc0f41..7c93cf896c97b 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp
@@ -33,7 +33,7 @@ test(It i, It x)
int main(int, char**)
{
char s[] = "123";
- test(input_iterator<char*>(s), input_iterator<char*>(s+1));
+ test(cpp17_input_iterator<char*>(s), cpp17_input_iterator<char*>(s+1));
test(forward_iterator<char*>(s), forward_iterator<char*>(s+1));
test(bidirectional_iterator<char*>(s), bidirectional_iterator<char*>(s+1));
test(random_access_iterator<char*>(s), random_access_iterator<char*>(s+1));
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp
index 84fbccb8be63c..a847192ef6005 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp
@@ -41,7 +41,7 @@ int main(int, char**)
{
Derived d;
- test<input_iterator<Base*> >(input_iterator<Derived*>(&d));
+ test<cpp17_input_iterator<Base*> >(cpp17_input_iterator<Derived*>(&d));
test<forward_iterator<Base*> >(forward_iterator<Derived*>(&d));
test<bidirectional_iterator<Base*> >(bidirectional_iterator<Derived*>(&d));
test<random_access_iterator<const Base*> >(random_access_iterator<Derived*>(&d));
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
index 9515e1fbd9105..1bee8dbf6fb7b 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
@@ -67,7 +67,7 @@ test()
int main(int, char**)
{
- test<input_iterator<char*> >();
+ test<cpp17_input_iterator<char*> >();
test<forward_iterator<char*> >();
test<bidirectional_iterator<char*> >();
test<random_access_iterator<char*> >();
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
index b9c96f2feb79f..41dc94bc0fed5 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
@@ -25,7 +25,7 @@
#include "platform_support.h" // locale name macros
-typedef std::money_get<char, input_iterator<const char*> > Fn;
+typedef std::money_get<char, cpp17_input_iterator<const char*> > Fn;
class my_facet
: public Fn
@@ -35,7 +35,7 @@ class my_facet
: Fn(refs) {}
};
-typedef std::money_get<wchar_t, input_iterator<const wchar_t*> > Fw;
+typedef std::money_get<wchar_t, cpp17_input_iterator<const wchar_t*> > Fw;
class my_facetw
: public Fw
@@ -62,7 +62,7 @@ int main(int, char**)
// char, national
{ // zero
std::string v = "0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -73,7 +73,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -84,7 +84,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -95,7 +95,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -106,7 +106,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -117,7 +117,7 @@ int main(int, char**)
}
{ // zero, showbase
std::string v = "$0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -129,7 +129,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "$0.00";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -141,7 +141,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::string v = "-$0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -153,7 +153,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "-$0.01";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -165,7 +165,7 @@ int main(int, char**)
}
{ // positive, showbase
std::string v = "$1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -177,7 +177,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "$1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -190,7 +190,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-$1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -203,7 +203,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -214,7 +214,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "-USD 1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -228,7 +228,7 @@ int main(int, char**)
// char, international
{ // zero
std::string v = "0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -239,7 +239,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -250,7 +250,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -261,7 +261,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -272,7 +272,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -283,7 +283,7 @@ int main(int, char**)
}
{ // zero, showbase
std::string v = "USD 0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -295,7 +295,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "USD 0.00";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -307,7 +307,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::string v = "-USD 0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -319,7 +319,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "-USD 0.01";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -331,7 +331,7 @@ int main(int, char**)
}
{ // positive, showbase
std::string v = "USD 1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -343,7 +343,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -356,7 +356,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -369,7 +369,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-$1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -380,7 +380,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "-$1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -394,7 +394,7 @@ int main(int, char**)
// wchar_t, national
{ // zero
std::wstring v = L"0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -405,7 +405,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -416,7 +416,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = L"1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -427,7 +427,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -438,7 +438,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -449,7 +449,7 @@ int main(int, char**)
}
{ // zero, showbase
std::wstring v = L"$0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -461,7 +461,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"$0.00";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -473,7 +473,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::wstring v = L"-$0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -485,7 +485,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"-$0.01";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -497,7 +497,7 @@ int main(int, char**)
}
{ // positive, showbase
std::wstring v = L"$1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -509,7 +509,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = L"$1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -522,7 +522,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-$1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -535,7 +535,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -546,7 +546,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = L"-USD 1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -560,7 +560,7 @@ int main(int, char**)
// wchar_t, international
{ // zero
std::wstring v = L"0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -571,7 +571,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -582,7 +582,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = L"1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -593,7 +593,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -604,7 +604,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -615,7 +615,7 @@ int main(int, char**)
}
{ // zero, showbase
std::wstring v = L"USD 0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -627,7 +627,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"USD 0.00";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -639,7 +639,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::wstring v = L"-USD 0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -651,7 +651,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"-USD 0.01";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -663,7 +663,7 @@ int main(int, char**)
}
{ // positive, showbase
std::wstring v = L"USD 1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -675,7 +675,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = L"USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -688,7 +688,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -701,7 +701,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-$1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -712,7 +712,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = L"-$1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
index 77ee90eda0d44..20bcfdd706728 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
@@ -31,7 +31,7 @@
#include "platform_support.h" // locale name macros
#include "test_macros.h"
-typedef std::money_get<char, input_iterator<const char*> > Fn;
+typedef std::money_get<char, cpp17_input_iterator<const char*> > Fn;
class my_facet
: public Fn
@@ -41,7 +41,7 @@ class my_facet
: Fn(refs) {}
};
-typedef std::money_get<wchar_t, input_iterator<const wchar_t*> > Fw;
+typedef std::money_get<wchar_t, cpp17_input_iterator<const wchar_t*> > Fw;
class my_facetw
: public Fw
@@ -95,7 +95,7 @@ int main(int, char**)
// char, national
{ // zero
std::string v = "0,00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -106,7 +106,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0,01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -117,7 +117,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1 234 567,89 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -128,7 +128,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1 234 567,89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -139,7 +139,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567,89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -151,7 +151,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "0,00 \u20ac"; // EURO SIGN
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -163,7 +163,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "0,00 \u20ac"; // EURO SIGN
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -174,7 +174,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::string v = "-0,01 \u20ac"; // EURO SIGN
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -186,7 +186,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "-0,01 \u20ac"; // EURO SIGN
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -197,7 +197,7 @@ int main(int, char**)
}
{ // positive, showbase
std::string v = "1 234 567,89 \u20ac"; // EURO SIGN
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -209,7 +209,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "1 234 567,89 \u20ac"; // EURO SIGN
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -222,7 +222,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-1 234 567,89 \u20ac"; // EURO SIGN
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -235,7 +235,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "1 234 567,89 EUR -";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -246,7 +246,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "1 234 567,89 EUR -";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -262,7 +262,7 @@ int main(int, char**)
// char, international
{ // zero
std::string v = "0,00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -273,7 +273,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0,01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -284,7 +284,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1 234 567,89 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -295,7 +295,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1 234 567,89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -306,7 +306,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567,89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -318,7 +318,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "0,00 EUR";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -330,7 +330,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "0,00 EUR";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -341,7 +341,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::string v = "-0,01 EUR";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -353,7 +353,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "-0,01 EUR";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -364,7 +364,7 @@ int main(int, char**)
}
{ // positive, showbase
std::string v = "1 234 567,89 EUR";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -376,7 +376,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "1 234 567,89 EUR";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -389,7 +389,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-1 234 567,89 EUR";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -402,7 +402,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "1 234 567,89 Eu-";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -413,7 +413,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "1 234 567,89 Eu-";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -428,7 +428,7 @@ int main(int, char**)
// wchar_t, national
{ // zero
std::wstring v = L"0,00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -439,7 +439,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0,01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -450,7 +450,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = convert_thousands_sep(L"1 234 567,89 ");
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -461,7 +461,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = convert_thousands_sep(L"-1 234 567,89");
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -472,7 +472,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567,89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -484,7 +484,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"0,00 \u20ac"; // EURO SIGN
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -496,7 +496,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"0,00 \u20ac"; // EURO SIGN
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -507,7 +507,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::wstring v = L"-0,01 \u20ac"; // EURO SIGN
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -519,7 +519,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"-0,01 \u20ac"; // EURO SIGN
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -530,7 +530,7 @@ int main(int, char**)
}
{ // positive, showbase
std::wstring v = convert_thousands_sep(L"1 234 567,89 \u20ac"); // EURO SIGN
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -542,7 +542,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = convert_thousands_sep(L"1 234 567,89 \u20ac"); // EURO SIGN
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -555,7 +555,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = convert_thousands_sep(L"-1 234 567,89 \u20ac"); // EURO SIGN
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -568,7 +568,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR -");
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -579,7 +579,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR -");
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -594,7 +594,7 @@ int main(int, char**)
// wchar_t, international
{ // zero
std::wstring v = L"0,00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -605,7 +605,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0,01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -616,7 +616,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = convert_thousands_sep(L"1 234 567,89 ");
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -627,7 +627,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = convert_thousands_sep(L"-1 234 567,89");
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -638,7 +638,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567,89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -650,7 +650,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"0,00 EUR";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -662,7 +662,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"0,00 EUR";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -673,7 +673,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::wstring v = L"-0,01 EUR";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -685,7 +685,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"-0,01 EUR";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -696,7 +696,7 @@ int main(int, char**)
}
{ // positive, showbase
std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR");
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -708,7 +708,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR");
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -721,7 +721,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = convert_thousands_sep(L"-1 234 567,89 EUR");
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -734,7 +734,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = convert_thousands_sep(L"1 234 567,89 Eu-");
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -745,7 +745,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = convert_thousands_sep(L"1 234 567,89 Eu-");
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
index a6829d0ecbb7c..5963aeed12cd8 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
@@ -48,7 +48,7 @@
# define APPLE_FIXME
#endif
-typedef std::money_get<char, input_iterator<const char*> > Fn;
+typedef std::money_get<char, cpp17_input_iterator<const char*> > Fn;
class my_facet
: public Fn
@@ -58,7 +58,7 @@ class my_facet
: Fn(refs) {}
};
-typedef std::money_get<wchar_t, input_iterator<const wchar_t*> > Fw;
+typedef std::money_get<wchar_t, cpp17_input_iterator<const wchar_t*> > Fw;
class my_facetw
: public Fw
@@ -85,7 +85,7 @@ int main(int, char**)
// char, national
{ // zero
std::string v = "0,00 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -96,7 +96,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0,01 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -107,7 +107,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1 234 567,89 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -118,7 +118,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1 234 567,89 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -129,7 +129,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567,89 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -140,7 +140,7 @@ int main(int, char**)
}
{ // zero, showbase
std::string v = "0,00 \xD1\x80\xD1\x83\xD0\xB1"".";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -152,7 +152,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "0,00 \xD1\x80\xD1\x83\xD0\xB1"".";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -164,7 +164,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::string v = "-0,01 \xD1\x80\xD1\x83\xD0\xB1"".";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -176,7 +176,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "-0,01 \xD1\x80\xD1\x83\xD0\xB1"".";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -188,7 +188,7 @@ int main(int, char**)
}
{ // positive, showbase
std::string v = "1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -200,7 +200,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -213,7 +213,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -226,7 +226,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-1 234 567,89 RUB ";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -237,7 +237,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "-1 234 567,89 RUB ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -252,7 +252,7 @@ int main(int, char**)
// char, international
{ // zero
std::string v = "0,00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -263,7 +263,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0,01 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -274,7 +274,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1 234 567,89 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -285,7 +285,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1 234 567,89 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -296,7 +296,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567,89 ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -307,7 +307,7 @@ int main(int, char**)
}
{ // zero, showbase
std::string v = "0,00 RUB ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -320,7 +320,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "0,00 RUB ";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -333,7 +333,7 @@ int main(int, char**)
#endif
{ // negative one, showbase
std::string v = "-0,01 RUB ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -346,7 +346,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "-0,01 RUB ";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -359,7 +359,7 @@ int main(int, char**)
#endif
{ // positive, showbase
std::string v = "1 234 567,89 RUB ";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -372,7 +372,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "1 234 567,89 RUB ";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -387,7 +387,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-1 234 567,89 RUB ";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -401,7 +401,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -412,7 +412,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -427,7 +427,7 @@ int main(int, char**)
// wchar_t, national
{ // zero
std::wstring v = L"0,00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -438,7 +438,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0,01 ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -449,7 +449,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = L"1 234 567,89 ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -460,7 +460,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1 234 567,89 ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -471,7 +471,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567,89 ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -482,7 +482,7 @@ int main(int, char**)
}
{ // zero, showbase
std::wstring v = L"0,00 \x440\x443\x431"".";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -494,7 +494,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"0,00 \x440\x443\x431"".";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -506,7 +506,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::wstring v = L"-0,01 \x440\x443\x431"".";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -518,7 +518,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"-0,01 \x440\x443\x431"".";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -530,7 +530,7 @@ int main(int, char**)
}
{ // positive, showbase
std::wstring v = L"1 234 567,89 \x440\x443\x431"".";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -542,7 +542,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = L"1 234 567,89 \x440\x443\x431"".";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -555,7 +555,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-1 234 567,89 \x440\x443\x431"".";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -568,7 +568,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-1 234 567,89 RUB ";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -579,7 +579,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = L"-1 234 567,89 RUB ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -594,7 +594,7 @@ int main(int, char**)
// wchar_t, international
{ // zero
std::wstring v = L"0,00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -605,7 +605,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0,01 ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -616,7 +616,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = L"1 234 567,89 ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -627,7 +627,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1 234 567,89 ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -638,7 +638,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567,89 ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -649,7 +649,7 @@ int main(int, char**)
}
{ // zero, showbase
std::wstring v = L"0,00 RUB ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -662,7 +662,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"0,00 RUB ";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -675,7 +675,7 @@ int main(int, char**)
#endif
{ // negative one, showbase
std::wstring v = L"-0,01 RUB ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -688,7 +688,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"-0,01 RUB ";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -701,7 +701,7 @@ int main(int, char**)
#endif
{ // positive, showbase
std::wstring v = L"1 234 567,89 RUB ";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -714,7 +714,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = L"1 234 567,89 RUB ";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -729,7 +729,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-1 234 567,89 RUB ";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -743,7 +743,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-1 234 567,89 \x440\x443\x431"".";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -754,7 +754,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = L"-1 234 567,89 \x440\x443\x431"".";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
index 632006c676e2d..69331bba6ff5d 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
@@ -32,7 +32,7 @@
#include "platform_support.h" // locale name macros
-typedef std::money_get<char, input_iterator<const char*> > Fn;
+typedef std::money_get<char, cpp17_input_iterator<const char*> > Fn;
class my_facet
: public Fn
@@ -42,7 +42,7 @@ class my_facet
: Fn(refs) {}
};
-typedef std::money_get<wchar_t, input_iterator<const wchar_t*> > Fw;
+typedef std::money_get<wchar_t, cpp17_input_iterator<const wchar_t*> > Fw;
class my_facetw
: public Fw
@@ -69,7 +69,7 @@ int main(int, char**)
// char, national
{ // zero
std::string v = "0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -80,7 +80,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -91,7 +91,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -102,7 +102,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -113,7 +113,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -124,7 +124,7 @@ int main(int, char**)
}
{ // zero, showbase
std::string v = "\xEF\xBF\xA5""0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -136,7 +136,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "\xEF\xBF\xA5""0.00";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -148,7 +148,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::string v = "\xEF\xBF\xA5""-0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -160,7 +160,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "\xEF\xBF\xA5""-0.01";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -172,7 +172,7 @@ int main(int, char**)
}
{ // positive, showbase
std::string v = "\xEF\xBF\xA5""1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -184,7 +184,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "\xEF\xBF\xA5""1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -197,7 +197,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "\xEF\xBF\xA5""-1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -210,7 +210,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "CNY -1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -221,7 +221,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "CNY -1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -235,7 +235,7 @@ int main(int, char**)
// char, international
{ // zero
std::string v = "0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -246,7 +246,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -257,7 +257,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -268,7 +268,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -279,7 +279,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -290,7 +290,7 @@ int main(int, char**)
}
{ // zero, showbase
std::string v = "CNY 0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -302,7 +302,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "CNY 0.00";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -314,7 +314,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::string v = "CNY -0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -326,7 +326,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "CNY -0.01";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -338,7 +338,7 @@ int main(int, char**)
}
{ // positive, showbase
std::string v = "CNY 1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -350,7 +350,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "CNY 1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -363,7 +363,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "CNY -1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -376,7 +376,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "\xEF\xBF\xA5""-1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -387,7 +387,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "\xEF\xBF\xA5""-1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -401,7 +401,7 @@ int main(int, char**)
// wchar_t, national
{ // zero
std::wstring v = L"0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -412,7 +412,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -423,7 +423,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = L"1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -434,7 +434,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -445,7 +445,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -456,7 +456,7 @@ int main(int, char**)
}
{ // zero, showbase
std::wstring v = L"\xFFE5""0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -468,7 +468,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"\xFFE5""0.00";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -480,7 +480,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::wstring v = L"\xFFE5""-0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -492,7 +492,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"\xFFE5""-0.01";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -504,7 +504,7 @@ int main(int, char**)
}
{ // positive, showbase
std::wstring v = L"\xFFE5""1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -516,7 +516,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = L"\xFFE5""1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -529,7 +529,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"\xFFE5""-1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -542,7 +542,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"CNY -1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -553,7 +553,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = L"CNY -1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -567,7 +567,7 @@ int main(int, char**)
// wchar_t, international
{ // zero
std::wstring v = L"0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -578,7 +578,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -589,7 +589,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = L"1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -600,7 +600,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -611,7 +611,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -622,7 +622,7 @@ int main(int, char**)
}
{ // zero, showbase
std::wstring v = L"CNY 0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -634,7 +634,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"CNY 0.00";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -646,7 +646,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::wstring v = L"CNY -0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -658,7 +658,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"CNY -0.01";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -670,7 +670,7 @@ int main(int, char**)
}
{ // positive, showbase
std::wstring v = L"CNY 1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -682,7 +682,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = L"CNY 1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -695,7 +695,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"CNY -1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -708,7 +708,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"\xFFE5""-1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -719,7 +719,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = L"\xFFE5""-1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
long double ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
index 2288cf5d1bd24..2f329463ae7e0 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
@@ -25,7 +25,7 @@
#include "platform_support.h" // locale name macros
-typedef std::money_get<char, input_iterator<const char*> > Fn;
+typedef std::money_get<char, cpp17_input_iterator<const char*> > Fn;
class my_facet
: public Fn
@@ -35,7 +35,7 @@ class my_facet
: Fn(refs) {}
};
-typedef std::money_get<wchar_t, input_iterator<const wchar_t*> > Fw;
+typedef std::money_get<wchar_t, cpp17_input_iterator<const wchar_t*> > Fw;
class my_facetw
: public Fw
@@ -62,7 +62,7 @@ int main(int, char**)
// char, national
{ // zero
std::string v = "0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -73,7 +73,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -84,7 +84,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -95,7 +95,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -106,7 +106,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -117,7 +117,7 @@ int main(int, char**)
}
{ // zero, showbase
std::string v = "$0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -129,7 +129,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "$0.00";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -141,7 +141,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::string v = "-$0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -153,7 +153,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "-$0.01";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -165,7 +165,7 @@ int main(int, char**)
}
{ // positive, showbase
std::string v = "$1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -177,7 +177,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "$1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -190,7 +190,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-$1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -203,7 +203,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -215,7 +215,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "-USD 1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -230,7 +230,7 @@ int main(int, char**)
// char, international
{ // zero
std::string v = "0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -241,7 +241,7 @@ int main(int, char**)
}
{ // negative one
std::string v = "-0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -252,7 +252,7 @@ int main(int, char**)
}
{ // positive
std::string v = "1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -263,7 +263,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -274,7 +274,7 @@ int main(int, char**)
}
{ // negative
std::string v = "-1234567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -285,7 +285,7 @@ int main(int, char**)
}
{ // zero, showbase
std::string v = "USD 0.00";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -297,7 +297,7 @@ int main(int, char**)
{ // zero, showbase
std::string v = "USD 0.00";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -309,7 +309,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::string v = "-USD 0.01";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -321,7 +321,7 @@ int main(int, char**)
{ // negative one, showbase
std::string v = "-USD 0.01";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -333,7 +333,7 @@ int main(int, char**)
}
{ // positive, showbase
std::string v = "USD 1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -345,7 +345,7 @@ int main(int, char**)
{ // positive, showbase
std::string v = "USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -358,7 +358,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -371,7 +371,7 @@ int main(int, char**)
{ // negative, showbase
std::string v = "-$1,234,567.89";
showbase(ios);
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -383,7 +383,7 @@ int main(int, char**)
}
{ // negative, showbase
std::string v = "-$1,234,567.89";
- typedef input_iterator<const char*> I;
+ typedef cpp17_input_iterator<const char*> I;
std::string ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -398,7 +398,7 @@ int main(int, char**)
// wchar_t, national
{ // zero
std::wstring v = L"0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -409,7 +409,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -420,7 +420,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = L"1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -431,7 +431,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -442,7 +442,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -453,7 +453,7 @@ int main(int, char**)
}
{ // zero, showbase
std::wstring v = L"$0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -465,7 +465,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"$0.00";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -477,7 +477,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::wstring v = L"-$0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -489,7 +489,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"-$0.01";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -501,7 +501,7 @@ int main(int, char**)
}
{ // positive, showbase
std::wstring v = L"$1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -513,7 +513,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = L"$1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -526,7 +526,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-$1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -539,7 +539,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -551,7 +551,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = L"-USD 1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -566,7 +566,7 @@ int main(int, char**)
// wchar_t, international
{ // zero
std::wstring v = L"0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -577,7 +577,7 @@ int main(int, char**)
}
{ // negative one
std::wstring v = L"-0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -588,7 +588,7 @@ int main(int, char**)
}
{ // positive
std::wstring v = L"1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -599,7 +599,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -610,7 +610,7 @@ int main(int, char**)
}
{ // negative
std::wstring v = L"-1234567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -621,7 +621,7 @@ int main(int, char**)
}
{ // zero, showbase
std::wstring v = L"USD 0.00";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -633,7 +633,7 @@ int main(int, char**)
{ // zero, showbase
std::wstring v = L"USD 0.00";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -645,7 +645,7 @@ int main(int, char**)
}
{ // negative one, showbase
std::wstring v = L"-USD 0.01";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -657,7 +657,7 @@ int main(int, char**)
{ // negative one, showbase
std::wstring v = L"-USD 0.01";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -669,7 +669,7 @@ int main(int, char**)
}
{ // positive, showbase
std::wstring v = L"USD 1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -681,7 +681,7 @@ int main(int, char**)
{ // positive, showbase
std::wstring v = L"USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -694,7 +694,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-USD 1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -707,7 +707,7 @@ int main(int, char**)
{ // negative, showbase
std::wstring v = L"-$1,234,567.89";
showbase(ios);
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
@@ -719,7 +719,7 @@ int main(int, char**)
}
{ // negative, showbase
std::wstring v = L"-$1,234,567.89";
- typedef input_iterator<const wchar_t*> I;
+ typedef cpp17_input_iterator<const wchar_t*> I;
std::wstring ex;
std::ios_base::iostate err = std::ios_base::goodbit;
I iter = f.get(I(v.data()), I(v.data() + v.size()),
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
index ceef901e59a99..fb2c6910182e8 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -60,9 +60,9 @@ int main(int, char**)
const char str[] = "1";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, b);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -72,9 +72,9 @@ int main(int, char**)
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, b);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -84,9 +84,9 @@ int main(int, char**)
const char str[] = "12";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, b);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -96,9 +96,9 @@ int main(int, char**)
const char str[] = "*12";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, b);
assert(iter.base() == str+0);
assert(err == ios.failbit);
@@ -109,9 +109,9 @@ int main(int, char**)
const char str[] = "1";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, b);
assert(iter.base() == str+0);
assert(err == ios.failbit);
@@ -121,9 +121,9 @@ int main(int, char**)
const char str[] = "true";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, b);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -133,9 +133,9 @@ int main(int, char**)
const char str[] = "false";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, b);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -146,9 +146,9 @@ int main(int, char**)
const char str[] = "a";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+1),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+1),
ios, err, b);
assert(iter.base() == str+1);
assert(err == ios.eofbit);
@@ -158,9 +158,9 @@ int main(int, char**)
const char str[] = "abc";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+3),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+3),
ios, err, b);
assert(iter.base() == str+2);
assert(err == ios.failbit);
@@ -170,9 +170,9 @@ int main(int, char**)
const char str[] = "acc";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+3),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+3),
ios, err, b);
assert(iter.base() == str+1);
assert(err == ios.goodbit);
@@ -183,9 +183,9 @@ int main(int, char**)
const char str[] = "a";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+1),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+1),
ios, err, b);
assert(iter.base() == str+1);
assert(err == ios.eofbit);
@@ -195,9 +195,9 @@ int main(int, char**)
const char str[] = "ab";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+2),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+2),
ios, err, b);
assert(iter.base() == str+2);
assert(err == ios.eofbit);
@@ -207,9 +207,9 @@ int main(int, char**)
const char str[] = "abc";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+3),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+3),
ios, err, b);
assert(iter.base() == str+2);
assert(err == ios.goodbit);
@@ -219,9 +219,9 @@ int main(int, char**)
const char str[] = "ac";
std::ios_base::iostate err = ios.goodbit;
bool b;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+2),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+2),
ios, err, b);
assert(iter.base() == str+1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
index 7644cf82b1958..3e83f13fa6c5e 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
@@ -22,7 +22,7 @@
#include "test_iterators.h"
#include "hexfloat.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -54,9 +54,9 @@ int main(int, char**)
assert((ios.flags() & ios.basefield) == ios.dec);
assert(ios.getloc().name() == "C");
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -65,9 +65,9 @@ int main(int, char**)
{
const char str[] = "-123";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -76,9 +76,9 @@ int main(int, char**)
{
const char str[] = "123.5";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -88,9 +88,9 @@ int main(int, char**)
const char str[] = "125e-1";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -100,9 +100,9 @@ int main(int, char**)
const char str[] = "0x125p-1";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -112,9 +112,9 @@ int main(int, char**)
const char str[] = "inf";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -124,9 +124,9 @@ int main(int, char**)
const char str[] = "INF";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -136,9 +136,9 @@ int main(int, char**)
const char str[] = "-inf";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -148,9 +148,9 @@ int main(int, char**)
const char str[] = "-INF";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -160,9 +160,9 @@ int main(int, char**)
const char str[] = "nan";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -172,9 +172,9 @@ int main(int, char**)
const char str[] = "NAN";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -184,9 +184,9 @@ int main(int, char**)
v = -1;
const char str[] = "123_456_78_9;125";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+3);
assert(err == ios.goodbit);
@@ -197,9 +197,9 @@ int main(int, char**)
v = -1;
const char str[] = "2-";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+1);
assert(err == ios.goodbit);
@@ -209,9 +209,9 @@ int main(int, char**)
v = -1;
const char str[] = "1.79779e+309"; // unrepresentable
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -221,9 +221,9 @@ int main(int, char**)
v = -1;
const char str[] = "-1.79779e+308"; // unrepresentable
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -234,9 +234,9 @@ int main(int, char**)
v = -1;
const char str[] = "123_456_78_9;125";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -256,9 +256,9 @@ int main(int, char**)
"1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
"1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -268,9 +268,9 @@ int main(int, char**)
v = -1;
const char str[] = "3;14159265358979323846264338327950288419716939937510582097494459230781640628620899862803482534211706798214808651e+10";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
index b8e587c027119..d60bc96b6452e 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
@@ -22,7 +22,7 @@
#include "test_iterators.h"
#include "hexfloat.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -43,9 +43,9 @@ int main(int, char**)
assert((ios.flags() & ios.basefield) == ios.dec);
assert(ios.getloc().name() == "C");
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -54,9 +54,9 @@ int main(int, char**)
{
const char str[] = "-123";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -65,9 +65,9 @@ int main(int, char**)
{
const char str[] = "123.5";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -77,9 +77,9 @@ int main(int, char**)
const char str[] = "125e-1";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -89,9 +89,9 @@ int main(int, char**)
const char str[] = "0x125p-1";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -101,9 +101,9 @@ int main(int, char**)
const char str[] = "inf";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -113,9 +113,9 @@ int main(int, char**)
const char str[] = "INF";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -125,9 +125,9 @@ int main(int, char**)
const char str[] = "-inf";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -137,9 +137,9 @@ int main(int, char**)
const char str[] = "-INF";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -149,9 +149,9 @@ int main(int, char**)
const char str[] = "nan";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -161,9 +161,9 @@ int main(int, char**)
const char str[] = "NAN";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -173,9 +173,9 @@ int main(int, char**)
v = -1;
const char str[] = "3.40283e+39"; // unrepresentable
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -185,9 +185,9 @@ int main(int, char**)
v = -1;
const char str[] = "-3.40283e+38"; // unrepresentable
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -198,9 +198,9 @@ int main(int, char**)
v = -1;
const char str[] = "2-";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
index 4e892865c9020..ca65da442d636 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
@@ -30,7 +30,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -62,9 +62,9 @@ int main(int, char**)
assert((ios.flags() & ios.basefield) == ios.dec);
assert(ios.getloc().name() == "C");
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+3);
assert(err == ios.goodbit);
@@ -75,9 +75,9 @@ int main(int, char**)
assert((ios.flags() & ios.basefield) == ios.dec);
assert(ios.getloc().name() == "C");
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+4);
assert(err == ios.goodbit);
@@ -87,9 +87,9 @@ int main(int, char**)
const char str[] = "123";
oct(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+3);
assert(err == ios.goodbit);
@@ -99,9 +99,9 @@ int main(int, char**)
const char str[] = "123";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+3);
assert(err == ios.goodbit);
@@ -111,9 +111,9 @@ int main(int, char**)
const char str[] = "0x123";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -123,9 +123,9 @@ int main(int, char**)
const char str[] = "123";
ios.setf(zf, ios.basefield);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -135,9 +135,9 @@ int main(int, char**)
const char str[] = "0x123";
ios.setf(zf, ios.basefield);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -147,9 +147,9 @@ int main(int, char**)
const char str[] = "0123";
ios.setf(zf, ios.basefield);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -160,9 +160,9 @@ int main(int, char**)
const char str[] = "2-";
ios.setf(zf, ios.basefield);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+1);
assert(err == ios.goodbit);
@@ -174,9 +174,9 @@ int main(int, char**)
v = -1;
const char str[] = "123"; // no separators at all
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -186,9 +186,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -198,9 +198,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1_";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -210,9 +210,9 @@ int main(int, char**)
v = -1;
const char str[] = "+_1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -222,9 +222,9 @@ int main(int, char**)
v = -1;
const char str[] = "_+1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -234,9 +234,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1__";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -246,9 +246,9 @@ int main(int, char**)
v = -1;
const char str[] = "+_1_";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -258,9 +258,9 @@ int main(int, char**)
v = -1;
const char str[] = "_+1_";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -270,9 +270,9 @@ int main(int, char**)
v = -1;
const char str[] = "+__1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -282,9 +282,9 @@ int main(int, char**)
v = -1;
const char str[] = "_+_1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -294,9 +294,9 @@ int main(int, char**)
v = -1;
const char str[] = "__+1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -306,9 +306,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1_2";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -318,9 +318,9 @@ int main(int, char**)
v = -1;
const char str[] = "+12_";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -330,9 +330,9 @@ int main(int, char**)
v = -1;
const char str[] = "+_12";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -342,9 +342,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1__2";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -354,9 +354,9 @@ int main(int, char**)
v = -1;
const char str[] = "+12_3";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -366,9 +366,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1_23";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -378,9 +378,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1_23_4";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -390,9 +390,9 @@ int main(int, char**)
v = -1;
const char str[] = "+123_4";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -402,9 +402,9 @@ int main(int, char**)
v = -1;
const char str[] = "+12_34";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -414,9 +414,9 @@ int main(int, char**)
v = -1;
const char str[] = "+12_34_5";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -426,9 +426,9 @@ int main(int, char**)
v = -1;
const char str[] = "+123_45_6";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -438,9 +438,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1_23_45_6";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -450,9 +450,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1_234_56_7";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -462,9 +462,9 @@ int main(int, char**)
v = -1;
const char str[] = "+1_234_567_89_0";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -474,9 +474,9 @@ int main(int, char**)
v = -1;
const char str[] = "-1_234_567_89_0";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -486,9 +486,9 @@ int main(int, char**)
v = -1;
const char str[] = "1_234_567_89_0";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -498,9 +498,9 @@ int main(int, char**)
v = -1;
const char str[] = "1234_567_89_0";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -520,9 +520,9 @@ int main(int, char**)
"1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
"1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
index d1b65b5f26833..99201dbc10488 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
@@ -22,7 +22,7 @@
#include "test_iterators.h"
#include "hexfloat.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -43,9 +43,9 @@ int main(int, char**)
assert((ios.flags() & ios.basefield) == ios.dec);
assert(ios.getloc().name() == "C");
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -54,9 +54,9 @@ int main(int, char**)
{
const char str[] = "-123";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -65,9 +65,9 @@ int main(int, char**)
{
const char str[] = "123.5";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -77,9 +77,9 @@ int main(int, char**)
const char str[] = "125e-1";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -89,9 +89,9 @@ int main(int, char**)
const char str[] = "0x125p-1";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -101,9 +101,9 @@ int main(int, char**)
const char str[] = "inf";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -113,9 +113,9 @@ int main(int, char**)
const char str[] = "INF";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -125,9 +125,9 @@ int main(int, char**)
const char str[] = "-inf";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -137,9 +137,9 @@ int main(int, char**)
const char str[] = "-INF";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -149,9 +149,9 @@ int main(int, char**)
const char str[] = "nan";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -161,9 +161,9 @@ int main(int, char**)
const char str[] = "NAN";
hex(ios);
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -173,9 +173,9 @@ int main(int, char**)
const char str[] = "1.189731495357231765021264e+49321";
std::ios_base::iostate err = ios.goodbit;
v = 0;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -185,9 +185,9 @@ int main(int, char**)
const char str[] = "1.189731495357231765021264e+49329";
std::ios_base::iostate err = ios.goodbit;
v = 0;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -197,9 +197,9 @@ int main(int, char**)
const char str[] = "11.189731495357231765021264e+4932";
std::ios_base::iostate err = ios.goodbit;
v = 0;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -209,9 +209,9 @@ int main(int, char**)
const char str[] = "91.189731495357231765021264e+4932";
std::ios_base::iostate err = ios.goodbit;
v = 0;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -221,9 +221,9 @@ int main(int, char**)
const char str[] = "304888344611713860501504000000";
std::ios_base::iostate err = ios.goodbit;
v = 0;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err != ios.failbit);
@@ -233,9 +233,9 @@ int main(int, char**)
v = -1;
const char str[] = "1.19973e+4933"; // unrepresentable
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -245,9 +245,9 @@ int main(int, char**)
v = -1;
const char str[] = "-1.18974e+4932"; // unrepresentable
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -257,9 +257,9 @@ int main(int, char**)
v = -1;
const char str[] = "2-";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
index 5ffd09de438ca..ef1de641f434e 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -49,9 +49,9 @@ int main(int, char**)
{
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -60,9 +60,9 @@ int main(int, char**)
{
const char str[] = "1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -71,9 +71,9 @@ int main(int, char**)
{
const char str[] = "-1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -83,9 +83,9 @@ int main(int, char**)
{
const char str[] = "0x7FFFFFFFFFFFFFFF";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -94,9 +94,9 @@ int main(int, char**)
{
const char str[] = "-0x8000000000000000";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
index c6ea2d9c97373..6cef269ff86ea 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -38,9 +38,9 @@ int main(int, char**)
const char str[] = "0x0";
std::ios_base::iostate err = ios.goodbit;
void* p;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, p);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -50,9 +50,9 @@ int main(int, char**)
const char str[] = "0x73";
std::ios_base::iostate err = ios.goodbit;
void* p;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, p);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
index c7ef8778f831e..44e5c48c96363 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -49,9 +49,9 @@ int main(int, char**)
{
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -60,9 +60,9 @@ int main(int, char**)
{
const char str[] = "1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -72,9 +72,9 @@ int main(int, char**)
{
const char str[] = "0xFFFFFFFF";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
index e9e0d514a4d4d..46f1487cfb2e9 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -49,9 +49,9 @@ int main(int, char**)
{
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -60,9 +60,9 @@ int main(int, char**)
{
const char str[] = "1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -72,9 +72,9 @@ int main(int, char**)
{
const char str[] = "0xFFFFFFFF";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
index 4090a836fe1d0..7228018deb40a 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -49,9 +49,9 @@ int main(int, char**)
{
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -60,9 +60,9 @@ int main(int, char**)
{
const char str[] = "1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -72,9 +72,9 @@ int main(int, char**)
{
const char str[] = "0xFFFFFFFFFFFFFFFF";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
index 699fa76b03d3a..00f80cb3576cc 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -49,9 +49,9 @@ int main(int, char**)
{
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -60,9 +60,9 @@ int main(int, char**)
{
const char str[] = "1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -72,9 +72,9 @@ int main(int, char**)
{
const char str[] = "0xFFFF";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp
index 9778254a6f62f..ecfe08c3d9fbd 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp
@@ -26,7 +26,7 @@
#pragma warning(disable: 4146) // unary minus operator applied to unsigned type, result still unsigned
#endif
-typedef std::num_get<char, input_iterator<const char*> > F;
+typedef std::num_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
@@ -52,9 +52,9 @@ void test_neg_one() {
{
const char str[] = "-1";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.goodbit);
@@ -64,9 +64,9 @@ void test_neg_one() {
{
const char str[] = "-";
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+sizeof(str)),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+sizeof(str)),
ios, err, v);
assert(iter.base() == str+sizeof(str)-1);
assert(err == ios.failbit);
@@ -87,9 +87,9 @@ void test_negate() {
const char* str = std_str.data();
size_t size = std_str.size();
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+size+1),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+size+1),
ios, err, v);
assert(iter.base() == str+size);
assert(err == ios.goodbit);
@@ -105,9 +105,9 @@ void test_negate() {
const char* str = std_str.data();
size_t size = std_str.size();
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+size+1),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+size+1),
ios, err, v);
assert(iter.base() == str+size);
assert(err == ios.goodbit);
@@ -121,9 +121,9 @@ void test_negate() {
const char* str = std_str.data();
size_t size = std_str.size();
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+size+1),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+size+1),
ios, err, v);
assert(iter.base() == str+size);
assert(err == ios.goodbit);
@@ -137,9 +137,9 @@ void test_negate() {
const char* str = std_str.data();
size_t size = std_str.size();
std::ios_base::iostate err = ios.goodbit;
- input_iterator<const char*> iter =
- f.get(input_iterator<const char*>(str),
- input_iterator<const char*>(str+size+1),
+ cpp17_input_iterator<const char*> iter =
+ f.get(cpp17_input_iterator<const char*>(str),
+ cpp17_input_iterator<const char*>(str+size+1),
ios, err, v);
assert(iter.base() == str+size);
assert(err == ios.failbit);
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
index 9e5dda43e3331..eb5af373d3691 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
@@ -24,7 +24,7 @@
#include "platform_support.h" // locale name macros
-typedef std::time_get_byname<char, input_iterator<const char*> > F;
+typedef std::time_get_byname<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
index c3687ae247032..22248ea15daf2 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
@@ -24,7 +24,7 @@
#include "platform_support.h" // locale name macros
-typedef std::time_get_byname<wchar_t, input_iterator<const wchar_t*> > F;
+typedef std::time_get_byname<wchar_t, cpp17_input_iterator<const wchar_t*> > F;
class my_facet
: public F
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
index da872e69d8dc3..9989f8cd801c9 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
@@ -35,7 +35,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get_byname<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
index b8e04e19bd065..0cb95a6fa78f5 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
@@ -35,7 +35,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get_byname<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
index 56f8d035b53a3..db6f845271f40 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
@@ -27,7 +27,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get_byname<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
index 211c04342e504..4771468b4e210 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
@@ -25,7 +25,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get_byname<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
index a4c6375447813..8c2712dc1838f 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
@@ -33,7 +33,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get_byname<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
index 78960cb4cb26c..3246b4dee1599 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
@@ -33,7 +33,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get_byname<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
index 50a04d55767ab..7545c11222cfe 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
@@ -27,7 +27,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get_byname<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
index fe9d9c7daf698..849b358f8193b 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
@@ -27,7 +27,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get_byname<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
index 9f2c30a32cdcc..c2c2a98442a45 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
@@ -31,7 +31,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get_byname<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
index 719aae3931397..856cf3f60b6ca 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
@@ -29,7 +29,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get_byname<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
index 590d1be036d71..1abb36161b2e7 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
@@ -26,7 +26,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get_byname<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
index a480a158c7329..85c4a3f9ab992 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
@@ -26,7 +26,7 @@
#include "platform_support.h" // locale name macros
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get_byname<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
index cbb9686f650cd..a0654d777ef8e 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
@@ -17,7 +17,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef std::time_get<char, input_iterator<const char*> > F;
+typedef std::time_get<char, cpp17_input_iterator<const char*> > F;
class my_facet
: public F
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
index bc18854d1a151..b056df1529e1f 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
index b344168e96b29..ea0432b34abf8 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
index 4062897ced1ae..e9a84ed0310da 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
@@ -20,7 +20,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
index 0d460cc51e48a..78a24984ba93d 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
@@ -19,7 +19,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
index 840db5bb8b98c..08c851b4b6f8e 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
@@ -19,7 +19,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
index fa67180e71ff9..13e06a4a03341 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
@@ -18,7 +18,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
index 380d525ab1429..ad3ac3cdf045f 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
@@ -19,7 +19,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
index 44cd664c03d7e..9107ef890e8d3 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
@@ -19,7 +19,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
index f5b9ed06222db..7ab8353bc013b 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
@@ -19,7 +19,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get<char, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
index 210a11aca7064..00929846383b6 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
@@ -19,7 +19,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const wchar_t*> I;
+typedef cpp17_input_iterator<const wchar_t*> I;
typedef std::time_get<wchar_t, I> F;
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
index cccf065db2887..404d11e30cae0 100644
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
@@ -19,7 +19,7 @@
#include "test_macros.h"
#include "test_iterators.h"
-typedef input_iterator<const char*> I;
+typedef cpp17_input_iterator<const char*> I;
typedef std::time_get<char, I> F;
diff --git a/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate.pass.cpp b/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate.pass.cpp
index 6d15930c1e574..387cb1207ffe4 100644
--- a/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate.pass.cpp
@@ -49,7 +49,7 @@ test()
TEST_CONSTEXPR_CXX20 bool
test()
{
- test<input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
index 6210bc373a106..f68e04118874b 100644
--- a/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
@@ -103,7 +103,7 @@ test()
TEST_CONSTEXPR_CXX20 bool
test()
{
- test<input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/adjacent.
diff erence/adjacent_
diff erence.pass.cpp b/libcxx/test/std/numerics/numeric.ops/adjacent.
diff erence/adjacent_
diff erence.pass.cpp
index 7e8bee69040ba..7b340f4cbecea 100644
--- a/libcxx/test/std/numerics/numeric.ops/adjacent.
diff erence/adjacent_
diff erence.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/adjacent.
diff erence/adjacent_
diff erence.pass.cpp
@@ -81,11 +81,11 @@ class Y
TEST_CONSTEXPR_CXX20 bool
test()
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/adjacent.
diff erence/adjacent_
diff erence_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/adjacent.
diff erence/adjacent_
diff erence_op.pass.cpp
index 4a50d4ec918a8..39dc6d022cee9 100644
--- a/libcxx/test/std/numerics/numeric.ops/adjacent.
diff erence/adjacent_
diff erence_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/adjacent.
diff erence/adjacent_
diff erence_op.pass.cpp
@@ -142,11 +142,11 @@ class Y
TEST_CONSTEXPR_CXX20 bool
test()
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan.pass.cpp b/libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan.pass.cpp
index 8d4da735a4b74..714a5139175ca 100644
--- a/libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan.pass.cpp
@@ -97,7 +97,7 @@ test()
basic_tests();
// All the iterator categories
- test<input_iterator <const int*> >();
+ test<cpp17_input_iterator <const int*> >();
test<forward_iterator <const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan_init_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan_init_op.pass.cpp
index 6814ae2e496ec..4c5f970898f5f 100644
--- a/libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan_init_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/exclusive.scan/exclusive_scan_init_op.pass.cpp
@@ -68,7 +68,7 @@ TEST_CONSTEXPR_CXX20 bool
test()
{
// All the iterator categories
- test<input_iterator <const int*> >();
+ test<cpp17_input_iterator <const int*> >();
test<forward_iterator <const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan.pass.cpp b/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan.pass.cpp
index e89d18f48a626..2ead8b7794c41 100644
--- a/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan.pass.cpp
@@ -103,7 +103,7 @@ test()
basic_tests();
// All the iterator categories
- test<input_iterator <const int*> >();
+ test<cpp17_input_iterator <const int*> >();
test<forward_iterator <const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op.pass.cpp
index bb1755c01e178..be62c5a895741 100644
--- a/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op.pass.cpp
@@ -107,7 +107,7 @@ test()
basic_tests();
// All the iterator categories
- test<input_iterator <const int*> >();
+ test<cpp17_input_iterator <const int*> >();
test<forward_iterator <const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op_init.pass.cpp b/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op_init.pass.cpp
index b832cb84af17f..48a0f16761de5 100644
--- a/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op_init.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/inclusive.scan/inclusive_scan_op_init.pass.cpp
@@ -124,7 +124,7 @@ test()
basic_tests();
// All the iterator categories
- test<input_iterator <const int*> >();
+ test<cpp17_input_iterator <const int*> >();
test<forward_iterator <const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/inner.product/inner_product.pass.cpp b/libcxx/test/std/numerics/numeric.ops/inner.product/inner_product.pass.cpp
index cfbcfee23d0a8..61b8bad37944c 100644
--- a/libcxx/test/std/numerics/numeric.ops/inner.product/inner_product.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/inner.product/inner_product.pass.cpp
@@ -54,31 +54,31 @@ test()
TEST_CONSTEXPR_CXX20 bool
test()
{
- test<input_iterator<const int*>, input_iterator<const int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*> >();
- test<input_iterator<const int*>, const int*>();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, const int*>();
- test<forward_iterator<const int*>, input_iterator<const int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*> >();
test<forward_iterator<const int*>, const int*>();
- test<bidirectional_iterator<const int*>, input_iterator<const int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*> >();
test<bidirectional_iterator<const int*>, const int*>();
- test<random_access_iterator<const int*>, input_iterator<const int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*> >();
test<random_access_iterator<const int*>, const int*>();
- test<const int*, input_iterator<const int*> >();
+ test<const int*, cpp17_input_iterator<const int*> >();
test<const int*, forward_iterator<const int*> >();
test<const int*, bidirectional_iterator<const int*> >();
test<const int*, random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp b/libcxx/test/std/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
index 2c54d42ad3bfc..171fb493763df 100644
--- a/libcxx/test/std/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
@@ -119,31 +119,31 @@ test()
TEST_CONSTEXPR_CXX20 bool
test()
{
- test<input_iterator<const int*>, input_iterator<const int*> >();
- test<input_iterator<const int*>, forward_iterator<const int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<const int*> >();
- test<input_iterator<const int*>, random_access_iterator<const int*> >();
- test<input_iterator<const int*>, const int*>();
+ test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*>, const int*>();
- test<forward_iterator<const int*>, input_iterator<const int*> >();
+ test<forward_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*>, forward_iterator<const int*> >();
test<forward_iterator<const int*>, bidirectional_iterator<const int*> >();
test<forward_iterator<const int*>, random_access_iterator<const int*> >();
test<forward_iterator<const int*>, const int*>();
- test<bidirectional_iterator<const int*>, input_iterator<const int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<bidirectional_iterator<const int*>, forward_iterator<const int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const int*> >();
test<bidirectional_iterator<const int*>, const int*>();
- test<random_access_iterator<const int*>, input_iterator<const int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator<const int*> >();
test<random_access_iterator<const int*>, forward_iterator<const int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const int*> >();
test<random_access_iterator<const int*>, const int*>();
- test<const int*, input_iterator<const int*> >();
+ test<const int*, cpp17_input_iterator<const int*> >();
test<const int*, forward_iterator<const int*> >();
test<const int*, bidirectional_iterator<const int*> >();
test<const int*, random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp b/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
index 0c6a51ba0d55e..e144aa3b3fe95 100644
--- a/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
@@ -42,11 +42,11 @@ test()
TEST_CONSTEXPR_CXX20 bool
test()
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
index 64d641c24a1e9..143edce2f9ddd 100644
--- a/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
@@ -102,11 +102,11 @@ test()
TEST_CONSTEXPR_CXX20 bool
test()
{
- test<input_iterator<const int*>, output_iterator<int*> >();
- test<input_iterator<const int*>, forward_iterator<int*> >();
- test<input_iterator<const int*>, bidirectional_iterator<int*> >();
- test<input_iterator<const int*>, random_access_iterator<int*> >();
- test<input_iterator<const int*>, int*>();
+ test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
+ test<cpp17_input_iterator<const int*>, int*>();
test<forward_iterator<const int*>, output_iterator<int*> >();
test<forward_iterator<const int*>, forward_iterator<int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp b/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp
index 85182658a4189..ed47c2145182e 100644
--- a/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp
@@ -60,7 +60,7 @@ test()
test_return_type<float>();
test_return_type<double>();
- test<input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp b/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp
index 362639b6ba975..6e535fc4aea49 100644
--- a/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp
@@ -64,7 +64,7 @@ test()
test_return_type<double, char>();
test_return_type<char, double>();
- test<input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp
index d1f9d88056a75..543f71f9ea970 100644
--- a/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp
@@ -64,7 +64,7 @@ test()
test_return_type<double, char>();
test_return_type<char, double>();
- test<input_iterator<const int*> >();
+ test<cpp17_input_iterator<const int*> >();
test<forward_iterator<const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp
index 1c91de77d4f5c..621a160705356 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp
@@ -150,7 +150,7 @@ test()
basic_tests();
// All the iterator categories
- test<input_iterator <const int*> >();
+ test<cpp17_input_iterator <const int*> >();
test<forward_iterator <const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp
index 9c70311b545cf..674aa82808bea 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp
@@ -122,7 +122,7 @@ test()
basic_tests();
// All the iterator categories
- test<input_iterator <const int*> >();
+ test<cpp17_input_iterator <const int*> >();
test<forward_iterator <const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp
index 3ef259f104c48..8910c2aa2778e 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp
@@ -152,7 +152,7 @@ test()
basic_tests();
// All the iterator categories
- test<input_iterator <const int*> >();
+ test<cpp17_input_iterator <const int*> >();
test<forward_iterator <const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_init_bop_uop.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_init_bop_uop.pass.cpp
index 8c19488bbb60a..08d114c00d9fe 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_init_bop_uop.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_init_bop_uop.pass.cpp
@@ -109,7 +109,7 @@ test()
test_return_type<char, double>();
// All the iterator categories
- test<input_iterator <const int*> >();
+ test<cpp17_input_iterator <const int*> >();
test<forward_iterator <const int*> >();
test<bidirectional_iterator<const int*> >();
test<random_access_iterator<const int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init.pass.cpp
index 65c38a0454dbe..c974f5c6660a0 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init.pass.cpp
@@ -83,22 +83,22 @@ test()
test_return_type<char, double>();
// All the iterator categories
- test<input_iterator <const int*>, input_iterator <const unsigned int*> >();
- test<input_iterator <const int*>, forward_iterator <const unsigned int*> >();
- test<input_iterator <const int*>, bidirectional_iterator<const unsigned int*> >();
- test<input_iterator <const int*>, random_access_iterator<const unsigned int*> >();
+ test<cpp17_input_iterator <const int*>, cpp17_input_iterator <const unsigned int*> >();
+ test<cpp17_input_iterator <const int*>, forward_iterator <const unsigned int*> >();
+ test<cpp17_input_iterator <const int*>, bidirectional_iterator<const unsigned int*> >();
+ test<cpp17_input_iterator <const int*>, random_access_iterator<const unsigned int*> >();
- test<forward_iterator <const int*>, input_iterator <const unsigned int*> >();
+ test<forward_iterator <const int*>, cpp17_input_iterator <const unsigned int*> >();
test<forward_iterator <const int*>, forward_iterator <const unsigned int*> >();
test<forward_iterator <const int*>, bidirectional_iterator<const unsigned int*> >();
test<forward_iterator <const int*>, random_access_iterator<const unsigned int*> >();
- test<bidirectional_iterator<const int*>, input_iterator <const unsigned int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator <const unsigned int*> >();
test<bidirectional_iterator<const int*>, forward_iterator <const unsigned int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const unsigned int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const unsigned int*> >();
- test<random_access_iterator<const int*>, input_iterator <const unsigned int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator <const unsigned int*> >();
test<random_access_iterator<const int*>, forward_iterator <const unsigned int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const unsigned int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const unsigned int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init_op_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init_op_op.pass.cpp
index e0a16e78ca5b8..89b427d4c7226 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init_op_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_iter_init_op_op.pass.cpp
@@ -87,22 +87,22 @@ test()
test_return_type<char, double>();
// All the iterator categories
- test<input_iterator <const int*>, input_iterator <const unsigned int*> >();
- test<input_iterator <const int*>, forward_iterator <const unsigned int*> >();
- test<input_iterator <const int*>, bidirectional_iterator<const unsigned int*> >();
- test<input_iterator <const int*>, random_access_iterator<const unsigned int*> >();
+ test<cpp17_input_iterator <const int*>, cpp17_input_iterator <const unsigned int*> >();
+ test<cpp17_input_iterator <const int*>, forward_iterator <const unsigned int*> >();
+ test<cpp17_input_iterator <const int*>, bidirectional_iterator<const unsigned int*> >();
+ test<cpp17_input_iterator <const int*>, random_access_iterator<const unsigned int*> >();
- test<forward_iterator <const int*>, input_iterator <const unsigned int*> >();
+ test<forward_iterator <const int*>, cpp17_input_iterator <const unsigned int*> >();
test<forward_iterator <const int*>, forward_iterator <const unsigned int*> >();
test<forward_iterator <const int*>, bidirectional_iterator<const unsigned int*> >();
test<forward_iterator <const int*>, random_access_iterator<const unsigned int*> >();
- test<bidirectional_iterator<const int*>, input_iterator <const unsigned int*> >();
+ test<bidirectional_iterator<const int*>, cpp17_input_iterator <const unsigned int*> >();
test<bidirectional_iterator<const int*>, forward_iterator <const unsigned int*> >();
test<bidirectional_iterator<const int*>, bidirectional_iterator<const unsigned int*> >();
test<bidirectional_iterator<const int*>, random_access_iterator<const unsigned int*> >();
- test<random_access_iterator<const int*>, input_iterator <const unsigned int*> >();
+ test<random_access_iterator<const int*>, cpp17_input_iterator <const unsigned int*> >();
test<random_access_iterator<const int*>, forward_iterator <const unsigned int*> >();
test<random_access_iterator<const int*>, bidirectional_iterator<const unsigned int*> >();
test<random_access_iterator<const int*>, random_access_iterator<const unsigned int*> >();
diff --git a/libcxx/test/std/ranges/range.range/helper_aliases.compile.pass.cpp b/libcxx/test/std/ranges/range.range/helper_aliases.compile.pass.cpp
index b8647b7c8cc8f..4fd128a349cd7 100644
--- a/libcxx/test/std/ranges/range.range/helper_aliases.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.range/helper_aliases.compile.pass.cpp
@@ -26,11 +26,12 @@
#include <concepts>
+#include "test_iterators.h"
#include "test_range.h"
namespace stdr = std::ranges;
-static_assert(std::same_as<stdr::range_
diff erence_t<test_range<> >, std::iter_
diff erence_t<int*> >);
-static_assert(std::same_as<stdr::range_value_t<test_range<> >, std::iter_value_t<int*> >);
-static_assert(std::same_as<stdr::range_reference_t<test_range<> >, std::iter_reference_t<int*> >);
-static_assert(std::same_as<stdr::range_rvalue_reference_t<test_range<> >, std::iter_rvalue_reference_t<int*> >);
+static_assert(std::same_as<stdr::range_
diff erence_t<test_range<cpp20_input_iterator> >, std::iter_
diff erence_t<int*> >);
+static_assert(std::same_as<stdr::range_value_t<test_range<cpp20_input_iterator> >, std::iter_value_t<int*> >);
+static_assert(std::same_as<stdr::range_reference_t<test_range<cpp20_input_iterator> >, std::iter_reference_t<int*> >);
+static_assert(std::same_as<stdr::range_rvalue_reference_t<test_range<cpp20_input_iterator> >, std::iter_rvalue_reference_t<int*> >);
diff --git a/libcxx/test/std/ranges/range.range/iterator_t.compile.pass.cpp b/libcxx/test/std/ranges/range.range/iterator_t.compile.pass.cpp
index ebdf7f3ae3f2c..60a307b3f5c51 100644
--- a/libcxx/test/std/ranges/range.range/iterator_t.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.range/iterator_t.compile.pass.cpp
@@ -21,12 +21,12 @@
namespace stdr = std::ranges;
-static_assert(std::same_as<stdr::iterator_t<test_range<input_iterator> >, input_iterator<int*> >);
-static_assert(std::same_as<stdr::iterator_t<test_range<input_iterator> const>, input_iterator<int const*> >);
+static_assert(std::same_as<stdr::iterator_t<test_range<cpp17_input_iterator> >, cpp17_input_iterator<int*> >);
+static_assert(std::same_as<stdr::iterator_t<test_range<cpp17_input_iterator> const>, cpp17_input_iterator<int const*> >);
-static_assert(std::same_as<stdr::iterator_t<test_non_const_range<input_iterator> >, input_iterator<int*> >);
+static_assert(std::same_as<stdr::iterator_t<test_non_const_range<cpp17_input_iterator> >, cpp17_input_iterator<int*> >);
-static_assert(std::same_as<stdr::iterator_t<test_common_range<input_iterator> >, input_iterator<int*> >);
-static_assert(std::same_as<stdr::iterator_t<test_common_range<input_iterator> const>, input_iterator<int const*> >);
+static_assert(std::same_as<stdr::iterator_t<test_common_range<cpp17_input_iterator> >, cpp17_input_iterator<int*> >);
+static_assert(std::same_as<stdr::iterator_t<test_common_range<cpp17_input_iterator> const>, cpp17_input_iterator<int const*> >);
-static_assert(std::same_as<stdr::iterator_t<test_non_const_common_range<input_iterator> >, input_iterator<int*> >);
+static_assert(std::same_as<stdr::iterator_t<test_non_const_common_range<cpp17_input_iterator> >, cpp17_input_iterator<int*> >);
diff --git a/libcxx/test/std/ranges/range.range/range.compile.pass.cpp b/libcxx/test/std/ranges/range.range/range.compile.pass.cpp
index 33aaf24e9b694..82b35dab0cd44 100644
--- a/libcxx/test/std/ranges/range.range/range.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.range/range.compile.pass.cpp
@@ -21,7 +21,7 @@
namespace stdr = std::ranges;
-static_assert(stdr::range<test_range<> >);
+static_assert(stdr::range<test_range<cpp20_input_iterator> >);
struct incompatible_iterators {
int* begin();
diff --git a/libcxx/test/std/ranges/range.range/sentinel_t.compile.pass.cpp b/libcxx/test/std/ranges/range.range/sentinel_t.compile.pass.cpp
index 15674c727a72b..84b9f444856a4 100644
--- a/libcxx/test/std/ranges/range.range/sentinel_t.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.range/sentinel_t.compile.pass.cpp
@@ -22,9 +22,9 @@
namespace stdr = std::ranges;
-static_assert(std::same_as<stdr::sentinel_t<test_range<> >, sentinel>);
-static_assert(std::same_as<stdr::sentinel_t<test_range<> const>, sentinel>);
-static_assert(std::same_as<stdr::sentinel_t<test_non_const_range<> >, sentinel>);
-static_assert(std::same_as<stdr::sentinel_t<test_common_range<> >, input_iterator<int*> >);
-static_assert(std::same_as<stdr::sentinel_t<test_common_range<> const>, input_iterator<int const*> >);
-static_assert(std::same_as<stdr::sentinel_t<test_non_const_common_range<> >, input_iterator<int*> >);
+static_assert(std::same_as<stdr::sentinel_t<test_range<cpp20_input_iterator> >, sentinel>);
+static_assert(std::same_as<stdr::sentinel_t<test_range<cpp20_input_iterator> const>, sentinel>);
+static_assert(std::same_as<stdr::sentinel_t<test_non_const_range<cpp20_input_iterator> >, sentinel>);
+static_assert(std::same_as<stdr::sentinel_t<test_common_range<cpp17_input_iterator> >, cpp17_input_iterator<int*> >);
+static_assert(std::same_as<stdr::sentinel_t<test_common_range<cpp17_input_iterator> const>, cpp17_input_iterator<int const*> >);
+static_assert(std::same_as<stdr::sentinel_t<test_non_const_common_range<cpp17_input_iterator> >, cpp17_input_iterator<int*> >);
diff --git a/libcxx/test/std/ranges/range.refinements/common_range.compile.pass.cpp b/libcxx/test/std/ranges/range.refinements/common_range.compile.pass.cpp
index 17b29a0ae5195..4c94e212795ed 100644
--- a/libcxx/test/std/ranges/range.refinements/common_range.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.refinements/common_range.compile.pass.cpp
@@ -19,17 +19,17 @@
namespace stdr = std::ranges;
-static_assert(!stdr::common_range<test_range<input_iterator> >);
-static_assert(!stdr::common_range<test_range<input_iterator> const>);
+static_assert(!stdr::common_range<test_range<cpp17_input_iterator> >);
+static_assert(!stdr::common_range<test_range<cpp17_input_iterator> const>);
-static_assert(!stdr::common_range<test_non_const_range<input_iterator> >);
-static_assert(!stdr::common_range<test_non_const_range<input_iterator> const>);
+static_assert(!stdr::common_range<test_non_const_range<cpp17_input_iterator> >);
+static_assert(!stdr::common_range<test_non_const_range<cpp17_input_iterator> const>);
-static_assert(stdr::common_range<test_common_range<input_iterator> >);
-static_assert(stdr::common_range<test_common_range<input_iterator> const>);
+static_assert(stdr::common_range<test_common_range<cpp17_input_iterator> >);
+static_assert(stdr::common_range<test_common_range<cpp17_input_iterator> const>);
-static_assert(stdr::common_range<test_non_const_common_range<input_iterator> >);
-static_assert(!stdr::common_range<test_non_const_common_range<input_iterator> const>);
+static_assert(stdr::common_range<test_non_const_common_range<cpp17_input_iterator> >);
+static_assert(!stdr::common_range<test_non_const_common_range<cpp17_input_iterator> const>);
struct subtly_not_common {
int* begin() const;
diff --git a/libcxx/test/std/ranges/range.refinements/input_range.compile.pass.cpp b/libcxx/test/std/ranges/range.refinements/input_range.compile.pass.cpp
index 14827ce5752a9..bdfa24f8c9272 100644
--- a/libcxx/test/std/ranges/range.refinements/input_range.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.refinements/input_range.compile.pass.cpp
@@ -15,30 +15,31 @@
#include <ranges>
+#include "test_iterators.h"
#include "test_range.h"
namespace stdr = std::ranges;
-static_assert(stdr::input_range<test_range<input_iterator> >);
-static_assert(stdr::input_range<test_range<input_iterator> const>);
+static_assert(stdr::input_range<test_range<cpp17_input_iterator> >);
+static_assert(stdr::input_range<test_range<cpp17_input_iterator> const>);
static_assert(stdr::input_range<test_range<cpp20_input_iterator> >);
static_assert(stdr::input_range<test_range<cpp20_input_iterator> const>);
-static_assert(stdr::input_range<test_non_const_range<input_iterator> >);
+static_assert(stdr::input_range<test_non_const_range<cpp17_input_iterator> >);
static_assert(stdr::input_range<test_non_const_range<cpp20_input_iterator> >);
-static_assert(!stdr::input_range<test_non_const_range<input_iterator> const>);
+static_assert(!stdr::input_range<test_non_const_range<cpp17_input_iterator> const>);
static_assert(!stdr::input_range<test_non_const_range<cpp20_input_iterator> const>);
-static_assert(stdr::input_range<test_common_range<input_iterator> >);
+static_assert(stdr::input_range<test_common_range<cpp17_input_iterator> >);
static_assert(!stdr::input_range<test_common_range<cpp20_input_iterator> >);
-static_assert(stdr::input_range<test_common_range<input_iterator> const>);
+static_assert(stdr::input_range<test_common_range<cpp17_input_iterator> const>);
static_assert(!stdr::input_range<test_common_range<cpp20_input_iterator> const>);
-static_assert(stdr::input_range<test_non_const_common_range<input_iterator> >);
+static_assert(stdr::input_range<test_non_const_common_range<cpp17_input_iterator> >);
static_assert(!stdr::input_range<test_non_const_common_range<cpp20_input_iterator> >);
-static_assert(!stdr::input_range<test_non_const_common_range<input_iterator> const>);
+static_assert(!stdr::input_range<test_non_const_common_range<cpp17_input_iterator> const>);
static_assert(!stdr::input_range<test_non_const_common_range<cpp20_input_iterator> const>);
diff --git a/libcxx/test/std/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp b/libcxx/test/std/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
index dd32c9466df2d..d228be0cc0ef2 100644
--- a/libcxx/test/std/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
+++ b/libcxx/test/std/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
@@ -23,7 +23,7 @@
int main(int, char**)
{
- typedef input_iterator<std::string::const_iterator> I;
+ typedef cpp17_input_iterator<std::string::const_iterator> I;
typedef forward_iterator<std::string::const_iterator> F;
std::string s4("(a([bc]))");
std::regex r2;
diff --git a/libcxx/test/std/strings/basic.string/input_iterator.h b/libcxx/test/std/strings/basic.string/cpp17_input_iterator.h
similarity index 69%
rename from libcxx/test/std/strings/basic.string/input_iterator.h
rename to libcxx/test/std/strings/basic.string/cpp17_input_iterator.h
index 96ca96f985ac5..14512a72671f9 100644
--- a/libcxx/test/std/strings/basic.string/input_iterator.h
+++ b/libcxx/test/std/strings/basic.string/cpp17_input_iterator.h
@@ -12,7 +12,7 @@
#include <iterator>
template <class It>
-class input_iterator
+class cpp17_input_iterator
{
It it_;
public:
@@ -22,18 +22,18 @@ class input_iterator
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
- input_iterator() : it_() {}
- explicit input_iterator(It it) : it_(it) {}
+ cpp17_input_iterator() : it_() {}
+ explicit cpp17_input_iterator(It it) : it_(it) {}
reference operator*() const {return *it_;}
pointer operator->() const {return it_;}
- input_iterator& operator++() {++it_; return *this;}
- input_iterator operator++(int) {input_iterator tmp(*this); ++(*this); return tmp;}
+ cpp17_input_iterator& operator++() {++it_; return *this;}
+ cpp17_input_iterator operator++(int) {cpp17_input_iterator tmp(*this); ++(*this); return tmp;}
- friend bool operator==(const input_iterator& x, const input_iterator& y)
+ friend bool operator==(const cpp17_input_iterator& x, const cpp17_input_iterator& y)
{return x.it_ == y.it_;}
- friend bool operator!=(const input_iterator& x, const input_iterator& y)
+ friend bool operator!=(const cpp17_input_iterator& x, const cpp17_input_iterator& y)
{return !(x == y);}
};
diff --git a/libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp
index 350891dbc1a42..a385032f41267 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp
@@ -175,7 +175,7 @@ int main(int, char**)
assert(w == L"abcdef");
}
{ // (8) w/o allocator
- using It = input_iterator<const char*>;
+ using It = cpp17_input_iterator<const char*>;
const char* input = "abcdef";
std::basic_string s(It(input), It(input + 3), std::allocator<char>{});
ASSERT_SAME_TYPE(decltype(s), std::string);
@@ -183,7 +183,7 @@ int main(int, char**)
}
{ // (8) w/ allocator
using ExpectW = std::basic_string<wchar_t, std::char_traits<wchar_t>, test_allocator<wchar_t>>;
- using It = input_iterator<const wchar_t*>;
+ using It = cpp17_input_iterator<const wchar_t*>;
const wchar_t* input = L"abcdef";
std::basic_string s(It(input), It(input + 3), test_allocator<wchar_t>{});
ASSERT_SAME_TYPE(decltype(s), ExpectW);
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
index 8850dd2a00784..ebcf1ec5e4897 100644
--- 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 "../input_iterator.h"
+#include "../cpp17_input_iterator.h"
#include "min_allocator.h"
template <class It>
@@ -74,17 +74,17 @@ int main(int, char**)
test(s, s+50);
test(s, s+50, A(2));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s), A(2));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), A(2));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+1));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+1), A(2));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), A(2));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+10));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+10), A(2));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), A(2));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+50));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+50), A(2));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+50));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+50), A(2));
}
#if TEST_STD_VER >= 11
{
@@ -103,17 +103,17 @@ int main(int, char**)
test(s, s+50);
test(s, s+50, A());
- test(input_iterator<const char*>(s), input_iterator<const char*>(s));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s), A());
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), A());
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+1));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+1), A());
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), A());
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+10));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+10), A());
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), A());
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+50));
- test(input_iterator<const char*>(s), input_iterator<const char*>(s+50), A());
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+50));
+ test(cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+50), A());
}
#endif
{
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
index ef461731791f0..3292003f14c31 100644
--- 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
@@ -33,7 +33,7 @@
#include "test_macros.h"
#include "test_allocator.h"
-#include "../input_iterator.h"
+#include "../cpp17_input_iterator.h"
#include "min_allocator.h"
int main(int, char**)
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
index f091e88bdadd0..e6dc0a72670c5 100644
--- 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
@@ -35,7 +35,7 @@
#include "test_macros.h"
#include "test_allocator.h"
-#include "../input_iterator.h"
+#include "../cpp17_input_iterator.h"
#include "min_allocator.h"
int main(int, char**)
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
index 769b4c00fc0e7..fae3b475712e9 100644
--- 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
@@ -39,7 +39,7 @@
#include "test_macros.h"
#include "test_allocator.h"
-#include "../input_iterator.h"
+#include "../cpp17_input_iterator.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
index 31ba8b05faf35..34b5d4139b394 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
@@ -78,38 +78,38 @@ int main(int, char**)
test(S("12345678901234567890"), s, s+52,
S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s), S());
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("A"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S());
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("A"));
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S("12345"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("12345A"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("12345ABCDEFGHIJ"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S("1234567890"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("1234567890A"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("1234567890ABCDEFGHIJ"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S("12345678901234567890"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("12345678901234567890""A"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("12345678901234567890""ABCDEFGHIJ"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#if TEST_STD_VER >= 11
@@ -137,38 +137,38 @@ int main(int, char**)
test(S("12345678901234567890"), s, s+52,
S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s), S());
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("A"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S());
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("A"));
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S("12345"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("12345A"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("12345ABCDEFGHIJ"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S("1234567890"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("1234567890A"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("1234567890ABCDEFGHIJ"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S("12345678901234567890"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("12345678901234567890""A"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("12345678901234567890""ABCDEFGHIJ"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#endif
@@ -176,7 +176,7 @@ int main(int, char**)
{ // test iterator operations that throw
typedef std::string S;
typedef ThrowingIterator<char> TIter;
- typedef input_iterator<TIter> IIter;
+ typedef cpp17_input_iterator<TIter> IIter;
const char* s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
test_exceptions(S(), IIter(TIter(s, s+10, 4, TIter::TAIncrement)), IIter());
test_exceptions(S(), IIter(TIter(s, s+10, 5, TIter::TADereference)), IIter());
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
index c0865f210aa6f..981350f500052 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
@@ -80,38 +80,38 @@ int main(int, char**)
test(S("12345678901234567890"), s, s+52,
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s), S());
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("A"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S());
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("A"));
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#if TEST_STD_VER >= 11
@@ -139,38 +139,38 @@ int main(int, char**)
test(S("12345678901234567890"), s, s+52,
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s), S());
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("A"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S());
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("A"));
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S(), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S(), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S("12345"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("12345"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S("1234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("1234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s),
S());
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+1),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1),
S("A"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+10),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10),
S("ABCDEFGHIJ"));
- test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S("12345678901234567890"), cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#endif
@@ -178,7 +178,7 @@ int main(int, char**)
{ // test iterator operations that throw
typedef std::string S;
typedef ThrowingIterator<char> TIter;
- typedef input_iterator<TIter> IIter;
+ typedef cpp17_input_iterator<TIter> IIter;
const char* s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
test_exceptions(S(), IIter(TIter(s, s+10, 4, TIter::TAIncrement)), IIter());
test_exceptions(S(), IIter(TIter(s, s+10, 5, TIter::TADereference)), IIter());
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
index d86da1cacc87f..1f0b12ff7be98 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
@@ -82,25 +82,25 @@ int main(int, char**)
test(S("12345678901234567890"), 20, s, s+52,
S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S(), 0, input_iterator<const char*>(s), input_iterator<const char*>(s), S());
- test(S(), 0, input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("A"));
- test(S(), 0, input_iterator<const char*>(s), input_iterator<const char*>(s+10), S("ABCDEFGHIJ"));
- test(S(), 0, input_iterator<const char*>(s), input_iterator<const char*>(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
-
- test(S("12345"), 0, input_iterator<const char*>(s), input_iterator<const char*>(s), S("12345"));
- test(S("12345"), 1, input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("1A2345"));
- test(S("12345"), 4, input_iterator<const char*>(s), input_iterator<const char*>(s+10), S("1234ABCDEFGHIJ5"));
- test(S("12345"), 5, input_iterator<const char*>(s), input_iterator<const char*>(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
-
- test(S("1234567890"), 0, input_iterator<const char*>(s), input_iterator<const char*>(s), S("1234567890"));
- test(S("1234567890"), 1, input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("1A234567890"));
- test(S("1234567890"), 10, input_iterator<const char*>(s), input_iterator<const char*>(s+10), S("1234567890ABCDEFGHIJ"));
- test(S("1234567890"), 8, input_iterator<const char*>(s), input_iterator<const char*>(s+52), S("12345678ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz90"));
-
- test(S("12345678901234567890"), 3, input_iterator<const char*>(s), input_iterator<const char*>(s), S("12345678901234567890"));
- test(S("12345678901234567890"), 3, input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("123A45678901234567890"));
- test(S("12345678901234567890"), 15, input_iterator<const char*>(s), input_iterator<const char*>(s+10), S("123456789012345ABCDEFGHIJ67890"));
- test(S("12345678901234567890"), 20, input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S(), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S());
+ test(S(), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("A"));
+ test(S(), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), S("ABCDEFGHIJ"));
+ test(S(), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
+
+ test(S("12345"), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S("12345"));
+ test(S("12345"), 1, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("1A2345"));
+ test(S("12345"), 4, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), S("1234ABCDEFGHIJ5"));
+ test(S("12345"), 5, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
+
+ test(S("1234567890"), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S("1234567890"));
+ test(S("1234567890"), 1, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("1A234567890"));
+ test(S("1234567890"), 10, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), S("1234567890ABCDEFGHIJ"));
+ test(S("1234567890"), 8, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52), S("12345678ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz90"));
+
+ test(S("12345678901234567890"), 3, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S("12345678901234567890"));
+ test(S("12345678901234567890"), 3, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("123A45678901234567890"));
+ test(S("12345678901234567890"), 15, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), S("123456789012345ABCDEFGHIJ67890"));
+ test(S("12345678901234567890"), 20, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#if TEST_STD_VER >= 11
@@ -128,25 +128,25 @@ int main(int, char**)
test(S("12345678901234567890"), 20, s, s+52,
S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
- test(S(), 0, input_iterator<const char*>(s), input_iterator<const char*>(s), S());
- test(S(), 0, input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("A"));
- test(S(), 0, input_iterator<const char*>(s), input_iterator<const char*>(s+10), S("ABCDEFGHIJ"));
- test(S(), 0, input_iterator<const char*>(s), input_iterator<const char*>(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
-
- test(S("12345"), 0, input_iterator<const char*>(s), input_iterator<const char*>(s), S("12345"));
- test(S("12345"), 1, input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("1A2345"));
- test(S("12345"), 4, input_iterator<const char*>(s), input_iterator<const char*>(s+10), S("1234ABCDEFGHIJ5"));
- test(S("12345"), 5, input_iterator<const char*>(s), input_iterator<const char*>(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
-
- test(S("1234567890"), 0, input_iterator<const char*>(s), input_iterator<const char*>(s), S("1234567890"));
- test(S("1234567890"), 1, input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("1A234567890"));
- test(S("1234567890"), 10, input_iterator<const char*>(s), input_iterator<const char*>(s+10), S("1234567890ABCDEFGHIJ"));
- test(S("1234567890"), 8, input_iterator<const char*>(s), input_iterator<const char*>(s+52), S("12345678ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz90"));
-
- test(S("12345678901234567890"), 3, input_iterator<const char*>(s), input_iterator<const char*>(s), S("12345678901234567890"));
- test(S("12345678901234567890"), 3, input_iterator<const char*>(s), input_iterator<const char*>(s+1), S("123A45678901234567890"));
- test(S("12345678901234567890"), 15, input_iterator<const char*>(s), input_iterator<const char*>(s+10), S("123456789012345ABCDEFGHIJ67890"));
- test(S("12345678901234567890"), 20, input_iterator<const char*>(s), input_iterator<const char*>(s+52),
+ test(S(), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S());
+ test(S(), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("A"));
+ test(S(), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), S("ABCDEFGHIJ"));
+ test(S(), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
+
+ test(S("12345"), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S("12345"));
+ test(S("12345"), 1, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("1A2345"));
+ test(S("12345"), 4, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), S("1234ABCDEFGHIJ5"));
+ test(S("12345"), 5, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
+
+ test(S("1234567890"), 0, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S("1234567890"));
+ test(S("1234567890"), 1, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("1A234567890"));
+ test(S("1234567890"), 10, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), S("1234567890ABCDEFGHIJ"));
+ test(S("1234567890"), 8, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52), S("12345678ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz90"));
+
+ test(S("12345678901234567890"), 3, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s), S("12345678901234567890"));
+ test(S("12345678901234567890"), 3, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+1), S("123A45678901234567890"));
+ test(S("12345678901234567890"), 15, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+10), S("123456789012345ABCDEFGHIJ67890"));
+ test(S("12345678901234567890"), 20, cpp17_input_iterator<const char*>(s), cpp17_input_iterator<const char*>(s+52),
S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#endif
@@ -154,7 +154,7 @@ int main(int, char**)
{ // test iterator operations that throw
typedef std::string S;
typedef ThrowingIterator<char> TIter;
- typedef input_iterator<TIter> IIter;
+ typedef cpp17_input_iterator<TIter> IIter;
const char* s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
test_exceptions(S(), 0, IIter(TIter(s, s+10, 4, TIter::TAIncrement)), IIter());
test_exceptions(S(), 0, IIter(TIter(s, s+10, 5, TIter::TADereference)), IIter());
@@ -208,7 +208,7 @@ int main(int, char**)
}
{ // test with a move iterator that returns char&&
- typedef input_iterator<const char*> It;
+ typedef cpp17_input_iterator<const char*> It;
typedef std::move_iterator<It> MoveIt;
const char p[] = "ABCD";
std::string s;
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
index d5e58db3589d5..9ce4a375aab8b 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
@@ -1006,7 +1006,7 @@ int main(int, char**)
{ // test iterator operations that throw
typedef std::string S;
typedef ThrowingIterator<char> TIter;
- typedef input_iterator<TIter> IIter;
+ typedef cpp17_input_iterator<TIter> IIter;
const char* s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
test_exceptions(S("abcdefghijklmnopqrst"), 10, 5, IIter(TIter(s, s+10, 4, TIter::TAIncrement)), IIter());
test_exceptions(S("abcdefghijklmnopqrst"), 10, 5, IIter(TIter(s, s+10, 5, TIter::TADereference)), IIter());
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
index 4e5baa600458e..625d30f64bd71 100644
--- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
+++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
@@ -79,7 +79,7 @@ void test_ctor_throws()
void test_counted()
{
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
using FIt = forward_iterator<Counted*>;
const int N = 5;
int values[N] = {1, 2, 3, 4, 5};
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
index 6a75e585cdee4..7dcdcf0c6324b 100644
--- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
+++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
@@ -79,7 +79,7 @@ void test_ctor_throws()
void test_counted()
{
- using It = input_iterator<int*>;
+ using It = cpp17_input_iterator<int*>;
using FIt = forward_iterator<Counted*>;
const int N = 5;
int values[N] = {1, 2, 3, 4, 5};
diff --git a/libcxx/test/support/test_iterators.h b/libcxx/test/support/test_iterators.h
index cea849f647aba..0a08173ca518a 100644
--- a/libcxx/test/support/test_iterators.h
+++ b/libcxx/test/support/test_iterators.h
@@ -52,14 +52,16 @@ class output_iterator
void operator,(T const &) DELETE_FUNCTION;
};
+// This is the Cpp17InputIterator requirement as described in Table 87 ([input.iterators]),
+// formerly known as InputIterator prior to C++20.
template <class It,
class ItTraits = It>
-class input_iterator
+class cpp17_input_iterator
{
typedef std::iterator_traits<ItTraits> Traits;
It it_;
- template <class U, class T> friend class input_iterator;
+ template <class U, class T> friend class cpp17_input_iterator;
public:
typedef std::input_iterator_tag iterator_category;
typedef typename Traits::value_type value_type;
@@ -69,21 +71,21 @@ class input_iterator
TEST_CONSTEXPR_CXX14 It base() const {return it_;}
- TEST_CONSTEXPR_CXX14 input_iterator() : it_() {}
- explicit TEST_CONSTEXPR_CXX14 input_iterator(It it) : it_(it) {}
+ TEST_CONSTEXPR_CXX14 cpp17_input_iterator() : it_() {}
+ explicit TEST_CONSTEXPR_CXX14 cpp17_input_iterator(It it) : it_(it) {}
template <class U, class T>
- TEST_CONSTEXPR_CXX14 input_iterator(const input_iterator<U, T>& u) :it_(u.it_) {}
+ TEST_CONSTEXPR_CXX14 cpp17_input_iterator(const cpp17_input_iterator<U, T>& u) :it_(u.it_) {}
TEST_CONSTEXPR_CXX14 reference operator*() const {return *it_;}
TEST_CONSTEXPR_CXX14 pointer operator->() const {return it_;}
- TEST_CONSTEXPR_CXX14 input_iterator& operator++() {++it_; return *this;}
- TEST_CONSTEXPR_CXX14 input_iterator operator++(int)
- {input_iterator tmp(*this); ++(*this); return tmp;}
+ TEST_CONSTEXPR_CXX14 cpp17_input_iterator& operator++() {++it_; return *this;}
+ TEST_CONSTEXPR_CXX14 cpp17_input_iterator operator++(int)
+ {cpp17_input_iterator tmp(*this); ++(*this); return tmp;}
- friend TEST_CONSTEXPR_CXX14 bool operator==(const input_iterator& x, const input_iterator& y)
+ friend TEST_CONSTEXPR_CXX14 bool operator==(const cpp17_input_iterator& x, const cpp17_input_iterator& y)
{return x.it_ == y.it_;}
- friend TEST_CONSTEXPR_CXX14 bool operator!=(const input_iterator& x, const input_iterator& y)
+ friend TEST_CONSTEXPR_CXX14 bool operator!=(const cpp17_input_iterator& x, const cpp17_input_iterator& y)
{return !(x == y);}
template <class T>
@@ -93,7 +95,7 @@ class input_iterator
template <class T, class TV, class U, class UV>
inline
bool
-operator==(const input_iterator<T, TV>& x, const input_iterator<U, UV>& y)
+operator==(const cpp17_input_iterator<T, TV>& x, const cpp17_input_iterator<U, UV>& y)
{
return x.base() == y.base();
}
@@ -101,7 +103,7 @@ operator==(const input_iterator<T, TV>& x, const input_iterator<U, UV>& y)
template <class T, class TV, class U, class UV>
inline
bool
-operator!=(const input_iterator<T, TV>& x, const input_iterator<U, UV>& y)
+operator!=(const cpp17_input_iterator<T, TV>& x, const cpp17_input_iterator<U, UV>& y)
{
return !(x == y);
}
@@ -396,7 +398,7 @@ template <class Iter>
inline TEST_CONSTEXPR_CXX14 Iter base(output_iterator<Iter> i) { return i.base(); }
template <class Iter>
-inline TEST_CONSTEXPR_CXX14 Iter base(input_iterator<Iter> i) { return i.base(); }
+inline TEST_CONSTEXPR_CXX14 Iter base(cpp17_input_iterator<Iter> i) { return i.base(); }
template <class Iter>
inline TEST_CONSTEXPR_CXX14 Iter base(forward_iterator<Iter> i) { return i.base(); }
diff --git a/libcxx/test/support/test_range.h b/libcxx/test/support/test_range.h
index 1b13deaedf8c5..9ded1325c7ce4 100644
--- a/libcxx/test/support/test_range.h
+++ b/libcxx/test/support/test_range.h
@@ -22,7 +22,7 @@ struct sentinel {
};
// clang-format off
-template <template <class...> class I = input_iterator>
+template <template <class...> class I>
requires std::input_or_output_iterator<I<int*> >
struct test_range {
I<int*> begin();
@@ -31,14 +31,14 @@ struct test_range {
sentinel end() const;
};
-template <template <class...> class I = input_iterator>
+template <template <class...> class I>
requires std::input_or_output_iterator<I<int*> >
struct test_non_const_range {
I<int*> begin();
sentinel end();
};
-template <template <class...> class I = input_iterator>
+template <template <class...> class I>
requires std::input_or_output_iterator<I<int*> >
struct test_common_range {
I<int*> begin();
@@ -47,7 +47,7 @@ struct test_common_range {
I<int const*> end() const;
};
-template <template <class...> class I = input_iterator>
+template <template <class...> class I>
requires std::input_or_output_iterator<I<int*> >
struct test_non_const_common_range {
I<int*> begin();
More information about the libcxx-commits
mailing list