diff options
Diffstat (limited to 'libcxx/test')
364 files changed, 389 insertions, 388 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 135293d47c3..a20d6ab7df8 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 "test_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 582717194d5..039fd2fe026 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 "test_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 6e94cd9d143..ab402a5eb8b 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 "test_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 cb755919214..f594a0bf618 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 "test_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 7960800451a..c72adac9e2e 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 "test_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 309d8a99f2c..b9be7c0ab3f 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 "test_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 bdf6acc8f99..f166d67ba2f 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 "test_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 64c6b00c2c8..249419169a1 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 "test_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 4eb6e9123af..43234be5d3b 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 "test_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 64584379959..02b6b16eca0 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 "test_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 2f7c026b0ff..6098a203d82 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 "test_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 81fb4075d4a..8eddfbc4d04 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 "test_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 8c28bdfd7ca..67e1cccaf73 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 "test_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 6056576cedf..f5b832c6639 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 "test_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 41bb315d381..7810dec2fe1 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 "test_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 8ca008fe2e8..80f86568c4d 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 "test_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 1bb2e63a759..bf5f79cf835 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 "test_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 7fb1d041bb8..de3f0a74104 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 "test_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 7493b87cae2..6da3a677a15 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 "test_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 3a4f3bfbaaf..f6033351ffc 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 "test_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 02bf2aa4778..3c4d0e50817 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 "test_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 d8c142e476d..1eff3d39e20 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 "test_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 a22e7fa4f2f..8d6ab04e14d 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 "test_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 4656a9d75eb..6c49605b661 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 "test_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 e6ffd4df2c7..70840d187bf 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 "test_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 949bb5ce585..b7da7354ca2 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 "test_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 b8a764d77a1..f2ad535a2f9 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 "test_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 9366564131e..24fc47eafc7 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 "test_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 95455fff201..8491ea59eff 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 "test_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 9c9c0d26a54..68556fd9881 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 "test_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 ca6eee6381d..ab4ffad60f9 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 "test_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 e3a59b86d2e..761dad4ecd0 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 "test_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 2e62ab6c321..6819899a114 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 "test_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 58df57d4a13..c6df235bed6 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 "test_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 e1b329867f5..ee030925d55 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 "test_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 d48861154a5..4d172ff8139 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 "test_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 7c900a7fcae..c3c34808819 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 "test_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 dd3de59fafe..d096e20d2d2 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 "test_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 39ecfb25eb8..260e5edece5 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 "test_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 33118c915e1..025bc06a618 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 "test_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 d77e1e3de4a..1b1a2ad420f 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 "test_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 bb3c947e2eb..b21d38b6ae5 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 "test_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 bdf9edc7681..e95162b4ad7 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 "test_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 1bd7509c8f8..411858d5b76 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 "test_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 31816a0bde8..966207671fc 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 "test_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 54957f31f31..d1d954ca0ca 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 "test_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 a078f063073..09f0f41215c 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 "test_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 321e0c22196..bde6ff389d0 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 "test_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 6c706315545..661e643f07d 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 "test_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 a3e3c6cdea4..bf80c2c6edd 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 "test_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 6f17853aac4..f68ccedbbd6 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 "test_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 e0125d591d2..2a3174f511c 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 "test_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 89fbb846343..f4ea161891b 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 "test_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 0a7e5c7e317..e5c2dd29d11 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 "test_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 193fc57e6e2..192da03d67b 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 "test_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 0ab71de8e10..9dfebacf57c 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 "test_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 ea842a62ee7..0258479b08f 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 "test_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 bf1c5dd3651..253e0e38690 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 "test_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 2860955b82b..1d2840921e8 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 "test_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 e15c9c1cf01..ce659c1b50f 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 "test_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 cd17c4c1596..2b29e2c8435 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 "test_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 804f65d9222..ce4f7ced5e6 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 "test_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 f68c670ed6d..ae65c59e315 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 "test_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 9c4ee64d89c..3659e08fb28 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 "test_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 abc7d880a5c..dd5fcfc2852 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 "test_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 f3b294f22f7..3fa8b2c6e5d 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 "test_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 1c78a50620c..f5f1c07fa02 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 "test_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 f4317eb2f71..01db088aa43 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 "test_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 7bc0809f472..8da8dfee719 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 "test_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 0536813aabb..be19710bf13 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 "test_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 77c072727c6..8ef6d542dd3 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 "test_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 4681041a537..2788b193200 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 "test_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 d4bde658b54..c99c6936ef5 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 "test_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 cba481368be..fd41f7a9ad7 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 "test_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 698729813ec..55d7215a40e 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 "test_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 daf1990c79e..6cdb87dedb4 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 "test_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 6bd532dbcfe..cc0e66e175c 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 "test_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 422f6e7acfb..fb58c718c7e 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 "test_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 caea596cf7c..8e87e9a4351 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 "test_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 ddff3ba12fb..d2fa2cb98b0 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 "test_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 220c8d68e22..51b7aa8c11b 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 "test_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 ab9df3e6dec..8db8177fb9c 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 "test_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 cc904f6e30a..7e1aef4749a 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 "test_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 1f7001ac07d..c2c20c295ca 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 "test_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 6217c45ee71..2b5a6a9f56b 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 "test_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 eea9972b465..f371890d8e7 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 "test_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 7f02ffd56a0..035522b5462 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 "test_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 46a564873d7..ea3812a7f1c 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 "test_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 ae880e45741..ba1f61a1067 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 "test_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 8b18c504d46..46578501d77 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 "test_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 0051e27c300..3d63e3fb9c4 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 "test_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 af75647f867..dd6b5c1766a 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 "test_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 cdeb3cd9be2..d5a34e2f2cb 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 "test_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 8dc1f835667..bef01027472 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 "test_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 2e445cfccce..68ed29c6f4b 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 "test_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 577dd9265bd..5f298fde7b3 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 "test_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 a075d02aed2..df8fb9eacac 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 "test_iterators.h" template <class Iter> void diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp index 6f26dfe3617..307e3e42f39 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp index 071c088886a..fcd4cee8f9b 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp index 5a09b087301..231e0c57a6e 100644 --- a/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp index 34d22267a9b..d8a3c145370 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp index 5f32267fb6b..a83e2ae581d 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp @@ -18,7 +18,7 @@ #include <set> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp index 3c2f6e3ed86..0bbaaf12eab 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" int main() diff --git a/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp b/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp index a22f5f834a8..3bc3a61544d 100644 --- a/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp index e1030c552b7..ff068503e5b 100644 --- a/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp index 6986db5460a..9b4992bdb09 100644 --- a/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp @@ -18,7 +18,7 @@ #include <set> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp b/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp index ee07bb2ca37..18bc0839003 100644 --- a/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" int main() diff --git a/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp index 6ce1bf8d605..da5a61630b4 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp @@ -15,7 +15,7 @@ #include <deque> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" std::deque<int> make(int size, int start = 0 ) diff --git a/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp index d7d8668c1a6..b92ba136a3d 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" std::deque<int> make(int size, int start = 0 ) diff --git a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp index 4c6604f489e..a43c344cb9b 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../stack_allocator.h" -#include "../../../../iterators.h" +#include "test_iterators.h" template <class InputIterator> void diff --git a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp index 86271fa455c..cfa86a94e88 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <deque> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_allocator.h" template <class InputIterator, class Allocator> diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp index 777fc7e44f6..7132ff4c6a3 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp @@ -15,7 +15,7 @@ #include <deque> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../MoveOnly.h" #include "../../../stack_allocator.h" diff --git a/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp index bca245e6669..c5ef688be52 100644 --- a/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp @@ -18,7 +18,7 @@ #include <deque> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" std::deque<int> make(int size, int start = 0 ) diff --git a/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp index 74e84bc1a58..7544ba82836 100644 --- a/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp @@ -18,7 +18,7 @@ #include <deque> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" std::deque<int> make(int size, int start = 0 ) diff --git a/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp index 36c37e0075c..c4d36513e8d 100644 --- a/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp @@ -18,7 +18,7 @@ #include <deque> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" std::deque<int> make(int size, int start = 0 ) diff --git a/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp index 5b4726e4a96..b56bf721bcb 100644 --- a/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp @@ -18,7 +18,7 @@ #include <deque> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" std::deque<int> make(int size, int start = 0 ) diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp index db6b587d461..38fef428725 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include <iterator> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp index 2986f61451e..e9c8aba916f 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include <iterator> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp index 5709c7b0bd1..0eec764f3fe 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp @@ -18,7 +18,7 @@ #include <iterator> #include "../../../test_allocator.h" -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp index 544eb0b73f0..4d8ccc2e46a 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp @@ -16,7 +16,7 @@ #include <forward_list> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp index 760a15e07f9..859f6bca6b4 100644 --- a/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../stack_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp index b64fd2d51be..e2c01ee4d9f 100644 --- a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class C, class Iterator> void diff --git a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp index df99cb53384..70932b114b9 100644 --- a/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <vector> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class C, class Iterator> void diff --git a/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp index 1f24c2e00dd..6d150cdd0fe 100644 --- a/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp index c284f63bad1..9c9b88e73dd 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../stack_allocator.h" template <class C, class Iterator> diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp index 8f21cd21993..17bba911e32 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../stack_allocator.h" template <class C, class Iterator> diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp index 878258ca13a..84998b24eac 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp index 9b9d5ab5994..0c4ccec7f39 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp index 9be6a3bf01f..0d8b1a7e4ce 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp index 05fa7889a60..0d55b26c1af 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp @@ -22,7 +22,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp index 4f4784fb452..0c81503e17f 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp @@ -22,7 +22,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp index d4f7b9f3490..c8371ce006e 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -23,7 +23,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp index ee605575b32..532c7cb22cc 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp index 2f01680ded8..eda189a7a1a 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp index 1055fbfd6ef..5894e63792c 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp index 1ab664e1701..c02aa5336d6 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp index fb2b6a421a5..c3ce6189dce 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp @@ -22,7 +22,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp index 23a38b2cf22..a13eba0e9c3 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp @@ -22,7 +22,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp index 8abeb3bd04b..402ef6bef92 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -23,7 +23,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp index 1cdc45ebee5..cab85081d87 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp index 43b6c994106..fa445472774 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp index bb4216d5a7d..db82f65ac5a 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp index 44dddfdb0ba..93d5e837735 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp @@ -19,7 +19,7 @@ #include <unordered_set> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp index ac977595f72..92a5e98d0e4 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp index 1fdee83934f..6d2aff60601 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp index 0f3ff9741d6..fbec983692c 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp index c0f3c310e93..c70187566ab 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp index 585adeb18fa..ba94ac43e4c 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -22,7 +22,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp index 57588f442f1..3b1abdf4896 100644 --- a/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp index cf713026acd..b0b8fc62874 100644 --- a/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp @@ -19,7 +19,7 @@ #include <unordered_set> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp index 6419f3339af..1515a0c2df7 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp index 531a5f03ac6..33d8f3a1149 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp index d84d7266082..deabebdbeab 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp index 266c2cbb134..a0fafaddee3 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp index b2e9914875d..c6153df62be 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp @@ -22,7 +22,7 @@ #include <cassert> #include <cfloat> -#include "../../../../iterators.h" +#include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" diff --git a/libcxx/test/depr/depr.c.headers/math_h.pass.cpp b/libcxx/test/depr/depr.c.headers/math_h.pass.cpp index 9bc3116eb45..9e93966f41e 100644 --- a/libcxx/test/depr/depr.c.headers/math_h.pass.cpp +++ b/libcxx/test/depr/depr.c.headers/math_h.pass.cpp @@ -13,7 +13,7 @@ #include <type_traits> #include <cassert> -#include "../../hexfloat.h" +#include "hexfloat.h" void test_acos() { diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp index 24d130cd8ea..1da38569821 100644 --- a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp +++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp @@ -16,7 +16,7 @@ #include <fstream> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> struct test_buf diff --git a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp index af6c651815c..e34bc844bd2 100644 --- a/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp +++ b/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp @@ -16,7 +16,7 @@ #include <fstream> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> struct test_buf diff --git a/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp b/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp index 297319c1546..cdd762a94a0 100644 --- a/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp +++ b/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp @@ -14,7 +14,7 @@ #include <iomanip> #include <cassert> -#include "../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> struct testbuf diff --git a/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp b/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp index 825b9959d02..686655245d5 100644 --- a/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp +++ b/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp @@ -14,7 +14,7 @@ #include <iomanip> #include <cassert> -#include "../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> struct testbuf diff --git a/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp b/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp index e6d3d3891fc..8d15dd93e0b 100644 --- a/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp +++ b/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp @@ -14,7 +14,7 @@ #include <iomanip> #include <cassert> -#include "../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> class testbuf diff --git a/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp b/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp index ca4d7e13072..d64ca07f830 100644 --- a/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp +++ b/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp @@ -14,7 +14,7 @@ #include <iomanip> #include <cassert> -#include "../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> class testbuf diff --git a/libcxx/test/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp b/libcxx/test/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp index db5781130d4..c0ed3150457 100644 --- a/libcxx/test/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp +++ b/libcxx/test/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp @@ -18,7 +18,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class test : public std::ios diff --git a/libcxx/test/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp b/libcxx/test/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp index 66bf829775b..4e34c08ab08 100644 --- a/libcxx/test/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp +++ b/libcxx/test/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp @@ -18,7 +18,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class test : public std::ios diff --git a/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/copyfmt.pass.cpp b/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/copyfmt.pass.cpp index 95048deda9c..80f6e2672de 100644 --- a/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/copyfmt.pass.cpp +++ b/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/copyfmt.pass.cpp @@ -17,7 +17,7 @@ #include <streambuf> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros struct testbuf : public std::streambuf diff --git a/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp b/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp index 33c32a79da4..6d4ce5f577f 100644 --- a/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp +++ b/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp @@ -17,7 +17,7 @@ #include <streambuf> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros struct testbuf : public std::streambuf diff --git a/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/move.pass.cpp b/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/move.pass.cpp index 647606da856..eb9262c9d81 100644 --- a/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/move.pass.cpp +++ b/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/move.pass.cpp @@ -17,7 +17,7 @@ #include <streambuf> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros struct testbuf : public std::streambuf diff --git a/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/swap.pass.cpp b/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/swap.pass.cpp index 5a59b350c7e..08b8ec4a9b6 100644 --- a/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/swap.pass.cpp +++ b/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/swap.pass.cpp @@ -17,7 +17,7 @@ #include <streambuf> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros struct testbuf : public std::streambuf diff --git a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp index 8af132e5be6..c1e18392b6c 100644 --- a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp +++ b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp @@ -17,7 +17,7 @@ #include <streambuf> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> struct test diff --git a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp index 3869c0bcf00..d8ca8aebc62 100644 --- a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp +++ b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp @@ -17,7 +17,7 @@ #include <streambuf> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> struct test diff --git a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp index 2b8181f5011..2c4f22b1cf0 100644 --- a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp +++ b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp @@ -18,7 +18,7 @@ #include <streambuf> #include <cassert> -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> struct test diff --git a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp index bde1676777c..803198938f6 100644 --- a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp +++ b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp @@ -17,7 +17,7 @@ #include <streambuf> #include <cassert> -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> struct test diff --git a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp index 9a07e9496ad..7a23206b42d 100644 --- a/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp +++ b/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp @@ -17,7 +17,7 @@ #include <streambuf> #include <cassert> -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros template <class CharT> struct test diff --git a/libcxx/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp b/libcxx/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp index db3dcc15760..e395da299dc 100644 --- a/libcxx/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp +++ b/libcxx/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp @@ -21,7 +21,7 @@ #include <iterator> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp b/libcxx/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp index aaea842a15e..7fef635838c 100644 --- a/libcxx/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp +++ b/libcxx/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp @@ -20,7 +20,7 @@ #include <iterator> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp b/libcxx/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp index 6d99ed2b4b7..f584110499b 100644 --- a/libcxx/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp +++ b/libcxx/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp @@ -15,7 +15,7 @@ #include <iterator> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp b/libcxx/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp index 44ceb007fdb..0641706c928 100644 --- a/libcxx/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp +++ b/libcxx/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp @@ -15,7 +15,7 @@ #include <iterator> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp index 6990459bd91..19535c760de 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp @@ -18,7 +18,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp index 62938c9465d..d52175c9229 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp @@ -20,7 +20,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp index ff975f6c670..e67ebfca371 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp @@ -18,7 +18,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp index 794fb970cc3..e9a19f4932c 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp index 6b6a8991131..5de1bccf877 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp index 5ed8e8c5baf..852f76a4a4d 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp index f5439bea095..f8630736980 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp index bc1b48bc945..fb4f0fa1dc1 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp index 1af51a1bd88..0edd2857c08 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp index e4c942158ee..cb9cdb9aeb4 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp index d0d1e889042..e7979ddd746 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp index 6dfecdab303..97a7bfdee46 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp index 3f1e517dc40..9e4b9e37202 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void 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 6a370a83d24..8c73a7d5c93 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 @@ -18,7 +18,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It, class U> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp index 30e4e14dcd3..782cb602032 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp @@ -15,7 +15,7 @@ #include <iterator> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp index ef37caf4a81..4a4a0601837 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp index bb1ddb3d6d6..26fab5be793 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp index a6ea855cc14..700b3b63774 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp index 8ef9305d084..e7c13b57962 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp index 4fae863af6c..f27c737277d 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp index 064d95eb677..8d507b822cd 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp @@ -20,7 +20,7 @@ #include <memory> #endif -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void 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 919302c2d57..449f7e809db 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 @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It, class U> void diff --git a/libcxx/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp b/libcxx/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp index 62398aa0d8f..9bdf7215e9e 100644 --- a/libcxx/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp @@ -26,7 +26,7 @@ #include <iterator> #include <type_traits> -#include "../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp index a809273695e..72a767d1711 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp @@ -15,7 +15,7 @@ #include <iterator> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp index 899c54ad060..ea213c0dcf0 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void 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 ef3382f2b6c..280e7d59ae8 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 @@ -18,7 +18,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It, class U> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp index 6bf2db7763a..29da57e3b5a 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op!=/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp index 74cc1a53b9c..bd936060c4d 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp index fed4fb3a5ad..f68a612fae6 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp index c823f1012a1..39129d6b64d 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp index 69f26e2fc7f..ac97aaf8c20 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp index b8ec2cb564d..c3126e8c21f 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp index 6292292e2ab..f9361cf9c72 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp index 29c600f5d88..79d477976fb 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp index ab34c31e00a..93addf99dc6 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void 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 dc20326b832..92573f9a924 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 @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It, class U> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp index 85b589f40c3..3da4b951df1 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp index 3b878ec54e7..437bb6f9f7e 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp @@ -20,7 +20,7 @@ #include <cstddef> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It1, class It2> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp index 18ce7bafdb0..afbb334ebfd 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp index 7732a3ae9e2..c6e79aff126 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp index 9296c2bde06..16f4a072855 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp index fb91b060be1..2b389b853a5 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp index 0331f02605f..6c4f05cdf65 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp @@ -19,7 +19,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp index 46720b8b913..74747cb1f0f 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp @@ -18,7 +18,7 @@ #include <iterator> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" template <class It> void diff --git a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp index 5bff9806c49..292a777876f 100644 --- a/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp +++ b/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp @@ -28,7 +28,7 @@ #include <iterator> #include <type_traits> -#include "../../../../iterators.h" +#include "test_iterators.h" template <class It> struct find_current diff --git a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp index f564adaea88..d64412521b7 100644 --- a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp @@ -24,7 +24,7 @@ #include <stdio.h> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp index 9ebf2f98416..f8641cb1eb6 100644 --- a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp index 70898d17db7..20a7d48fe30 100644 --- a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp @@ -19,7 +19,7 @@ #include <stdio.h> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp index 021d92d4ab9..04974b244e4 100644 --- a/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp @@ -27,7 +27,7 @@ #include <stdio.h> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp index 736be10cf56..bc55f009e0a 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::codecvt_byname<wchar_t, char, std::mbstate_t> F; diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp index ec6b95bfb6d..0ade80ae2bc 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp @@ -17,7 +17,7 @@ #include <type_traits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp index e573574ca55..39f60714143 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp @@ -20,7 +20,7 @@ #include <stdio.h> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp index c1edbfaf0b9..04d061bcf63 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp index 1a758013dfe..7165dc93545 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp @@ -18,7 +18,7 @@ #include <vector> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp index d3da67e29a7..ab087942046 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp @@ -20,7 +20,7 @@ #include <stdio.h> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp index 603c33ad531..126fc5ab681 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp @@ -20,7 +20,7 @@ #include <stdio.h> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp index e5c76c8b879..f97944e5f9d 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp index 11eba5293bf..4543c93d20e 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp @@ -17,7 +17,7 @@ #include <string> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp index e31a808eb8d..7548b3329c5 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp index 6a6c9ef5d8a..95ec1ff7d14 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp @@ -17,7 +17,7 @@ #include <string> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp index aaa5fe962e5..03e8dfcef97 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp @@ -25,7 +25,7 @@ #include <type_traits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp index 022a595007c..ed56dd38c9f 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include <limits.h> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp index bf229596104..c522762df28 100644 --- a/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp @@ -20,7 +20,7 @@ #include <vector> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp index 49448d54e08..edd9015c8f5 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_get<char, input_iterator<const char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp index 6d32770f212..2800b49887d 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_get<char, input_iterator<const char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp index c33e51c2430..82e47471556 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_get<char, input_iterator<const char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp index 3b342de4954..cc5d825e1b5 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_get<char, input_iterator<const char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp index a6efb9c9cad..29c526648bc 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_get<char, input_iterator<const char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp index 4c58309c0e6..861480756c9 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_put<char, output_iterator<char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp index b8434cd57a8..f7ca56bf93f 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_put<char, output_iterator<char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp index 76c33ea566c..07481dec350 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_put<char, output_iterator<char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp index 84c1fef8a08..8dc68c1a004 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_put<char, output_iterator<char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp index 27e9de61bbf..13c6ef75b78 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp @@ -18,9 +18,9 @@ #include <ios> #include <streambuf> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::money_put<char, output_iterator<char*> > Fn; diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp index 3f8c701124c..33ffe54fa70 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class Fnf : public std::moneypunct_byname<char, false> diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp index 9e6a629b8f1..b0fa38f5de0 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class Fnf : public std::moneypunct_byname<char, false> diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp index 7893d21d173..6bfb097525b 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class Fnf : public std::moneypunct_byname<char, false> diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp index 63bf30818a0..1c140373a81 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class Fnf : public std::moneypunct_byname<char, false> diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp index 25ab9c4f281..0ab295765e4 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class Fnf : public std::moneypunct_byname<char, false> diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp index a84c3c62d5b..97fcdaa1ac0 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class Fnf : public std::moneypunct_byname<char, false> diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp index 7f18d39fbef..d9ea4a4a433 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class Fnf : public std::moneypunct_byname<char, false> diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp index 59990dd1163..3196d480432 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class Fnf : public std::moneypunct_byname<char, false> diff --git a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp index 92b0369023b..b681874decb 100644 --- a/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros class Fnf : public std::moneypunct_byname<char, false> diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp index 897f76424db..4f6f0b47e4f 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp @@ -17,7 +17,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp index 4020e0b3832..a54b37314e8 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include <streambuf> #include <cmath> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp index 9325f02ab5b..4085f08c742 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp @@ -17,7 +17,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp index 21287cdf471..7da56bbb27c 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include <streambuf> #include <cmath> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp index 9c7e4d1d4c8..55f7d0f9fb9 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp @@ -17,7 +17,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp index fa925d00d28..8edcfc41582 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp @@ -17,7 +17,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp index 8b330c2489f..f7a577fb8a9 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp @@ -17,7 +17,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp index 9826f936a0f..debbd5e0ee6 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp @@ -17,7 +17,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp index e41fdc7da8c..f2cc2e7960d 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp @@ -18,7 +18,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp index 8773b292f3e..45505244f76 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp @@ -19,8 +19,8 @@ #include <cassert> #include <streambuf> #include <cmath> -#include "../../../../../iterators.h" -#include "../../../../../hexfloat.h" +#include "test_iterators.h" +#include "hexfloat.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp index 768d0463ed8..9138894784e 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp @@ -19,8 +19,8 @@ #include <cassert> #include <streambuf> #include <cmath> -#include "../../../../../iterators.h" -#include "../../../../../hexfloat.h" +#include "test_iterators.h" +#include "hexfloat.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp index 6f06a9f77c2..d900c3764a1 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp @@ -18,7 +18,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp index 5525ce15a2d..673f8dcce06 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp @@ -19,8 +19,8 @@ #include <cassert> #include <streambuf> #include <cmath> -#include "../../../../../iterators.h" -#include "../../../../../hexfloat.h" +#include "test_iterators.h" +#include "hexfloat.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp index c0b5d2a8806..fe00876251c 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp @@ -18,7 +18,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp index f75fbbc971e..c290722f32d 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp @@ -18,7 +18,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp index 1124e222f11..2d10569796c 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp @@ -18,7 +18,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp index c234f8b09f3..50f0ff5ee5d 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp @@ -18,7 +18,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp index 1f353af0d48..31fbb2a2c81 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp @@ -18,7 +18,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp index 1438bceb9dc..822b83e0ff9 100644 --- a/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp @@ -18,7 +18,7 @@ #include <ios> #include <cassert> #include <streambuf> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::num_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp index b99bfa734c2..f9b8ef24b02 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp @@ -15,9 +15,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::time_get_byname<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp index 011aefebf7f..f9fc39ffe90 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp @@ -15,9 +15,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::time_get_byname<wchar_t, input_iterator<const wchar_t*> > F; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp index e1dc1842c04..a5935bf08d7 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp @@ -17,9 +17,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp index bb8400a769e..4c569ca7f05 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp @@ -17,9 +17,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp index 1d5794fbc06..b9c64d792e1 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp @@ -17,9 +17,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp index 6d8cb1c57f5..17ddaceb359 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp @@ -17,9 +17,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp index 51b17b37ca5..473bc277636 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp @@ -16,9 +16,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp index a23869ea582..6d58337afb9 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp @@ -16,9 +16,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp index f23b737168e..094a52c071a 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp @@ -17,9 +17,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp index 5035519e28a..451e87f8f9d 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp @@ -17,9 +17,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp index 2ecdd0d562f..39a6fe928c1 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp @@ -17,9 +17,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp index deee27ecda3..951aee5f30c 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp @@ -17,9 +17,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp index a7d0e8f49a7..b558f43c639 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp @@ -16,9 +16,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp index 81eb3b2a83a..088849d9ae1 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp @@ -16,9 +16,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp index 64de281db5c..264494ba618 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp @@ -15,7 +15,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::time_get<char, input_iterator<const char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp index 25fb8f398e5..6b8bd73bed5 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp index 89a9ac79f5b..4c663a3bc69 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp index fa3f4d996c1..39a10b48ada 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp index 8055544341b..19e378ce8f5 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp index 3baa47a0079..1761a6d8c03 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp index 6bca2670bba..05182c288e4 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp index d7b6f4776a3..b8b05f6dc7f 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp index 85ef7c7afdb..679d0584076 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp index 2ddcef7c30c..918a9026f30 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp index dfce7e9e4f7..5212eb12b1d 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const wchar_t*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp index f8a5fb97d10..6e5e04d25a5 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef input_iterator<const char*> I; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp index 2d07b4a0111..270af25d0f7 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp @@ -23,9 +23,9 @@ #include <locale> #include <cassert> -#include "../../../../iterators.h" +#include "test_iterators.h" -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros typedef std::time_put_byname<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp index bd3133088b6..408141d7daa 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::time_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp index 3e6d0670cd1..577655f7263 100644 --- a/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp +++ b/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../../iterators.h" +#include "test_iterators.h" typedef std::time_put<char, output_iterator<char*> > F; diff --git a/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp b/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp index fbfd189ccf3..7becb8c1de9 100644 --- a/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp +++ b/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp b/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp index ec0ed36a582..78bd944bf44 100644 --- a/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp +++ b/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp b/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp index 10eebffed3c..9fdca1d41c0 100644 --- a/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp +++ b/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp @@ -16,7 +16,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locales/locale/locale.cons/assign.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/assign.pass.cpp index b6fcf3e73e6..c894b628180 100644 --- a/libcxx/test/localization/locales/locale/locale.cons/assign.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.cons/assign.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <new> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int new_called = 0; diff --git a/libcxx/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp index 737da285dd7..d279bf09233 100644 --- a/libcxx/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <new> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int new_called = 0; diff --git a/libcxx/test/localization/locales/locale/locale.cons/copy.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/copy.pass.cpp index 03845757d26..73ef24bca73 100644 --- a/libcxx/test/localization/locales/locale/locale.cons/copy.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.cons/copy.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <new> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int new_called = 0; diff --git a/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp index 9a7809fc7f8..0d46a763de2 100644 --- a/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp @@ -15,7 +15,7 @@ #include <new> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int new_called = 0; diff --git a/libcxx/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp index 0e6c071c663..f5b959aca80 100644 --- a/libcxx/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp @@ -15,7 +15,7 @@ #include <new> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int new_called = 0; diff --git a/libcxx/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp index e8016f48b2b..cbf6185990c 100644 --- a/libcxx/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp @@ -15,7 +15,7 @@ #include <new> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int new_called = 0; diff --git a/libcxx/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp index 586febb02be..87041a290ec 100644 --- a/libcxx/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp @@ -15,7 +15,7 @@ #include <new> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int new_called = 0; diff --git a/libcxx/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp index 3b43e70e569..5774097fb5a 100644 --- a/libcxx/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp @@ -15,7 +15,7 @@ #include <new> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int new_called = 0; diff --git a/libcxx/test/localization/locales/locale/locale.cons/string.pass.cpp b/libcxx/test/localization/locales/locale/locale.cons/string.pass.cpp index 8cfeccf78fe..55694be2068 100644 --- a/libcxx/test/localization/locales/locale/locale.cons/string.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.cons/string.pass.cpp @@ -15,7 +15,7 @@ #include <new> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int new_called = 0; diff --git a/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp b/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp index 9948854fa56..9d9b1423f33 100644 --- a/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp @@ -14,7 +14,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp b/libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp index b3cf68e3b41..ec118e07ff2 100644 --- a/libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp @@ -14,7 +14,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp b/libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp index ca73505d37c..59a6bc6dd38 100644 --- a/libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp +++ b/libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp @@ -14,7 +14,7 @@ #include <locale> #include <cassert> -#include "../../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros void check(const std::locale& loc) { diff --git a/libcxx/test/numerics/c.math/cmath.pass.cpp b/libcxx/test/numerics/c.math/cmath.pass.cpp index 7fa763b66bb..09b1fe411ab 100644 --- a/libcxx/test/numerics/c.math/cmath.pass.cpp +++ b/libcxx/test/numerics/c.math/cmath.pass.cpp @@ -13,7 +13,7 @@ #include <type_traits> #include <cassert> -#include "../../hexfloat.h" +#include "hexfloat.h" void test_abs() { diff --git a/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp b/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp index d6b303bb697..aae97ef4117 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 <numeric> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class Iter, class T> 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 53f460b25a9..19a872868bf 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class Iter, class T> 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 7eccaeb9c5d..623371edc97 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 <numeric> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class InIter, class OutIter> 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 bba7161bc17..a8fbfbe00f6 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class InIter, class OutIter> 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 d23af2f011f..68a8c49b82b 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 <numeric> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class Iter1, class Iter2, class T> 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 cf6f9c4aee0..31dbbd0bec5 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class Iter1, class Iter2, class T> void 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 84f78301e1a..eb7c8373ad5 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 <numeric> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class InIter> 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 5d990a235bd..cb468e019bb 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 <numeric> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class InIter, class OutIter> 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 3c3f403f4a3..d8f2a93e41c 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 <functional> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class InIter, class OutIter> void diff --git a/libcxx/test/re/re.alg/re.alg.match/awk.pass.cpp b/libcxx/test/re/re.alg/re.alg.match/awk.pass.cpp index 4b0ed7ce845..50cc55c43df 100644 --- a/libcxx/test/re/re.alg/re.alg.match/awk.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.match/awk.pass.cpp @@ -20,7 +20,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.match/basic.pass.cpp b/libcxx/test/re/re.alg/re.alg.match/basic.pass.cpp index c18109c60a8..55c73618fbd 100644 --- a/libcxx/test/re/re.alg/re.alg.match/basic.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.match/basic.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.match/ecma.pass.cpp b/libcxx/test/re/re.alg/re.alg.match/ecma.pass.cpp index f741622bd6b..50c5cc61714 100644 --- a/libcxx/test/re/re.alg/re.alg.match/ecma.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.match/ecma.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.match/egrep.pass.cpp b/libcxx/test/re/re.alg/re.alg.match/egrep.pass.cpp index 2106bd1e394..dd2e6038dc3 100644 --- a/libcxx/test/re/re.alg/re.alg.match/egrep.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.match/egrep.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.match/extended.pass.cpp b/libcxx/test/re/re.alg/re.alg.match/extended.pass.cpp index 3c6be081ca0..683f65bb12b 100644 --- a/libcxx/test/re/re.alg/re.alg.match/extended.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.match/extended.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.match/grep.pass.cpp b/libcxx/test/re/re.alg/re.alg.match/grep.pass.cpp index 954f8a46938..2dc0966d6b8 100644 --- a/libcxx/test/re/re.alg/re.alg.match/grep.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.match/grep.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.replace/test1.pass.cpp b/libcxx/test/re/re.alg/re.alg.replace/test1.pass.cpp index cc51ec3a538..9fd84fdc1f6 100644 --- a/libcxx/test/re/re.alg/re.alg.replace/test1.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.replace/test1.pass.cpp @@ -22,7 +22,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.replace/test2.pass.cpp b/libcxx/test/re/re.alg/re.alg.replace/test2.pass.cpp index 4be5a1292af..63a4ed56933 100644 --- a/libcxx/test/re/re.alg/re.alg.replace/test2.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.replace/test2.pass.cpp @@ -22,7 +22,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.search/awk.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/awk.pass.cpp index e8193a2911b..57606c1bb8a 100644 --- a/libcxx/test/re/re.alg/re.alg.search/awk.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.search/awk.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.search/basic.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/basic.pass.cpp index 824c82c5546..56396f31dd2 100644 --- a/libcxx/test/re/re.alg/re.alg.search/basic.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.search/basic.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp index 52efef00a36..8149157f28e 100644 --- a/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp index 562cc082eed..1dffed44f22 100644 --- a/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.search/extended.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/extended.pass.cpp index e1a5ca74be6..8240872d116 100644 --- a/libcxx/test/re/re.alg/re.alg.search/extended.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.search/extended.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp b/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp index 018118ba007..113243ecd34 100644 --- a/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp +++ b/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp b/libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp index 493c9fa95e8..529a64a239a 100644 --- a/libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp +++ b/libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp b/libcxx/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp index e16bb729ea8..a38e1623419 100644 --- a/libcxx/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp +++ b/libcxx/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class Iter> void diff --git a/libcxx/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp b/libcxx/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp index 37b66e9edbb..c4c440e6d24 100644 --- a/libcxx/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp +++ b/libcxx/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp @@ -18,7 +18,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" template <class Iter> void diff --git a/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp b/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp index 173ecdd99c1..be0b26dc5c2 100644 --- a/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp +++ b/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/re/re.results/re.results.form/form1.pass.cpp b/libcxx/test/re/re.results/re.results.form/form1.pass.cpp index 602311c636d..9701c60ba77 100644 --- a/libcxx/test/re/re.results/re.results.form/form1.pass.cpp +++ b/libcxx/test/re/re.results/re.results.form/form1.pass.cpp @@ -19,7 +19,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.results/re.results.form/form2.pass.cpp b/libcxx/test/re/re.results/re.results.form/form2.pass.cpp index 447b39b0b0b..9e82c1f6bfe 100644 --- a/libcxx/test/re/re.results/re.results.form/form2.pass.cpp +++ b/libcxx/test/re/re.results/re.results.form/form2.pass.cpp @@ -21,7 +21,7 @@ #include <regex> #include <cassert> -#include "../../../iterators.h" +#include "test_iterators.h" #include "../../test_allocator.h" int main() diff --git a/libcxx/test/re/re.traits/default.pass.cpp b/libcxx/test/re/re.traits/default.pass.cpp index babc1c5412e..c9a97e025ac 100644 --- a/libcxx/test/re/re.traits/default.pass.cpp +++ b/libcxx/test/re/re.traits/default.pass.cpp @@ -17,7 +17,7 @@ #include <regex> #include <cassert> -#include "../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/re/re.traits/getloc.pass.cpp b/libcxx/test/re/re.traits/getloc.pass.cpp index d2eb21c8007..27ab6cd8654 100644 --- a/libcxx/test/re/re.traits/getloc.pass.cpp +++ b/libcxx/test/re/re.traits/getloc.pass.cpp @@ -16,7 +16,7 @@ #include <regex> #include <cassert> -#include "../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/re/re.traits/imbue.pass.cpp b/libcxx/test/re/re.traits/imbue.pass.cpp index 224efd71aaf..11eca41de37 100644 --- a/libcxx/test/re/re.traits/imbue.pass.cpp +++ b/libcxx/test/re/re.traits/imbue.pass.cpp @@ -17,7 +17,7 @@ #include <locale> #include <cassert> -#include "../../platform_support.h" // locale name macros +#include "platform_support.h" // locale name macros int main() { diff --git a/libcxx/test/re/re.traits/lookup_classname.pass.cpp b/libcxx/test/re/re.traits/lookup_classname.pass.cpp index 0db61c0b491..6819fb4f3e7 100644 --- a/libcxx/test/re/re.traits/lookup_classname.pass.cpp +++ b/libcxx/test/re/re.traits/lookup_classname.pass.cpp @@ -18,7 +18,7 @@ #include <regex> #include <cassert> -#include "../../iterators.h" +#include "test_iterators.h" template <class char_type> void diff --git a/libcxx/test/re/re.traits/lookup_collatename.pass.cpp b/libcxx/test/re/re.traits/lookup_collatename.pass.cpp index 96acd6791f0..055b5548a70 100644 --- a/libcxx/test/re/re.traits/lookup_collatename.pass.cpp +++ b/libcxx/test/re/re.traits/lookup_collatename.pass.cpp @@ -18,7 +18,7 @@ #include <regex> #include <iterator> #include <cassert> -#include "../../iterators.h" +#include "test_iterators.h" template <class char_type> void diff --git a/libcxx/test/re/re.traits/transform.pass.cpp b/libcxx/test/re/re.traits/transform.pass.cpp index 780826dcfcb..9b9feb130b3 100644 --- a/libcxx/test/re/re.traits/transform.pass.cpp +++ b/libcxx/test/re/re.traits/transform.pass.cpp @@ -17,7 +17,7 @@ #include <regex> #include <cassert> -#include "../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.traits/transform_primary.pass.cpp b/libcxx/test/re/re.traits/transform_primary.pass.cpp index 869f12e4c34..1e2aca67710 100644 --- a/libcxx/test/re/re.traits/transform_primary.pass.cpp +++ b/libcxx/test/re/re.traits/transform_primary.pass.cpp @@ -18,7 +18,7 @@ #include <regex> #include <cassert> -#include "../../iterators.h" +#include "test_iterators.h" int main() { diff --git a/libcxx/test/re/re.traits/translate_nocase.pass.cpp b/libcxx/test/re/re.traits/translate_nocase.pass.cpp index 86d303ae19a..3afc336268f 100644 --- a/libcxx/test/re/re.traits/translate_nocase.pass.cpp +++ b/libcxx/test/re/re.traits/translate_nocase.pass.cpp @@ -17,7 +17,7 @@ #include <regex> #include <cassert> -#include "../../platform_support.h" +#include "platform_support.h" int main() { diff --git a/libcxx/test/hexfloat.h b/libcxx/test/support/hexfloat.h index 7ef093714fe..7ef093714fe 100644 --- a/libcxx/test/hexfloat.h +++ b/libcxx/test/support/hexfloat.h diff --git a/libcxx/test/platform_support.h b/libcxx/test/support/platform_support.h index 11cdb0452bb..11cdb0452bb 100644 --- a/libcxx/test/platform_support.h +++ b/libcxx/test/support/platform_support.h diff --git a/libcxx/test/iterators.h b/libcxx/test/support/test_iterators.h index 6b3d3d1610c..6b3d3d1610c 100644 --- a/libcxx/test/iterators.h +++ b/libcxx/test/support/test_iterators.h diff --git a/libcxx/test/testit b/libcxx/test/testit index 748c24666ea..945c7004624 100755 --- a/libcxx/test/testit +++ b/libcxx/test/testit @@ -40,6 +40,7 @@ if [ -z "$OPTIONS" ] then OPTIONS="-std=c++0x -stdlib=libc++" fi +OPTIONS="$OPTIONS -I$LIBCXX_ROOT/test/support" if [ -z "$HEADER_INCLUDE" ] then |
