diff --git a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp index c9339cf8361a..135293d47c35 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp index 01b980587e65..582717194d56 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp index da3ff64af8fe..6e94cd9d143d 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp index a6ad030cd4ad..cb7559192145 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp index 01bef66d6ab6..7960800451a4 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp index 90024d36df1d..309d8a99f2c8 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp index 26e797473bd8..bdf6acc8f998 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp index dd06d7b04ea5..64c6b00c2c8a 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp index b0bca0d08173..4eb6e9123af7 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp index 39ff05c4ca0f..645843799591 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp index 322a4b9e055e..2f7c026b0ffd 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp index 53dc274ada28..81fb4075d4a6 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp index d93a4b7f4ef9..8c28bdfd7cab 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp index 25c33034a905..6056576cedf5 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp index a940107db465..41bb315d3813 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp index 15b9b1614747..8ca008fe2e87 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp index 8c765d8a027f..1bb2e63a759a 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp index 93004dec87b5..7fb1d041bb8d 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp index f4f7a749ee31..7493b87cae2f 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp index efa93172be75..3a4f3bfbaaf0 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp index 4961934d4ee3..02bf2aa47787 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp index e936dd388d9c..d8c142e476dd 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp index e2adf0022a50..a22e7fa4f2fb 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp index d81833394198..4656a9d75ebf 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp index 0922dc64b396..e6ffd4df2c7f 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp index d7d8ca22014f..949bb5ce5853 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp index 426b457c9e5a..b8a764d77a1f 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp index 493f65b376b2..9366564131e7 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp index b4dde51b2747..95455fff201c 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp index 44ac492e677e..9c9c0d26a548 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp index 931a56574147..ca6eee6381d2 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp index f68622c96106..e3a59b86d2e4 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp index 9feab5c98b17..2e62ab6c3218 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp b/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp index bc33f47275f2..58df57d4a13e 100644 --- a/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp index d0ceba044f8e..e1b329867f5b 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp index 99440d57ef48..d48861154a5f 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp index d4bfe3484859..7c900a7fcaef 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp index f29932b9cda4..dd3de59fafe5 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp index 555993a0ce01..39ecfb25eb8f 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp index cc66445ec5a3..33118c915e14 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp index 6bae45e3b879..d77e1e3de4a3 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp index 58ce5972ff2e..bb3c947e2ebc 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp index 4f9fa4cc70cd..bdf9edc76813 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp index f485c99407db..1bd7509c8f82 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp index b88bfc49e995..31816a0bde8c 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp index e47b3ad0e4dd..54957f31f317 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp index 0024b440f7cc..a078f0630730 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp index e3bb29cfecd5..321e0c221968 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp index 36eb7ddde09a..6c7063155458 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp index b6b6d4852f0c..a3e3c6cdea41 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp index 7c9c247c26fe..6f17853aac4e 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp index cfb1249fc852..e0125d591d2b 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp index e76fac288081..89fbb8463435 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp index 2797e6588d98..0a7e5c7e3177 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp index c0118e2e4fc6..193fc57e6e2c 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp index fa9c6f8a9062..0ab71de8e106 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp b/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp index dcf7a28abd75..ea842a62ee7d 100644 --- a/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp index 8f2dc5162591..bf1c5dd3651d 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp index 44d792fc2df5..2860955b82b0 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp index dc77dc5c94b0..e15c9c1cf010 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp index 5c95e8bac852..cd17c4c15968 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp index 5a9be2024b09..804f65d92221 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp index aba62daae239..f68c670ed6d5 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp index b6aa17e93268..9c4ee64d89cf 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp index 319e6dd82401..abc7d880a5c6 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp index b306a316733b..f3b294f22f7f 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp index de5253f8a975..1c78a50620ca 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp index d8c5221c52f3..f4317eb2f71d 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp index 091068c89d58..7bc0809f4722 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp index 97bc7a8f9839..0536813aabbd 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp index 5ae38052994c..77c072727c6e 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp index 3e7d5d733394..4681041a5371 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp index fe03492abb5b..d4bde658b546 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp index c20d061e79ab..cba481368be9 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp index c6b85399c060..698729813ecd 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp index 4e19beabde03..daf1990c79e1 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp index f278df69fa16..6bd532dbcfe1 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp index ea8acb5debc4..422f6e7acfbf 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp index 27723004c7f8..caea596cf7ca 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp index 99665775e482..ddff3ba12fb8 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp index c4ed0989cb76..220c8d68e220 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp index 9cc04cbb95a4..ab9df3e6dec4 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp index 137d64eaa80e..cc904f6e30a7 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp index 316b9983a902..1f7001ac07da 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp index 371ee700431c..6217c45ee71d 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp index c10933168fde..eea9972b4655 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp index 7e68e81ebce0..7f02ffd56a0c 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp index 9d8f7accdd16..46a564873d7c 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp index f73ce33836ea..ae880e457418 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp index 2ee894b37e82..8b18c504d469 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp index 6ddcc143572b..0051e27c3002 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp index b473dda627d7..af75647f8671 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp index 9ca390f5daad..cdeb3cd9be23 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp index 5c5517273529..8dc1f8356672 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp index c055641fd7e3..2e445cfccce7 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp index c7f714fd14c6..577dd9265bd4 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp index adf51c53b617..a075d02aed22 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp +++ b/libcxx/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/libcxx/test/algorithms/iterators.h b/libcxx/test/algorithms/iterators.h deleted file mode 100644 index 539a9a498487..000000000000 --- a/libcxx/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/libcxx/test/iterators.h b/libcxx/test/iterators.h index 167ed0bb63b6..6b3d3d1610c1 100644 --- a/libcxx/test/iterators.h +++ b/libcxx/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/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp index 9a5e0553f975..6a370a83d24a 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp +++ b/libcxx/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/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp index 262b2d521b21..919302c2d57c 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp +++ b/libcxx/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/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp index 383200a6faa5..ef3382f2b6cd 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp +++ b/libcxx/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/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp index 3d4b4161fb7a..dc20326b8322 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp +++ b/libcxx/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/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp b/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp index a3a03b58a75e..d6b303bb6971 100644 --- a/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp +++ b/libcxx/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/libcxx/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp b/libcxx/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp index b7ed40f2fe2a..53f460b25a95 100644 --- a/libcxx/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp +++ b/libcxx/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/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp index 36bda6c0344d..7eccaeb9c5df 100644 --- a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp +++ b/libcxx/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/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp index f5a61244f118..bba7161bc170 100644 --- a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp +++ b/libcxx/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/libcxx/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp b/libcxx/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp index 06df32d6c4d3..d23af2f011f1 100644 --- a/libcxx/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp +++ b/libcxx/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/libcxx/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp b/libcxx/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp index f720bb6f386d..cf6f9c4aee05 100644 --- a/libcxx/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp +++ b/libcxx/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/libcxx/test/numerics/numeric.ops/iterators.h b/libcxx/test/numerics/numeric.ops/iterators.h deleted file mode 100644 index 539a9a498487..000000000000 --- a/libcxx/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/libcxx/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp b/libcxx/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp index d165b11b9e90..84f78301e1ab 100644 --- a/libcxx/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp +++ b/libcxx/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/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp b/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp index 6fb4c09fe534..5d990a235bd7 100644 --- a/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp +++ b/libcxx/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/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp b/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp index c0f83bf91a92..3c3f403f4a39 100644 --- a/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp +++ b/libcxx/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