From 8226d0b7c5f9e3a4d4a2b94179234085d973841f Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Fri, 4 Jan 2013 18:24:04 +0000 Subject: [PATCH] ...and then there was one. Only one copy of 'iterators.h' in the test tree for libc++ git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@171479 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../alg.copy/copy.pass.cpp | 2 +- .../alg.copy/copy_backward.pass.cpp | 2 +- .../alg.copy/copy_if.pass.cpp | 2 +- .../alg.copy/copy_n.pass.cpp | 2 +- .../alg.fill/fill.pass.cpp | 2 +- .../alg.fill/fill_n.pass.cpp | 2 +- .../alg.generate/generate.pass.cpp | 2 +- .../alg.generate/generate_n.pass.cpp | 2 +- .../alg.move/move.pass.cpp | 2 +- .../alg.move/move_backward.pass.cpp | 2 +- .../alg.partitions/is_partitioned.pass.cpp | 2 +- .../alg.partitions/partition.pass.cpp | 2 +- .../alg.partitions/partition_copy.pass.cpp | 2 +- .../alg.partitions/partition_point.pass.cpp | 2 +- .../alg.partitions/stable_partition.pass.cpp | 2 +- .../alg.remove/remove.pass.cpp | 2 +- .../alg.remove/remove_copy.pass.cpp | 2 +- .../alg.remove/remove_copy_if.pass.cpp | 2 +- .../alg.remove/remove_if.pass.cpp | 2 +- .../alg.replace/replace.pass.cpp | 2 +- .../alg.replace/replace_copy.pass.cpp | 2 +- .../alg.replace/replace_copy_if.pass.cpp | 2 +- .../alg.replace/replace_if.pass.cpp | 2 +- .../alg.reverse/reverse.pass.cpp | 2 +- .../alg.reverse/reverse_copy.pass.cpp | 2 +- .../alg.rotate/rotate.pass.cpp | 2 +- .../alg.rotate/rotate_copy.pass.cpp | 2 +- .../alg.swap/swap_ranges.pass.cpp | 2 +- .../alg.transform/binary_transform.pass.cpp | 2 +- .../alg.transform/unary_transform.pass.cpp | 2 +- .../alg.unique/unique.pass.cpp | 2 +- .../alg.unique/unique_copy.pass.cpp | 2 +- .../alg.unique/unique_copy_pred.pass.cpp | 2 +- .../alg.unique/unique_pred.pass.cpp | 2 +- .../alg.adjacent.find/adjacent_find.pass.cpp | 2 +- .../adjacent_find_pred.pass.cpp | 2 +- .../alg.all_of/all_of.pass.cpp | 2 +- .../alg.any_of/any_of.pass.cpp | 2 +- .../alg.nonmodifying/alg.count/count.pass.cpp | 2 +- .../alg.count/count_if.pass.cpp | 2 +- .../alg.nonmodifying/alg.equal/equal.pass.cpp | 2 +- .../alg.equal/equal_pred.pass.cpp | 2 +- .../alg.find.end/find_end.pass.cpp | 2 +- .../alg.find.end/find_end_pred.pass.cpp | 2 +- .../alg.find.first.of/find_first_of.pass.cpp | 2 +- .../find_first_of_pred.pass.cpp | 2 +- .../alg.nonmodifying/alg.find/find.pass.cpp | 2 +- .../alg.find/find_if.pass.cpp | 2 +- .../alg.find/find_if_not.pass.cpp | 2 +- .../alg.foreach/test.pass.cpp | 2 +- .../is_permutation.pass.cpp | 2 +- .../is_permutation_pred.pass.cpp | 2 +- .../alg.none_of/none_of.pass.cpp | 2 +- .../alg.search/search.pass.cpp | 2 +- .../alg.search/search_pred.pass.cpp | 2 +- .../mismatch/mismatch.pass.cpp | 2 +- .../mismatch/mismatch_pred.pass.cpp | 2 +- .../binary.search/binary_search.pass.cpp | 2 +- .../binary.search/binary_search_comp.pass.cpp | 2 +- .../equal.range/equal_range.pass.cpp | 2 +- .../equal.range/equal_range_comp.pass.cpp | 2 +- .../lower.bound/lower_bound.pass.cpp | 2 +- .../lower.bound/lower_bound_comp.pass.cpp | 2 +- .../upper.bound/upper_bound.pass.cpp | 2 +- .../upper.bound/upper_bound_comp.pass.cpp | 2 +- .../lexicographical_compare.pass.cpp | 2 +- .../lexicographical_compare_comp.pass.cpp | 2 +- .../alg.merge/inplace_merge.pass.cpp | 2 +- .../alg.merge/inplace_merge_comp.pass.cpp | 2 +- .../alg.sorting/alg.merge/merge.pass.cpp | 2 +- .../alg.sorting/alg.merge/merge_comp.pass.cpp | 2 +- .../alg.min.max/max_element.pass.cpp | 2 +- .../alg.min.max/max_element_comp.pass.cpp | 2 +- .../alg.min.max/min_element.pass.cpp | 2 +- .../alg.min.max/min_element_comp.pass.cpp | 2 +- .../alg.min.max/minmax_element.pass.cpp | 2 +- .../alg.min.max/minmax_element_comp.pass.cpp | 2 +- .../next_permutation.pass.cpp | 2 +- .../next_permutation_comp.pass.cpp | 2 +- .../prev_permutation.pass.cpp | 2 +- .../prev_permutation_comp.pass.cpp | 2 +- .../includes/includes.pass.cpp | 2 +- .../includes/includes_comp.pass.cpp | 2 +- .../set.difference/set_difference.pass.cpp | 2 +- .../set_difference_comp.pass.cpp | 2 +- .../set_intersection.pass.cpp | 2 +- .../set_intersection_comp.pass.cpp | 2 +- .../set_symmetric_difference.pass.cpp | 2 +- .../set_symmetric_difference_comp.pass.cpp | 2 +- .../set.union/set_union.pass.cpp | 2 +- .../set.union/set_union_comp.pass.cpp | 2 +- .../alg.sort/is.sorted/is_sorted.pass.cpp | 2 +- .../is.sorted/is_sorted_comp.pass.cpp | 2 +- .../is.sorted/is_sorted_until.pass.cpp | 2 +- .../is.sorted/is_sorted_until_comp.pass.cpp | 2 +- .../partial_sort_copy.pass.cpp | 2 +- .../partial_sort_copy_comp.pass.cpp | 2 +- test/algorithms/iterators.h | 314 ------------------ test/iterators.h | 18 + .../move.iter.op.const/convert.pass.cpp | 16 +- .../move.iter.op=/move_iterator.pass.cpp | 16 +- .../reverse_iterator.pass.cpp | 12 +- .../reverse_iterator.pass.cpp | 12 +- .../accumulate/accumulate.pass.cpp | 2 +- .../accumulate/accumulate_op.pass.cpp | 2 +- .../adjacent_difference.pass.cpp | 2 +- .../adjacent_difference_op.pass.cpp | 2 +- .../inner.product/inner_product.pass.cpp | 2 +- .../inner.product/inner_product_comp.pass.cpp | 2 +- test/numerics/numeric.ops/iterators.h | 314 ------------------ .../numeric.ops/numeric.iota/iota.pass.cpp | 2 +- .../partial.sum/partial_sum.pass.cpp | 2 +- .../partial.sum/partial_sum_op.pass.cpp | 2 +- 113 files changed, 152 insertions(+), 762 deletions(-) delete mode 100644 test/algorithms/iterators.h delete mode 100644 test/numerics/numeric.ops/iterators.h diff --git a/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp index c9339cf8..135293d4 100644 --- a/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp b/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp index 01b98058..58271719 100644 --- a/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp index da3ff64a..6e94cd9d 100644 --- a/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct Pred { diff --git a/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp b/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp index a6ad030c..cb755919 100644 --- a/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp b/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp index 01bef66d..79608004 100644 --- a/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp b/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp index 90024d36..309d8a99 100644 --- a/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp b/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp index 26e79747..bdf6acc8 100644 --- a/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct gen_test { diff --git a/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp b/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp index dd06d7b0..64c6b00c 100644 --- a/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct gen_test { diff --git a/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp b/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp index b0bca0d0..4eb6e912 100644 --- a/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp @@ -20,7 +20,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp b/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp index 39ff05c4..64584379 100644 --- a/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp @@ -20,7 +20,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp b/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp index 322a4b9e..2f7c026b 100644 --- a/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct is_odd { diff --git a/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp b/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp index 53dc274a..81fb4075 100644 --- a/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp @@ -21,7 +21,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" struct is_odd { diff --git a/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp index d93a4b7f..8c28bdfd 100644 --- a/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct is_odd { diff --git a/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp b/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp index 25c33034..6056576c 100644 --- a/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct is_odd { diff --git a/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp b/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp index a940107d..41bb315d 100644 --- a/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp @@ -21,7 +21,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" struct is_odd { diff --git a/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp b/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp index 15b9b161..8ca008fe 100644 --- a/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp @@ -21,7 +21,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp index 8c765d8a..1bb2e63a 100644 --- a/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp index 93004dec..7fb1d041 100644 --- a/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp index f4f7a749..7493b87c 100644 --- a/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp @@ -22,7 +22,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp b/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp index efa93172..3a4f3bfb 100644 --- a/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp index 4961934d..02bf2aa4 100644 --- a/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp index e936dd38..d8c142e4 100644 --- a/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp index e2adf002..a22e7fa4 100644 --- a/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp b/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp index d8183339..4656a9d7 100644 --- a/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp index 0922dc64..e6ffd4df 100644 --- a/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp b/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp index d7d8ca22..949bb5ce 100644 --- a/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp @@ -19,7 +19,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp index 426b457c..b8a764d7 100644 --- a/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp b/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp index 493f65b3..93665641 100644 --- a/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp @@ -20,7 +20,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp b/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp index b4dde51b..95455fff 100644 --- a/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp b/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp index 44ac492e..9c9c0d26 100644 --- a/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp b/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp index 931a5657..ca6eee63 100644 --- a/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp @@ -21,7 +21,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp index f68622c9..e3a59b86 100644 --- a/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp b/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp index 9feab5c9..2e62ab6c 100644 --- a/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct count_equal { diff --git a/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp b/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp index bc33f472..58df57d4 100644 --- a/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp +++ b/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp @@ -21,7 +21,7 @@ #include #endif -#include "../../iterators.h" +#include "../../../iterators.h" struct count_equal { diff --git a/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp b/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp index d0ceba04..e1b32986 100644 --- a/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp index 99440d57..d4886115 100644 --- a/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp b/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp index d4bfe348..7c900a7f 100644 --- a/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct test1 { diff --git a/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp b/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp index f29932b9..dd3de59f 100644 --- a/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct test1 { diff --git a/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp b/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp index 555993a0..39ecfb25 100644 --- a/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp b/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp index cc66445e..33118c91 100644 --- a/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp b/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp index 6bae45e3..d77e1e3d 100644 --- a/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp index 58ce5972..bb3c947e 100644 --- a/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp index 4f9fa4cc..bdf9edc7 100644 --- a/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp index f485c994..1bd7509c 100644 --- a/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct count_equal { diff --git a/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp index b88bfc49..31816a0b 100644 --- a/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp index e47b3ad0..54957f31 100644 --- a/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp index 0024b440..a078f063 100644 --- a/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp index e3bb29cf..321e0c22 100644 --- a/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp index 36eb7ddd..6c706315 100644 --- a/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp b/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp index b6b6d485..a3e3c6cd 100644 --- a/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct for_each_test { diff --git a/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp b/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp index 7c9c247c..6f17853a 100644 --- a/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp index cfb1249f..e0125d59 100644 --- a/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp b/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp index e76fac28..89fbb846 100644 --- a/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct test1 { diff --git a/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp b/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp index 2797e658..0a7e5c7e 100644 --- a/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp index c0118e2e..193fc57e 100644 --- a/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp +++ b/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" struct count_equal { diff --git a/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp b/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp index fa9c6f8a..0ab71de8 100644 --- a/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp +++ b/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp b/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp index dcf7a28a..ea842a62 100644 --- a/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp +++ b/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" int main() { diff --git a/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp index 8f2dc516..bf1c5dd3 100644 --- a/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp +++ b/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp index 44d792fc..2860955b 100644 --- a/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp index dc77dc5c..e15c9c1c 100644 --- a/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp +++ b/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp index 5c95e8ba..cd17c4c1 100644 --- a/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp index 5a9be202..804f65d9 100644 --- a/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp +++ b/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp index aba62daa..f68c670e 100644 --- a/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp index b6aa17e9..9c4ee64d 100644 --- a/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp +++ b/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp index 319e6dd8..abc7d880 100644 --- a/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp index b306a316..f3b294f2 100644 --- a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp +++ b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp index de5253f8..1c78a506 100644 --- a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp b/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp index d8c5221c..f4317eb2 100644 --- a/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp +++ b/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp index 091068c8..7bc0809f 100644 --- a/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp @@ -30,7 +30,7 @@ struct indirect_less #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp index 97bc7a8f..0536813a 100644 --- a/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp +++ b/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp index 5ae38052..77c07272 100644 --- a/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp index 3e7d5d73..4681041a 100644 --- a/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp +++ b/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp index fe03492a..d4bde658 100644 --- a/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp index c20d061e..cba48136 100644 --- a/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp +++ b/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp index c6b85399..69872981 100644 --- a/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp index 4e19beab..daf1990c 100644 --- a/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp +++ b/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp index f278df69..6bd532db 100644 --- a/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp b/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp index ea8acb5d..422f6e7a 100644 --- a/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp +++ b/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" #include diff --git a/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp b/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp index 27723004..caea596c 100644 --- a/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" #include diff --git a/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp b/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp index 99665775..ddff3ba1 100644 --- a/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp +++ b/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" #include diff --git a/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp b/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp index c4ed0989..220c8d68 100644 --- a/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../iterators.h" +#include "../../../iterators.h" #include diff --git a/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp index 9cc04cbb..ab9df3e6 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp index 137d64ea..cc904f6e 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp index 316b9983..1f7001ac 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp index 371ee700..6217c45e 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp @@ -23,7 +23,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp index c1093316..eea9972b 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp index 7e68e81e..7f02ffd5 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp @@ -23,7 +23,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp index 9d8f7acc..46a56487 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp index f73ce338..ae880e45 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp @@ -24,7 +24,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp index 2ee894b3..8b18c504 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp index 6ddcc143..0051e27c 100644 --- a/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp @@ -23,7 +23,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp index b473dda6..af75647f 100644 --- a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp +++ b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp index 9ca390f5..cdeb3cd9 100644 --- a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp index 5c551727..8dc1f835 100644 --- a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp +++ b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp index c055641f..2e445cfc 100644 --- a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp b/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp index c7f714fd..577dd926 100644 --- a/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp +++ b/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp b/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp index adf51c53..a075d02a 100644 --- a/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp +++ b/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp @@ -23,7 +23,7 @@ #include #include -#include "../../../iterators.h" +#include "../../../../iterators.h" template void diff --git a/test/algorithms/iterators.h b/test/algorithms/iterators.h deleted file mode 100644 index 539a9a49..00000000 --- a/test/algorithms/iterators.h +++ /dev/null @@ -1,314 +0,0 @@ -#ifndef ITERATORS_H -#define ITERATORS_H - -#include - -template -class output_iterator -{ - It it_; - - template friend class output_iterator; -public: - typedef std::output_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - explicit output_iterator(It it) : it_(it) {} - template - output_iterator(const output_iterator& u) :it_(u.it_) {} - - reference operator*() const {return *it_;} - - output_iterator& operator++() {++it_; return *this;} - output_iterator operator++(int) - {output_iterator tmp(*this); ++(*this); return tmp;} -}; - -template -inline -Iter -base(output_iterator i) -{ - return i.base(); -} - -template -class input_iterator -{ - It it_; - - template friend class input_iterator; -public: - typedef std::input_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - explicit input_iterator(It it) : it_(it) {} - template - input_iterator(const input_iterator& u) :it_(u.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;} -}; - -template -inline -bool -operator==(const input_iterator& x, const input_iterator& y) -{ - return x.base() == y.base(); -} - -template -inline -bool -operator!=(const input_iterator& x, const input_iterator& y) -{ - return !(x == y); -} - -template -inline -Iter -base(input_iterator i) -{ - return i.base(); -} - -template -class forward_iterator -{ - It it_; - - template friend class forward_iterator; -public: - typedef std::forward_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - forward_iterator() : it_() {} - explicit forward_iterator(It it) : it_(it) {} - template - forward_iterator(const forward_iterator& u) :it_(u.it_) {} - - reference operator*() const {return *it_;} - pointer operator->() const {return it_;} - - forward_iterator& operator++() {++it_; return *this;} - forward_iterator operator++(int) - {forward_iterator tmp(*this); ++(*this); return tmp;} -}; - -template -inline -bool -operator==(const forward_iterator& x, const forward_iterator& y) -{ - return x.base() == y.base(); -} - -template -inline -bool -operator!=(const forward_iterator& x, const forward_iterator& y) -{ - return !(x == y); -} - -template -inline -Iter -base(forward_iterator i) -{ - return i.base(); -} - -template -class bidirectional_iterator -{ - It it_; - - template friend class bidirectional_iterator; -public: - typedef std::bidirectional_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - bidirectional_iterator() : it_() {} - explicit bidirectional_iterator(It it) : it_(it) {} - template - bidirectional_iterator(const bidirectional_iterator& u) :it_(u.it_) {} - - reference operator*() const {return *it_;} - pointer operator->() const {return it_;} - - bidirectional_iterator& operator++() {++it_; return *this;} - bidirectional_iterator operator++(int) - {bidirectional_iterator tmp(*this); ++(*this); return tmp;} - - bidirectional_iterator& operator--() {--it_; return *this;} - bidirectional_iterator operator--(int) - {bidirectional_iterator tmp(*this); --(*this); return tmp;} -}; - -template -inline -bool -operator==(const bidirectional_iterator& x, const bidirectional_iterator& y) -{ - return x.base() == y.base(); -} - -template -inline -bool -operator!=(const bidirectional_iterator& x, const bidirectional_iterator& y) -{ - return !(x == y); -} - -template -inline -Iter -base(bidirectional_iterator i) -{ - return i.base(); -} - -template -class random_access_iterator -{ - It it_; - - template friend class random_access_iterator; -public: - typedef std::random_access_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - random_access_iterator() : it_() {} - explicit random_access_iterator(It it) : it_(it) {} - template - random_access_iterator(const random_access_iterator& u) :it_(u.it_) {} - - reference operator*() const {return *it_;} - pointer operator->() const {return it_;} - - random_access_iterator& operator++() {++it_; return *this;} - random_access_iterator operator++(int) - {random_access_iterator tmp(*this); ++(*this); return tmp;} - - random_access_iterator& operator--() {--it_; return *this;} - random_access_iterator operator--(int) - {random_access_iterator tmp(*this); --(*this); return tmp;} - - random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;} - random_access_iterator operator+(difference_type n) const - {random_access_iterator tmp(*this); tmp += n; return tmp;} - friend random_access_iterator operator+(difference_type n, random_access_iterator x) - {x += n; return x;} - random_access_iterator& operator-=(difference_type n) {return *this += -n;} - random_access_iterator operator-(difference_type n) const - {random_access_iterator tmp(*this); tmp -= n; return tmp;} - - reference operator[](difference_type n) const {return it_[n];} -}; - -template -inline -bool -operator==(const random_access_iterator& x, const random_access_iterator& y) -{ - return x.base() == y.base(); -} - -template -inline -bool -operator!=(const random_access_iterator& x, const random_access_iterator& y) -{ - return !(x == y); -} - -template -inline -bool -operator<(const random_access_iterator& x, const random_access_iterator& y) -{ - return x.base() < y.base(); -} - -template -inline -bool -operator<=(const random_access_iterator& x, const random_access_iterator& y) -{ - return !(y < x); -} - -template -inline -bool -operator>(const random_access_iterator& x, const random_access_iterator& y) -{ - return y < x; -} - -template -inline -bool -operator>=(const random_access_iterator& x, const random_access_iterator& y) -{ - return !(x < y); -} - -template -inline -typename std::iterator_traits::difference_type -operator-(const random_access_iterator& x, const random_access_iterator& y) -{ - return x.base() - y.base(); -} - -template -inline -Iter -base(random_access_iterator i) -{ - return i.base(); -} - -template -inline -Iter -base(Iter i) -{ - return i; -} - -#endif // ITERATORS_H diff --git a/test/iterators.h b/test/iterators.h index 167ed0bb..6b3d3d16 100644 --- a/test/iterators.h +++ b/test/iterators.h @@ -275,4 +275,22 @@ operator-(const random_access_iterator& x, const random_access_iterator& y return x.base() - y.base(); } +template +inline Iter base(output_iterator i) { return i.base(); } + +template +inline Iter base(input_iterator i) { return i.base(); } + +template +inline Iter base(forward_iterator i) { return i.base(); } + +template +inline Iter base(bidirectional_iterator i) { return i.base(); } + +template +inline Iter base(random_access_iterator i) { return i.base(); } + +template // everything else +inline Iter base(Iter i) { return i; } + #endif // ITERATORS_H diff --git a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp index 9a5e0553..6a370a83 100644 --- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp +++ b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp @@ -29,16 +29,16 @@ test(U u) assert(r1.base() == u); } -struct base {}; -struct derived : base {}; +struct Base {}; +struct Derived : Base {}; int main() { - derived d; + Derived d; - test >(input_iterator(&d)); - test >(forward_iterator(&d)); - test >(bidirectional_iterator(&d)); - test >(random_access_iterator(&d)); - test(&d); + test >(input_iterator(&d)); + test >(forward_iterator(&d)); + test >(bidirectional_iterator(&d)); + test >(random_access_iterator(&d)); + test(&d); } diff --git a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp index 262b2d52..919302c2 100644 --- a/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp +++ b/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp @@ -32,16 +32,16 @@ test(U u) assert(&rr == &r1); } -struct base {}; -struct derived : base {}; +struct Base {}; +struct Derived : Base {}; int main() { - derived d; + Derived d; - test >(input_iterator(&d)); - test >(forward_iterator(&d)); - test >(bidirectional_iterator(&d)); - test >(random_access_iterator(&d)); - test(&d); + test >(input_iterator(&d)); + test >(forward_iterator(&d)); + test >(bidirectional_iterator(&d)); + test >(random_access_iterator(&d)); + test(&d); } diff --git a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp index 383200a6..ef3382f2 100644 --- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp +++ b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp @@ -29,14 +29,14 @@ test(U u) assert(r1.base() == u); } -struct base {}; -struct derived : base {}; +struct Base {}; +struct Derived : Base {}; int main() { - derived d; + Derived d; - test >(bidirectional_iterator(&d)); - test >(random_access_iterator(&d)); - test(&d); + test >(bidirectional_iterator(&d)); + test >(random_access_iterator(&d)); + test(&d); } diff --git a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp index 3d4b4161..dc20326b 100644 --- a/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp +++ b/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp @@ -32,14 +32,14 @@ test(U u) assert(&rr == &r1); } -struct base {}; -struct derived : base {}; +struct Base {}; +struct Derived : Base {}; int main() { - derived d; + Derived d; - test >(bidirectional_iterator(&d)); - test >(random_access_iterator(&d)); - test(&d); + test >(bidirectional_iterator(&d)); + test >(random_access_iterator(&d)); + test(&d); } diff --git a/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp b/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp index a3a03b58..d6b303bb 100644 --- a/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp +++ b/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp b/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp index b7ed40f2..53f460b2 100644 --- a/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp +++ b/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp b/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp index 36bda6c0..7eccaeb9 100644 --- a/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp +++ b/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp b/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp index f5a61244..bba7161b 100644 --- a/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp +++ b/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp @@ -23,7 +23,7 @@ #include #include -#include "../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp b/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp index 06df32d6..d23af2f0 100644 --- a/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp +++ b/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp b/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp index f720bb6f..cf6f9c4a 100644 --- a/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp +++ b/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp @@ -24,7 +24,7 @@ #include #include -#include "../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/numerics/numeric.ops/iterators.h b/test/numerics/numeric.ops/iterators.h deleted file mode 100644 index 539a9a49..00000000 --- a/test/numerics/numeric.ops/iterators.h +++ /dev/null @@ -1,314 +0,0 @@ -#ifndef ITERATORS_H -#define ITERATORS_H - -#include - -template -class output_iterator -{ - It it_; - - template friend class output_iterator; -public: - typedef std::output_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - explicit output_iterator(It it) : it_(it) {} - template - output_iterator(const output_iterator& u) :it_(u.it_) {} - - reference operator*() const {return *it_;} - - output_iterator& operator++() {++it_; return *this;} - output_iterator operator++(int) - {output_iterator tmp(*this); ++(*this); return tmp;} -}; - -template -inline -Iter -base(output_iterator i) -{ - return i.base(); -} - -template -class input_iterator -{ - It it_; - - template friend class input_iterator; -public: - typedef std::input_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - explicit input_iterator(It it) : it_(it) {} - template - input_iterator(const input_iterator& u) :it_(u.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;} -}; - -template -inline -bool -operator==(const input_iterator& x, const input_iterator& y) -{ - return x.base() == y.base(); -} - -template -inline -bool -operator!=(const input_iterator& x, const input_iterator& y) -{ - return !(x == y); -} - -template -inline -Iter -base(input_iterator i) -{ - return i.base(); -} - -template -class forward_iterator -{ - It it_; - - template friend class forward_iterator; -public: - typedef std::forward_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - forward_iterator() : it_() {} - explicit forward_iterator(It it) : it_(it) {} - template - forward_iterator(const forward_iterator& u) :it_(u.it_) {} - - reference operator*() const {return *it_;} - pointer operator->() const {return it_;} - - forward_iterator& operator++() {++it_; return *this;} - forward_iterator operator++(int) - {forward_iterator tmp(*this); ++(*this); return tmp;} -}; - -template -inline -bool -operator==(const forward_iterator& x, const forward_iterator& y) -{ - return x.base() == y.base(); -} - -template -inline -bool -operator!=(const forward_iterator& x, const forward_iterator& y) -{ - return !(x == y); -} - -template -inline -Iter -base(forward_iterator i) -{ - return i.base(); -} - -template -class bidirectional_iterator -{ - It it_; - - template friend class bidirectional_iterator; -public: - typedef std::bidirectional_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - bidirectional_iterator() : it_() {} - explicit bidirectional_iterator(It it) : it_(it) {} - template - bidirectional_iterator(const bidirectional_iterator& u) :it_(u.it_) {} - - reference operator*() const {return *it_;} - pointer operator->() const {return it_;} - - bidirectional_iterator& operator++() {++it_; return *this;} - bidirectional_iterator operator++(int) - {bidirectional_iterator tmp(*this); ++(*this); return tmp;} - - bidirectional_iterator& operator--() {--it_; return *this;} - bidirectional_iterator operator--(int) - {bidirectional_iterator tmp(*this); --(*this); return tmp;} -}; - -template -inline -bool -operator==(const bidirectional_iterator& x, const bidirectional_iterator& y) -{ - return x.base() == y.base(); -} - -template -inline -bool -operator!=(const bidirectional_iterator& x, const bidirectional_iterator& y) -{ - return !(x == y); -} - -template -inline -Iter -base(bidirectional_iterator i) -{ - return i.base(); -} - -template -class random_access_iterator -{ - It it_; - - template friend class random_access_iterator; -public: - typedef std::random_access_iterator_tag iterator_category; - typedef typename std::iterator_traits::value_type value_type; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits::reference reference; - - It base() const {return it_;} - - random_access_iterator() : it_() {} - explicit random_access_iterator(It it) : it_(it) {} - template - random_access_iterator(const random_access_iterator& u) :it_(u.it_) {} - - reference operator*() const {return *it_;} - pointer operator->() const {return it_;} - - random_access_iterator& operator++() {++it_; return *this;} - random_access_iterator operator++(int) - {random_access_iterator tmp(*this); ++(*this); return tmp;} - - random_access_iterator& operator--() {--it_; return *this;} - random_access_iterator operator--(int) - {random_access_iterator tmp(*this); --(*this); return tmp;} - - random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;} - random_access_iterator operator+(difference_type n) const - {random_access_iterator tmp(*this); tmp += n; return tmp;} - friend random_access_iterator operator+(difference_type n, random_access_iterator x) - {x += n; return x;} - random_access_iterator& operator-=(difference_type n) {return *this += -n;} - random_access_iterator operator-(difference_type n) const - {random_access_iterator tmp(*this); tmp -= n; return tmp;} - - reference operator[](difference_type n) const {return it_[n];} -}; - -template -inline -bool -operator==(const random_access_iterator& x, const random_access_iterator& y) -{ - return x.base() == y.base(); -} - -template -inline -bool -operator!=(const random_access_iterator& x, const random_access_iterator& y) -{ - return !(x == y); -} - -template -inline -bool -operator<(const random_access_iterator& x, const random_access_iterator& y) -{ - return x.base() < y.base(); -} - -template -inline -bool -operator<=(const random_access_iterator& x, const random_access_iterator& y) -{ - return !(y < x); -} - -template -inline -bool -operator>(const random_access_iterator& x, const random_access_iterator& y) -{ - return y < x; -} - -template -inline -bool -operator>=(const random_access_iterator& x, const random_access_iterator& y) -{ - return !(x < y); -} - -template -inline -typename std::iterator_traits::difference_type -operator-(const random_access_iterator& x, const random_access_iterator& y) -{ - return x.base() - y.base(); -} - -template -inline -Iter -base(random_access_iterator i) -{ - return i.base(); -} - -template -inline -Iter -base(Iter i) -{ - return i; -} - -#endif // ITERATORS_H diff --git a/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp b/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp index d165b11b..84f78301 100644 --- a/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp +++ b/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp b/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp index 6fb4c09f..5d990a23 100644 --- a/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp +++ b/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../iterators.h" +#include "../../../iterators.h" template void diff --git a/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp b/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp index c0f83bf9..3c3f403f 100644 --- a/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp +++ b/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "../iterators.h" +#include "../../../iterators.h" template void