diff options
Diffstat (limited to 'libcxx/test/algorithms')
98 files changed, 97 insertions, 411 deletions
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 c9339cf8361..135293d47c3 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 01b980587e6..582717194d5 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 da3ff64af8f..6e94cd9d143 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 <algorithm> #include <cassert> -#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 a6ad030cd4a..cb755919214 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 01bef66d6ab..7960800451a 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 90024d36df1..309d8a99f2c 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 26e797473bd..bdf6acc8f99 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 <algorithm> #include <cassert> -#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 dd06d7b04ea..64c6b00c2c8 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 <algorithm> #include <cassert> -#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 b0bca0d0817..4eb6e9123af 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 <memory> #endif -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 39ff05c4ca0..64584379959 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 <memory> #endif -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 322a4b9e055..2f7c026b0ff 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 <algorithm> #include <cassert> -#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 53dc274ada2..81fb4075d4a 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 <memory> #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 d93a4b7f4ef..8c28bdfd7ca 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 <algorithm> #include <cassert> -#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 25c33034a90..6056576cedf 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 <algorithm> #include <cassert> -#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 a940107db46..41bb315d381 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 <memory> #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 15b9b161474..8ca008fe2e8 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 <memory> #endif -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 8c765d8a027..1bb2e63a759 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 93004dec87b..7fb1d041bb8 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 f4f7a749ee3..7493b87cae2 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 <memory> #endif -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 efa93172be7..3a4f3bfbaaf 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 4961934d4ee..02bf2aa4778 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 e936dd388d9..d8c142e476d 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 e2adf0022a5..a22e7fa4f2f 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 d8183339419..4656a9d75eb 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 0922dc64b39..e6ffd4df2c7 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 d7d8ca22014..949bb5ce585 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 <memory> #endif -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 426b457c9e5..b8a764d77a1 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 493f65b376b..9366564131e 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 <memory> #endif -#include "../../iterators.h" +#include "../../../iterators.h" template<class Iter1, class Iter2> 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 b4dde51b274..95455fff201 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template<class InIter1, class InIter2, class OutIter> 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 44ac492e677..9c9c0d26a54 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 931a5657414..ca6eee6381d 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 <memory> #endif -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 f68622c9610..e3a59b86d2e 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter, class OutIter> 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 9feab5c98b1..2e62ab6c321 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 <algorithm> #include <cassert> -#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 bc33f47275f..58df57d4a13 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 <memory> #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 d0ceba044f8..e1b329867f5 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 <algorithm> #include <cassert> -#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 99440d57ef4..d48861154a5 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 <functional> #include <cassert> -#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 d4bfe348485..7c900a7fcae 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 <algorithm> #include <cassert> -#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 f29932b9cda..dd3de59fafe 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 <algorithm> #include <cassert> -#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 555993a0ce0..39ecfb25eb8 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 <algorithm> #include <cassert> -#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 cc66445ec5a..33118c915e1 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 <functional> #include <cassert> -#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 6bae45e3b87..d77e1e3de4a 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 <algorithm> #include <cassert> -#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 58ce5972ff2..bb3c947e2eb 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 <functional> #include <cassert> -#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 4f9fa4cc70c..bdf9edc7681 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter1, class Iter2> 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 f485c99407d..1bd7509c8f8 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 <algorithm> #include <cassert> -#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 b88bfc49e99..31816a0bde8 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 <algorithm> #include <cassert> -#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 e47b3ad0e4d..54957f31f31 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 <functional> #include <cassert> -#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 0024b440f7c..a078f063073 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 <algorithm> #include <cassert> -#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 e3bb29cfecd..321e0c22196 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 <functional> #include <cassert> -#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 36eb7ddde09..6c706315545 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 <functional> #include <cassert> -#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 b6b6d4852f0..a3e3c6cdea4 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 <algorithm> #include <cassert> -#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 7c9c247c26f..6f17853aac4 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 <algorithm> #include <cassert> -#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 cfb1249fc85..e0125d591d2 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 <functional> #include <cassert> -#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 e76fac28808..89fbb846343 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 <algorithm> #include <cassert> -#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 2797e6588d9..0a7e5c7e317 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter1, class Iter2> 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 c0118e2e4fc..193fc57e6e2 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 <algorithm> #include <cassert> -#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 fa9c6f8a906..0ab71de8e10 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 <algorithm> #include <cassert> -#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 dcf7a28abd7..ea842a62ee7 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 <functional> #include <cassert> -#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 8f2dc516259..bf1c5dd3651 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 <vector> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter, class T> 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 44d792fc2df..2860955b82b 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter, class T> 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 dc77dc5c94b..e15c9c1cf01 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 <vector> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter, class T> 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 5c95e8bac85..cd17c4c1596 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 <vector> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter, class T> 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 5a9be2024b0..804f65d9222 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 <vector> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter, class T> 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 aba62daae23..f68c670ed6d 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 <vector> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter, class T> 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 b6aa17e9326..9c4ee64d89c 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 <vector> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter, class T> 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 319e6dd8240..abc7d880a5c 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 <vector> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter, class T> 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 b306a316733..f3b294f22f7 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter1, class Iter2> 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 de5253f8a97..1c78a50620c 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter1, class Iter2> 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 d8c5221c52f..f4317eb2f71 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 091068c89d5..7bc0809f472 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 <class Iter> 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 97bc7a8f983..0536813aabb 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter1, class InIter2, class OutIter> 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 5ae38052994..77c072727c6 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class InIter1, class InIter2, class OutIter> 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 3e7d5d73339..4681041a537 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 fe03492abb5..d4bde658b54 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 c20d061e79a..cba481368be 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 c6b85399c06..698729813ec 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 4e19beabde0..daf1990c79e 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 f278df69fa1..6bd532dbcfe 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" template <class Iter> 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 ea8acb5debc..422f6e7acfb 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" #include <cstdio> 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 27723004c7f..caea596cf7c 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" #include <cstdio> 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 99665775e48..ddff3ba12fb 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 <algorithm> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" #include <cstdio> 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 c4ed0989cb7..220c8d68e22 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 <functional> #include <cassert> -#include "../../iterators.h" +#include "../../../iterators.h" #include <cstdio> 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 9cc04cbb95a..ab9df3e6dec 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 <algorithm> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2> 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 137d64eaa80..cc904f6e30a 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2> 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 316b9983a90..1f7001ac07d 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 <algorithm> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2, class OutIter> 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 371ee700431..6217c45ee71 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2, class OutIter> 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 c10933168fd..eea9972b465 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 <algorithm> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2, class OutIter> 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 7e68e81ebce..7f02ffd56a0 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2, class OutIter> 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 9d8f7accdd1..46a564873d7 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 <algorithm> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2, class OutIter> 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 f73ce33836e..ae880e45741 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2, class OutIter> 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 2ee894b37e8..8b18c504d46 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 <algorithm> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2, class OutIter> 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 6ddcc143572..0051e27c300 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter1, class Iter2, class OutIter> 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 b473dda627d..af75647f867 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 <algorithm> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter> 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 9ca390f5daa..cdeb3cd9be2 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter> 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 5c551727352..8dc1f835667 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 <algorithm> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter> 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 c055641fd7e..2e445cfccce 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter> 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 c7f714fd14c..577dd9265bd 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 <algorithm> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter> 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 adf51c53b61..a075d02aed2 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "../../../../iterators.h" template <class Iter> void diff --git a/libcxx/test/algorithms/iterators.h b/libcxx/test/algorithms/iterators.h deleted file mode 100644 index 539a9a49848..00000000000 --- a/libcxx/test/algorithms/iterators.h +++ /dev/null @@ -1,314 +0,0 @@ -#ifndef ITERATORS_H -#define ITERATORS_H - -#include <iterator> - -template <class It> -class output_iterator -{ - It it_; - - template <class U> friend class output_iterator; -public: - typedef std::output_iterator_tag iterator_category; - typedef typename std::iterator_traits<It>::value_type value_type; - typedef typename std::iterator_traits<It>::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits<It>::reference reference; - - It base() const {return it_;} - - explicit output_iterator(It it) : it_(it) {} - template <class U> - output_iterator(const output_iterator<U>& 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 <class Iter> -inline -Iter -base(output_iterator<Iter> i) -{ - return i.base(); -} - -template <class It> -class input_iterator -{ - It it_; - - template <class U> friend class input_iterator; -public: - typedef std::input_iterator_tag iterator_category; - typedef typename std::iterator_traits<It>::value_type value_type; - typedef typename std::iterator_traits<It>::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits<It>::reference reference; - - It base() const {return it_;} - - explicit input_iterator(It it) : it_(it) {} - template <class U> - input_iterator(const input_iterator<U>& 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 <class T, class U> -inline -bool -operator==(const input_iterator<T>& x, const input_iterator<U>& y) -{ - return x.base() == y.base(); -} - -template <class T, class U> -inline -bool -operator!=(const input_iterator<T>& x, const input_iterator<U>& y) -{ - return !(x == y); -} - -template <class Iter> -inline -Iter -base(input_iterator<Iter> i) -{ - return i.base(); -} - -template <class It> -class forward_iterator -{ - It it_; - - template <class U> friend class forward_iterator; -public: - typedef std::forward_iterator_tag iterator_category; - typedef typename std::iterator_traits<It>::value_type value_type; - typedef typename std::iterator_traits<It>::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits<It>::reference reference; - - It base() const {return it_;} - - forward_iterator() : it_() {} - explicit forward_iterator(It it) : it_(it) {} - template <class U> - forward_iterator(const forward_iterator<U>& 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 <class T, class U> -inline -bool -operator==(const forward_iterator<T>& x, const forward_iterator<U>& y) -{ - return x.base() == y.base(); -} - -template <class T, class U> -inline -bool -operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y) -{ - return !(x == y); -} - -template <class Iter> -inline -Iter -base(forward_iterator<Iter> i) -{ - return i.base(); -} - -template <class It> -class bidirectional_iterator -{ - It it_; - - template <class U> friend class bidirectional_iterator; -public: - typedef std::bidirectional_iterator_tag iterator_category; - typedef typename std::iterator_traits<It>::value_type value_type; - typedef typename std::iterator_traits<It>::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits<It>::reference reference; - - It base() const {return it_;} - - bidirectional_iterator() : it_() {} - explicit bidirectional_iterator(It it) : it_(it) {} - template <class U> - bidirectional_iterator(const bidirectional_iterator<U>& 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 <class T, class U> -inline -bool -operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y) -{ - return x.base() == y.base(); -} - -template <class T, class U> -inline -bool -operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y) -{ - return !(x == y); -} - -template <class Iter> -inline -Iter -base(bidirectional_iterator<Iter> i) -{ - return i.base(); -} - -template <class It> -class random_access_iterator -{ - It it_; - - template <class U> friend class random_access_iterator; -public: - typedef std::random_access_iterator_tag iterator_category; - typedef typename std::iterator_traits<It>::value_type value_type; - typedef typename std::iterator_traits<It>::difference_type difference_type; - typedef It pointer; - typedef typename std::iterator_traits<It>::reference reference; - - It base() const {return it_;} - - random_access_iterator() : it_() {} - explicit random_access_iterator(It it) : it_(it) {} - template <class U> - random_access_iterator(const random_access_iterator<U>& 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 <class T, class U> -inline -bool -operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y) -{ - return x.base() == y.base(); -} - -template <class T, class U> -inline -bool -operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y) -{ - return !(x == y); -} - -template <class T, class U> -inline -bool -operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y) -{ - return x.base() < y.base(); -} - -template <class T, class U> -inline -bool -operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y) -{ - return !(y < x); -} - -template <class T, class U> -inline -bool -operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y) -{ - return y < x; -} - -template <class T, class U> -inline -bool -operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y) -{ - return !(x < y); -} - -template <class T, class U> -inline -typename std::iterator_traits<T>::difference_type -operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y) -{ - return x.base() - y.base(); -} - -template <class Iter> -inline -Iter -base(random_access_iterator<Iter> i) -{ - return i.base(); -} - -template <class Iter> -inline -Iter -base(Iter i) -{ - return i; -} - -#endif // ITERATORS_H |
