diff --git a/libcxx/benchmarks/filesystem.bench.cpp b/libcxx/benchmarks/filesystem.bench.cpp --- a/libcxx/benchmarks/filesystem.bench.cpp +++ b/libcxx/benchmarks/filesystem.bench.cpp @@ -62,7 +62,7 @@ } template void BM_PathConstructInputIter(benchmark::State &st, GenInputs gen) { - BM_PathConstructIter(st, gen); + BM_PathConstructIter(st, gen); } template 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 --- 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 a[] = {1, 2, 3, 4, 5}; const int N = sizeof(a)/sizeof(a[0]); std::list::iterator i = v.insert(next(v2.cbegin(), 10), - input_iterator(a), - input_iterator(a+N)); + cpp17_input_iterator(a), + cpp17_input_iterator(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 --- a/libcxx/test/libcxx/containers/sequences/vector/asan.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/asan.pass.cpp @@ -42,7 +42,7 @@ #endif { - typedef input_iterator MyInputIter; + typedef cpp17_input_iterator MyInputIter; // Sould not trigger ASan. std::vector 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 --- 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 @@ using const_cstr_type = const CharT*; using array_type = CharT[25]; using const_array_type = const CharT[25]; - using iter_type = input_iterator; - using bad_iter_type = input_iterator; + using iter_type = cpp17_input_iterator; + using bad_iter_type = cpp17_input_iterator; template static void AssertPathable() { diff --git a/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp b/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp --- a/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp +++ b/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp @@ -192,7 +192,7 @@ // iterators in the libc++ test suite static_assert((!std::__is_cpp17_contiguous_iterator >::value), ""); - static_assert((!std::__is_cpp17_contiguous_iterator >::value), ""); + static_assert((!std::__is_cpp17_contiguous_iterator >::value), ""); static_assert((!std::__is_cpp17_contiguous_iterator >::value), ""); static_assert((!std::__is_cpp17_contiguous_iterator >::value), ""); static_assert((!std::__is_cpp17_contiguous_iterator >::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 --- 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_CONSTEXPR_CXX20 bool test() { - test_copy, output_iterator >(); - test_copy, forward_iterator >(); - test_copy, bidirectional_iterator >(); - test_copy, random_access_iterator >(); - test_copy, int*>(); + test_copy, output_iterator >(); + test_copy, forward_iterator >(); + test_copy, bidirectional_iterator >(); + test_copy, random_access_iterator >(); + test_copy, int*>(); test_copy, output_iterator >(); test_copy, forward_iterator >(); @@ -70,7 +70,7 @@ test_copy(); #if TEST_STD_VER > 17 - test_copy, contiguous_iterator>(); + test_copy, contiguous_iterator>(); test_copy, contiguous_iterator>(); test_copy, contiguous_iterator>(); test_copy, contiguous_iterator>(); 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 --- 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_CONSTEXPR_CXX20 bool test() { - test_copy_if, output_iterator >(); - test_copy_if, input_iterator >(); - test_copy_if, forward_iterator >(); - test_copy_if, bidirectional_iterator >(); - test_copy_if, random_access_iterator >(); - test_copy_if, int*>(); + test_copy_if, output_iterator >(); + test_copy_if, cpp17_input_iterator >(); + test_copy_if, forward_iterator >(); + test_copy_if, bidirectional_iterator >(); + test_copy_if, random_access_iterator >(); + test_copy_if, int*>(); test_copy_if, output_iterator >(); - test_copy_if, input_iterator >(); + test_copy_if, cpp17_input_iterator >(); test_copy_if, forward_iterator >(); test_copy_if, bidirectional_iterator >(); test_copy_if, random_access_iterator >(); test_copy_if, int*>(); test_copy_if, output_iterator >(); - test_copy_if, input_iterator >(); + test_copy_if, cpp17_input_iterator >(); test_copy_if, forward_iterator >(); test_copy_if, bidirectional_iterator >(); test_copy_if, random_access_iterator >(); test_copy_if, int*>(); test_copy_if, output_iterator >(); - test_copy_if, input_iterator >(); + test_copy_if, cpp17_input_iterator >(); test_copy_if, forward_iterator >(); test_copy_if, bidirectional_iterator >(); test_copy_if, random_access_iterator >(); test_copy_if, int*>(); test_copy_if >(); - test_copy_if >(); + test_copy_if >(); test_copy_if >(); test_copy_if >(); test_copy_if >(); 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 --- 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_CONSTEXPR_CXX20 bool test() { - test_copy_n, output_iterator >(); - test_copy_n, input_iterator >(); - test_copy_n, forward_iterator >(); - test_copy_n, bidirectional_iterator >(); - test_copy_n, random_access_iterator >(); - test_copy_n, int*>(); + test_copy_n, output_iterator >(); + test_copy_n, cpp17_input_iterator >(); + test_copy_n, forward_iterator >(); + test_copy_n, bidirectional_iterator >(); + test_copy_n, random_access_iterator >(); + test_copy_n, int*>(); test_copy_n, output_iterator >(); - test_copy_n, input_iterator >(); + test_copy_n, cpp17_input_iterator >(); test_copy_n, forward_iterator >(); test_copy_n, bidirectional_iterator >(); test_copy_n, random_access_iterator >(); test_copy_n, int*>(); test_copy_n, output_iterator >(); - test_copy_n, input_iterator >(); + test_copy_n, cpp17_input_iterator >(); test_copy_n, forward_iterator >(); test_copy_n, bidirectional_iterator >(); test_copy_n, random_access_iterator >(); test_copy_n, int*>(); test_copy_n, output_iterator >(); - test_copy_n, input_iterator >(); + test_copy_n, cpp17_input_iterator >(); test_copy_n, forward_iterator >(); test_copy_n, bidirectional_iterator >(); test_copy_n, random_access_iterator >(); test_copy_n, int*>(); test_copy_n >(); - test_copy_n >(); + test_copy_n >(); test_copy_n >(); test_copy_n >(); test_copy_n >(); 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 --- 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 @@ int main(int, char**) { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); @@ -94,11 +94,11 @@ test(); #if TEST_STD_VER >= 11 - test1*>, output_iterator*> >(); - test1*>, forward_iterator*> >(); - test1*>, bidirectional_iterator*> >(); - test1*>, random_access_iterator*> >(); - test1*>, std::unique_ptr*>(); + test1*>, output_iterator*> >(); + test1*>, forward_iterator*> >(); + test1*>, bidirectional_iterator*> >(); + test1*>, random_access_iterator*> >(); + test1*>, std::unique_ptr*>(); test1*>, output_iterator*> >(); test1*>, forward_iterator*> >(); @@ -126,7 +126,7 @@ #endif // TEST_STD_VER >= 11 #if TEST_STD_VER > 17 - test, contiguous_iterator>(); + test, contiguous_iterator>(); test, contiguous_iterator>(); test, contiguous_iterator>(); test, contiguous_iterator>(); @@ -138,7 +138,7 @@ test, int*>(); test, contiguous_iterator>(); - test1*>, contiguous_iterator*>>(); + test1*>, contiguous_iterator*>>(); test1*>, contiguous_iterator*>>(); test1*>, contiguous_iterator*>>(); test1*>, contiguous_iterator*>>(); @@ -150,42 +150,42 @@ test1*>, std::unique_ptr*>(); test1*>, contiguous_iterator*>>(); - static_assert(test, input_iterator >()); - static_assert(test, forward_iterator >()); - static_assert(test, bidirectional_iterator >()); - static_assert(test, random_access_iterator >()); - static_assert(test, contiguous_iterator >()); - static_assert(test, int*>()); + static_assert(test, cpp17_input_iterator >()); + static_assert(test, forward_iterator >()); + static_assert(test, bidirectional_iterator >()); + static_assert(test, random_access_iterator >()); + static_assert(test, contiguous_iterator >()); + static_assert(test, int*>()); - static_assert(test, input_iterator >()); + static_assert(test, cpp17_input_iterator >()); static_assert(test, forward_iterator >()); static_assert(test, bidirectional_iterator >()); static_assert(test, random_access_iterator >()); static_assert(test, contiguous_iterator >()); static_assert(test, int*>()); - static_assert(test, input_iterator >()); + static_assert(test, cpp17_input_iterator >()); static_assert(test, forward_iterator >()); static_assert(test, bidirectional_iterator >()); static_assert(test, random_access_iterator >()); static_assert(test, contiguous_iterator >()); static_assert(test, int*>()); - static_assert(test, input_iterator >()); + static_assert(test, cpp17_input_iterator >()); static_assert(test, forward_iterator >()); static_assert(test, bidirectional_iterator >()); static_assert(test, random_access_iterator >()); static_assert(test, contiguous_iterator >()); static_assert(test, int*>()); - static_assert(test, input_iterator >()); + static_assert(test, cpp17_input_iterator >()); static_assert(test, forward_iterator >()); static_assert(test, bidirectional_iterator >()); static_assert(test, random_access_iterator >()); static_assert(test, contiguous_iterator >()); static_assert(test, int*>()); - static_assert(test >()); + static_assert(test >()); static_assert(test >()); static_assert(test >()); static_assert(test >()); 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 --- 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 @@ { const int ia[] = {1, 2, 3, 4, 5, 6}; unary_counting_predicate pred((is_odd())); - assert(!std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), + assert(!std::is_partitioned(cpp17_input_iterator(std::begin(ia)), + cpp17_input_iterator(std::end(ia)), std::ref(pred))); assert(static_cast(pred.count()) <= std::distance(std::begin(ia), std::end(ia))); @@ -48,8 +48,8 @@ { const int ia[] = {1, 3, 5, 2, 4, 6}; unary_counting_predicate pred((is_odd())); - assert(std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), + assert(std::is_partitioned(cpp17_input_iterator(std::begin(ia)), + cpp17_input_iterator(std::end(ia)), std::ref(pred))); assert(static_cast(pred.count()) <= std::distance(std::begin(ia), std::end(ia))); @@ -57,8 +57,8 @@ { const int ia[] = {2, 4, 6, 1, 3, 5}; unary_counting_predicate pred((is_odd())); - assert(!std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), + assert(!std::is_partitioned(cpp17_input_iterator(std::begin(ia)), + cpp17_input_iterator(std::end(ia)), std::ref(pred))); assert(static_cast(pred.count()) <= std::distance(std::begin(ia), std::end(ia))); @@ -66,8 +66,8 @@ { const int ia[] = {1, 3, 5, 2, 4, 6, 7}; unary_counting_predicate pred((is_odd())); - assert(!std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), + assert(!std::is_partitioned(cpp17_input_iterator(std::begin(ia)), + cpp17_input_iterator(std::end(ia)), std::ref(pred))); assert(static_cast(pred.count()) <= std::distance(std::begin(ia), std::end(ia))); @@ -75,8 +75,8 @@ { const int ia[] = {1, 3, 5, 2, 4, 6, 7}; unary_counting_predicate pred((is_odd())); - assert(std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::begin(ia)), + assert(std::is_partitioned(cpp17_input_iterator(std::begin(ia)), + cpp17_input_iterator(std::begin(ia)), std::ref(pred))); assert(static_cast(pred.count()) <= std::distance(std::begin(ia), std::begin(ia))); @@ -84,8 +84,8 @@ { const int ia[] = {1, 3, 5, 7, 9, 11, 2}; unary_counting_predicate pred((is_odd())); - assert(std::is_partitioned(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), + assert(std::is_partitioned(cpp17_input_iterator(std::begin(ia)), + cpp17_input_iterator(std::end(ia)), std::ref(pred))); assert(static_cast(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 --- 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 r1[10] = {0}; int r2[10] = {0}; typedef std::pair, int*> P; - P p = std::partition_copy(input_iterator(std::begin(ia)), - input_iterator(std::end(ia)), + P p = std::partition_copy(cpp17_input_iterator(std::begin(ia)), + cpp17_input_iterator(std::end(ia)), output_iterator(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 --- 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 @@ // expected-error-re@algorithm:* {{static_assert failed{{( due to requirement '.*')?}} "SampleIterator must meet the requirements of RandomAccessIterator"}} // expected-error@algorithm:* 2 {{does not provide a subscript operator}} // expected-error@algorithm:* {{invalid operands}} - test, output_iterator >(); + test, output_iterator >(); 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 --- 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 @@ } int main(int, char**) { - test(); + test(); test(); test(); - test(); + test(); test(); test(); - test_empty_population(); + test_empty_population(); test_empty_population(); test_empty_population(); - test_empty_sample(); + test_empty_sample(); test_empty_sample(); test_empty_sample(); - test_small_population(); + test_small_population(); test_small_population(); test_small_population(); 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 --- 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 @@ int main(int, char**) { test_stability, output_iterator >(true); - test_stability, random_access_iterator >(false); + test_stability, random_access_iterator >(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 --- 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 @@ int main(int, char**) { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); 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 --- 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 @@ int main(int, char**) { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); 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 --- 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 @@ int main(int, char**) { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); 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 --- 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 @@ int main(int, char**) { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); 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 --- 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 @@ int main(int, char**) { - test, input_iterator, output_iterator >(); - test, input_iterator, input_iterator >(); - test, input_iterator, forward_iterator >(); - test, input_iterator, bidirectional_iterator >(); - test, input_iterator, random_access_iterator >(); - test, input_iterator, int*>(); - - test, forward_iterator, output_iterator >(); - test, forward_iterator, input_iterator >(); - test, forward_iterator, forward_iterator >(); - test, forward_iterator, bidirectional_iterator >(); - test, forward_iterator, random_access_iterator >(); - test, forward_iterator, int*>(); - - test, bidirectional_iterator, output_iterator >(); - test, bidirectional_iterator, input_iterator >(); - test, bidirectional_iterator, forward_iterator >(); - test, bidirectional_iterator, bidirectional_iterator >(); - test, bidirectional_iterator, random_access_iterator >(); - test, bidirectional_iterator, int*>(); - - test, random_access_iterator, output_iterator >(); - test, random_access_iterator, input_iterator >(); - test, random_access_iterator, forward_iterator >(); - test, random_access_iterator, bidirectional_iterator >(); - test, random_access_iterator, random_access_iterator >(); - test, random_access_iterator, int*>(); - - test, const int*, output_iterator >(); - test, const int*, input_iterator >(); - test, const int*, forward_iterator >(); - test, const int*, bidirectional_iterator >(); - test, const int*, random_access_iterator >(); - test, const int*, int*>(); - - test, input_iterator, output_iterator >(); - test, input_iterator, input_iterator >(); - test, input_iterator, forward_iterator >(); - test, input_iterator, bidirectional_iterator >(); - test, input_iterator, random_access_iterator >(); - test, input_iterator, int*>(); + test, cpp17_input_iterator, output_iterator >(); + test, cpp17_input_iterator, cpp17_input_iterator >(); + test, cpp17_input_iterator, forward_iterator >(); + test, cpp17_input_iterator, bidirectional_iterator >(); + test, cpp17_input_iterator, random_access_iterator >(); + test, cpp17_input_iterator, int*>(); + + test, forward_iterator, output_iterator >(); + test, forward_iterator, cpp17_input_iterator >(); + test, forward_iterator, forward_iterator >(); + test, forward_iterator, bidirectional_iterator >(); + test, forward_iterator, random_access_iterator >(); + test, forward_iterator, int*>(); + + test, bidirectional_iterator, output_iterator >(); + test, bidirectional_iterator, cpp17_input_iterator >(); + test, bidirectional_iterator, forward_iterator >(); + test, bidirectional_iterator, bidirectional_iterator >(); + test, bidirectional_iterator, random_access_iterator >(); + test, bidirectional_iterator, int*>(); + + test, random_access_iterator, output_iterator >(); + test, random_access_iterator, cpp17_input_iterator >(); + test, random_access_iterator, forward_iterator >(); + test, random_access_iterator, bidirectional_iterator >(); + test, random_access_iterator, random_access_iterator >(); + test, random_access_iterator, int*>(); + + test, const int*, output_iterator >(); + test, const int*, cpp17_input_iterator >(); + test, const int*, forward_iterator >(); + test, const int*, bidirectional_iterator >(); + test, const int*, random_access_iterator >(); + test, const int*, int*>(); + + test, cpp17_input_iterator, output_iterator >(); + test, cpp17_input_iterator, cpp17_input_iterator >(); + test, cpp17_input_iterator, forward_iterator >(); + test, cpp17_input_iterator, bidirectional_iterator >(); + test, cpp17_input_iterator, random_access_iterator >(); + test, cpp17_input_iterator, int*>(); test, forward_iterator, output_iterator >(); - test, forward_iterator, input_iterator >(); + test, forward_iterator, cpp17_input_iterator >(); test, forward_iterator, forward_iterator >(); test, forward_iterator, bidirectional_iterator >(); test, forward_iterator, random_access_iterator >(); test, forward_iterator, int*>(); test, bidirectional_iterator, output_iterator >(); - test, bidirectional_iterator, input_iterator >(); + test, bidirectional_iterator, cpp17_input_iterator >(); test, bidirectional_iterator, forward_iterator >(); test, bidirectional_iterator, bidirectional_iterator >(); test, bidirectional_iterator, random_access_iterator >(); test, bidirectional_iterator, int*>(); test, random_access_iterator, output_iterator >(); - test, random_access_iterator, input_iterator >(); + test, random_access_iterator, cpp17_input_iterator >(); test, random_access_iterator, forward_iterator >(); test, random_access_iterator, bidirectional_iterator >(); test, random_access_iterator, random_access_iterator >(); test, random_access_iterator, int*>(); test, const int*, output_iterator >(); - test, const int*, input_iterator >(); + test, const int*, cpp17_input_iterator >(); test, const int*, forward_iterator >(); test, const int*, bidirectional_iterator >(); test, const int*, random_access_iterator >(); test, const int*, int*>(); - test, input_iterator, output_iterator >(); - test, input_iterator, input_iterator >(); - test, input_iterator, forward_iterator >(); - test, input_iterator, bidirectional_iterator >(); - test, input_iterator, random_access_iterator >(); - test, input_iterator, int*>(); + test, cpp17_input_iterator, output_iterator >(); + test, cpp17_input_iterator, cpp17_input_iterator >(); + test, cpp17_input_iterator, forward_iterator >(); + test, cpp17_input_iterator, bidirectional_iterator >(); + test, cpp17_input_iterator, random_access_iterator >(); + test, cpp17_input_iterator, int*>(); test, forward_iterator, output_iterator >(); - test, forward_iterator, input_iterator >(); + test, forward_iterator, cpp17_input_iterator >(); test, forward_iterator, forward_iterator >(); test, forward_iterator, bidirectional_iterator >(); test, forward_iterator, random_access_iterator >(); test, forward_iterator, int*>(); test, bidirectional_iterator, output_iterator >(); - test, bidirectional_iterator, input_iterator >(); + test, bidirectional_iterator, cpp17_input_iterator >(); test, bidirectional_iterator, forward_iterator >(); test, bidirectional_iterator, bidirectional_iterator >(); test, bidirectional_iterator, random_access_iterator >(); test, bidirectional_iterator, int*>(); test, random_access_iterator, output_iterator >(); - test, random_access_iterator, input_iterator >(); + test, random_access_iterator, cpp17_input_iterator >(); test, random_access_iterator, forward_iterator >(); test, random_access_iterator, bidirectional_iterator >(); test, random_access_iterator, random_access_iterator >(); test, random_access_iterator, int*>(); test, const int*, output_iterator >(); - test, const int*, input_iterator >(); + test, const int*, cpp17_input_iterator >(); test, const int*, forward_iterator >(); test, const int*, bidirectional_iterator >(); test, const int*, random_access_iterator >(); test, const int*, int*>(); - test, input_iterator, output_iterator >(); - test, input_iterator, input_iterator >(); - test, input_iterator, forward_iterator >(); - test, input_iterator, bidirectional_iterator >(); - test, input_iterator, random_access_iterator >(); - test, input_iterator, int*>(); + test, cpp17_input_iterator, output_iterator >(); + test, cpp17_input_iterator, cpp17_input_iterator >(); + test, cpp17_input_iterator, forward_iterator >(); + test, cpp17_input_iterator, bidirectional_iterator >(); + test, cpp17_input_iterator, random_access_iterator >(); + test, cpp17_input_iterator, int*>(); test, forward_iterator, output_iterator >(); - test, forward_iterator, input_iterator >(); + test, forward_iterator, cpp17_input_iterator >(); test, forward_iterator, forward_iterator >(); test, forward_iterator, bidirectional_iterator >(); test, forward_iterator, random_access_iterator >(); test, forward_iterator, int*>(); test, bidirectional_iterator, output_iterator >(); - test, bidirectional_iterator, input_iterator >(); + test, bidirectional_iterator, cpp17_input_iterator >(); test, bidirectional_iterator, forward_iterator >(); test, bidirectional_iterator, bidirectional_iterator >(); test, bidirectional_iterator, random_access_iterator >(); test, bidirectional_iterator, int*>(); test, random_access_iterator, output_iterator >(); - test, random_access_iterator, input_iterator >(); + test, random_access_iterator, cpp17_input_iterator >(); test, random_access_iterator, forward_iterator >(); test, random_access_iterator, bidirectional_iterator >(); test, random_access_iterator, random_access_iterator >(); test, random_access_iterator, int*>(); test, const int*, output_iterator >(); - test, const int*, input_iterator >(); + test, const int*, cpp17_input_iterator >(); test, const int*, forward_iterator >(); test, const int*, bidirectional_iterator >(); test, const int*, random_access_iterator >(); test, const int*, int*>(); - test, output_iterator >(); - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, int*>(); test, output_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, int*>(); test, output_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, int*>(); test >(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ int main(int, char**) { - test, output_iterator >(); - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, int*>(); test, output_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, int*>(); test, output_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, int*>(); test >(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ int main(int, char**) { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); 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 --- 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 @@ int main(int, char**) { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); 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 --- 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 ia[] = {2, 4, 6, 8}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::all_of(input_iterator(ia), - input_iterator(ia + sa), test1()) == true); - assert(std::all_of(input_iterator(ia), - input_iterator(ia), test1()) == true); + assert(std::all_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), test1()) == true); + assert(std::all_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia), test1()) == true); } { const int ia[] = {2, 4, 5, 8}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::all_of(input_iterator(ia), - input_iterator(ia + sa), test1()) == false); - assert(std::all_of(input_iterator(ia), - input_iterator(ia), test1()) == true); + assert(std::all_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), test1()) == false); + assert(std::all_of(cpp17_input_iterator(ia), + cpp17_input_iterator(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 --- 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 ia[] = {2, 4, 6, 8}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::any_of(input_iterator(ia), - input_iterator(ia + sa), test1()) == true); - assert(std::any_of(input_iterator(ia), - input_iterator(ia), test1()) == false); + assert(std::any_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), test1()) == true); + assert(std::any_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia), test1()) == false); } { const int ia[] = {2, 4, 5, 8}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::any_of(input_iterator(ia), - input_iterator(ia + sa), test1()) == true); - assert(std::any_of(input_iterator(ia), - input_iterator(ia), test1()) == false); + assert(std::any_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), test1()) == true); + assert(std::any_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia), test1()) == false); } { const int ia[] = {1, 3, 5, 7}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::any_of(input_iterator(ia), - input_iterator(ia + sa), test1()) == false); - assert(std::any_of(input_iterator(ia), - input_iterator(ia), test1()) == false); + assert(std::any_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), test1()) == false); + assert(std::any_of(cpp17_input_iterator(ia), + cpp17_input_iterator(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 --- 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 ia[] = {0, 1, 2, 2, 0, 1, 2, 3}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::count(input_iterator(ia), - input_iterator(ia + sa), 2) == 3); - assert(std::count(input_iterator(ia), - input_iterator(ia + sa), 7) == 0); - assert(std::count(input_iterator(ia), - input_iterator(ia), 2) == 0); + assert(std::count(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), 2) == 3); + assert(std::count(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), 7) == 0); + assert(std::count(cpp17_input_iterator(ia), + cpp17_input_iterator(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 --- 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 ia[] = {0, 1, 2, 2, 0, 1, 2, 3}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::count_if(input_iterator(ia), - input_iterator(ia + sa), + assert(std::count_if(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), eq(2)) == 3); - assert(std::count_if(input_iterator(ia), - input_iterator(ia + sa), + assert(std::count_if(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), eq(7)) == 0); - assert(std::count_if(input_iterator(ia), - input_iterator(ia), + assert(std::count_if(cpp17_input_iterator(ia), + cpp17_input_iterator(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 --- 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 @@ int ia[] = {1, 3, 6, 7}; int ib[] = {1, 3}; int ic[] = {1, 3, 5, 7}; - typedef input_iterator II; + typedef cpp17_input_iterator II; typedef bidirectional_iterator BI; return !std::equal(std::begin(ia), std::end(ia), std::begin(ic)) @@ -49,35 +49,35 @@ 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(ia), - input_iterator(ia+s), - input_iterator(ia))); + assert(std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ia))); #if TEST_STD_VER >= 14 - assert(std::equal(input_iterator(ia), - input_iterator(ia+s), - input_iterator(ia), - input_iterator(ia+s))); + assert(std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s))); assert(std::equal(random_access_iterator(ia), random_access_iterator(ia+s), random_access_iterator(ia), random_access_iterator(ia+s))); #endif - assert(!std::equal(input_iterator(ia), - input_iterator(ia+s), - input_iterator(ib))); + assert(!std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ib))); #if TEST_STD_VER >= 14 - assert(!std::equal(input_iterator(ia), - input_iterator(ia+s), - input_iterator(ib), - input_iterator(ib+s))); + assert(!std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ib), + cpp17_input_iterator(ib+s))); assert(!std::equal(random_access_iterator(ia), random_access_iterator(ia+s), random_access_iterator(ib), random_access_iterator(ib+s))); - assert(!std::equal(input_iterator(ia), - input_iterator(ia+s), - input_iterator(ia), - input_iterator(ia+s-1))); + assert(!std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s-1))); assert(!std::equal(random_access_iterator(ia), random_access_iterator(ia+s), random_access_iterator(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 --- 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 @@ int ia[] = {1, 3, 6, 7}; int ib[] = {1, 3}; int ic[] = {1, 3, 5, 7}; - typedef input_iterator II; + typedef cpp17_input_iterator II; typedef bidirectional_iterator BI; return !std::equal(std::begin(ia), std::end(ia), std::begin(ic) , eq) @@ -63,15 +63,15 @@ 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(ia), - input_iterator(ia+s), - input_iterator(ia), + assert(std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ia), std::equal_to())); #if TEST_STD_VER >= 14 - assert(std::equal(input_iterator(ia), - input_iterator(ia+s), - input_iterator(ia), - input_iterator(ia+s), + assert(std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), std::equal_to())); assert(std::equal(random_access_iterator(ia), random_access_iterator(ia+s), @@ -80,10 +80,10 @@ std::equal_to())); comparison_count = 0; - assert(!std::equal(input_iterator(ia), - input_iterator(ia+s), - input_iterator(ia), - input_iterator(ia+s-1), + assert(!std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s-1), counting_equals)); assert(comparison_count > 0); comparison_count = 0; @@ -94,15 +94,15 @@ counting_equals)); assert(comparison_count == 0); #endif - assert(!std::equal(input_iterator(ia), - input_iterator(ia+s), - input_iterator(ib), + assert(!std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ib), std::equal_to())); #if TEST_STD_VER >= 14 - assert(!std::equal(input_iterator(ia), - input_iterator(ia+s), - input_iterator(ib), - input_iterator(ib+s), + assert(!std::equal(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), + cpp17_input_iterator(ib), + cpp17_input_iterator(ib+s), std::equal_to())); assert(!std::equal(random_access_iterator(ia), random_access_iterator(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 --- 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 @@ 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(ia), - input_iterator(ia + sa), + assert(std::find_first_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), forward_iterator(ib), forward_iterator(ib + sb)) == - input_iterator(ia+1)); + cpp17_input_iterator(ia+1)); int ic[] = {7}; - assert(std::find_first_of(input_iterator(ia), - input_iterator(ia + sa), + assert(std::find_first_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), forward_iterator(ic), forward_iterator(ic + 1)) == - input_iterator(ia+sa)); - assert(std::find_first_of(input_iterator(ia), - input_iterator(ia + sa), + cpp17_input_iterator(ia+sa)); + assert(std::find_first_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), forward_iterator(ic), forward_iterator(ic)) == - input_iterator(ia+sa)); - assert(std::find_first_of(input_iterator(ia), - input_iterator(ia), + cpp17_input_iterator(ia+sa)); + assert(std::find_first_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia), forward_iterator(ic), forward_iterator(ic+1)) == - input_iterator(ia)); + cpp17_input_iterator(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 --- 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 @@ 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(ia), - input_iterator(ia + sa), + assert(std::find_first_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), forward_iterator(ib), forward_iterator(ib + sb), std::equal_to()) == - input_iterator(ia+1)); + cpp17_input_iterator(ia+1)); int ic[] = {7}; - assert(std::find_first_of(input_iterator(ia), - input_iterator(ia + sa), + assert(std::find_first_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), forward_iterator(ic), forward_iterator(ic + 1), std::equal_to()) == - input_iterator(ia+sa)); - assert(std::find_first_of(input_iterator(ia), - input_iterator(ia + sa), + cpp17_input_iterator(ia+sa)); + assert(std::find_first_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), forward_iterator(ic), forward_iterator(ic), std::equal_to()) == - input_iterator(ia+sa)); - assert(std::find_first_of(input_iterator(ia), - input_iterator(ia), + cpp17_input_iterator(ia+sa)); + assert(std::find_first_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia), forward_iterator(ic), forward_iterator(ic+1), std::equal_to()) == - input_iterator(ia)); + cpp17_input_iterator(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 --- 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 ia[] = {0, 1, 2, 3, 4, 5}; const unsigned s = sizeof(ia)/sizeof(ia[0]); - input_iterator r = std::find(input_iterator(ia), - input_iterator(ia+s), 3); + cpp17_input_iterator r = std::find(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), 3); assert(*r == 3); - r = std::find(input_iterator(ia), input_iterator(ia+s), 10); - assert(r == input_iterator(ia+s)); + r = std::find(cpp17_input_iterator(ia), cpp17_input_iterator(ia+s), 10); + assert(r == cpp17_input_iterator(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 --- 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 ia[] = {0, 1, 2, 3, 4, 5}; const unsigned s = sizeof(ia)/sizeof(ia[0]); - input_iterator r = std::find_if(input_iterator(ia), - input_iterator(ia+s), + cpp17_input_iterator r = std::find_if(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), eq(3)); assert(*r == 3); - r = std::find_if(input_iterator(ia), - input_iterator(ia+s), + r = std::find_if(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), eq(10)); - assert(r == input_iterator(ia+s)); + assert(r == cpp17_input_iterator(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 --- 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 ia[] = {0, 1, 2, 3, 4, 5}; const unsigned s = sizeof(ia)/sizeof(ia[0]); - input_iterator r = std::find_if_not(input_iterator(ia), - input_iterator(ia+s), + cpp17_input_iterator r = std::find_if_not(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), ne(3)); assert(*r == 3); - r = std::find_if_not(input_iterator(ia), - input_iterator(ia+s), + r = std::find_if_not(cpp17_input_iterator(ia), + cpp17_input_iterator(ia+s), ne(10)); - assert(r == input_iterator(ia+s)); + assert(r == cpp17_input_iterator(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 --- 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 @@ int main(int, char**) { - typedef input_iterator Iter; + typedef cpp17_input_iterator 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 --- 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 ia[] = {0, 1, 2, 3, 4, 5}; const unsigned s = sizeof(ia)/sizeof(ia[0]); - for_each_test f = std::for_each(input_iterator(ia), - input_iterator(ia+s), + for_each_test f = std::for_each(cpp17_input_iterator(ia), + cpp17_input_iterator(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 --- 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 ia[] = {2, 4, 6, 8}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::none_of(input_iterator(ia), - input_iterator(ia + sa), test1()) == false); - assert(std::none_of(input_iterator(ia), - input_iterator(ia), test1()) == true); + assert(std::none_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), test1()) == false); + assert(std::none_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia), test1()) == true); } { const int ia[] = {2, 4, 5, 8}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::none_of(input_iterator(ia), - input_iterator(ia + sa), test1()) == false); - assert(std::none_of(input_iterator(ia), - input_iterator(ia), test1()) == true); + assert(std::none_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), test1()) == false); + assert(std::none_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia), test1()) == true); } { const int ia[] = {1, 3, 5, 7}; const unsigned sa = sizeof(ia)/sizeof(ia[0]); - assert(std::none_of(input_iterator(ia), - input_iterator(ia + sa), test1()) == true); - assert(std::none_of(input_iterator(ia), - input_iterator(ia), test1()) == true); + assert(std::none_of(cpp17_input_iterator(ia), + cpp17_input_iterator(ia + sa), test1()) == true); + assert(std::none_of(cpp17_input_iterator(ia), + cpp17_input_iterator(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 --- 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 @@ int ia[] = {1, 3, 6, 7}; int ib[] = {1, 3}; int ic[] = {1, 3, 5, 7}; - typedef input_iterator II; + typedef cpp17_input_iterator II; typedef bidirectional_iterator BI; auto p1 = std::mismatch(std::begin(ia), std::end(ia), std::begin(ic)); @@ -65,7 +65,7 @@ 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 II; + typedef cpp17_input_iterator II; typedef random_access_iterator 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 --- 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 @@ int ia[] = {1, 3, 6, 7}; int ib[] = {1, 3}; int ic[] = {1, 3, 5, 7}; - typedef input_iterator II; + typedef cpp17_input_iterator II; typedef bidirectional_iterator BI; auto p1 = std::mismatch(std::begin(ia), std::end(ia), std::begin(ic), eq); @@ -75,7 +75,7 @@ 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 II; + typedef cpp17_input_iterator II; typedef random_access_iterator RAI; typedef std::equal_to 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 --- 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 @@ int main(int, char**) { - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, const int*>(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ int main(int, char**) { - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, const int*>(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -74,7 +74,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); 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 --- 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 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -75,7 +75,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); 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 --- 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 Iter; + typedef cpp17_input_iterator Iter; { // expected-error@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 --- 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 @@ TEST_CONSTEXPR_CXX20 bool do_tests() { - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, const int*>(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ TEST_CONSTEXPR_CXX20 bool do_tests() { - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, const int*>(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test >(); + test >(); test >(); test >(); test >(); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp --- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp @@ -64,7 +64,7 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -74,7 +74,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp --- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp @@ -65,7 +65,7 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -75,7 +75,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); 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 --- 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 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -72,7 +72,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); 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 --- 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 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -73,7 +73,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp --- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp @@ -64,7 +64,7 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -74,7 +74,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp --- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp @@ -65,7 +65,7 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -75,7 +75,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); 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 --- 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 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -74,7 +74,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); 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 --- 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 @@ template TEST_CONSTEXPR_CXX20 void test2() { - test3 >(); + test3 >(); test3 >(); test3 >(); test3 >(); @@ -75,7 +75,7 @@ template TEST_CONSTEXPR_CXX20 void test1() { - test2 >(); + test2 >(); test2 >(); test2 >(); test2 >(); 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 --- 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 @@ P(3, 2), }; M m; - m.insert(input_iterator(ar), input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); + m.insert(cpp17_input_iterator(ar), cpp17_input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); assert(m.size() == 3); assert(m.begin()->first == 1); assert(m.begin()->second == 1); @@ -64,7 +64,7 @@ P(3, 2), }; M m; - m.insert(input_iterator(ar), input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); + m.insert(cpp17_input_iterator(ar), cpp17_input_iterator(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 --- 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 @@ P(3, 2), }; M m; - m.insert(input_iterator(ar), input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); + m.insert(cpp17_input_iterator(ar), cpp17_input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); assert(m.size() == 9); assert(m.begin()->first == 1); assert(m.begin()->second == 1); @@ -76,7 +76,7 @@ P(3, 2), }; M m; - m.insert(input_iterator(ar), input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); + m.insert(cpp17_input_iterator(ar), cpp17_input_iterator(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 --- 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 @@ 3 }; M m; - m.insert(input_iterator(ar), - input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); + m.insert(cpp17_input_iterator(ar), + cpp17_input_iterator(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 @@ 3 }; M m; - m.insert(input_iterator(ar), - input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); + m.insert(cpp17_input_iterator(ar), + cpp17_input_iterator(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 --- 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 @@ 3, 3 }; - std::multiset m(input_iterator(ar), - input_iterator(ar+sizeof(ar)/sizeof(ar[0]))); + std::multiset m(cpp17_input_iterator(ar), + cpp17_input_iterator(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 @@ 3, 3 }; - std::multiset, min_allocator> m(input_iterator(ar), - input_iterator(ar+sizeof(ar)/sizeof(ar[0]))); + std::multiset, min_allocator> m(cpp17_input_iterator(ar), + cpp17_input_iterator(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 --- 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 @@ }; typedef test_compare > C; typedef test_allocator A; - std::multiset m(input_iterator(ar), - input_iterator(ar+sizeof(ar)/sizeof(ar[0])), + std::multiset m(cpp17_input_iterator(ar), + cpp17_input_iterator(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 --- 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 @@ 3 }; typedef test_compare > C; - std::multiset m(input_iterator(ar), - input_iterator(ar+sizeof(ar)/sizeof(ar[0])), C(5)); + std::multiset m(cpp17_input_iterator(ar), + cpp17_input_iterator(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 --- 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 @@ 3 }; M m; - m.insert(input_iterator(ar), - input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); + m.insert(cpp17_input_iterator(ar), + cpp17_input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); assert(m.size() == 3); assert(*m.begin() == 1); assert(*next(m.begin()) == 2); @@ -62,8 +62,8 @@ 3 }; M m; - m.insert(input_iterator(ar), - input_iterator(ar + sizeof(ar)/sizeof(ar[0]))); + m.insert(cpp17_input_iterator(ar), + cpp17_input_iterator(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 --- 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 @@ 3, 3 }; - std::set m(input_iterator(ar), - input_iterator(ar+sizeof(ar)/sizeof(ar[0]))); + std::set m(cpp17_input_iterator(ar), + cpp17_input_iterator(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 @@ 3, 3 }; - std::set, min_allocator> m(input_iterator(ar), - input_iterator(ar+sizeof(ar)/sizeof(ar[0]))); + std::set, min_allocator> m(cpp17_input_iterator(ar), + cpp17_input_iterator(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 --- 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 @@ }; typedef test_compare > C; typedef test_allocator A; - std::set m(input_iterator(ar), - input_iterator(ar+sizeof(ar)/sizeof(ar[0])), + std::set m(cpp17_input_iterator(ar), + cpp17_input_iterator(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 --- 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 @@ 3 }; typedef test_compare > C; - std::set m(input_iterator(ar), - input_iterator(ar+sizeof(ar)/sizeof(ar[0])), C(5)); + std::set m(cpp17_input_iterator(ar), + cpp17_input_iterator(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 --- 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 @@ testI(C& c1, const C& c2) { typedef typename C::const_iterator CI; - typedef input_iterator ICI; + typedef cpp17_input_iterator ICI; c1.assign(ICI(c2.begin()), ICI(c2.end())); assert(static_cast(distance(c1.begin(), c1.end())) == c1.size()); assert(c1 == c2); @@ -128,7 +128,7 @@ } { using T = EmplaceConstructibleMoveableAndAssignable; - using It = input_iterator; + using It = cpp17_input_iterator; { std::deque 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 --- 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 @@ { 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(ab), input_iterator(an)); + test(cpp17_input_iterator(ab), cpp17_input_iterator(an)); test(forward_iterator(ab), forward_iterator(an)); test(bidirectional_iterator(ab), bidirectional_iterator(an)); test(random_access_iterator(ab), random_access_iterator(an)); @@ -86,7 +86,7 @@ } { using T = EmplaceConstructibleAndMoveable; - using It = input_iterator; + using It = cpp17_input_iterator; { std::deque 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 --- 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 @@ { 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(ab), input_iterator(an), test_allocator(3)); + test(cpp17_input_iterator(ab), cpp17_input_iterator(an), test_allocator(3)); test(forward_iterator(ab), forward_iterator(an), test_allocator(4)); test(bidirectional_iterator(ab), bidirectional_iterator(an), test_allocator(5)); test(random_access_iterator(ab), random_access_iterator(an), test_allocator(6)); #if TEST_STD_VER >= 11 - test(input_iterator(ab), input_iterator(an), min_allocator()); + test(cpp17_input_iterator(ab), cpp17_input_iterator(an), min_allocator()); test(forward_iterator(ab), forward_iterator(an), min_allocator()); test(bidirectional_iterator(ab), bidirectional_iterator(an), min_allocator()); test(random_access_iterator(ab), random_access_iterator(an), min_allocator()); @@ -76,7 +76,7 @@ } { using T = EmplaceConstructibleAndMoveable; - using It = input_iterator; + using It = cpp17_input_iterator; std::allocator a; { std::deque 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 --- 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 @@ { { typedef typename C::const_iterator CI; - typedef input_iterator BCI; + typedef cpp17_input_iterator 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 @@ testI(int P, C& c1, const C& c2) { typedef typename C::const_iterator CI; - typedef input_iterator ICI; + typedef cpp17_input_iterator 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 @@ assert(*i == MoveOnly(j)); { MoveOnly mo(1); - typedef input_iterator I; + typedef cpp17_input_iterator I; c.insert(c.end(), std::move_iterator(I(&mo)), std::move_iterator(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 --- 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 @@ typedef typename C::const_iterator CI; typedef random_access_iterator RAI; typedef random_access_iterator RACI; - typedef input_iterator ICI; + typedef cpp17_input_iterator ICI; C c1 = make(N, start); C c2 = make(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 --- 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 @@ 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 I; + typedef cpp17_input_iterator 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 @@ 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 I; + typedef cpp17_input_iterator 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 @@ 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 I; + typedef cpp17_input_iterator 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 @@ 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 I; + typedef cpp17_input_iterator 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 --- 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 @@ { typedef int T; typedef std::forward_list C; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { typedef int T; typedef std::forward_list> C; - typedef input_iterator I; + typedef cpp17_input_iterator 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 --- 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 @@ typedef int T; typedef test_allocator A; typedef std::forward_list C; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ typedef int T; typedef min_allocator A; typedef std::forward_list C; - typedef input_iterator I; + typedef cpp17_input_iterator 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 --- 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 @@ typedef int T; typedef std::forward_list C; typedef C::iterator I; - typedef input_iterator J; + typedef cpp17_input_iterator 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 @@ typedef int T; typedef std::forward_list> C; typedef C::iterator I; - typedef input_iterator J; + typedef cpp17_input_iterator 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 --- 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 @@ { { int a[] = {0, 1, 2, 3}; - std::list l(input_iterator(a), - input_iterator(a + sizeof(a)/sizeof(a[0]))); + std::list l(cpp17_input_iterator(a), + cpp17_input_iterator(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 @@ } { int a[] = {0, 1, 2, 3}; - std::list l(input_iterator(a), - input_iterator(a + sizeof(a)/sizeof(a[0])), + std::list l(cpp17_input_iterator(a), + cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), std::allocator()); assert(l.size() == sizeof(a)/sizeof(a[0])); assert(std::distance(l.begin(), l.end()) == sizeof(a)/sizeof(a[0])); @@ -48,8 +48,8 @@ { int a[] = {0, 1, 2, 3}; // Add 2 for implementations that dynamically allocate a sentinel node and container proxy. - std::list > l(input_iterator(a), - input_iterator(a + sizeof(a)/sizeof(a[0]))); + std::list > l(cpp17_input_iterator(a), + cpp17_input_iterator(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 @@ #if TEST_STD_VER >= 11 { int a[] = {0, 1, 2, 3}; - std::list> l(input_iterator(a), - input_iterator(a + sizeof(a)/sizeof(a[0]))); + std::list> l(cpp17_input_iterator(a), + cpp17_input_iterator(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 @@ } { int a[] = {0, 1, 2, 3}; - std::list> l(input_iterator(a), - input_iterator(a + sizeof(a)/sizeof(a[0])), + std::list> l(cpp17_input_iterator(a), + cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), min_allocator()); assert(l.size() == sizeof(a)/sizeof(a[0])); assert(std::distance(l.begin(), l.end()) == sizeof(a)/sizeof(a[0])); @@ -107,7 +107,7 @@ } { using T = EmplaceConstructible; - using It = input_iterator; + using It = cpp17_input_iterator; { std::list v(It(arr1), It(std::end(arr1))); auto I = v.begin(); @@ -155,7 +155,7 @@ } { using T = EmplaceConstructible; - using It = input_iterator; + using It = cpp17_input_iterator; std::allocator a; { std::list v(It(arr1), It(std::end(arr1)), a); @@ -195,7 +195,7 @@ } { using C = TCT::list<>; - using It = input_iterator; + using It = cpp17_input_iterator; { ExpectConstructGuard G(1); C v(It(arr1), It(std::end(arr1))); @@ -228,7 +228,7 @@ } { using C = TCT::list<>; - using It = input_iterator; + using It = cpp17_input_iterator; 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 --- 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 @@ { 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 >(input_iterator(a), input_iterator(an)); + test >(cpp17_input_iterator(a), cpp17_input_iterator(an)); test >(forward_iterator(a), forward_iterator(an)); test >(bidirectional_iterator(a), bidirectional_iterator(an)); test >(random_access_iterator(a), random_access_iterator(an)); test >(a, an); #if TEST_STD_VER >= 11 - test> >(input_iterator(a), input_iterator(an)); + test> >(cpp17_input_iterator(a), cpp17_input_iterator(an)); test> >(forward_iterator(a), forward_iterator(an)); test> >(bidirectional_iterator(a), bidirectional_iterator(an)); test> >(random_access_iterator(a), random_access_iterator(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 --- 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 @@ bool* an = a + sizeof(a)/sizeof(a[0]); { std::allocator alloc; - test >(input_iterator(a), input_iterator(an), alloc); + test >(cpp17_input_iterator(a), cpp17_input_iterator(an), alloc); test >(forward_iterator(a), forward_iterator(an), alloc); test >(bidirectional_iterator(a), bidirectional_iterator(an), alloc); test >(random_access_iterator(a), random_access_iterator(an), alloc); @@ -46,7 +46,7 @@ #if TEST_STD_VER >= 11 { min_allocator alloc; - test> >(input_iterator(a), input_iterator(an), alloc); + test> >(cpp17_input_iterator(a), cpp17_input_iterator(an), alloc); test> >(forward_iterator(a), forward_iterator(an), alloc); test> >(bidirectional_iterator(a), bidirectional_iterator(an), alloc); test> >(random_access_iterator(a), random_access_iterator(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 --- 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 @@ std::vector v(100); bool a[] = {1, 0, 0, 1, 1}; const unsigned N = sizeof(a)/sizeof(a[0]); - std::vector::iterator i = v.insert(v.cbegin() + 10, input_iterator(a), - input_iterator(a+N)); + std::vector::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator(a), + cpp17_input_iterator(a+N)); assert(v.size() == 100 + N); assert(i == v.begin() + 10); std::size_t j; @@ -96,8 +96,8 @@ std::vector> v(100); bool a[] = {1, 0, 0, 1, 1}; const unsigned N = sizeof(a)/sizeof(a[0]); - std::vector>::iterator i = v.insert(v.cbegin() + 10, input_iterator(a), - input_iterator(a+N)); + std::vector>::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator(a), + cpp17_input_iterator(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 --- 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 @@ } { using T = EmplaceConstructibleMoveableAndAssignable; - using It = input_iterator; + using It = cpp17_input_iterator; { std::vector 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 --- 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 @@ 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 >(input_iterator(a), - input_iterator(an)); + test >(cpp17_input_iterator(a), + cpp17_input_iterator(an)); test >(forward_iterator(a), forward_iterator(an)); test >(bidirectional_iterator(a), @@ -49,7 +49,7 @@ test >(a, an); test > >( - input_iterator(a), input_iterator(an)); + cpp17_input_iterator(a), cpp17_input_iterator(an)); // Add 1 for implementations that dynamically allocate a container proxy. test > >( forward_iterator(a), forward_iterator(an)); @@ -61,8 +61,8 @@ random_access_iterator(an)); test > >(a, an); #if TEST_STD_VER >= 11 - test > >(input_iterator(a), - input_iterator(an)); + test > >(cpp17_input_iterator(a), + cpp17_input_iterator(an)); test > >( forward_iterator(a), forward_iterator(an)); test > >( @@ -95,7 +95,7 @@ } { using T = EmplaceConstructibleAndMoveInsertable; - using It = input_iterator; + using It = cpp17_input_iterator; { std::vector v(It(arr1), It(std::end(arr1))); assert(v[0].copied == 0); @@ -132,7 +132,7 @@ } { using C = TCT::vector<>; - using It = input_iterator; + using It = cpp17_input_iterator; { ExpectConstructGuard 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 --- 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 @@ 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 alloc; - test >(input_iterator(a), - input_iterator(an), alloc); + test >(cpp17_input_iterator(a), + cpp17_input_iterator(an), alloc); test >(forward_iterator(a), forward_iterator(an), alloc); test >(bidirectional_iterator(a), @@ -70,7 +70,7 @@ int* an = a + sizeof(a) / sizeof(a[0]); min_allocator alloc; test > >( - input_iterator(a), input_iterator(an), alloc); + cpp17_input_iterator(a), cpp17_input_iterator(an), alloc); test > >( forward_iterator(a), forward_iterator(an), alloc); @@ -108,7 +108,7 @@ } { using T = EmplaceConstructibleAndMoveInsertable; - using It = input_iterator; + using It = cpp17_input_iterator; using Alloc = std::allocator; Alloc a; { @@ -147,7 +147,7 @@ } { using C = TCT::vector<>; - using It = input_iterator; + using It = cpp17_input_iterator; 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 --- 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 @@ 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(a), - input_iterator(a+N)); + V::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator(a), + cpp17_input_iterator(a+N)); assert(v.size() == 100 + N); assert(is_contiguous_container_asan_correct(v)); assert(i == v.begin() + 10); @@ -107,8 +107,8 @@ 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(a), - input_iterator(a+N)); + V::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator(a), + cpp17_input_iterator(a+N)); assert(v.size() == 100 + N); assert(is_contiguous_container_asan_correct(v)); assert(i == v.begin() + 10); @@ -144,8 +144,8 @@ 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(a), - input_iterator(a+N)); + V::iterator i = v.insert(v.cbegin() + 10, cpp17_input_iterator(a), + cpp17_input_iterator(a+N)); assert(v.size() == 100 + N); assert(is_contiguous_container_asan_correct(v)); assert(i == v.begin() + 10); @@ -179,7 +179,7 @@ { std::vector s; - s.insert(s.end(), input_iterator(), input_iterator()); + s.insert(s.end(), cpp17_input_iterator(), cpp17_input_iterator()); } 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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.bucket_count() >= 5); assert(c.size() == 4); assert(c.at(1) == "one"); @@ -82,7 +82,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.bucket_count() >= 5); assert(c.size() == 4); assert(c.at(1) == "one"); @@ -116,7 +116,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(arr), input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 14); + C c(cpp17_input_iterator(arr), cpp17_input_iterator(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 @@ }; HF hf(42); A a(43); - C c(input_iterator(arr), input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 14, hf, a); + C c(cpp17_input_iterator(arr), cpp17_input_iterator(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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 10 ); LIBCPP_ASSERT(c.bucket_count() == 11); @@ -84,7 +84,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8) ); @@ -86,7 +86,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9) @@ -87,7 +87,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9), @@ -89,7 +89,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9), @@ -128,7 +128,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(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 --- 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 @@ P(2, "four"), }; C c; - c.insert(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + c.insert(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.size() == 4); assert(c.at(1) == "one"); assert(c.at(2) == "two"); @@ -60,7 +60,7 @@ P(2, "four"), }; C c; - c.insert(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + c.insert(cpp17_input_iterator(a), cpp17_input_iterator(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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.bucket_count() >= 7); assert(c.size() == 6); typedef std::pair Eq; @@ -101,7 +101,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.bucket_count() >= 7); assert(c.size() == 6); typedef std::pair Eq; @@ -153,7 +153,7 @@ P(2, "four"), }; A a(42); - C c(input_iterator(arr), input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 14, a); + C c(cpp17_input_iterator(arr), cpp17_input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 14, a); assert(c.bucket_count() >= 14); assert(c.size() == 6); typedef std::pair Eq; @@ -206,7 +206,7 @@ }; A a(42); HF hf (43); - C c(input_iterator(arr), input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 12, hf, a ); + C c(cpp17_input_iterator(arr), cpp17_input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 12, hf, a ); assert(c.bucket_count() >= 12); assert(c.size() == 6); typedef std::pair 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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 10 ); LIBCPP_ASSERT(c.bucket_count() == 11); @@ -103,7 +103,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8) ); @@ -105,7 +105,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9) @@ -106,7 +106,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(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 --- 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 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9), @@ -108,7 +108,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9), @@ -164,7 +164,7 @@ P(1, "four"), P(2, "four"), }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(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 --- 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 @@ P(2, "four"), }; C c; - c.insert(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + c.insert(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.size() == 6); typedef std::pair Eq; Eq eq = c.equal_range(1); @@ -83,7 +83,7 @@ P(2, "four"), }; C c; - c.insert(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + c.insert(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.size() == 6); typedef std::pair 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 --- 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 @@ P(2) }; C c; - c.insert(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + c.insert(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.size() == 6); assert(c.count(1) == 2); assert(c.count(2) == 2); @@ -59,7 +59,7 @@ P(2) }; C c; - c.insert(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + c.insert(cpp17_input_iterator(a), cpp17_input_iterator(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.bucket_count() >= 7); assert(c.size() == 6); assert(c.count(1) == 2); @@ -79,7 +79,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.bucket_count() >= 7); assert(c.size() == 6); assert(c.count(1) == 2); @@ -112,7 +112,7 @@ T(2) }; A a(42); - C c(input_iterator(arr), input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 12, a); + C c(cpp17_input_iterator(arr), cpp17_input_iterator(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 @@ }; HF hf(43); A a(42); - C c(input_iterator(arr), input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 16, hf, a); + C c(cpp17_input_iterator(arr), cpp17_input_iterator(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7 ); LIBCPP_ASSERT(c.bucket_count() == 7); @@ -81,7 +81,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8) ); @@ -83,7 +83,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9) @@ -84,7 +84,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9), @@ -86,7 +86,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(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 --- 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 @@ P(2) }; C c; - c.insert(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + c.insert(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.size() == 4); assert(c.count(1) == 1); assert(c.count(2) == 1); @@ -59,7 +59,7 @@ P(2) }; C c; - c.insert(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + c.insert(cpp17_input_iterator(a), cpp17_input_iterator(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.bucket_count() >= 5); assert(c.size() == 4); assert(c.count(1) == 1); @@ -79,7 +79,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0]))); + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0]))); assert(c.bucket_count() >= 5); assert(c.size() == 4); assert(c.count(1) == 1); @@ -112,7 +112,7 @@ T(2) }; A a(42); - C c(input_iterator(arr), input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 12, a); + C c(cpp17_input_iterator(arr), cpp17_input_iterator(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 @@ }; HF hf(43); A a(42); - C c(input_iterator(arr), input_iterator(arr + sizeof(arr)/sizeof(arr[0])), 16, hf, a); + C c(cpp17_input_iterator(arr), cpp17_input_iterator(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7 ); LIBCPP_ASSERT(c.bucket_count() == 7); @@ -81,7 +81,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8) ); @@ -83,7 +83,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9) @@ -84,7 +84,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(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 --- 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 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(9), @@ -86,7 +86,7 @@ P(1), P(2) }; - C c(input_iterator(a), input_iterator(a + sizeof(a)/sizeof(a[0])), + C c(cpp17_input_iterator(a), cpp17_input_iterator(a + sizeof(a)/sizeof(a[0])), 7, test_hash >(8), test_compare >(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 --- 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 @@ test('X', chars, chars+10, "0X1X2X3X4X5X6X7X8X9"); test('x', ints, ints+10, "10x11x12x13x14x15x16x17x18x19"); - test('X', input_iterator(chars), input_iterator(chars+10), "0X1X2X3X4X5X6X7X8X9"); - test('x', input_iterator(ints), input_iterator(ints+10), "10x11x12x13x14x15x16x17x18x19"); + test('X', cpp17_input_iterator(chars), cpp17_input_iterator(chars+10), "0X1X2X3X4X5X6X7X8X9"); + test('x', cpp17_input_iterator(ints), cpp17_input_iterator(ints+10), "10x11x12x13x14x15x16x17x18x19"); test('X', forward_iterator(chars), forward_iterator(chars+10), "0X1X2X3X4X5X6X7X8X9"); test('x', forward_iterator(ints), forward_iterator(ints+10), "10x11x12x13x14x15x16x17x18x19"); test('X', random_access_iterator(chars), random_access_iterator(chars+10), "0X1X2X3X4X5X6X7X8X9"); @@ -101,8 +101,8 @@ 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(chars), input_iterator(chars+10), L"0X1X2X3X4X5X6X7X8X9"); - test(L'x', input_iterator(ints), input_iterator(ints+10), L"10x11x12x13x14x15x16x17x18x19"); + test(L'X', cpp17_input_iterator(chars), cpp17_input_iterator(chars+10), L"0X1X2X3X4X5X6X7X8X9"); + test(L'x', cpp17_input_iterator(ints), cpp17_input_iterator(ints+10), L"10x11x12x13x14x15x16x17x18x19"); test(L'X', forward_iterator(chars), forward_iterator(chars+10), L"0X1X2X3X4X5X6X7X8X9"); test(L'x', forward_iterator(ints), forward_iterator(ints+10), L"10x11x12x13x14x15x16x17x18x19"); test(L'X', random_access_iterator(chars), random_access_iterator(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 --- 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 @@ using Ptr = CharT const*; using Str = std::basic_string; using StrView = std::basic_string_view; - using InputIter = input_iterator; + using InputIter = cpp17_input_iterator; const Ptr L = TC.lhs; Str RShort = (Ptr)TC.rhs; @@ -235,7 +235,7 @@ using Ptr = CharT const*; using Str = std::basic_string; using StrView = std::basic_string_view; - using InputIter = input_iterator; + using InputIter = cpp17_input_iterator; const Ptr L = TC.lhs; const Ptr R = TC.rhs; const Ptr E = TC.expected_result(); @@ -341,7 +341,7 @@ static_assert(has_append(), ""); } { - using It = input_iterator; + using It = cpp17_input_iterator; static_assert(has_append(), ""); } { @@ -352,7 +352,7 @@ using reference = const char&; using difference_type = std::ptrdiff_t; }; - using It = input_iterator; + using It = cpp17_input_iterator; static_assert(has_append(), ""); } { 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 --- 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 @@ ////////////////////////////////////////////////////////////////////////////// // Iterators { - using It = input_iterator; + using It = cpp17_input_iterator; path p; PathReserve(p, Size + 1); It it(TestPath); { @@ -150,7 +150,7 @@ assert(p.string() == TestPath); } { - using It = input_iterator; + using It = cpp17_input_iterator; path p; PathReserve(p, Size + 1); It it(TestPath); { @@ -161,7 +161,7 @@ assert(p.string() == TestPath); } { - using It = input_iterator; + using It = cpp17_input_iterator; path p; PathReserve(p, Size + 1); It it(TestPath); It e(TestPathEnd); @@ -189,7 +189,7 @@ static_assert(has_assign(), ""); } { - using It = input_iterator; + using It = cpp17_input_iterator; static_assert(std::is_assignable::value, ""); static_assert(has_assign(), ""); } @@ -201,7 +201,7 @@ using reference = const char&; using difference_type = std::ptrdiff_t; }; - using It = input_iterator; + using It = cpp17_input_iterator; static_assert(std::is_assignable::value, ""); static_assert(has_assign(), ""); } 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 --- 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 @@ using Ptr = CharT const*; using Str = std::basic_string; using StrView = std::basic_string_view; - using InputIter = input_iterator; + using InputIter = cpp17_input_iterator; const Ptr L = TC.lhs; const Ptr R = TC.rhs; @@ -177,7 +177,7 @@ using Ptr = CharT const*; using Str = std::basic_string; using StrView = std::basic_string_view; - using InputIter = input_iterator; + using InputIter = cpp17_input_iterator; const Ptr L = TC.lhs; const Ptr R = TC.rhs; const Ptr E = TC.expect; @@ -307,7 +307,7 @@ static_assert(has_concat(), ""); } { - using It = input_iterator; + using It = cpp17_input_iterator; static_assert(has_concat(), ""); } { @@ -318,7 +318,7 @@ using reference = const char&; using difference_type = std::ptrdiff_t; }; - using It = input_iterator; + using It = cpp17_input_iterator; static_assert(has_concat(), ""); } { 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 --- 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 @@ } // Iterators { - using It = input_iterator; + using It = cpp17_input_iterator; path p(It{TestPath}, args...); assert(p.native() == Expect); assert(p.string() == TestPath); } { - using It = input_iterator; + using It = cpp17_input_iterator; path p(It{TestPath}, It{TestPathEnd}, args...); assert(p.native() == Expect); assert(p.string() == TestPath); @@ -99,7 +99,7 @@ static_assert(std::is_constructible::value, ""); } { - using It = input_iterator; + using It = cpp17_input_iterator; static_assert(std::is_constructible::value, ""); } { @@ -110,7 +110,7 @@ using reference = const char&; using difference_type = std::ptrdiff_t; }; - using It = input_iterator; + using It = cpp17_input_iterator; static_assert(std::is_constructible::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 --- 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 @@ { const char* s = "1234567890"; typedef std::iterator_traits::difference_type Distance; - check_advance(input_iterator(s), 10, input_iterator(s+10)); + check_advance(cpp17_input_iterator(s), 10, cpp17_input_iterator(s+10)); check_advance(forward_iterator(s), 10, forward_iterator(s+10)); check_advance(bidirectional_iterator(s+5), 5, bidirectional_iterator(s+10)); check_advance(bidirectional_iterator(s+5), -5, bidirectional_iterator(s)); @@ -53,7 +53,7 @@ check_advance(s+5, -5, s); // Also check with other distance types - check_advance(input_iterator(s), 10u, input_iterator(s+10)); + check_advance(cpp17_input_iterator(s), 10u, cpp17_input_iterator(s+10)); check_advance(forward_iterator(s), 10u, forward_iterator(s+10)); check_advance(bidirectional_iterator(s), 10u, bidirectional_iterator(s+10)); check_advance(random_access_iterator(s), 10u, random_access_iterator(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 --- 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 @@ TEST_CONSTEXPR_CXX17 bool tests() { const char* s = "1234567890"; - check_distance(input_iterator(s), input_iterator(s+10), 10); + check_distance(cpp17_input_iterator(s), cpp17_input_iterator(s+10), 10); check_distance(forward_iterator(s), forward_iterator(s+10), 10); check_distance(bidirectional_iterator(s), bidirectional_iterator(s+10), 10); check_distance(random_access_iterator(s), random_access_iterator(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 --- 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 @@ TEST_CONSTEXPR_CXX17 bool tests() { const char* s = "1234567890"; - check_next_n(input_iterator(s), 10, input_iterator(s+10)); + check_next_n(cpp17_input_iterator(s), 10, cpp17_input_iterator(s+10)); check_next_n(forward_iterator(s), 10, forward_iterator(s+10)); check_next_n(bidirectional_iterator(s), 10, bidirectional_iterator(s+10)); check_next_n(bidirectional_iterator(s+10), -10, bidirectional_iterator(s)); @@ -50,7 +50,7 @@ check_next_n(random_access_iterator(s+10), -10, random_access_iterator(s)); check_next_n(s, 10, s+10); - check_next_1(input_iterator(s), input_iterator(s+1)); + check_next_1(cpp17_input_iterator(s), cpp17_input_iterator(s+1)); check_next_1(forward_iterator(s), forward_iterator(s+1)); check_next_1(bidirectional_iterator(s), bidirectional_iterator(s+1)); check_next_1(random_access_iterator(s), random_access_iterator(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 --- 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 @@ // Other test iterators. -using InputTestItereatorTraits = std::iterator_traits >; +using InputTestItereatorTraits = std::iterator_traits >; static_assert(std::same_as); static_assert(std::same_as); 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 --- 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 >, int&>); +static_assert(std::same_as >, int&>); static_assert(std::same_as >, int&>); static_assert(std::same_as >, int&>); static_assert(std::same_as >, 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 --- 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 >); +static_assert(std::input_iterator >); static_assert(std::input_iterator >); 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 --- 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); static_assert(std::input_or_output_iterator); -static_assert(std::input_or_output_iterator >); -static_assert(std::input_or_output_iterator >); -static_assert(std::input_or_output_iterator >); -static_assert(std::input_or_output_iterator >); +static_assert(std::input_or_output_iterator >); +static_assert(std::input_or_output_iterator >); +static_assert(std::input_or_output_iterator >); +static_assert(std::input_or_output_iterator >); static_assert(std::input_or_output_iterator >); static_assert(std::input_or_output_iterator >); 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 --- 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 @@ { { char s[] = "1234567890"; - test(input_iterator(s+5)); + test(cpp17_input_iterator(s+5)); test(forward_iterator(s+5)); test(bidirectional_iterator(s+5)); test(random_access_iterator(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 --- 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 @@ int main(int, char**) { char s[] = "1234567890"; - test(input_iterator(s), input_iterator(s), true); - test(input_iterator(s), input_iterator(s+1), false); + test(cpp17_input_iterator(s), cpp17_input_iterator(s), true); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+1), false); test(forward_iterator(s), forward_iterator(s), true); test(forward_iterator(s), forward_iterator(s+1), false); test(bidirectional_iterator(s), bidirectional_iterator(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 --- 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 @@ int main(int, char**) { char s[] = "1234567890"; - test(input_iterator(s), input_iterator(s), false); - test(input_iterator(s), input_iterator(s+1), true); + test(cpp17_input_iterator(s), cpp17_input_iterator(s), false); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+1), true); test(forward_iterator(s), forward_iterator(s), false); test(forward_iterator(s), forward_iterator(s+1), true); test(bidirectional_iterator(s), bidirectional_iterator(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 --- 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 @@ { Derived d; - test >(input_iterator(&d)); + test >(cpp17_input_iterator(&d)); test >(forward_iterator(&d)); test >(bidirectional_iterator(&d)); test >(random_access_iterator(&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 --- 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 @@ int main(int, char**) { - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ int main(int, char**) { char s[] = "123"; - test(input_iterator(s)); + test(cpp17_input_iterator(s)); test(forward_iterator(s)); test(bidirectional_iterator(s)); test(random_access_iterator(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 --- 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 @@ { char s[] = "123"; #if TEST_STD_VER > 17 - test_single_pass(input_iterator(s), input_iterator(s + 1)); + test_single_pass(cpp17_input_iterator(s), cpp17_input_iterator(s + 1)); #else - test(input_iterator(s), input_iterator(s+1)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+1)); #endif test(forward_iterator(s), forward_iterator(s+1)); test(bidirectional_iterator(s), bidirectional_iterator(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 --- 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 @@ int main(int, char**) { char s[] = "123"; - test(input_iterator(s), input_iterator(s+1)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+1)); test(forward_iterator(s), forward_iterator(s+1)); test(bidirectional_iterator(s), bidirectional_iterator(s+1)); test(random_access_iterator(s), random_access_iterator(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 --- 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 @@ { Derived d; - test >(input_iterator(&d)); + test >(cpp17_input_iterator(&d)); test >(forward_iterator(&d)); test >(bidirectional_iterator(&d)); test >(random_access_iterator(&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 --- 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 @@ int main(int, char**) { - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 > Fn; +typedef std::money_get > Fn; class my_facet : public Fn @@ -35,7 +35,7 @@ : Fn(refs) {} }; -typedef std::money_get > Fw; +typedef std::money_get > Fw; class my_facetw : public Fw @@ -62,7 +62,7 @@ // char, national { // zero std::string v = "0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::string v = "$0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "$0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::string v = "-$0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "-$0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::string v = "$1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "-USD 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // char, international { // zero std::string v = "0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::string v = "USD 0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "USD 0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::string v = "-USD 0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "-USD 0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::string v = "USD 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "-$1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, national { // zero std::wstring v = L"0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = L"1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::wstring v = L"$0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"$0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::wstring v = L"-$0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"-$0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::wstring v = L"$1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = L"$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = L"-USD 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, international { // zero std::wstring v = L"0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = L"1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::wstring v = L"USD 0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"USD 0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::wstring v = L"-USD 0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"-USD 0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::wstring v = L"USD 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = L"USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = L"-$1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 --- 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 > Fn; +typedef std::money_get > Fn; class my_facet : public Fn @@ -41,7 +41,7 @@ : Fn(refs) {} }; -typedef std::money_get > Fw; +typedef std::money_get > Fw; class my_facetw : public Fw @@ -95,7 +95,7 @@ // char, national { // zero std::string v = "0,00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0,01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1 234 567,89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567,89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "0,00 \u20ac"; // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "0,00 \u20ac"; // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::string v = "-0,01 \u20ac"; // EURO SIGN - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "-0,01 \u20ac"; // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::string v = "1 234 567,89 \u20ac"; // EURO SIGN - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "1 234 567,89 \u20ac"; // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-1 234 567,89 \u20ac"; // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "1 234 567,89 EUR -"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "1 234 567,89 EUR -"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // char, international { // zero std::string v = "0,00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0,01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1 234 567,89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567,89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "0,00 EUR"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "0,00 EUR"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::string v = "-0,01 EUR"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "-0,01 EUR"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::string v = "1 234 567,89 EUR"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "1 234 567,89 EUR"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-1 234 567,89 EUR"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "1 234 567,89 Eu-"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "1 234 567,89 Eu-"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, national { // zero std::wstring v = L"0,00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0,01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = convert_thousands_sep(L"1 234 567,89 "); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = convert_thousands_sep(L"-1 234 567,89"); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567,89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"0,00 \u20ac"; // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"0,00 \u20ac"; // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::wstring v = L"-0,01 \u20ac"; // EURO SIGN - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"-0,01 \u20ac"; // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::wstring v = convert_thousands_sep(L"1 234 567,89 \u20ac"); // EURO SIGN - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = convert_thousands_sep(L"1 234 567,89 \u20ac"); // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = convert_thousands_sep(L"-1 234 567,89 \u20ac"); // EURO SIGN showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR -"); showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR -"); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, international { // zero std::wstring v = L"0,00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0,01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = convert_thousands_sep(L"1 234 567,89 "); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = convert_thousands_sep(L"-1 234 567,89"); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567,89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"0,00 EUR"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"0,00 EUR"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::wstring v = L"-0,01 EUR"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"-0,01 EUR"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR"); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = convert_thousands_sep(L"1 234 567,89 EUR"); showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = convert_thousands_sep(L"-1 234 567,89 EUR"); showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = convert_thousands_sep(L"1 234 567,89 Eu-"); showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = convert_thousands_sep(L"1 234 567,89 Eu-"); - typedef input_iterator I; + typedef cpp17_input_iterator 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 --- 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 > Fn; +typedef std::money_get > Fn; class my_facet : public Fn @@ -58,7 +58,7 @@ : Fn(refs) {} }; -typedef std::money_get > Fw; +typedef std::money_get > Fw; class my_facetw : public Fw @@ -85,7 +85,7 @@ // char, national { // zero std::string v = "0,00 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0,01 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::string v = "0,00 \xD1\x80\xD1\x83\xD0\xB1""."; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "0,00 \xD1\x80\xD1\x83\xD0\xB1""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::string v = "-0,01 \xD1\x80\xD1\x83\xD0\xB1""."; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "-0,01 \xD1\x80\xD1\x83\xD0\xB1""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::string v = "1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1""."; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-1 234 567,89 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "-1 234 567,89 RUB "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // char, international { // zero std::string v = "0,00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0,01 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::string v = "0,00 RUB "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "0,00 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ #endif { // negative one, showbase std::string v = "-0,01 RUB "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "-0,01 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ #endif { // positive, showbase std::string v = "1 234 567,89 RUB "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "1 234 567,89 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-1 234 567,89 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1""."; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, national { // zero std::wstring v = L"0,00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0,01 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = L"1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::wstring v = L"0,00 \x440\x443\x431""."; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"0,00 \x440\x443\x431""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::wstring v = L"-0,01 \x440\x443\x431""."; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"-0,01 \x440\x443\x431""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::wstring v = L"1 234 567,89 \x440\x443\x431""."; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = L"1 234 567,89 \x440\x443\x431""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-1 234 567,89 \x440\x443\x431""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-1 234 567,89 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = L"-1 234 567,89 RUB "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, international { // zero std::wstring v = L"0,00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0,01 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = L"1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1 234 567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567,89 "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::wstring v = L"0,00 RUB "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"0,00 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ #endif { // negative one, showbase std::wstring v = L"-0,01 RUB "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"-0,01 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ #endif { // positive, showbase std::wstring v = L"1 234 567,89 RUB "; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = L"1 234 567,89 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-1 234 567,89 RUB "; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-1 234 567,89 \x440\x443\x431""."; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = L"-1 234 567,89 \x440\x443\x431""."; - typedef input_iterator I; + typedef cpp17_input_iterator 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 --- 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 > Fn; +typedef std::money_get > Fn; class my_facet : public Fn @@ -42,7 +42,7 @@ : Fn(refs) {} }; -typedef std::money_get > Fw; +typedef std::money_get > Fw; class my_facetw : public Fw @@ -69,7 +69,7 @@ // char, national { // zero std::string v = "0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::string v = "\xEF\xBF\xA5""0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "\xEF\xBF\xA5""0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::string v = "\xEF\xBF\xA5""-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "\xEF\xBF\xA5""-0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::string v = "\xEF\xBF\xA5""1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "\xEF\xBF\xA5""1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "\xEF\xBF\xA5""-1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "CNY -1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "CNY -1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // char, international { // zero std::string v = "0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::string v = "CNY 0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "CNY 0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::string v = "CNY -0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "CNY -0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::string v = "CNY 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "CNY 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "CNY -1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "\xEF\xBF\xA5""-1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "\xEF\xBF\xA5""-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, national { // zero std::wstring v = L"0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = L"1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::wstring v = L"\xFFE5""0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"\xFFE5""0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::wstring v = L"\xFFE5""-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"\xFFE5""-0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::wstring v = L"\xFFE5""1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = L"\xFFE5""1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"\xFFE5""-1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"CNY -1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = L"CNY -1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, international { // zero std::wstring v = L"0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = L"1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::wstring v = L"CNY 0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"CNY 0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::wstring v = L"CNY -0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"CNY -0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::wstring v = L"CNY 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = L"CNY 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"CNY -1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"\xFFE5""-1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = L"\xFFE5""-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 --- 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 > Fn; +typedef std::money_get > Fn; class my_facet : public Fn @@ -35,7 +35,7 @@ : Fn(refs) {} }; -typedef std::money_get > Fw; +typedef std::money_get > Fw; class my_facetw : public Fw @@ -62,7 +62,7 @@ // char, national { // zero std::string v = "0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::string v = "$0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "$0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::string v = "-$0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "-$0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::string v = "$1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "-USD 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // char, international { // zero std::string v = "0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::string v = "-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::string v = "1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::string v = "-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::string v = "USD 0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::string v = "USD 0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::string v = "-USD 0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::string v = "-USD 0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::string v = "USD 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::string v = "USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::string v = "-$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::string v = "-$1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, national { // zero std::wstring v = L"0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = L"1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::wstring v = L"$0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"$0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::wstring v = L"-$0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"-$0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::wstring v = L"$1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = L"$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = L"-USD 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ // wchar_t, international { // zero std::wstring v = L"0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one std::wstring v = L"-0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive std::wstring v = L"1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative std::wstring v = L"-1234567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // zero, showbase std::wstring v = L"USD 0.00"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // zero, showbase std::wstring v = L"USD 0.00"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative one, showbase std::wstring v = L"-USD 0.01"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative one, showbase std::wstring v = L"-USD 0.01"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // positive, showbase std::wstring v = L"USD 1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // positive, showbase std::wstring v = L"USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-USD 1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ { // negative, showbase std::wstring v = L"-$1,234,567.89"; showbase(ios); - typedef input_iterator I; + typedef cpp17_input_iterator 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 @@ } { // negative, showbase std::wstring v = L"-$1,234,567.89"; - typedef input_iterator I; + typedef cpp17_input_iterator 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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -60,9 +60,9 @@ const char str[] = "1"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, b); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -72,9 +72,9 @@ const char str[] = "0"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, b); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -84,9 +84,9 @@ const char str[] = "12"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, b); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -96,9 +96,9 @@ const char str[] = "*12"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, b); assert(iter.base() == str+0); assert(err == ios.failbit); @@ -109,9 +109,9 @@ const char str[] = "1"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, b); assert(iter.base() == str+0); assert(err == ios.failbit); @@ -121,9 +121,9 @@ const char str[] = "true"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, b); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -133,9 +133,9 @@ const char str[] = "false"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, b); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -146,9 +146,9 @@ const char str[] = "a"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+1), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+1), ios, err, b); assert(iter.base() == str+1); assert(err == ios.eofbit); @@ -158,9 +158,9 @@ const char str[] = "abc"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+3), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+3), ios, err, b); assert(iter.base() == str+2); assert(err == ios.failbit); @@ -170,9 +170,9 @@ const char str[] = "acc"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+3), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+3), ios, err, b); assert(iter.base() == str+1); assert(err == ios.goodbit); @@ -183,9 +183,9 @@ const char str[] = "a"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+1), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+1), ios, err, b); assert(iter.base() == str+1); assert(err == ios.eofbit); @@ -195,9 +195,9 @@ const char str[] = "ab"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+2), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+2), ios, err, b); assert(iter.base() == str+2); assert(err == ios.eofbit); @@ -207,9 +207,9 @@ const char str[] = "abc"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+3), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+3), ios, err, b); assert(iter.base() == str+2); assert(err == ios.goodbit); @@ -219,9 +219,9 @@ const char str[] = "ac"; std::ios_base::iostate err = ios.goodbit; bool b; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+2), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -54,9 +54,9 @@ assert((ios.flags() & ios.basefield) == ios.dec); assert(ios.getloc().name() == "C"); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -65,9 +65,9 @@ { const char str[] = "-123"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -76,9 +76,9 @@ { const char str[] = "123.5"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -88,9 +88,9 @@ const char str[] = "125e-1"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -100,9 +100,9 @@ const char str[] = "0x125p-1"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -112,9 +112,9 @@ const char str[] = "inf"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -124,9 +124,9 @@ const char str[] = "INF"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -136,9 +136,9 @@ const char str[] = "-inf"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -148,9 +148,9 @@ const char str[] = "-INF"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -160,9 +160,9 @@ const char str[] = "nan"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -172,9 +172,9 @@ const char str[] = "NAN"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -184,9 +184,9 @@ v = -1; const char str[] = "123_456_78_9;125"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+3); assert(err == ios.goodbit); @@ -197,9 +197,9 @@ v = -1; const char str[] = "2-"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+1); assert(err == ios.goodbit); @@ -209,9 +209,9 @@ v = -1; const char str[] = "1.79779e+309"; // unrepresentable std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -221,9 +221,9 @@ v = -1; const char str[] = "-1.79779e+308"; // unrepresentable std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -234,9 +234,9 @@ v = -1; const char str[] = "123_456_78_9;125"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -256,9 +256,9 @@ "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 iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -268,9 +268,9 @@ v = -1; const char str[] = "3;14159265358979323846264338327950288419716939937510582097494459230781640628620899862803482534211706798214808651e+10"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -43,9 +43,9 @@ assert((ios.flags() & ios.basefield) == ios.dec); assert(ios.getloc().name() == "C"); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -54,9 +54,9 @@ { const char str[] = "-123"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -65,9 +65,9 @@ { const char str[] = "123.5"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -77,9 +77,9 @@ const char str[] = "125e-1"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -89,9 +89,9 @@ const char str[] = "0x125p-1"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -101,9 +101,9 @@ const char str[] = "inf"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -113,9 +113,9 @@ const char str[] = "INF"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -125,9 +125,9 @@ const char str[] = "-inf"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -137,9 +137,9 @@ const char str[] = "-INF"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -149,9 +149,9 @@ const char str[] = "nan"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -161,9 +161,9 @@ const char str[] = "NAN"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -173,9 +173,9 @@ v = -1; const char str[] = "3.40283e+39"; // unrepresentable std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -185,9 +185,9 @@ v = -1; const char str[] = "-3.40283e+38"; // unrepresentable std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -198,9 +198,9 @@ v = -1; const char str[] = "2-"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -62,9 +62,9 @@ assert((ios.flags() & ios.basefield) == ios.dec); assert(ios.getloc().name() == "C"); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+3); assert(err == ios.goodbit); @@ -75,9 +75,9 @@ assert((ios.flags() & ios.basefield) == ios.dec); assert(ios.getloc().name() == "C"); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+4); assert(err == ios.goodbit); @@ -87,9 +87,9 @@ const char str[] = "123"; oct(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+3); assert(err == ios.goodbit); @@ -99,9 +99,9 @@ const char str[] = "123"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+3); assert(err == ios.goodbit); @@ -111,9 +111,9 @@ const char str[] = "0x123"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -123,9 +123,9 @@ const char str[] = "123"; ios.setf(zf, ios.basefield); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -135,9 +135,9 @@ const char str[] = "0x123"; ios.setf(zf, ios.basefield); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -147,9 +147,9 @@ const char str[] = "0123"; ios.setf(zf, ios.basefield); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -160,9 +160,9 @@ const char str[] = "2-"; ios.setf(zf, ios.basefield); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+1); assert(err == ios.goodbit); @@ -174,9 +174,9 @@ v = -1; const char str[] = "123"; // no separators at all std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -186,9 +186,9 @@ v = -1; const char str[] = "+1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -198,9 +198,9 @@ v = -1; const char str[] = "+1_"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -210,9 +210,9 @@ v = -1; const char str[] = "+_1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -222,9 +222,9 @@ v = -1; const char str[] = "_+1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -234,9 +234,9 @@ v = -1; const char str[] = "+1__"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -246,9 +246,9 @@ v = -1; const char str[] = "+_1_"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -258,9 +258,9 @@ v = -1; const char str[] = "_+1_"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -270,9 +270,9 @@ v = -1; const char str[] = "+__1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -282,9 +282,9 @@ v = -1; const char str[] = "_+_1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -294,9 +294,9 @@ v = -1; const char str[] = "__+1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -306,9 +306,9 @@ v = -1; const char str[] = "+1_2"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -318,9 +318,9 @@ v = -1; const char str[] = "+12_"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -330,9 +330,9 @@ v = -1; const char str[] = "+_12"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -342,9 +342,9 @@ v = -1; const char str[] = "+1__2"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -354,9 +354,9 @@ v = -1; const char str[] = "+12_3"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -366,9 +366,9 @@ v = -1; const char str[] = "+1_23"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -378,9 +378,9 @@ v = -1; const char str[] = "+1_23_4"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -390,9 +390,9 @@ v = -1; const char str[] = "+123_4"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -402,9 +402,9 @@ v = -1; const char str[] = "+12_34"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -414,9 +414,9 @@ v = -1; const char str[] = "+12_34_5"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -426,9 +426,9 @@ v = -1; const char str[] = "+123_45_6"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -438,9 +438,9 @@ v = -1; const char str[] = "+1_23_45_6"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -450,9 +450,9 @@ v = -1; const char str[] = "+1_234_56_7"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -462,9 +462,9 @@ v = -1; const char str[] = "+1_234_567_89_0"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -474,9 +474,9 @@ v = -1; const char str[] = "-1_234_567_89_0"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -486,9 +486,9 @@ v = -1; const char str[] = "1_234_567_89_0"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -498,9 +498,9 @@ v = -1; const char str[] = "1234_567_89_0"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -520,9 +520,9 @@ "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 iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -43,9 +43,9 @@ assert((ios.flags() & ios.basefield) == ios.dec); assert(ios.getloc().name() == "C"); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -54,9 +54,9 @@ { const char str[] = "-123"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -65,9 +65,9 @@ { const char str[] = "123.5"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -77,9 +77,9 @@ const char str[] = "125e-1"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -89,9 +89,9 @@ const char str[] = "0x125p-1"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -101,9 +101,9 @@ const char str[] = "inf"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -113,9 +113,9 @@ const char str[] = "INF"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -125,9 +125,9 @@ const char str[] = "-inf"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -137,9 +137,9 @@ const char str[] = "-INF"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -149,9 +149,9 @@ const char str[] = "nan"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -161,9 +161,9 @@ const char str[] = "NAN"; hex(ios); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -173,9 +173,9 @@ const char str[] = "1.189731495357231765021264e+49321"; std::ios_base::iostate err = ios.goodbit; v = 0; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -185,9 +185,9 @@ const char str[] = "1.189731495357231765021264e+49329"; std::ios_base::iostate err = ios.goodbit; v = 0; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -197,9 +197,9 @@ const char str[] = "11.189731495357231765021264e+4932"; std::ios_base::iostate err = ios.goodbit; v = 0; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -209,9 +209,9 @@ const char str[] = "91.189731495357231765021264e+4932"; std::ios_base::iostate err = ios.goodbit; v = 0; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -221,9 +221,9 @@ const char str[] = "304888344611713860501504000000"; std::ios_base::iostate err = ios.goodbit; v = 0; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err != ios.failbit); @@ -233,9 +233,9 @@ v = -1; const char str[] = "1.19973e+4933"; // unrepresentable std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -245,9 +245,9 @@ v = -1; const char str[] = "-1.18974e+4932"; // unrepresentable std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -257,9 +257,9 @@ v = -1; const char str[] = "2-"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -49,9 +49,9 @@ { const char str[] = "0"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -60,9 +60,9 @@ { const char str[] = "1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -71,9 +71,9 @@ { const char str[] = "-1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -83,9 +83,9 @@ { const char str[] = "0x7FFFFFFFFFFFFFFF"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -94,9 +94,9 @@ { const char str[] = "-0x8000000000000000"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -38,9 +38,9 @@ const char str[] = "0x0"; std::ios_base::iostate err = ios.goodbit; void* p; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, p); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -50,9 +50,9 @@ const char str[] = "0x73"; std::ios_base::iostate err = ios.goodbit; void* p; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -49,9 +49,9 @@ { const char str[] = "0"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -60,9 +60,9 @@ { const char str[] = "1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -72,9 +72,9 @@ { const char str[] = "0xFFFFFFFF"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -49,9 +49,9 @@ { const char str[] = "0"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -60,9 +60,9 @@ { const char str[] = "1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -72,9 +72,9 @@ { const char str[] = "0xFFFFFFFF"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -49,9 +49,9 @@ { const char str[] = "0"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -60,9 +60,9 @@ { const char str[] = "1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -72,9 +72,9 @@ { const char str[] = "0xFFFFFFFFFFFFFFFF"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -49,9 +49,9 @@ { const char str[] = "0"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -60,9 +60,9 @@ { const char str[] = "1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -72,9 +72,9 @@ { const char str[] = "0xFFFF"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::num_get > F; class my_facet : public F @@ -52,9 +52,9 @@ { const char str[] = "-1"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.goodbit); @@ -64,9 +64,9 @@ { const char str[] = "-"; std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+sizeof(str)), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+sizeof(str)), ios, err, v); assert(iter.base() == str+sizeof(str)-1); assert(err == ios.failbit); @@ -87,9 +87,9 @@ const char* str = std_str.data(); size_t size = std_str.size(); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+size+1), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+size+1), ios, err, v); assert(iter.base() == str+size); assert(err == ios.goodbit); @@ -105,9 +105,9 @@ const char* str = std_str.data(); size_t size = std_str.size(); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+size+1), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+size+1), ios, err, v); assert(iter.base() == str+size); assert(err == ios.goodbit); @@ -121,9 +121,9 @@ const char* str = std_str.data(); size_t size = std_str.size(); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+size+1), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(str+size+1), ios, err, v); assert(iter.base() == str+size); assert(err == ios.goodbit); @@ -137,9 +137,9 @@ const char* str = std_str.data(); size_t size = std_str.size(); std::ios_base::iostate err = ios.goodbit; - input_iterator iter = - f.get(input_iterator(str), - input_iterator(str+size+1), + cpp17_input_iterator iter = + f.get(cpp17_input_iterator(str), + cpp17_input_iterator(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 --- 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 > F; +typedef std::time_get_byname > 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 --- 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 > F; +typedef std::time_get_byname > 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get_byname 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 --- 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 > F; +typedef std::time_get > 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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 I; +typedef cpp17_input_iterator I; typedef std::time_get 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 --- 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_CONSTEXPR_CXX20 bool test() { - test >(); + test >(); test >(); test >(); test >(); 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 --- 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_CONSTEXPR_CXX20 bool test() { - test >(); + test >(); test >(); test >(); test >(); diff --git a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp --- a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp +++ b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp @@ -81,11 +81,11 @@ TEST_CONSTEXPR_CXX20 bool test() { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); diff --git a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp --- a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp +++ b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp @@ -142,11 +142,11 @@ TEST_CONSTEXPR_CXX20 bool test() { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); 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 --- 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 @@ basic_tests(); // All the iterator categories - test >(); + test >(); test >(); test >(); test >(); 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 --- 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() { // All the iterator categories - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ basic_tests(); // All the iterator categories - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ basic_tests(); // All the iterator categories - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ basic_tests(); // All the iterator categories - test >(); + test >(); test >(); test >(); test >(); 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 --- 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_CONSTEXPR_CXX20 bool test() { - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, const int*>(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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_CONSTEXPR_CXX20 bool test() { - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, const int*>(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); test, const int*>(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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_CONSTEXPR_CXX20 bool test() { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); 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 --- 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_CONSTEXPR_CXX20 bool test() { - test, output_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); - test, int*>(); + test, output_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); + test, int*>(); test, output_iterator >(); test, forward_iterator >(); diff --git a/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp b/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp --- 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_return_type(); test_return_type(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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_return_type(); test_return_type(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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_return_type(); test_return_type(); - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ basic_tests(); // All the iterator categories - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ basic_tests(); // All the iterator categories - test >(); + test >(); test >(); test >(); test >(); 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 --- 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 @@ basic_tests(); // All the iterator categories - test >(); + test >(); test >(); test >(); test >(); 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 --- 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_return_type(); // All the iterator categories - test >(); + test >(); test >(); test >(); test >(); 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 --- 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_return_type(); // All the iterator categories - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); 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 --- 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_return_type(); // All the iterator categories - test, input_iterator >(); - test, forward_iterator >(); - test, bidirectional_iterator >(); - test, random_access_iterator >(); + test, cpp17_input_iterator >(); + test, forward_iterator >(); + test, bidirectional_iterator >(); + test, random_access_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); - test, input_iterator >(); + test, cpp17_input_iterator >(); test, forward_iterator >(); test, bidirectional_iterator >(); test, random_access_iterator >(); 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 --- 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 +#include "test_iterators.h" #include "test_range.h" namespace stdr = std::ranges; -static_assert(std::same_as >, std::iter_difference_t >); -static_assert(std::same_as >, std::iter_value_t >); -static_assert(std::same_as >, std::iter_reference_t >); -static_assert(std::same_as >, std::iter_rvalue_reference_t >); +static_assert(std::same_as >, std::iter_difference_t >); +static_assert(std::same_as >, std::iter_value_t >); +static_assert(std::same_as >, std::iter_reference_t >); +static_assert(std::same_as >, std::iter_rvalue_reference_t >); 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 --- 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 >, input_iterator >); -static_assert(std::same_as const>, input_iterator >); +static_assert(std::same_as >, cpp17_input_iterator >); +static_assert(std::same_as const>, cpp17_input_iterator >); -static_assert(std::same_as >, input_iterator >); +static_assert(std::same_as >, cpp17_input_iterator >); -static_assert(std::same_as >, input_iterator >); -static_assert(std::same_as const>, input_iterator >); +static_assert(std::same_as >, cpp17_input_iterator >); +static_assert(std::same_as const>, cpp17_input_iterator >); -static_assert(std::same_as >, input_iterator >); +static_assert(std::same_as >, cpp17_input_iterator >); diff --git a/libcxx/test/std/ranges/range.range/range.compile.pass.cpp b/libcxx/test/std/ranges/range.range/range.compile.pass.cpp --- 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 >); +static_assert(stdr::range >); 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 --- 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 >, sentinel>); -static_assert(std::same_as const>, sentinel>); -static_assert(std::same_as >, sentinel>); -static_assert(std::same_as >, input_iterator >); -static_assert(std::same_as const>, input_iterator >); -static_assert(std::same_as >, input_iterator >); +static_assert(std::same_as >, sentinel>); +static_assert(std::same_as const>, sentinel>); +static_assert(std::same_as >, sentinel>); +static_assert(std::same_as >, cpp17_input_iterator >); +static_assert(std::same_as const>, cpp17_input_iterator >); +static_assert(std::same_as >, cpp17_input_iterator >); 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 --- 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 >); -static_assert(!stdr::common_range const>); +static_assert(!stdr::common_range >); +static_assert(!stdr::common_range const>); -static_assert(!stdr::common_range >); -static_assert(!stdr::common_range const>); +static_assert(!stdr::common_range >); +static_assert(!stdr::common_range const>); -static_assert(stdr::common_range >); -static_assert(stdr::common_range const>); +static_assert(stdr::common_range >); +static_assert(stdr::common_range const>); -static_assert(stdr::common_range >); -static_assert(!stdr::common_range const>); +static_assert(stdr::common_range >); +static_assert(!stdr::common_range 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 --- 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 +#include "test_iterators.h" #include "test_range.h" namespace stdr = std::ranges; -static_assert(stdr::input_range >); -static_assert(stdr::input_range const>); +static_assert(stdr::input_range >); +static_assert(stdr::input_range const>); static_assert(stdr::input_range >); static_assert(stdr::input_range const>); -static_assert(stdr::input_range >); +static_assert(stdr::input_range >); static_assert(stdr::input_range >); -static_assert(!stdr::input_range const>); +static_assert(!stdr::input_range const>); static_assert(!stdr::input_range const>); -static_assert(stdr::input_range >); +static_assert(stdr::input_range >); static_assert(!stdr::input_range >); -static_assert(stdr::input_range const>); +static_assert(stdr::input_range const>); static_assert(!stdr::input_range const>); -static_assert(stdr::input_range >); +static_assert(stdr::input_range >); static_assert(!stdr::input_range >); -static_assert(!stdr::input_range const>); +static_assert(!stdr::input_range const>); static_assert(!stdr::input_range 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 --- 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 I; + typedef cpp17_input_iterator I; typedef forward_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 rename from libcxx/test/std/strings/basic.string/input_iterator.h rename to libcxx/test/std/strings/basic.string/cpp17_input_iterator.h --- 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 template -class input_iterator +class cpp17_input_iterator { It it_; public: @@ -22,18 +22,18 @@ typedef It pointer; typedef typename std::iterator_traits::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 --- 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 @@ assert(w == L"abcdef"); } { // (8) w/o allocator - using It = input_iterator; + using It = cpp17_input_iterator; const char* input = "abcdef"; std::basic_string s(It(input), It(input + 3), std::allocator{}); ASSERT_SAME_TYPE(decltype(s), std::string); @@ -183,7 +183,7 @@ } { // (8) w/ allocator using ExpectW = std::basic_string, test_allocator>; - using It = input_iterator; + using It = cpp17_input_iterator; const wchar_t* input = L"abcdef"; std::basic_string s(It(input), It(input + 3), test_allocator{}); 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 --- 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 @@ -74,17 +74,17 @@ test(s, s+50); test(s, s+50, A(2)); - test(input_iterator(s), input_iterator(s)); - test(input_iterator(s), input_iterator(s), A(2)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s), A(2)); - test(input_iterator(s), input_iterator(s+1)); - test(input_iterator(s), input_iterator(s+1), A(2)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+1)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+1), A(2)); - test(input_iterator(s), input_iterator(s+10)); - test(input_iterator(s), input_iterator(s+10), A(2)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+10)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+10), A(2)); - test(input_iterator(s), input_iterator(s+50)); - test(input_iterator(s), input_iterator(s+50), A(2)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+50)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+50), A(2)); } #if TEST_STD_VER >= 11 { @@ -103,17 +103,17 @@ test(s, s+50); test(s, s+50, A()); - test(input_iterator(s), input_iterator(s)); - test(input_iterator(s), input_iterator(s), A()); + test(cpp17_input_iterator(s), cpp17_input_iterator(s)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s), A()); - test(input_iterator(s), input_iterator(s+1)); - test(input_iterator(s), input_iterator(s+1), A()); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+1)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+1), A()); - test(input_iterator(s), input_iterator(s+10)); - test(input_iterator(s), input_iterator(s+10), A()); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+10)); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+10), A()); - test(input_iterator(s), input_iterator(s+50)); - test(input_iterator(s), input_iterator(s+50), A()); + test(cpp17_input_iterator(s), cpp17_input_iterator(s+50)); + test(cpp17_input_iterator(s), cpp17_input_iterator(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 --- 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 --- 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 --- 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 --- 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 @@ test(S("12345678901234567890"), s, s+52, S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S(), input_iterator(s), input_iterator(s), S()); - test(S(), input_iterator(s), input_iterator(s+1), S("A")); - test(S(), input_iterator(s), input_iterator(s+10), + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S(), input_iterator(s), input_iterator(s+52), + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("12345"), input_iterator(s), input_iterator(s), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s), S("12345")); - test(S("12345"), input_iterator(s), input_iterator(s+1), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("12345A")); - test(S("12345"), input_iterator(s), input_iterator(s+10), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("12345ABCDEFGHIJ")); - test(S("12345"), input_iterator(s), input_iterator(s+52), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("1234567890"), input_iterator(s), input_iterator(s), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s), S("1234567890")); - test(S("1234567890"), input_iterator(s), input_iterator(s+1), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("1234567890A")); - test(S("1234567890"), input_iterator(s), input_iterator(s+10), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("1234567890ABCDEFGHIJ")); - test(S("1234567890"), input_iterator(s), input_iterator(s+52), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s), S("12345678901234567890")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+1), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("12345678901234567890""A")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+10), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("12345678901234567890""ABCDEFGHIJ")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+52), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); } #if TEST_STD_VER >= 11 @@ -137,38 +137,38 @@ test(S("12345678901234567890"), s, s+52, S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S(), input_iterator(s), input_iterator(s), S()); - test(S(), input_iterator(s), input_iterator(s+1), S("A")); - test(S(), input_iterator(s), input_iterator(s+10), + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S(), input_iterator(s), input_iterator(s+52), + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("12345"), input_iterator(s), input_iterator(s), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s), S("12345")); - test(S("12345"), input_iterator(s), input_iterator(s+1), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("12345A")); - test(S("12345"), input_iterator(s), input_iterator(s+10), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("12345ABCDEFGHIJ")); - test(S("12345"), input_iterator(s), input_iterator(s+52), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("1234567890"), input_iterator(s), input_iterator(s), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s), S("1234567890")); - test(S("1234567890"), input_iterator(s), input_iterator(s+1), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("1234567890A")); - test(S("1234567890"), input_iterator(s), input_iterator(s+10), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("1234567890ABCDEFGHIJ")); - test(S("1234567890"), input_iterator(s), input_iterator(s+52), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s), S("12345678901234567890")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+1), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("12345678901234567890""A")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+10), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("12345678901234567890""ABCDEFGHIJ")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+52), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); } #endif @@ -176,7 +176,7 @@ { // test iterator operations that throw typedef std::string S; typedef ThrowingIterator TIter; - typedef input_iterator IIter; + typedef cpp17_input_iterator 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 --- 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 @@ test(S("12345678901234567890"), s, s+52, S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S(), input_iterator(s), input_iterator(s), S()); - test(S(), input_iterator(s), input_iterator(s+1), S("A")); - test(S(), input_iterator(s), input_iterator(s+10), + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S(), input_iterator(s), input_iterator(s+52), + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("12345"), input_iterator(s), input_iterator(s), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); - test(S("12345"), input_iterator(s), input_iterator(s+1), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); - test(S("12345"), input_iterator(s), input_iterator(s+10), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S("12345"), input_iterator(s), input_iterator(s+52), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("1234567890"), input_iterator(s), input_iterator(s), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); - test(S("1234567890"), input_iterator(s), input_iterator(s+1), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); - test(S("1234567890"), input_iterator(s), input_iterator(s+10), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S("1234567890"), input_iterator(s), input_iterator(s+52), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+1), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+10), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+52), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); } #if TEST_STD_VER >= 11 @@ -139,38 +139,38 @@ test(S("12345678901234567890"), s, s+52, S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S(), input_iterator(s), input_iterator(s), S()); - test(S(), input_iterator(s), input_iterator(s+1), S("A")); - test(S(), input_iterator(s), input_iterator(s+10), + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S(), input_iterator(s), input_iterator(s+52), + test(S(), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("12345"), input_iterator(s), input_iterator(s), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); - test(S("12345"), input_iterator(s), input_iterator(s+1), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); - test(S("12345"), input_iterator(s), input_iterator(s+10), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S("12345"), input_iterator(s), input_iterator(s+52), + test(S("12345"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("1234567890"), input_iterator(s), input_iterator(s), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); - test(S("1234567890"), input_iterator(s), input_iterator(s+1), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); - test(S("1234567890"), input_iterator(s), input_iterator(s+10), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S("1234567890"), input_iterator(s), input_iterator(s+52), + test(S("1234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s), S()); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+1), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+10), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); - test(S("12345678901234567890"), input_iterator(s), input_iterator(s+52), + test(S("12345678901234567890"), cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); } #endif @@ -178,7 +178,7 @@ { // test iterator operations that throw typedef std::string S; typedef ThrowingIterator TIter; - typedef input_iterator IIter; + typedef cpp17_input_iterator 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 --- 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 @@ test(S("12345678901234567890"), 20, s, s+52, S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S(), 0, input_iterator(s), input_iterator(s), S()); - test(S(), 0, input_iterator(s), input_iterator(s+1), S("A")); - test(S(), 0, input_iterator(s), input_iterator(s+10), S("ABCDEFGHIJ")); - test(S(), 0, input_iterator(s), input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - - test(S("12345"), 0, input_iterator(s), input_iterator(s), S("12345")); - test(S("12345"), 1, input_iterator(s), input_iterator(s+1), S("1A2345")); - test(S("12345"), 4, input_iterator(s), input_iterator(s+10), S("1234ABCDEFGHIJ5")); - test(S("12345"), 5, input_iterator(s), input_iterator(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - - test(S("1234567890"), 0, input_iterator(s), input_iterator(s), S("1234567890")); - test(S("1234567890"), 1, input_iterator(s), input_iterator(s+1), S("1A234567890")); - test(S("1234567890"), 10, input_iterator(s), input_iterator(s+10), S("1234567890ABCDEFGHIJ")); - test(S("1234567890"), 8, input_iterator(s), input_iterator(s+52), S("12345678ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz90")); - - test(S("12345678901234567890"), 3, input_iterator(s), input_iterator(s), S("12345678901234567890")); - test(S("12345678901234567890"), 3, input_iterator(s), input_iterator(s+1), S("123A45678901234567890")); - test(S("12345678901234567890"), 15, input_iterator(s), input_iterator(s+10), S("123456789012345ABCDEFGHIJ67890")); - test(S("12345678901234567890"), 20, input_iterator(s), input_iterator(s+52), + test(S(), 0, cpp17_input_iterator(s), cpp17_input_iterator(s), S()); + test(S(), 0, cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); + test(S(), 0, cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); + test(S(), 0, cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); + + test(S("12345"), 0, cpp17_input_iterator(s), cpp17_input_iterator(s), S("12345")); + test(S("12345"), 1, cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("1A2345")); + test(S("12345"), 4, cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("1234ABCDEFGHIJ5")); + test(S("12345"), 5, cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); + + test(S("1234567890"), 0, cpp17_input_iterator(s), cpp17_input_iterator(s), S("1234567890")); + test(S("1234567890"), 1, cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("1A234567890")); + test(S("1234567890"), 10, cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("1234567890ABCDEFGHIJ")); + test(S("1234567890"), 8, cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345678ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz90")); + + test(S("12345678901234567890"), 3, cpp17_input_iterator(s), cpp17_input_iterator(s), S("12345678901234567890")); + test(S("12345678901234567890"), 3, cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("123A45678901234567890")); + test(S("12345678901234567890"), 15, cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("123456789012345ABCDEFGHIJ67890")); + test(S("12345678901234567890"), 20, cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); } #if TEST_STD_VER >= 11 @@ -128,25 +128,25 @@ test(S("12345678901234567890"), 20, s, s+52, S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - test(S(), 0, input_iterator(s), input_iterator(s), S()); - test(S(), 0, input_iterator(s), input_iterator(s+1), S("A")); - test(S(), 0, input_iterator(s), input_iterator(s+10), S("ABCDEFGHIJ")); - test(S(), 0, input_iterator(s), input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - - test(S("12345"), 0, input_iterator(s), input_iterator(s), S("12345")); - test(S("12345"), 1, input_iterator(s), input_iterator(s+1), S("1A2345")); - test(S("12345"), 4, input_iterator(s), input_iterator(s+10), S("1234ABCDEFGHIJ5")); - test(S("12345"), 5, input_iterator(s), input_iterator(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); - - test(S("1234567890"), 0, input_iterator(s), input_iterator(s), S("1234567890")); - test(S("1234567890"), 1, input_iterator(s), input_iterator(s+1), S("1A234567890")); - test(S("1234567890"), 10, input_iterator(s), input_iterator(s+10), S("1234567890ABCDEFGHIJ")); - test(S("1234567890"), 8, input_iterator(s), input_iterator(s+52), S("12345678ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz90")); - - test(S("12345678901234567890"), 3, input_iterator(s), input_iterator(s), S("12345678901234567890")); - test(S("12345678901234567890"), 3, input_iterator(s), input_iterator(s+1), S("123A45678901234567890")); - test(S("12345678901234567890"), 15, input_iterator(s), input_iterator(s+10), S("123456789012345ABCDEFGHIJ67890")); - test(S("12345678901234567890"), 20, input_iterator(s), input_iterator(s+52), + test(S(), 0, cpp17_input_iterator(s), cpp17_input_iterator(s), S()); + test(S(), 0, cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("A")); + test(S(), 0, cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("ABCDEFGHIJ")); + test(S(), 0, cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); + + test(S("12345"), 0, cpp17_input_iterator(s), cpp17_input_iterator(s), S("12345")); + test(S("12345"), 1, cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("1A2345")); + test(S("12345"), 4, cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("1234ABCDEFGHIJ5")); + test(S("12345"), 5, cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); + + test(S("1234567890"), 0, cpp17_input_iterator(s), cpp17_input_iterator(s), S("1234567890")); + test(S("1234567890"), 1, cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("1A234567890")); + test(S("1234567890"), 10, cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("1234567890ABCDEFGHIJ")); + test(S("1234567890"), 8, cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345678ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz90")); + + test(S("12345678901234567890"), 3, cpp17_input_iterator(s), cpp17_input_iterator(s), S("12345678901234567890")); + test(S("12345678901234567890"), 3, cpp17_input_iterator(s), cpp17_input_iterator(s+1), S("123A45678901234567890")); + test(S("12345678901234567890"), 15, cpp17_input_iterator(s), cpp17_input_iterator(s+10), S("123456789012345ABCDEFGHIJ67890")); + test(S("12345678901234567890"), 20, cpp17_input_iterator(s), cpp17_input_iterator(s+52), S("12345678901234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); } #endif @@ -154,7 +154,7 @@ { // test iterator operations that throw typedef std::string S; typedef ThrowingIterator TIter; - typedef input_iterator IIter; + typedef cpp17_input_iterator 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 @@ } { // test with a move iterator that returns char&& - typedef input_iterator It; + typedef cpp17_input_iterator It; typedef std::move_iterator 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 --- 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 @@ { // test iterator operations that throw typedef std::string S; typedef ThrowingIterator TIter; - typedef input_iterator IIter; + typedef cpp17_input_iterator 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 --- 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_counted() { - using It = input_iterator; + using It = cpp17_input_iterator; using FIt = forward_iterator; 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 --- 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_counted() { - using It = input_iterator; + using It = cpp17_input_iterator; using FIt = forward_iterator; 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 --- a/libcxx/test/support/test_iterators.h +++ b/libcxx/test/support/test_iterators.h @@ -52,14 +52,16 @@ 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 input_iterator +class cpp17_input_iterator { typedef std::iterator_traits Traits; It it_; - template friend class input_iterator; + template friend class cpp17_input_iterator; public: typedef std::input_iterator_tag iterator_category; typedef typename Traits::value_type value_type; @@ -69,21 +71,21 @@ 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 - TEST_CONSTEXPR_CXX14 input_iterator(const input_iterator& u) :it_(u.it_) {} + TEST_CONSTEXPR_CXX14 cpp17_input_iterator(const cpp17_input_iterator& 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 @@ -93,7 +95,7 @@ template inline bool -operator==(const input_iterator& x, const input_iterator& y) +operator==(const cpp17_input_iterator& x, const cpp17_input_iterator& y) { return x.base() == y.base(); } @@ -101,7 +103,7 @@ template inline bool -operator!=(const input_iterator& x, const input_iterator& y) +operator!=(const cpp17_input_iterator& x, const cpp17_input_iterator& y) { return !(x == y); } @@ -396,7 +398,7 @@ inline TEST_CONSTEXPR_CXX14 Iter base(output_iterator i) { return i.base(); } template -inline TEST_CONSTEXPR_CXX14 Iter base(input_iterator i) { return i.base(); } +inline TEST_CONSTEXPR_CXX14 Iter base(cpp17_input_iterator i) { return i.base(); } template inline TEST_CONSTEXPR_CXX14 Iter base(forward_iterator i) { return i.base(); } diff --git a/libcxx/test/support/test_range.h b/libcxx/test/support/test_range.h --- a/libcxx/test/support/test_range.h +++ b/libcxx/test/support/test_range.h @@ -22,7 +22,7 @@ }; // clang-format off -template