diff options
Diffstat (limited to 'libcxx/test')
810 files changed, 808 insertions, 1060 deletions
diff --git a/libcxx/test/containers/associative/map/map.access/at.pass.cpp b/libcxx/test/containers/associative/map/map.access/at.pass.cpp index 6c001a34428..86b1e3d2dfa 100644 --- a/libcxx/test/containers/associative/map/map.access/at.pass.cpp +++ b/libcxx/test/containers/associative/map/map.access/at.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.access/empty.pass.cpp b/libcxx/test/containers/associative/map/map.access/empty.pass.cpp index 2e542ac8c32..b11e94c8042 100644 --- a/libcxx/test/containers/associative/map/map.access/empty.pass.cpp +++ b/libcxx/test/containers/associative/map/map.access/empty.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp b/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp index 5dfdf400e5e..ab1144c60af 100644 --- a/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp +++ b/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp b/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp index 4c15f088fae..a58d50d8499 100644 --- a/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp +++ b/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp b/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp index 64a6284eabe..7aa713cc5c1 100644 --- a/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp +++ b/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp @@ -29,7 +29,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp b/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp index 6f86d0e9de8..551120d331e 100644 --- a/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp +++ b/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.access/size.pass.cpp b/libcxx/test/containers/associative/map/map.access/size.pass.cpp index ab4b05baa5a..07c12322a46 100644 --- a/libcxx/test/containers/associative/map/map.access/size.pass.cpp +++ b/libcxx/test/containers/associative/map/map.access/size.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp index 95d71da664a..92146734d21 100644 --- a/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp index a583f0d597f..482d1acff84 100644 --- a/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp b/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp index 2c4bb1a8cbc..5a213c8e8b8 100644 --- a/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp index 670acffc458..dcb0856a744 100644 --- a/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp index ce20d69d7c9..15d1a4eb507 100644 --- a/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp index 849240408ab..1512e2dfdfb 100644 --- a/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp index fefb35ce712..8bd45a3646d 100644 --- a/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/default.pass.cpp b/libcxx/test/containers/associative/map/map.cons/default.pass.cpp index 49fc223ffad..2c6908e7b38 100644 --- a/libcxx/test/containers/associative/map/map.cons/default.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/default.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp index 63820beea13..196943653a1 100644 --- a/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp index 0c3bd23a635..08f8a529f03 100644 --- a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> #include "../../../test_compare.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp index d844624560e..93930fc9e85 100644 --- a/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp index d981ccff889..c1029af6889 100644 --- a/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp index 0481de24ccd..837fa8c6cde 100644 --- a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp index 2c767123af1..81fa3c8225e 100644 --- a/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp @@ -20,7 +20,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/move.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move.pass.cpp index 323a26548e9..0a0ca445585 100644 --- a/libcxx/test/containers/associative/map/map.cons/move.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/move.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp index 2bb2c061258..d377ad87d85 100644 --- a/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp @@ -19,7 +19,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp index 2e6ede7bec7..8b0eca74256 100644 --- a/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp @@ -19,7 +19,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp index 77f50badfef..c37499df307 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp index 9a87becf684..5ac44286376 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp @@ -20,7 +20,7 @@ #include "../../../Emplaceable.h" #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp index bf8173f770d..7ce8c19805f 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp @@ -19,7 +19,7 @@ #include "../../../Emplaceable.h" #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp index 086096b7c8b..05fb988e991 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp index 6589ace8ff1..1b49956d8a5 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp index 4a93173a704..e41f5129140 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp index 24d3f84ea30..3d28242fd32 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp index bc7e760fad0..ab325ed45bf 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp index 43ca35a099f..278db4631a8 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 d1acdf2b826..964738b4a68 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 @@ -18,7 +18,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp index e84a82b609a..22164202932 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp b/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp index c5724c42980..fea88957a70 100644 --- a/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp +++ b/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.ops/count.pass.cpp b/libcxx/test/containers/associative/map/map.ops/count.pass.cpp index 70eadac3f8f..6628e3d8973 100644 --- a/libcxx/test/containers/associative/map/map.ops/count.pass.cpp +++ b/libcxx/test/containers/associative/map/map.ops/count.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp b/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp index b08acb08693..dff751c3724 100644 --- a/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp +++ b/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/map/map.ops/find.pass.cpp b/libcxx/test/containers/associative/map/map.ops/find.pass.cpp index 4d1beabc815..a7578449f5b 100644 --- a/libcxx/test/containers/associative/map/map.ops/find.pass.cpp +++ b/libcxx/test/containers/associative/map/map.ops/find.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp b/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp index 1ac175327c8..87b84eef070 100644 --- a/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp +++ b/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp b/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp index 20973e3e163..037ceb962cd 100644 --- a/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp +++ b/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp b/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp index af5922526a0..4f7bd5154ed 100644 --- a/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp +++ b/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp index e474a4661bb..dc925fda87d 100644 --- a/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp +++ b/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../test_allocator.h" #include "../../../test_compare.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/map/types.pass.cpp b/libcxx/test/containers/associative/map/types.pass.cpp index aca81dfb964..487b69f8c37 100644 --- a/libcxx/test/containers/associative/map/types.pass.cpp +++ b/libcxx/test/containers/associative/map/types.pass.cpp @@ -32,7 +32,7 @@ #include <map> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/empty.pass.cpp b/libcxx/test/containers/associative/multimap/empty.pass.cpp index cafdb7344c8..2384960d10d 100644 --- a/libcxx/test/containers/associative/multimap/empty.pass.cpp +++ b/libcxx/test/containers/associative/multimap/empty.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/iterator.pass.cpp b/libcxx/test/containers/associative/multimap/iterator.pass.cpp index a58b5830837..1fdbfa1aa3a 100644 --- a/libcxx/test/containers/associative/multimap/iterator.pass.cpp +++ b/libcxx/test/containers/associative/multimap/iterator.pass.cpp @@ -29,7 +29,7 @@ #include <map> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/max_size.pass.cpp b/libcxx/test/containers/associative/multimap/max_size.pass.cpp index 7bcb12a2e80..ccd8b10638c 100644 --- a/libcxx/test/containers/associative/multimap/max_size.pass.cpp +++ b/libcxx/test/containers/associative/multimap/max_size.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp index aa3b6e2e6d2..5b494c92303 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp index 8c658d4f61a..0c899183252 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp index 99265ef72f8..9a4e0f987fd 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp index 864a5429974..c578b20723a 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp index 65a1e921a47..7edcc5121bf 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp index a9cba17de93..c5b87aaa0d9 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp index 533338c9683..c7a0e49588f 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp index ca8225f3738..2651d90a6fd 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp index 139052c5730..937a202a55e 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp index f2545c0cbc1..e6677039c90 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> #include "../../../test_compare.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp index a2c0cdb858d..c65c36b4aaa 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp index 78fdbdb2022..fa062e2be0b 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp index 267edc21061..d6de59428dd 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp index 883f64c8e93..dfd946e3be5 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp @@ -20,7 +20,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp index d6e835ca477..06bab095f03 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp index c807b4ff558..7f5f0f7f2b0 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp @@ -19,7 +19,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp index 0aa7c185784..e02a9888bb4 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp @@ -19,7 +19,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp index 4864ec1141b..fe9b8c8ba12 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp index 7af44261b43..6fbcda922df 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp @@ -19,7 +19,7 @@ #include "../../../Emplaceable.h" #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp index 3f94c03a3e5..7d5e5e89d15 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp @@ -19,7 +19,7 @@ #include "../../../Emplaceable.h" #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp index d2979b1eecc..d91295b48c6 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp index be1ab6f8d23..4d378949311 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp index c5dd6fbdcc7..ebae10e6ebc 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp index c23d821e0bb..d9afc9d0fdf 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp index 8fc080d013f..5e1a1d4125e 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp index 0c8e9168731..b83c802c04c 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.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 6e3d2f26bc3..70ff7ef6d6b 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 @@ -18,7 +18,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp index efc99e1e762..60ca7d4a5b4 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp index 1678c9de89e..2f198f8f7c2 100644 --- a/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp index b0e4c58873c..34c0413284a 100644 --- a/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp index 4632eb1c472..a408796d1fb 100644 --- a/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp index e4dba289d09..fb5afa241ca 100644 --- a/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp index 5ec1210e842..49cf6de853c 100644 --- a/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp index aa5a525ae54..1920647705f 100644 --- a/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp index 1e1ab2335ab..c8f30aa7c71 100644 --- a/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp index 6f5b92fe1fe..d403774b6e5 100644 --- a/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../test_allocator.h" #include "../../../test_compare.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/size.pass.cpp b/libcxx/test/containers/associative/multimap/size.pass.cpp index 794c34a2846..ac71d4c95b6 100644 --- a/libcxx/test/containers/associative/multimap/size.pass.cpp +++ b/libcxx/test/containers/associative/multimap/size.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multimap/types.pass.cpp b/libcxx/test/containers/associative/multimap/types.pass.cpp index 2fe8fe0eabf..82132f15d09 100644 --- a/libcxx/test/containers/associative/multimap/types.pass.cpp +++ b/libcxx/test/containers/associative/multimap/types.pass.cpp @@ -32,7 +32,7 @@ #include <map> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/clear.pass.cpp b/libcxx/test/containers/associative/multiset/clear.pass.cpp index f325a701abe..3069de5a300 100644 --- a/libcxx/test/containers/associative/multiset/clear.pass.cpp +++ b/libcxx/test/containers/associative/multiset/clear.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/count.pass.cpp b/libcxx/test/containers/associative/multiset/count.pass.cpp index cba64301a33..12af167a19d 100644 --- a/libcxx/test/containers/associative/multiset/count.pass.cpp +++ b/libcxx/test/containers/associative/multiset/count.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/emplace.pass.cpp b/libcxx/test/containers/associative/multiset/emplace.pass.cpp index 08ac42b1d13..6b76cf05e03 100644 --- a/libcxx/test/containers/associative/multiset/emplace.pass.cpp +++ b/libcxx/test/containers/associative/multiset/emplace.pass.cpp @@ -19,7 +19,7 @@ #include "../../Emplaceable.h" #include "../../DefaultOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp b/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp index 1510c010477..1eddd1e920d 100644 --- a/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp +++ b/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp @@ -19,7 +19,7 @@ #include "../../Emplaceable.h" #include "../../DefaultOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/empty.pass.cpp b/libcxx/test/containers/associative/multiset/empty.pass.cpp index 154180def46..32aef90d418 100644 --- a/libcxx/test/containers/associative/multiset/empty.pass.cpp +++ b/libcxx/test/containers/associative/multiset/empty.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/equal_range.pass.cpp b/libcxx/test/containers/associative/multiset/equal_range.pass.cpp index 6babfa1b9ae..8c69d0c61ec 100644 --- a/libcxx/test/containers/associative/multiset/equal_range.pass.cpp +++ b/libcxx/test/containers/associative/multiset/equal_range.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp b/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp index 3657f521cb1..b6656668d40 100644 --- a/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp +++ b/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp b/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp index de4c8783bf3..e1d7090d816 100644 --- a/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/erase_key.pass.cpp b/libcxx/test/containers/associative/multiset/erase_key.pass.cpp index 170232904c4..e9bce1e1b64 100644 --- a/libcxx/test/containers/associative/multiset/erase_key.pass.cpp +++ b/libcxx/test/containers/associative/multiset/erase_key.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/find.pass.cpp b/libcxx/test/containers/associative/multiset/find.pass.cpp index b4963e9dd0f..364460a6ca3 100644 --- a/libcxx/test/containers/associative/multiset/find.pass.cpp +++ b/libcxx/test/containers/associative/multiset/find.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp index 57e1e98f500..179715753ab 100644 --- a/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp +++ b/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp index c609d242ae2..7e923f2516d 100644 --- a/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp index fccc2b71960..7d204024c21 100644 --- a/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp +++ b/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.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 3cfa9dd16c4..189c4549866 100644 --- a/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp index f09d97de827..342c6fd53d7 100644 --- a/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp +++ b/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../MoveOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp b/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp index e9e773ccd73..1030e0886eb 100644 --- a/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp +++ b/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../MoveOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/iterator.pass.cpp b/libcxx/test/containers/associative/multiset/iterator.pass.cpp index f801de7269e..ccb6c6665ad 100644 --- a/libcxx/test/containers/associative/multiset/iterator.pass.cpp +++ b/libcxx/test/containers/associative/multiset/iterator.pass.cpp @@ -29,7 +29,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp b/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp index 48e297ac608..e466791d935 100644 --- a/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp +++ b/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/multiset/max_size.pass.cpp b/libcxx/test/containers/associative/multiset/max_size.pass.cpp index a209d700ee6..5524f771b34 100644 --- a/libcxx/test/containers/associative/multiset/max_size.pass.cpp +++ b/libcxx/test/containers/associative/multiset/max_size.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp index 16ba28abfca..7d76581d6d8 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp index cf24bf771ce..b6176c92d2a 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp index 60e6940e723..dadafec7c3b 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.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 3f0053996f3..f6c1fd76de1 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 @@ -18,7 +18,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp index 97f593bb32b..a5195f7eb6f 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp index e02942ffeea..2af24ce9d59 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp @@ -19,7 +19,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp index 8d5b1e822bc..ce906896b9a 100644 --- a/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/size.pass.cpp b/libcxx/test/containers/associative/multiset/size.pass.cpp index 8129a9c3675..68099b566df 100644 --- a/libcxx/test/containers/associative/multiset/size.pass.cpp +++ b/libcxx/test/containers/associative/multiset/size.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/types.pass.cpp b/libcxx/test/containers/associative/multiset/types.pass.cpp index e3331cddc6d..da9c8d6b5fe 100644 --- a/libcxx/test/containers/associative/multiset/types.pass.cpp +++ b/libcxx/test/containers/associative/multiset/types.pass.cpp @@ -32,7 +32,7 @@ #include <set> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp b/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp index 932ab0b1044..7ad3d6ced3d 100644 --- a/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp +++ b/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/set/clear.pass.cpp b/libcxx/test/containers/associative/set/clear.pass.cpp index c6e01023f65..4439ad3b1e4 100644 --- a/libcxx/test/containers/associative/set/clear.pass.cpp +++ b/libcxx/test/containers/associative/set/clear.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/count.pass.cpp b/libcxx/test/containers/associative/set/count.pass.cpp index 7d7a31ad0db..a2dc177f2da 100644 --- a/libcxx/test/containers/associative/set/count.pass.cpp +++ b/libcxx/test/containers/associative/set/count.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/emplace.pass.cpp b/libcxx/test/containers/associative/set/emplace.pass.cpp index 69fdbeeb6b2..731382f8d2c 100644 --- a/libcxx/test/containers/associative/set/emplace.pass.cpp +++ b/libcxx/test/containers/associative/set/emplace.pass.cpp @@ -19,7 +19,7 @@ #include "../../Emplaceable.h" #include "../../DefaultOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/emplace_hint.pass.cpp b/libcxx/test/containers/associative/set/emplace_hint.pass.cpp index 8e7fbbc4033..f06cfeceaf2 100644 --- a/libcxx/test/containers/associative/set/emplace_hint.pass.cpp +++ b/libcxx/test/containers/associative/set/emplace_hint.pass.cpp @@ -19,7 +19,7 @@ #include "../../Emplaceable.h" #include "../../DefaultOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/empty.pass.cpp b/libcxx/test/containers/associative/set/empty.pass.cpp index 305ae39ff90..eb1080263f4 100644 --- a/libcxx/test/containers/associative/set/empty.pass.cpp +++ b/libcxx/test/containers/associative/set/empty.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/equal_range.pass.cpp b/libcxx/test/containers/associative/set/equal_range.pass.cpp index 5b83887e61f..8a180ef4924 100644 --- a/libcxx/test/containers/associative/set/equal_range.pass.cpp +++ b/libcxx/test/containers/associative/set/equal_range.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/set/erase_iter.pass.cpp b/libcxx/test/containers/associative/set/erase_iter.pass.cpp index f05d4819e07..21666c36401 100644 --- a/libcxx/test/containers/associative/set/erase_iter.pass.cpp +++ b/libcxx/test/containers/associative/set/erase_iter.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp b/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp index 953d1be8bd4..47995031665 100644 --- a/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/erase_key.pass.cpp b/libcxx/test/containers/associative/set/erase_key.pass.cpp index 12ee0af980e..9d92bd70d70 100644 --- a/libcxx/test/containers/associative/set/erase_key.pass.cpp +++ b/libcxx/test/containers/associative/set/erase_key.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/find.pass.cpp b/libcxx/test/containers/associative/set/find.pass.cpp index 6ce47f8dea0..d08d2fb1e24 100644 --- a/libcxx/test/containers/associative/set/find.pass.cpp +++ b/libcxx/test/containers/associative/set/find.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/set/insert_cv.pass.cpp b/libcxx/test/containers/associative/set/insert_cv.pass.cpp index eabd1a8722a..18d5c2e0339 100644 --- a/libcxx/test/containers/associative/set/insert_cv.pass.cpp +++ b/libcxx/test/containers/associative/set/insert_cv.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp index d75e8a8bcbd..fc6d612b2eb 100644 --- a/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp b/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp index d86d40e8909..718e720559f 100644 --- a/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp +++ b/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.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 d99dbe365ac..ff729a0e7b9 100644 --- a/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp +++ b/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp b/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp index cf2dcbf91bb..c149fa3c68e 100644 --- a/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp +++ b/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../MoveOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/insert_rv.pass.cpp b/libcxx/test/containers/associative/set/insert_rv.pass.cpp index 0b58af6cad0..39894514ee9 100644 --- a/libcxx/test/containers/associative/set/insert_rv.pass.cpp +++ b/libcxx/test/containers/associative/set/insert_rv.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../MoveOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/iterator.pass.cpp b/libcxx/test/containers/associative/set/iterator.pass.cpp index f52e8451c5f..39c8cc6723e 100644 --- a/libcxx/test/containers/associative/set/iterator.pass.cpp +++ b/libcxx/test/containers/associative/set/iterator.pass.cpp @@ -29,7 +29,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/lower_bound.pass.cpp b/libcxx/test/containers/associative/set/lower_bound.pass.cpp index 1562dfa9041..df202f31a4c 100644 --- a/libcxx/test/containers/associative/set/lower_bound.pass.cpp +++ b/libcxx/test/containers/associative/set/lower_bound.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/associative/set/max_size.pass.cpp b/libcxx/test/containers/associative/set/max_size.pass.cpp index b744b9eb16a..cde4397c717 100644 --- a/libcxx/test/containers/associative/set/max_size.pass.cpp +++ b/libcxx/test/containers/associative/set/max_size.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp index 26f38e94b19..892ae5a0a79 100644 --- a/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/default.pass.cpp b/libcxx/test/containers/associative/set/set.cons/default.pass.cpp index 300b4fc6873..d047b12a9d1 100644 --- a/libcxx/test/containers/associative/set/set.cons/default.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/default.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp index 7d981a11a85..2ad538e143f 100644 --- a/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.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 3248257fe2a..7ca7fe14d6c 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 @@ -18,7 +18,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/move.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move.pass.cpp index 2d1b37f4e07..53d4bd6dcfd 100644 --- a/libcxx/test/containers/associative/set/set.cons/move.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/move.pass.cpp @@ -18,7 +18,7 @@ #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp index 3e82e28d516..48a799e4983 100644 --- a/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp @@ -19,7 +19,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp b/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp index aa38fe03577..f72abd7eb4a 100644 --- a/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp +++ b/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/size.pass.cpp b/libcxx/test/containers/associative/set/size.pass.cpp index e1b6b6ce7c8..e7865473550 100644 --- a/libcxx/test/containers/associative/set/size.pass.cpp +++ b/libcxx/test/containers/associative/set/size.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/types.pass.cpp b/libcxx/test/containers/associative/set/types.pass.cpp index 04b9ead0381..8d7bb68f078 100644 --- a/libcxx/test/containers/associative/set/types.pass.cpp +++ b/libcxx/test/containers/associative/set/types.pass.cpp @@ -32,7 +32,7 @@ #include <set> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/upper_bound.pass.cpp b/libcxx/test/containers/associative/set/upper_bound.pass.cpp index 5e889d280d0..10a28f06469 100644 --- a/libcxx/test/containers/associative/set/upper_bound.pass.cpp +++ b/libcxx/test/containers/associative/set/upper_bound.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" #include "private_constructor.hpp" int main() diff --git a/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp b/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp index 1215f9582b0..77aaf3c131e 100644 --- a/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp @@ -24,7 +24,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp b/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp index fee4a8955c6..15f49df395e 100644 --- a/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp index b05bffae93e..727b5d5d864 100644 --- a/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp b/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp index b823ace58be..0ac1d5a680c 100644 --- a/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp index e23e50003aa..1bb672cb1c2 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp @@ -16,7 +16,7 @@ #include "../../../test_allocator.h" #include "../../../NotConstructible.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class T, class Allocator> void diff --git a/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp index 27b8bbbed5f..c760b437244 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.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 0c60d75a8e8..6594984fc0d 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 @@ -16,7 +16,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C 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 7401f042efb..fd6dd6e4ab6 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 @@ -15,7 +15,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp index 4029bcc724b..8f79e122609 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp index 156e011343c..9cf660cfb8c 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp index 910421c6fc3..f8754f1df15 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp @@ -16,7 +16,7 @@ #include "../../../stack_allocator.h" #include "../../../NotConstructible.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class T, class Allocator> void diff --git a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp index 537ded5e034..a9e0218e2e0 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp index 66ee3abdaeb..a2529b416a2 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 1a85871f9d5..faadf2b1a1d 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 @@ -16,7 +16,7 @@ #include "../../../stack_allocator.h" #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 2070f4a957a..89d9b34e5e9 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 @@ -17,7 +17,7 @@ #include "test_iterators.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class InputIterator, class Allocator> void diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp index 5764c61d54e..e2fb7e61f15 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp @@ -16,7 +16,7 @@ #include "../../../MoveOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp index def1fc396f7..f801ceb60e7 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include "../../../MoveOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp index a9e760f2fbd..eaab0f7cc85 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include "../../../MoveOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp index bb169c1f836..4cbb0fb0249 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp index 577b51cf05f..6468e4329bd 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp index 1f07caf4860..8ce1ab2fd9f 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp @@ -16,7 +16,7 @@ #include "../../../stack_allocator.h" #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class T, class Allocator> void diff --git a/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp index 782c0ed5d0d..859deba1e1a 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class T, class Allocator> void diff --git a/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp index c61ce155e6d..5693be702de 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class T, class Allocator> void diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp index d332bb45d72..806f7280332 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../Emplaceable.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp index 892418e935f..aa977eb84bf 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../Emplaceable.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp index 6eebfa8e1a1..cf09d6e19b6 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../Emplaceable.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp index 1b4da3faa9d..bfab2a3a4fc 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp index 37b6c1c157c..b7fa4f6c5a5 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp index 487db6bd564..5f7804023c7 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 1cf507c5d74..6ab948e7c3d 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 @@ -18,7 +18,7 @@ #include "test_iterators.h" #include "../../../MoveOnly.h" #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp index e1cac32357e..0bde7d9b7e3 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp index 71129bf98e3..7b7786161db 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp index 87be595b67b..97827c1183a 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp index 51812cf268f..e642f7132f5 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp index 17597abc7f5..e27edf51f79 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp index cb7155a59f4..444ab9ba955 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp @@ -16,7 +16,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp index c60fdfc55d1..d6c44391477 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp index e3b2d98f7a5..700edd3abdb 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp b/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp index 650a9b8a050..1670a44aa07 100644 --- a/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES 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 e8bf4daf0b7..7dfb4bc5c2d 100644 --- a/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C 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 61681265908..b484a865c57 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 @@ -19,7 +19,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C 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 2da742f6d76..b100ba487ea 100644 --- a/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C 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 6fe094f7b48..072d7a78a30 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 @@ -19,7 +19,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp index d4da735a408..035bcea37c3 100644 --- a/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp @@ -15,7 +15,7 @@ #include <deque> #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> C diff --git a/libcxx/test/containers/sequences/deque/iterators.pass.cpp b/libcxx/test/containers/sequences/deque/iterators.pass.cpp index a83a16b3a2f..9140e02ba2b 100644 --- a/libcxx/test/containers/sequences/deque/iterators.pass.cpp +++ b/libcxx/test/containers/sequences/deque/iterators.pass.cpp @@ -20,7 +20,7 @@ #include <iterator> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/deque/types.pass.cpp b/libcxx/test/containers/sequences/deque/types.pass.cpp index 9e70299787f..71cb54032f1 100644 --- a/libcxx/test/containers/sequences/deque/types.pass.cpp +++ b/libcxx/test/containers/sequences/deque/types.pass.cpp @@ -35,7 +35,7 @@ #include "../../test_allocator.h" #include "../../Copyable.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class T, class Allocator> void diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp index 9a201aafd0c..2ec9b871332 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include <iterator> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp index 318328753f8..07a8e22e016 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp @@ -16,7 +16,7 @@ #include "../../../test_allocator.h" #include "../../../NotConstructible.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp index 0379e47f4d1..0de0d99fd52 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp index 088ed6d961b..e0382a10db4 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp index 480350becc2..ee4130127ee 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp @@ -17,7 +17,7 @@ #include "../../../test_allocator.h" #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp index 5efe79ff3ba..551908fea16 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 ccbd7ce5b42..fb3765d2030 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 @@ -17,7 +17,7 @@ #include <iterator> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp index 7e7dbb63aa7..ea53e1c3732 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp index 0c3f1623768..0759418a4b3 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp index 764967931d1..9ff8215ff8e 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp index aa002360619..dcc438c3ed2 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp index 987185dca05..5b31c4dad0a 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp index 4b62a42e697..e6e2f124980 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp index 01b12597c41..41de1eb0559 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp @@ -17,7 +17,7 @@ #include "../../../test_allocator.h" #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp index b659e88ed90..c43b3c19079 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp @@ -17,7 +17,7 @@ #include "../../../test_allocator.h" #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 57d345060af..763952439f0 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 8f3b39a64cf..d0810f9df2f 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 @@ -19,7 +19,7 @@ #include "../../../test_allocator.h" #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp index fb71b318581..1bebcd4dec0 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class T, class Allocator> void check_allocator(unsigned n, Allocator const &alloc = Allocator()) diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp index 4981d7e4214..05ab98bb205 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp index da4e80dad92..6d92c68165c 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp index 1b89177220e..083cec2886d 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include <iterator> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp index 2e9951456b9..02e17d72e5f 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <iterator> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp index 33db9e9e5ce..2739b49d8eb 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../NotConstructible.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp index 680b5b848f2..e305c5b6ab5 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "../../../Emplaceable.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp index f3c7f4aac84..c02337e0562 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../Emplaceable.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp index f3265930538..bd9b15300ef 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp index e36089e3b61..4f51498bc65 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp index b6785e72f2f..ec650b69572 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp index 7afaacdb3f6..4d301819980 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.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 dde6a13dcf5..103475f1eda 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 @@ -17,7 +17,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp index 59f67701921..4f0be520c30 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp index 42977535231..b2da2ecd3bb 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp index 0b73c7a09b0..276f2c9f8ed 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp index bcf2865f89c..85958afc1ce 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp index f2e99e1e363..53181ec881e 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp index e9372808489..20861368b43 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp index 89775d15a57..d722b925e19 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp index 280d92ca5e8..3b6f853c84c 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp @@ -15,7 +15,7 @@ #include <iterator> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp index 6d6c40ef374..7e873bdddd0 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp @@ -16,7 +16,7 @@ #include <functional> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp index 98748033f9a..a15e786cd28 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp @@ -15,7 +15,7 @@ #include <iterator> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp index 93b8ad8090e..4c4e80c3df2 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp @@ -15,7 +15,7 @@ #include <iterator> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" bool g(int i) { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp index b707c191d97..9bf0d03a885 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(int N) diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp index 9a8bd17d3e2..06e40c595ec 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp @@ -17,7 +17,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(int N) diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp index 8524439d208..8b6ca39b2aa 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp @@ -18,7 +18,7 @@ #include <functional> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(int N) diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp index 0fee4a49217..51da651970c 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../min_allocator.h" +#include "min_allocator.h" typedef int T; const T t1[] = {0, 1, 2, 3, 4, 5, 6, 7}; diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp index 6e75d49fdfe..296ffcd6955 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../min_allocator.h" +#include "min_allocator.h" typedef int T; const T t1[] = {0, 1, 2, 3, 4, 5, 6, 7}; diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp index 0c6128055f4..90a15995963 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include <iterator> -#include "../../../min_allocator.h" +#include "min_allocator.h" typedef int T; const T t1[] = {0, 1, 2, 3, 4, 5, 6, 7}; diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp index 9c95dc9369f..25db6e64b8a 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp @@ -15,7 +15,7 @@ #include <iterator> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp index f956f270aa8..b7dce20b709 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp @@ -15,7 +15,7 @@ #include <iterator> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" bool g(int x, int y) { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp index 485d89ef057..ca673b58368 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp @@ -22,7 +22,7 @@ #include <algorithm> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(int N, int M) diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp index da27cc9d994..9c3a5466d9f 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp index 115a369e53c..aa34ce95098 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp index 7823693d0ed..42e245d007b 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp @@ -30,7 +30,7 @@ #include <algorithm> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(int N, int M) diff --git a/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp b/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp index 96883b51517..be7ebaf44b0 100644 --- a/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/forwardlist/types.pass.cpp b/libcxx/test/containers/sequences/forwardlist/types.pass.cpp index d812f8a9e4a..68cebf978cb 100644 --- a/libcxx/test/containers/sequences/forwardlist/types.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/types.pass.cpp @@ -28,7 +28,7 @@ #include <forward_list> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/db_back.pass.cpp b/libcxx/test/containers/sequences/list/db_back.pass.cpp index 22a7eac4889..b16c0e90701 100644 --- a/libcxx/test/containers/sequences/list/db_back.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_back.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/db_cback.pass.cpp b/libcxx/test/containers/sequences/list/db_cback.pass.cpp index 613b4f1b818..ba3977e16f4 100644 --- a/libcxx/test/containers/sequences/list/db_cback.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_cback.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/db_cfront.pass.cpp b/libcxx/test/containers/sequences/list/db_cfront.pass.cpp index 2646fe1d1ee..d42290c43c0 100644 --- a/libcxx/test/containers/sequences/list/db_cfront.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_cfront.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/db_front.pass.cpp b/libcxx/test/containers/sequences/list/db_front.pass.cpp index f7c3dfcf34a..037b16035c6 100644 --- a/libcxx/test/containers/sequences/list/db_front.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_front.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp index 9528d75dce1..a5b8020b373 100644 --- a/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp index 795ffa7d46c..76a491b1184 100644 --- a/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp index 2c347231b86..1d1ee23a393 100644 --- a/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/iterators.pass.cpp b/libcxx/test/containers/sequences/list/iterators.pass.cpp index 9f6a51b951f..a843334e42c 100644 --- a/libcxx/test/containers/sequences/list/iterators.pass.cpp +++ b/libcxx/test/containers/sequences/list/iterators.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <iterator> -#include "../../min_allocator.h" +#include "min_allocator.h" struct A { diff --git a/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp b/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp index d5135eef8c7..7f0ebc980b4 100644 --- a/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp index dbe2c3f66e1..ab171d5cc7e 100644 --- a/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp index 422436ad05c..6426e01202d 100644 --- a/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp index e438f4062de..24bd140c4e4 100644 --- a/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp index da788dd7ee5..3bcd82414a8 100644 --- a/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp index b490ebaf8bf..0d093bd2a55 100644 --- a/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../DefaultOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp index 30eb9ff38f2..910021c6853 100644 --- a/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../DefaultOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp index a6e193c2ea8..e992dca9c7f 100644 --- a/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp index ef42e522fb3..9d9946b6896 100644 --- a/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp index f862eedf392..3307017989e 100644 --- a/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp index 649610abc0a..9720a3d0d3c 100644 --- a/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 b5d8dcba72a..09eae8ab43c 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 @@ -16,7 +16,7 @@ #include <cassert> #include "test_iterators.h" #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp index f1c5a98f1b5..ced38b47361 100644 --- a/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp index 94711d4b1db..78e144559b7 100644 --- a/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp index f090043844b..7b7b8a327b8 100644 --- a/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp @@ -13,7 +13,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp index 864b5adcf8a..b72c9ca70e1 100644 --- a/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../DefaultOnly.h" #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class T, class Allocator> void diff --git a/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp index 89cdf0e1602..e1d768e4446 100644 --- a/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../DefaultOnly.h" #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp index 5bfab6fe20c..38696b6eb50 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp index 9f5edf5113d..6476d1d6c6a 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp @@ -18,7 +18,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" class A { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp index 71bc671e23e..5983efc59ad 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" class A { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp index 2eee9da2deb..e2e68e33138 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" class A { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp index 0c2e5a1ccee..c1cc9004367 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp index d5fd0449092..18c15eb02c8 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <exception> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp index df567aa6e52..61ff8409c96 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <exception> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp index e1a6e5aef5d..bd3f66b4116 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp index 18b825beec4..71ad497e7d9 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp index 84fbf375554..db76b4de486 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp index 4bdee44faf3..25c5c6147a0 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp index 5b1d3e1ac2f..35a4ceb4848 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp index 9afb506fea5..a82a2696e82 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp index 9e23df3aa63..625004b5c7d 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int throw_next = 0xFFFF; int count = 0; diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp index e575753e7fa..27d0411fb04 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp index 0de5a9f04fb..ce2d386e91f 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp @@ -19,7 +19,7 @@ #include <cstdlib> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int throw_next = 0xFFFF; int count = 0; diff --git a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp index bf9ed8b8770..1b097e362e9 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp @@ -19,7 +19,7 @@ #include <cstdlib> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int throw_next = 0xFFFF; int count = 0; diff --git a/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp index a687b1b8fbb..3add8518809 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp @@ -18,7 +18,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp index cc1462cb422..aec17cc08f4 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp index 2022bb05a54..2638c541fa1 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp index 3f0dddd4924..070db9e8d6b 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp index 7042829eac6..b7f4febcd38 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp b/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp index e7976fa4cd5..8a3175504eb 100644 --- a/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp index 9b8d2ad2389..d226ed5dc64 100644 --- a/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp index b09e2dcdbc5..ce861a5dcb8 100644 --- a/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp @@ -15,7 +15,7 @@ #include <functional> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp index f17dfc8ded6..76d878d02c3 100644 --- a/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp index e6366072ae6..b45562abdd3 100644 --- a/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <functional> -#include "../../../min_allocator.h" +#include "min_allocator.h" bool g(int i) { diff --git a/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp index 3eafeee6e2b..046453ae538 100644 --- a/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp index a79f0a69ba2..1c11227237a 100644 --- a/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp index c107e1fb9b4..28125ab83c0 100644 --- a/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp @@ -15,7 +15,7 @@ #include <functional> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp index 81916e0fced..354871c20af 100644 --- a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp @@ -18,7 +18,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp index f4c04896fb0..5082c3f8517 100644 --- a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp @@ -18,7 +18,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp index 5745af5181f..fcc4acceec5 100644 --- a/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp @@ -18,7 +18,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp index cfd9d03ab42..48cad1ddd15 100644 --- a/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp b/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp index a9687a9e5ed..f8935b81f6a 100644 --- a/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" bool g(int x, int y) { diff --git a/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp b/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp index e440f695f28..f7171795cd5 100644 --- a/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <__debug> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp b/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp index a8283fdeb59..9f790cd22f6 100644 --- a/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp @@ -15,7 +15,7 @@ #include <list> #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/list/types.pass.cpp b/libcxx/test/containers/sequences/list/types.pass.cpp index 9fa3a0573ed..95d7f5010f0 100644 --- a/libcxx/test/containers/sequences/list/types.pass.cpp +++ b/libcxx/test/containers/sequences/list/types.pass.cpp @@ -25,7 +25,7 @@ #include <list> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp b/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp index 7cf927b7553..e524e1a9761 100644 --- a/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp index 2cf92970474..2925fbc6674 100644 --- a/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp b/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp index 5edd3137c5f..b3bb0f157ee 100644 --- a/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp b/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp index 87c98987dbc..63bff25f9f9 100644 --- a/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp index fa396abddb7..f7ec5db5e9b 100644 --- a/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void 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 3225d8732ae..94e6801825d 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 @@ -16,7 +16,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.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 12f1caec4b0..ea9d41d342f 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 @@ -17,7 +17,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C, class Iterator> void diff --git a/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp index aa4ca0e27a4..65f2ed504d2 100644 --- a/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" #include "../../test_allocator.h" template <class C> diff --git a/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp index dc950a26c26..fc772f10dfc 100644 --- a/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp index 5e0b22af19c..6cca948ed83 100644 --- a/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp b/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp index f0e2c7980ef..b9ce87c216d 100644 --- a/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp index 58e71ddca02..2b5cae68a8b 100644 --- a/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp b/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp index c5754408504..f3fd1e9926f 100644 --- a/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/emplace_back.pass.cpp b/libcxx/test/containers/sequences/vector.bool/emplace_back.pass.cpp index 86e0d7a8d3b..57aa47822f8 100644 --- a/libcxx/test/containers/sequences/vector.bool/emplace_back.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/emplace_back.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp index 776b43ec4d7..cbf26dd570a 100644 --- a/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp index 8778c32d724..2c2c4cc4861 100644 --- a/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp index 7c1a5de61ab..b9b46865449 100644 --- a/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp index 19b5b57fe15..c86b644ab44 100644 --- a/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp index 4865b289142..c081cc81c59 100644 --- a/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { 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 5099ebc2e14..c49ef9bface 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 @@ -16,7 +16,7 @@ #include <vector> #include <cassert> #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp b/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp index 9d49816c7d1..f9cb65cb808 100644 --- a/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp b/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp index 37bdebcb14a..1213985f53f 100644 --- a/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp b/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp index 98f725e25ce..b63f6a60e98 100644 --- a/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <iterator> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/move.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move.pass.cpp index 49d8e237883..1b3fe49eea7 100644 --- a/libcxx/test/containers/sequences/vector.bool/move.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/move.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp index 2b890d72ca2..7b157fb580e 100644 --- a/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp index 6f201770dbe..ef3dc5d1079 100644 --- a/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp b/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp index 21b3907b36a..c6b0fbf4185 100644 --- a/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp b/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp index 4e7fbeffebe..be717a3be8a 100644 --- a/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp b/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp index 17032458118..77d54e5efc1 100644 --- a/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp index 1413f5cd022..8cecf44d2fb 100644 --- a/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp b/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp index 0b4cf4937cb..1f9fcac3d9b 100644 --- a/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp b/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp index ce5a10e7b68..f30e3473c23 100644 --- a/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector.bool/types.pass.cpp b/libcxx/test/containers/sequences/vector.bool/types.pass.cpp index ef33d04219c..8cc9cb9990e 100644 --- a/libcxx/test/containers/sequences/vector.bool/types.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/types.pass.cpp @@ -33,7 +33,7 @@ #include "../../test_allocator.h" #include "../../Copyable.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class Allocator> void diff --git a/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp b/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp index e2bc48a8da8..ea2262cd9c1 100644 --- a/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp @@ -22,7 +22,7 @@ #include <cassert> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_back.pass.cpp b/libcxx/test/containers/sequences/vector/db_back.pass.cpp index 05444528182..05f3d07712e 100644 --- a/libcxx/test/containers/sequences/vector/db_back.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_back.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/containers/sequences/vector/db_cback.pass.cpp index b8fd0326f20..5eb1a353e8b 100644 --- a/libcxx/test/containers/sequences/vector/db_cback.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_cback.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp b/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp index 36ba0dd4792..5e54da1d444 100644 --- a/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp b/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp index 18ef2cfa815..133aa565282 100644 --- a/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_front.pass.cpp b/libcxx/test/containers/sequences/vector/db_front.pass.cpp index 97cdb2428de..388058fb315 100644 --- a/libcxx/test/containers/sequences/vector/db_front.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_front.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_index.pass.cpp b/libcxx/test/containers/sequences/vector/db_index.pass.cpp index 785263b8ce3..1daf076da67 100644 --- a/libcxx/test/containers/sequences/vector/db_index.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_index.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp index 26700027848..2d43843067b 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp index d47e3d456e1..051d66c3339 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp index bba222e31f1..4c2aa628de1 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp index c5d96c520f2..1b1090499c2 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp index d33f29d0024..424bc939b13 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp index 25555b491da..72cdb10cbc8 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp b/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp index d891630a13f..7b898533197 100644 --- a/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/iterators.pass.cpp b/libcxx/test/containers/sequences/vector/iterators.pass.cpp index 4ee16e9fd24..82de6654abc 100644 --- a/libcxx/test/containers/sequences/vector/iterators.pass.cpp +++ b/libcxx/test/containers/sequences/vector/iterators.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <iterator> -#include "../../min_allocator.h" +#include "min_allocator.h" struct A { diff --git a/libcxx/test/containers/sequences/vector/types.pass.cpp b/libcxx/test/containers/sequences/vector/types.pass.cpp index 5e1dc9b9ec4..c0645878f45 100644 --- a/libcxx/test/containers/sequences/vector/types.pass.cpp +++ b/libcxx/test/containers/sequences/vector/types.pass.cpp @@ -35,7 +35,7 @@ #include "../../test_allocator.h" #include "../../Copyable.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class T, class Allocator> void diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp index 861ec9ab78d..a22c6dae37c 100644 --- a/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp index 4b91711dfc3..2914af91a07 100644 --- a/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp index 7a3389fd0fa..e415cee04da 100644 --- a/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../stack_allocator.h" #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp index fb267617820..49f373a09cb 100644 --- a/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp index 7a8d0c71a38..6b0cce4eb67 100644 --- a/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp b/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp index 8152802bfa5..46d84033a9e 100644 --- a/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp index 9623d0f328a..1ad4bfcf8be 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp index 13c3e492013..c0dafce02a1 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp index 1a29db939ee..335525475c7 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp index ec66c0d8545..7321f939751 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp @@ -17,7 +17,7 @@ #include "../../../test_allocator.h" #include "../../../NotConstructible.h" #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void 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 6841319920e..8dde17fb301 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 @@ -16,7 +16,7 @@ #include "test_iterators.h" #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C, class Iterator> void 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 afc8ea5d3d2..9edc10c8047 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 @@ -17,7 +17,7 @@ #include "test_iterators.h" #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C, class Iterator, class A> void diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp index 19d2760227b..800c732194b 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "../../../test_allocator.h" template <class C> diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp index 35adaed2fb1..6a52d52afb5 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp index 27da426f82c..5653521f261 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp index 34008ae3bde..78e7fac79ff 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp index 22fca55f74c..b0e07db29b0 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp index 938c0361157..f231fcf8a2a 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp index 12d27c67454..d449f2a655e 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp index 0514f31a5a2..6b9be7b3df5 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp index 2f590dcdf89..2640593ec27 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp index 916ddaa9fc8..13ec845eca8 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp b/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp index 9ae324332a6..4bda599a85b 100644 --- a/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp b/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp index 77e8b83af99..7cb64f85d0d 100644 --- a/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp index 7cca940859a..37298a53437 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp @@ -18,7 +18,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp index 1d024d452d6..a399433ce65 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp index d70320716bb..04ff228313c 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp index 6fcd189bdac..fb9d8084f2b 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp index bd20844c02d..0478d24c79f 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <exception> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp index bbad13b05e3..c394f197402 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <exception> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp index 8a382edba67..e82d3a0dda6 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp index 395d97b1ebc..af6d0f75789 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp index 1f87c8000df..eee2c66c5c8 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp index ab9cc370ee5..505067d05a1 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp index 141598ec477..c7e4131cb49 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp index caba7844390..386a4f6b37c 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 41566a8d149..97255b0b139 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 @@ -20,7 +20,7 @@ #include <cassert> #include "../../../stack_allocator.h" #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp index 2f4b8e81ea3..7ceb9332be2 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../stack_allocator.h" #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp index e4232ff3746..322c9ff71ae 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp @@ -18,7 +18,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp index d24847b588e..28c7718175d 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp @@ -18,7 +18,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp index 16891ae0026..62fa60103ba 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp @@ -18,7 +18,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #if _LIBCPP_DEBUG >= 1 #include <cstdlib> diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp index 3170fe86363..5446b7409b9 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp index 0127dbc6590..bb1af29d3ac 100644 --- a/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp b/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp index 7443fecc4d5..e7f6a0011e1 100644 --- a/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp @@ -19,7 +19,7 @@ #include <vector> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp b/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp index 8e2ea372036..9fa1274162a 100644 --- a/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/bucket.pass.cpp b/libcxx/test/containers/unord/unord.map/bucket.pass.cpp index aa69708e319..6837294e35b 100644 --- a/libcxx/test/containers/unord/unord.map/bucket.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/bucket.pass.cpp @@ -23,7 +23,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/bucket_count.pass.cpp b/libcxx/test/containers/unord/unord.map/bucket_count.pass.cpp index dbc24eed737..9b8b4abf5ee 100644 --- a/libcxx/test/containers/unord/unord.map/bucket_count.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/bucket_count.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp b/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp index 6000ab920e3..f3ab8fff4e4 100644 --- a/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp @@ -23,7 +23,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/count.pass.cpp b/libcxx/test/containers/unord/unord.map/count.pass.cpp index 04d16991260..ebacf2baa20 100644 --- a/libcxx/test/containers/unord/unord.map/count.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/count.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/db_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.map/db_iterators_7.pass.cpp index 4e1ad1e045b..b8db0a35ffc 100644 --- a/libcxx/test/containers/unord/unord.map/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/db_iterators_7.pass.cpp @@ -22,7 +22,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/db_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.map/db_iterators_8.pass.cpp index dbf0ddeb755..c923dd77862 100644 --- a/libcxx/test/containers/unord/unord.map/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/db_iterators_8.pass.cpp @@ -22,7 +22,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp index 95797f2484e..fa1886bfff1 100644 --- a/libcxx/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/db_local_iterators_7.pass.cpp @@ -22,7 +22,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp index 8a2ae7641d7..4b071cad7b4 100644 --- a/libcxx/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/db_local_iterators_8.pass.cpp @@ -22,7 +22,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/eq.pass.cpp b/libcxx/test/containers/unord/unord.map/eq.pass.cpp index ec1378577a0..17184e6a6da 100644 --- a/libcxx/test/containers/unord/unord.map/eq.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/eq.pass.cpp @@ -23,7 +23,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/equal_range_const.pass.cpp b/libcxx/test/containers/unord/unord.map/equal_range_const.pass.cpp index 8f9c58e44f2..d61c2e22c89 100644 --- a/libcxx/test/containers/unord/unord.map/equal_range_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/equal_range_const.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/equal_range_non_const.pass.cpp b/libcxx/test/containers/unord/unord.map/equal_range_non_const.pass.cpp index 9291eb4fda7..508205aa64c 100644 --- a/libcxx/test/containers/unord/unord.map/equal_range_non_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/equal_range_non_const.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/find_const.pass.cpp b/libcxx/test/containers/unord/unord.map/find_const.pass.cpp index c049d2392c8..ee897d9ca22 100644 --- a/libcxx/test/containers/unord/unord.map/find_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/find_const.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/find_non_const.pass.cpp b/libcxx/test/containers/unord/unord.map/find_non_const.pass.cpp index 04126938815..efab12bba29 100644 --- a/libcxx/test/containers/unord/unord.map/find_non_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/find_non_const.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/iterators.pass.cpp b/libcxx/test/containers/unord/unord.map/iterators.pass.cpp index c780a6631ce..4ac126a596d 100644 --- a/libcxx/test/containers/unord/unord.map/iterators.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/iterators.pass.cpp @@ -24,7 +24,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/load_factor.pass.cpp b/libcxx/test/containers/unord/unord.map/load_factor.pass.cpp index 70e6048c59a..3b12480b078 100644 --- a/libcxx/test/containers/unord/unord.map/load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/load_factor.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <cfloat> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/local_iterators.pass.cpp b/libcxx/test/containers/unord/unord.map/local_iterators.pass.cpp index ec10f50b8b1..770b1ace7a3 100644 --- a/libcxx/test/containers/unord/unord.map/local_iterators.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/local_iterators.pass.cpp @@ -24,7 +24,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/max_bucket_count.pass.cpp b/libcxx/test/containers/unord/unord.map/max_bucket_count.pass.cpp index a1f1c3c3faa..b4ca8eb0447 100644 --- a/libcxx/test/containers/unord/unord.map/max_bucket_count.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/max_bucket_count.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp b/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp index 925997bd752..69fd70d2a17 100644 --- a/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp @@ -24,7 +24,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/max_size.pass.cpp b/libcxx/test/containers/unord/unord.map/max_size.pass.cpp index 1993741d0dc..7d5ae3a8e46 100644 --- a/libcxx/test/containers/unord/unord.map/max_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/max_size.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_map> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/rehash.pass.cpp b/libcxx/test/containers/unord/unord.map/rehash.pass.cpp index c516872c617..84ece235551 100644 --- a/libcxx/test/containers/unord/unord.map/rehash.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/rehash.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(const C& c) diff --git a/libcxx/test/containers/unord/unord.map/reserve.pass.cpp b/libcxx/test/containers/unord/unord.map/reserve.pass.cpp index 753316f7f0c..48667cdc7f9 100644 --- a/libcxx/test/containers/unord/unord.map/reserve.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/reserve.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(const C& c) diff --git a/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp b/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp index 311a9a541e4..d0e16206b59 100644 --- a/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp @@ -22,7 +22,7 @@ #include "../../test_compare.h" #include "../../test_hash.h" #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/types.pass.cpp b/libcxx/test/containers/unord/unord.map/types.pass.cpp index 4bf459169d1..2f3eab15186 100644 --- a/libcxx/test/containers/unord/unord.map/types.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/types.pass.cpp @@ -31,7 +31,7 @@ #include <unordered_map> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp index b49d6bfe994..9267f1f927f 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp index 8e8f97d9586..987d339cbb6 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp index 86d44f20642..3a854e10654 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp index f722249b6f6..a98c9007719 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp index 398f2fd822b..1aa67efa5a6 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp index c7d5396e77a..800bc59f44c 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp index b32c260e820..1adaba98587 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp index 594331c3d0d..60895ddb7ef 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp index fd28845f243..e1591054d79 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp index bcc97b67dce..59b488f05aa 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp index 5e21873796d..e2c0de7cb5a 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp @@ -24,7 +24,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp index 0f5e7b58729..e7ae08eee12 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -24,7 +24,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp index 41055c40e22..379ce22a63e 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp index 0f7348087f9..ae2f2f7dc68 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 bc316d325a5..8026c0135ee 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 @@ -26,7 +26,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 42822bc6e8f..2f01ba04d15 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 @@ -26,7 +26,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 f6f294fded9..0aaf1d453db 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 @@ -27,7 +27,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 16b7f8bf34e..cc07ff202a5 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 @@ -27,7 +27,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 82825ce5f85..b67258734cc 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 @@ -28,7 +28,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp index 71303660cc3..7881f708a25 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp index 81cb07ddb7e..05d6937bf91 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp index 783189c7aa4..0d54d5e2c57 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp index 9c7f2b57359..83e0ffc3fa5 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp index 139ffad1295..0b7754606f0 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.elem/at.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.elem/at.pass.cpp index c8eade2fba1..c4d7128698e 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.elem/at.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.elem/at.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp index bbee80d938c..7f4e067c515 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp index 224286ab964..44a6b8f6785 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/clear.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/clear.pass.cpp index 0e0f188be78..9f320e94947 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/clear.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/clear.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp index a115101d761..5de74d2e6c9 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../../Emplaceable.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp index 7cd14c63047..21a4689658a 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp @@ -24,7 +24,7 @@ #include <cassert> #include "../../../Emplaceable.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_const_iter.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_const_iter.pass.cpp index 977581cdf1c..422dbe45b43 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_const_iter.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_const_iter.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_key.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_key.pass.cpp index c2a8666b1dc..e6741a80efa 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_key.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_key.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_range.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_range.pass.cpp index ad915fd63c9..f0664c3c3ff 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_range.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_const_lvalue.pass.cpp index 8bf66caf806..a16f097b4c0 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_const_lvalue.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp index 2e4230af16d..981b8fb18a0 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp index 5a4fd23aaf0..92f6c40e4de 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp @@ -25,7 +25,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 b667c7e4533..81e8a468d83 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 @@ -20,7 +20,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 68cb25c8e87..fc44e7828ff 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 @@ -21,7 +21,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp index 3e050e94301..6c5e8c8ee84 100644 --- a/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp b/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp index 46f7334027b..be5acc19630 100644 --- a/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp @@ -23,7 +23,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp index 1528a347b60..a02f72efc6c 100644 --- a/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp @@ -23,7 +23,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/count.pass.cpp b/libcxx/test/containers/unord/unord.multimap/count.pass.cpp index a1d0432b3c5..66ac28c6b6f 100644 --- a/libcxx/test/containers/unord/unord.multimap/count.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/count.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp index e7f06fe4d2c..b6ba8d6194a 100644 --- a/libcxx/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/db_iterators_7.pass.cpp @@ -22,7 +22,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp index 2f7a0d91ebc..f5ea5089349 100644 --- a/libcxx/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/db_iterators_8.pass.cpp @@ -22,7 +22,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp index 330374f576c..93cbd5433f4 100644 --- a/libcxx/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp @@ -22,7 +22,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp index 9185147404c..159ae496353 100644 --- a/libcxx/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp @@ -22,7 +22,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/eq.pass.cpp b/libcxx/test/containers/unord/unord.multimap/eq.pass.cpp index b069ded55af..3e6eaf64cdb 100644 --- a/libcxx/test/containers/unord/unord.multimap/eq.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/eq.pass.cpp @@ -23,7 +23,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/equal_range_const.pass.cpp b/libcxx/test/containers/unord/unord.multimap/equal_range_const.pass.cpp index bc0c703bf81..11116e95f19 100644 --- a/libcxx/test/containers/unord/unord.multimap/equal_range_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/equal_range_const.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/equal_range_non_const.pass.cpp b/libcxx/test/containers/unord/unord.multimap/equal_range_non_const.pass.cpp index 8b78f70b515..98d6862341c 100644 --- a/libcxx/test/containers/unord/unord.multimap/equal_range_non_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/equal_range_non_const.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/find_const.pass.cpp b/libcxx/test/containers/unord/unord.multimap/find_const.pass.cpp index b967a5132f4..0d9ccaa692a 100644 --- a/libcxx/test/containers/unord/unord.multimap/find_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/find_const.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/find_non_const.pass.cpp b/libcxx/test/containers/unord/unord.multimap/find_non_const.pass.cpp index 8da85ba9aa5..fd623d99f71 100644 --- a/libcxx/test/containers/unord/unord.multimap/find_non_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/find_non_const.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/iterators.pass.cpp b/libcxx/test/containers/unord/unord.multimap/iterators.pass.cpp index 9abb196b368..8a3faa8b389 100644 --- a/libcxx/test/containers/unord/unord.multimap/iterators.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/iterators.pass.cpp @@ -24,7 +24,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/load_factor.pass.cpp b/libcxx/test/containers/unord/unord.multimap/load_factor.pass.cpp index 29cf689e001..0d25ef52e41 100644 --- a/libcxx/test/containers/unord/unord.multimap/load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/load_factor.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <cfloat> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/local_iterators.pass.cpp b/libcxx/test/containers/unord/unord.multimap/local_iterators.pass.cpp index 695953d0012..35e4c772fd3 100644 --- a/libcxx/test/containers/unord/unord.multimap/local_iterators.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/local_iterators.pass.cpp @@ -24,7 +24,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/max_bucket_count.pass.cpp b/libcxx/test/containers/unord/unord.multimap/max_bucket_count.pass.cpp index 0504db0666e..23b90579ec4 100644 --- a/libcxx/test/containers/unord/unord.multimap/max_bucket_count.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/max_bucket_count.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp b/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp index 0a208452dd6..39b7feeba4e 100644 --- a/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp @@ -24,7 +24,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/max_size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/max_size.pass.cpp index ac247d7674c..caba5932b23 100644 --- a/libcxx/test/containers/unord/unord.multimap/max_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/max_size.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_map> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/rehash.pass.cpp b/libcxx/test/containers/unord/unord.multimap/rehash.pass.cpp index e722c04ac9e..1d99208596c 100644 --- a/libcxx/test/containers/unord/unord.multimap/rehash.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/rehash.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include <cfloat> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(const C& c) diff --git a/libcxx/test/containers/unord/unord.multimap/reserve.pass.cpp b/libcxx/test/containers/unord/unord.multimap/reserve.pass.cpp index f13ae73b0bd..801c74457d7 100644 --- a/libcxx/test/containers/unord/unord.multimap/reserve.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/reserve.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(const C& c) diff --git a/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp b/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp index 41b34ddae75..e68fcd5216e 100644 --- a/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp @@ -23,7 +23,7 @@ #include "../../test_hash.h" #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/types.pass.cpp b/libcxx/test/containers/unord/unord.multimap/types.pass.cpp index 369063cffd4..5235415c4c5 100644 --- a/libcxx/test/containers/unord/unord.multimap/types.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/types.pass.cpp @@ -31,7 +31,7 @@ #include <unordered_map> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp index dbcdca44a6e..b8ceb36cce4 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp index 5c074ec4ed4..20b4da3f002 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp index a48f2ea05e5..4bac2a86c48 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp index 8c7bc76ec24..f9aa41647a1 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp index d46ba1c05be..e89667394b6 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp index 0e0d864d7a5..fc3f31add16 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp index f450455d97a..34b26f89333 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp index bcde6666eb2..45a56d7c715 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp index 7cb292744c5..1c1b5f25fda 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp index 7a2faaa66f4..45b4400d1ba 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp index 73c0ec2851e..370bc53d6d3 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp @@ -24,7 +24,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp index bc59d64b0e8..a115d167bca 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -24,7 +24,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp index b4983eaf3d5..5f24df230a2 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp index 6f0cba8fb68..25f11932a88 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp @@ -25,7 +25,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 a4314813111..5849ece238c 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 @@ -26,7 +26,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 53a50de4018..58006fb16c3 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 @@ -26,7 +26,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 02cfb2fa52d..a54bc5ba0ec 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 @@ -27,7 +27,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 e4fdfd3d912..ca48b5e6cc0 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 @@ -27,7 +27,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 640de3556e8..3208c7813b2 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 @@ -28,7 +28,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp index 95ba70bbea7..787e9304fec 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp index d9fac2ff3f1..cfc7b1ad6bb 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp index d691dd9cd65..ea20b6bfe19 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp index 9f902751820..5fb433ad113 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp index 23fae577503..1512f36e601 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp index a731f5b04c4..4efcfaa6ce5 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp index 80453b199d7..4f2e8ef061f 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../../Emplaceable.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp index 13776deea55..4d141ad137c 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp @@ -24,7 +24,7 @@ #include <cassert> #include "../../../Emplaceable.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp index 2b1d4d20667..25d6a7a010d 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp index d59609a20a8..3c099f32284 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp index 3ca3a3610fd..f60ec071ff7 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp index 0528714d79e..e7e7cb03b6d 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp index f7149a5a403..c7cb1f4c014 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_map> #include <cassert> -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp index 0489fc71e89..bb89c3f1bca 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp @@ -25,7 +25,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 0a7d8ea55ac..23dbe84a3c5 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 @@ -20,7 +20,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 bda1958c251..2820639b4ea 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 @@ -21,7 +21,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp index c8bd1284ab4..f3637587efe 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp index 0b5c5c3cd9f..286b574061f 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp b/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp index 2d8927d6710..0293133d494 100644 --- a/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/bucket_count.pass.cpp b/libcxx/test/containers/unord/unord.multiset/bucket_count.pass.cpp index 36c45b0554b..c7842e5c197 100644 --- a/libcxx/test/containers/unord/unord.multiset/bucket_count.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/bucket_count.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp index 8718223fbc9..639d7ac3796 100644 --- a/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/clear.pass.cpp b/libcxx/test/containers/unord/unord.multiset/clear.pass.cpp index 73916312d6e..61ca847e7c4 100644 --- a/libcxx/test/containers/unord/unord.multiset/clear.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/clear.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/count.pass.cpp b/libcxx/test/containers/unord/unord.multiset/count.pass.cpp index 426b5f88b56..e548324d954 100644 --- a/libcxx/test/containers/unord/unord.multiset/count.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/count.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp index 92611ca767c..c8ef2fbca16 100644 --- a/libcxx/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/db_iterators_7.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp index 635e2115d88..eef79978794 100644 --- a/libcxx/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/db_iterators_8.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp index 8bfe0fcd01f..c1de95cace7 100644 --- a/libcxx/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp index 1adc686b81d..962b85298ae 100644 --- a/libcxx/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/emplace.pass.cpp b/libcxx/test/containers/unord/unord.multiset/emplace.pass.cpp index 78478831bd2..13787d9b403 100644 --- a/libcxx/test/containers/unord/unord.multiset/emplace.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/emplace.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../Emplaceable.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp b/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp index eddffc40df2..8885cc03cf0 100644 --- a/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp @@ -24,7 +24,7 @@ #include <cassert> #include "../../Emplaceable.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/eq.pass.cpp b/libcxx/test/containers/unord/unord.multiset/eq.pass.cpp index 7350e4444ae..bbedbc905a4 100644 --- a/libcxx/test/containers/unord/unord.multiset/eq.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/eq.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/equal_range_const.pass.cpp b/libcxx/test/containers/unord/unord.multiset/equal_range_const.pass.cpp index 3fe242f58eb..a0aaac2bd86 100644 --- a/libcxx/test/containers/unord/unord.multiset/equal_range_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/equal_range_const.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/equal_range_non_const.pass.cpp b/libcxx/test/containers/unord/unord.multiset/equal_range_non_const.pass.cpp index ebda719bdcb..73d44f7a56b 100644 --- a/libcxx/test/containers/unord/unord.multiset/equal_range_non_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/equal_range_non_const.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/erase_const_iter.pass.cpp b/libcxx/test/containers/unord/unord.multiset/erase_const_iter.pass.cpp index 6cb2c72cccd..6a005d3e3ba 100644 --- a/libcxx/test/containers/unord/unord.multiset/erase_const_iter.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/erase_const_iter.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/erase_key.pass.cpp b/libcxx/test/containers/unord/unord.multiset/erase_key.pass.cpp index b0b68158666..646d3562582 100644 --- a/libcxx/test/containers/unord/unord.multiset/erase_key.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/erase_key.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/erase_range.pass.cpp b/libcxx/test/containers/unord/unord.multiset/erase_range.pass.cpp index 601c4b3be1e..baac08eddc1 100644 --- a/libcxx/test/containers/unord/unord.multiset/erase_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/erase_range.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/find_const.pass.cpp b/libcxx/test/containers/unord/unord.multiset/find_const.pass.cpp index dbe4eae54f2..5caaf207aaf 100644 --- a/libcxx/test/containers/unord/unord.multiset/find_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/find_const.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/find_non_const.pass.cpp b/libcxx/test/containers/unord/unord.multiset/find_non_const.pass.cpp index af630180741..030487863f9 100644 --- a/libcxx/test/containers/unord/unord.multiset/find_non_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/find_non_const.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp index ce469976c82..0051e497fd7 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp index d3a3d767218..25b4bc1aa04 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp index fb95ea32f3d..634e4f4a176 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp @@ -23,7 +23,7 @@ #include <cassert> #include "../../MoveOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.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 7a9d3f7cfbd..6941d86f619 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.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 28637f5f47c..41c9d8136fe 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp index 7cddb0d9094..65a5bc2eb2a 100644 --- a/libcxx/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../MoveOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/iterators.pass.cpp b/libcxx/test/containers/unord/unord.multiset/iterators.pass.cpp index e51b3e1c85f..fd7077b40ac 100644 --- a/libcxx/test/containers/unord/unord.multiset/iterators.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/iterators.pass.cpp @@ -23,7 +23,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/load_factor.pass.cpp b/libcxx/test/containers/unord/unord.multiset/load_factor.pass.cpp index c6e4825fcba..07980c2afc8 100644 --- a/libcxx/test/containers/unord/unord.multiset/load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/load_factor.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include <cfloat> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/local_iterators.pass.cpp b/libcxx/test/containers/unord/unord.multiset/local_iterators.pass.cpp index 6cc07b600d8..3471707e42a 100644 --- a/libcxx/test/containers/unord/unord.multiset/local_iterators.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/local_iterators.pass.cpp @@ -23,7 +23,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/max_bucket_count.pass.cpp b/libcxx/test/containers/unord/unord.multiset/max_bucket_count.pass.cpp index fa55a1f8ef2..619a8cf1266 100644 --- a/libcxx/test/containers/unord/unord.multiset/max_bucket_count.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/max_bucket_count.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp b/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp index 00cd1b1f3a9..08f52bb7084 100644 --- a/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp @@ -23,7 +23,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/max_size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/max_size.pass.cpp index 23171294d71..a5d0b5538bc 100644 --- a/libcxx/test/containers/unord/unord.multiset/max_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/max_size.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/rehash.pass.cpp b/libcxx/test/containers/unord/unord.multiset/rehash.pass.cpp index 9358c327c57..bc8d461c60b 100644 --- a/libcxx/test/containers/unord/unord.multiset/rehash.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/rehash.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(const C& c) diff --git a/libcxx/test/containers/unord/unord.multiset/reserve.pass.cpp b/libcxx/test/containers/unord/unord.multiset/reserve.pass.cpp index e1c9e0a0f38..0c17583d371 100644 --- a/libcxx/test/containers/unord/unord.multiset/reserve.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/reserve.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(const C& c) diff --git a/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp b/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp index 3a7c506f56a..5c2ea2358c1 100644 --- a/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp @@ -21,7 +21,7 @@ #include "../../test_compare.h" #include "../../test_hash.h" #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/types.pass.cpp b/libcxx/test/containers/unord/unord.multiset/types.pass.cpp index 5d7fa3aa6af..82b403daa5e 100644 --- a/libcxx/test/containers/unord/unord.multiset/types.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/types.pass.cpp @@ -30,7 +30,7 @@ #include <unordered_set> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp index af9dd01bf32..ca7169e5c78 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp index 5f5cac2ffe8..6a2cd8ef081 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp index 23ca1fc4b78..7baf89a26c2 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp index 942ab86ae64..94b78c7434b 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp index 300a4db8bba..d778861c029 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp index 636f644944d..37d8ed6541d 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp index 4546d597139..220aa94edd0 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp index 3578d35e534..fbb39ea304f 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp index f16c2321211..e1331da9f11 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp index 53bf1953345..2894700c696 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp index bd2c3188d80..7644bd3750d 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp index d7c69359527..ef798657bd3 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp index 593ba0dae5c..697ecf5518a 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp index e5283168ac7..daa26f28381 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 1286eeef1ce..6f3caeedff0 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 @@ -24,7 +24,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 5fa494b91fb..9538cde542c 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 @@ -24,7 +24,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 bace36a8538..2b83cb0ea0a 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 @@ -25,7 +25,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 a97750eb567..cccd74b97da 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 @@ -25,7 +25,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 41f2e27797e..3675a240ef1 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 @@ -26,7 +26,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp index 1916b6b8072..61cfc5e97c9 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp index 4e9903745c0..6ffdbfd54e0 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp index 19f4440a8f6..c0ec5af41db 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp index 59eba5321a0..4d7b3f61999 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp index ca71ab3709b..9d913e739cb 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp index b75816a9ab4..c2e068edffa 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/bucket.pass.cpp b/libcxx/test/containers/unord/unord.set/bucket.pass.cpp index b2bf2e1cd59..0dae664e0b2 100644 --- a/libcxx/test/containers/unord/unord.set/bucket.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/bucket.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/bucket_count.pass.cpp b/libcxx/test/containers/unord/unord.set/bucket_count.pass.cpp index 649aaa150e6..caaa5a6011a 100644 --- a/libcxx/test/containers/unord/unord.set/bucket_count.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/bucket_count.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp b/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp index 26f05dbd3d8..628d55737a8 100644 --- a/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/clear.pass.cpp b/libcxx/test/containers/unord/unord.set/clear.pass.cpp index 1f97ab75b13..6da15308508 100644 --- a/libcxx/test/containers/unord/unord.set/clear.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/clear.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/count.pass.cpp b/libcxx/test/containers/unord/unord.set/count.pass.cpp index d850a7e5754..83bb8aaa2be 100644 --- a/libcxx/test/containers/unord/unord.set/count.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/count.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/db_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.set/db_iterators_7.pass.cpp index 3247f01a391..80b1a49c575 100644 --- a/libcxx/test/containers/unord/unord.set/db_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/db_iterators_7.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/db_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.set/db_iterators_8.pass.cpp index 4ee888335c7..8b266bbf664 100644 --- a/libcxx/test/containers/unord/unord.set/db_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/db_iterators_8.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp b/libcxx/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp index e6df2a471d5..b9fcb8c4ae0 100644 --- a/libcxx/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/db_local_iterators_7.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp b/libcxx/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp index 0c5a1677b44..74d131b19ab 100644 --- a/libcxx/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/db_local_iterators_8.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/emplace.pass.cpp b/libcxx/test/containers/unord/unord.set/emplace.pass.cpp index a6faecb3a75..d105e7ac0f4 100644 --- a/libcxx/test/containers/unord/unord.set/emplace.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/emplace.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../Emplaceable.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp b/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp index 0d8a57aa995..50b0035165d 100644 --- a/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp @@ -24,7 +24,7 @@ #include <cassert> #include "../../Emplaceable.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/eq.pass.cpp b/libcxx/test/containers/unord/unord.set/eq.pass.cpp index 7b5569e24bb..54a9c2eced3 100644 --- a/libcxx/test/containers/unord/unord.set/eq.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/eq.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/equal_range_const.pass.cpp b/libcxx/test/containers/unord/unord.set/equal_range_const.pass.cpp index c64e0af34bf..4168903e020 100644 --- a/libcxx/test/containers/unord/unord.set/equal_range_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/equal_range_const.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/equal_range_non_const.pass.cpp b/libcxx/test/containers/unord/unord.set/equal_range_non_const.pass.cpp index 6d7e044b5f5..5a55083ba8a 100644 --- a/libcxx/test/containers/unord/unord.set/equal_range_non_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/equal_range_non_const.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/erase_const_iter.pass.cpp b/libcxx/test/containers/unord/unord.set/erase_const_iter.pass.cpp index ff746016a97..3a9cb5817df 100644 --- a/libcxx/test/containers/unord/unord.set/erase_const_iter.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/erase_const_iter.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/erase_key.pass.cpp b/libcxx/test/containers/unord/unord.set/erase_key.pass.cpp index 187f11826f3..d97374a4d1e 100644 --- a/libcxx/test/containers/unord/unord.set/erase_key.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/erase_key.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/erase_range.pass.cpp b/libcxx/test/containers/unord/unord.set/erase_range.pass.cpp index 98b7d4d4297..a8a900551c7 100644 --- a/libcxx/test/containers/unord/unord.set/erase_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/erase_range.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/find_const.pass.cpp b/libcxx/test/containers/unord/unord.set/find_const.pass.cpp index ca8b9e6a032..e2238e5665f 100644 --- a/libcxx/test/containers/unord/unord.set/find_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/find_const.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/find_non_const.pass.cpp b/libcxx/test/containers/unord/unord.set/find_non_const.pass.cpp index a2ab80425fc..8afe32abd72 100644 --- a/libcxx/test/containers/unord/unord.set/find_non_const.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/find_non_const.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/insert_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_const_lvalue.pass.cpp index b5d2733e122..321e9054af6 100644 --- a/libcxx/test/containers/unord/unord.set/insert_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_const_lvalue.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp index c195e522ddf..1393f542011 100644 --- a/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp index ff7d742bb62..f612ec57249 100644 --- a/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp @@ -23,7 +23,7 @@ #include <cassert> #include "../../MoveOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { 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 18a97a15314..2d8eafba489 100644 --- a/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.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 aa3b38bbe2a..72a83abf74e 100644 --- a/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/insert_rvalue.pass.cpp b/libcxx/test/containers/unord/unord.set/insert_rvalue.pass.cpp index 9ed2cda9905..d62308e7357 100644 --- a/libcxx/test/containers/unord/unord.set/insert_rvalue.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/insert_rvalue.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../MoveOnly.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/iterators.pass.cpp b/libcxx/test/containers/unord/unord.set/iterators.pass.cpp index 7bb9770d8e0..d88310ece94 100644 --- a/libcxx/test/containers/unord/unord.set/iterators.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/iterators.pass.cpp @@ -23,7 +23,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/load_factor.pass.cpp b/libcxx/test/containers/unord/unord.set/load_factor.pass.cpp index 959f384cc37..e0ed1694b05 100644 --- a/libcxx/test/containers/unord/unord.set/load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/load_factor.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include <cfloat> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/local_iterators.pass.cpp b/libcxx/test/containers/unord/unord.set/local_iterators.pass.cpp index 5b82228a3b1..2ffd93f30d1 100644 --- a/libcxx/test/containers/unord/unord.set/local_iterators.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/local_iterators.pass.cpp @@ -23,7 +23,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/max_bucket_count.pass.cpp b/libcxx/test/containers/unord/unord.set/max_bucket_count.pass.cpp index 80398b8f8bd..8b5e265de3f 100644 --- a/libcxx/test/containers/unord/unord.set/max_bucket_count.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/max_bucket_count.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp b/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp index 982c6b578c9..d326f4a2d7e 100644 --- a/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp @@ -23,7 +23,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/max_size.pass.cpp b/libcxx/test/containers/unord/unord.set/max_size.pass.cpp index 43d66bb6d80..1c6e74125c7 100644 --- a/libcxx/test/containers/unord/unord.set/max_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/max_size.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/rehash.pass.cpp b/libcxx/test/containers/unord/unord.set/rehash.pass.cpp index bf4d3175938..30fffa561f7 100644 --- a/libcxx/test/containers/unord/unord.set/rehash.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/rehash.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(const C& c) diff --git a/libcxx/test/containers/unord/unord.set/reserve.pass.cpp b/libcxx/test/containers/unord/unord.set/reserve.pass.cpp index 525f9438412..7d6656a1867 100644 --- a/libcxx/test/containers/unord/unord.set/reserve.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/reserve.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class C> void test(const C& c) diff --git a/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp b/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp index 9a972b725eb..44976063c40 100644 --- a/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp @@ -21,7 +21,7 @@ #include "../../test_compare.h" #include "../../test_hash.h" #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/types.pass.cpp b/libcxx/test/containers/unord/unord.set/types.pass.cpp index 11d992f9fa0..be0b359b242 100644 --- a/libcxx/test/containers/unord/unord.set/types.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/types.pass.cpp @@ -30,7 +30,7 @@ #include <unordered_set> #include <type_traits> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp index 5d7897b90f7..3e2213432b2 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp index e7fa903636e..e53656a0fdd 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp index 256f4447c92..55c8df6db97 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp index a197fca8376..50ce419fe98 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp index 7fe0e15df7c..dbed56c37e4 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp index 67995b3abdc..4265e3092f7 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp index e53264fc570..6eaa8c25b55 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp index fcee4007ee0..8e5938eb62c 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp index 3cc3cf0ab8c..4872babc608 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp index 9dc61fbb082..2905c042cd0 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp index a191c7c2f0b..04c7b8aa409 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp index 4a1fc6cd8a8..e8875ab6e46 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp index 3f1685c7975..11191a1783a 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp index 1e58dbd7a26..c9770579e1e 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.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 d0166fab893..24a6e3579a2 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 @@ -24,7 +24,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 87e62a005d1..e4ed1343b81 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 @@ -24,7 +24,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 6f6f1782f98..b0e568ac117 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 @@ -25,7 +25,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 ac2aafd7350..90c419b6ffc 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 @@ -25,7 +25,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { 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 5a051e82712..0f8925868c5 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 @@ -26,7 +26,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp index fe019669b2e..450f2dd7bb9 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp index 2bda6cc2fd2..b2b7da7fa3d 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp index bd5e7545d36..9a52988cd9c 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp index e3378ce856b..d20e03fb600 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp index 57899aeffbd..f529ad6325e 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/min_allocator.h b/libcxx/test/strings/basic.string/min_allocator.h deleted file mode 100644 index c0d28e5faa2..00000000000 --- a/libcxx/test/strings/basic.string/min_allocator.h +++ /dev/null @@ -1,252 +0,0 @@ -#ifndef MIN_ALLOCATOR_H -#define MIN_ALLOCATOR_H - -#if __cplusplus >= 201103L - -#include <memory> - -template <class T> class min_pointer; -template <class T> class min_pointer<const T>; -template <> class min_pointer<void>; -template <> class min_pointer<const void>; -template <class T> class min_allocator; - -template <> -class min_pointer<const void> -{ - const void* ptr_; -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - template <class T> - min_pointer(min_pointer<T> p) : ptr_(p.ptr_) {} - - explicit operator bool() const {return ptr_ != nullptr;} - - friend bool operator==(min_pointer x, min_pointer y) {return x.ptr_ == y.ptr_;} - friend bool operator!=(min_pointer x, min_pointer y) {return !(x == y);} - template <class U> friend class min_pointer; -}; - -template <> -class min_pointer<void> -{ - void* ptr_; -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - template <class T, - class = typename std::enable_if - < - !std::is_const<T>::value - >::type - > - min_pointer(min_pointer<T> p) : ptr_(p.ptr_) {} - - explicit operator bool() const {return ptr_ != nullptr;} - - friend bool operator==(min_pointer x, min_pointer y) {return x.ptr_ == y.ptr_;} - friend bool operator!=(min_pointer x, min_pointer y) {return !(x == y);} - template <class U> friend class min_pointer; -}; - -template <class T> -class min_pointer -{ - T* ptr_; - - explicit min_pointer(T* p) : ptr_(p) {} -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - explicit min_pointer(min_pointer<void> p) : ptr_(static_cast<T*>(p.ptr_)) {} - - explicit operator bool() const {return ptr_ != nullptr;} - - typedef std::ptrdiff_t difference_type; - typedef T& reference; - typedef T* pointer; - typedef T value_type; - typedef std::random_access_iterator_tag iterator_category; - - reference operator*() const {return *ptr_;} - pointer operator->() const {return ptr_;} - - min_pointer& operator++() {++ptr_; return *this;} - min_pointer operator++(int) {min_pointer tmp(*this); ++ptr_; return tmp;} - - min_pointer& operator--() {--ptr_; return *this;} - min_pointer operator--(int) {min_pointer tmp(*this); --ptr_; return tmp;} - - min_pointer& operator+=(difference_type n) {ptr_ += n; return *this;} - min_pointer& operator-=(difference_type n) {ptr_ -= n; return *this;} - - min_pointer operator+(difference_type n) const - { - min_pointer tmp(*this); - tmp += n; - return tmp; - } - - friend min_pointer operator+(difference_type n, min_pointer x) - { - return x + n; - } - - min_pointer operator-(difference_type n) const - { - min_pointer tmp(*this); - tmp -= n; - return tmp; - } - - friend difference_type operator-(min_pointer x, min_pointer y) - { - return x.ptr_ - y.ptr_; - } - - reference operator[](difference_type n) const {return ptr_[n];} - - friend bool operator< (min_pointer x, min_pointer y) {return x.ptr_ < y.ptr_;} - friend bool operator> (min_pointer x, min_pointer y) {return y < x;} - friend bool operator<=(min_pointer x, min_pointer y) {return !(y < x);} - friend bool operator>=(min_pointer x, min_pointer y) {return !(x < y);} - - static min_pointer pointer_to(T& t) {return min_pointer(std::addressof(t));} - - friend bool operator==(min_pointer x, min_pointer y) {return x.ptr_ == y.ptr_;} - friend bool operator!=(min_pointer x, min_pointer y) {return !(x == y);} - template <class U> friend class min_pointer; - template <class U> friend class min_allocator; -}; - -template <class T> -class min_pointer<const T> -{ - const T* ptr_; - - explicit min_pointer(const T* p) : ptr_(p) {} -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - min_pointer(min_pointer<T> p) : ptr_(p.ptr_) {} - explicit min_pointer(min_pointer<const void> p) : ptr_(static_cast<const T*>(p.ptr_)) {} - - explicit operator bool() const {return ptr_ != nullptr;} - - typedef std::ptrdiff_t difference_type; - typedef const T& reference; - typedef const T* pointer; - typedef const T value_type; - typedef std::random_access_iterator_tag iterator_category; - - reference operator*() const {return *ptr_;} - pointer operator->() const {return ptr_;} - - min_pointer& operator++() {++ptr_; return *this;} - min_pointer operator++(int) {min_pointer tmp(*this); ++ptr_; return tmp;} - - min_pointer& operator--() {--ptr_; return *this;} - min_pointer operator--(int) {min_pointer tmp(*this); --ptr_; return tmp;} - - min_pointer& operator+=(difference_type n) {ptr_ += n; return *this;} - min_pointer& operator-=(difference_type n) {ptr_ -= n; return *this;} - - min_pointer operator+(difference_type n) const - { - min_pointer tmp(*this); - tmp += n; - return tmp; - } - - friend min_pointer operator+(difference_type n, min_pointer x) - { - return x + n; - } - - min_pointer operator-(difference_type n) const - { - min_pointer tmp(*this); - tmp -= n; - return tmp; - } - - friend difference_type operator-(min_pointer x, min_pointer y) - { - return x.ptr_ - y.ptr_; - } - - reference operator[](difference_type n) const {return ptr_[n];} - - friend bool operator< (min_pointer x, min_pointer y) {return x.ptr_ < y.ptr_;} - friend bool operator> (min_pointer x, min_pointer y) {return y < x;} - friend bool operator<=(min_pointer x, min_pointer y) {return !(y < x);} - friend bool operator>=(min_pointer x, min_pointer y) {return !(x < y);} - - static min_pointer pointer_to(const T& t) {return min_pointer(std::addressof(t));} - - friend bool operator==(min_pointer x, min_pointer y) {return x.ptr_ == y.ptr_;} - friend bool operator!=(min_pointer x, min_pointer y) {return !(x == y);} - template <class U> friend class min_pointer; -}; - -template <class T> -inline -bool -operator==(min_pointer<T> x, std::nullptr_t) -{ - return !static_cast<bool>(x); -} - -template <class T> -inline -bool -operator==(std::nullptr_t, min_pointer<T> x) -{ - return !static_cast<bool>(x); -} - -template <class T> -inline -bool -operator!=(min_pointer<T> x, std::nullptr_t) -{ - return static_cast<bool>(x); -} - -template <class T> -inline -bool -operator!=(std::nullptr_t, min_pointer<T> x) -{ - return static_cast<bool>(x); -} - -template <class T> -class min_allocator -{ -public: - typedef T value_type; - typedef min_pointer<T> pointer; - - min_allocator() = default; - template <class U> - min_allocator(min_allocator<U>) {} - - pointer allocate(std::ptrdiff_t n) - { - return pointer(static_cast<T*>(::operator new(n*sizeof(T)))); - } - - void deallocate(pointer p, std::ptrdiff_t) - { - return ::operator delete(p.ptr_); - } - - friend bool operator==(min_allocator, min_allocator) {return true;} - friend bool operator!=(min_allocator x, min_allocator y) {return !(x == y);} -}; - -#endif // __cplusplus >= 201103L - -#endif // MIN_ALLOCATOR_H diff --git a/libcxx/test/strings/basic.string/string.access/at.pass.cpp b/libcxx/test/strings/basic.string/string.access/at.pass.cpp index e24b560d3c9..8fada8fb1ee 100644 --- a/libcxx/test/strings/basic.string/string.access/at.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/at.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.access/back.pass.cpp b/libcxx/test/strings/basic.string/string.access/back.pass.cpp index ed0d327f52d..e91521441b8 100644 --- a/libcxx/test/strings/basic.string/string.access/back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/back.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp index b153249a717..2b31fabc7c7 100644 --- a/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_back.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp index ece27a6d654..7feb4239f07 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cback.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp index d36885e36b7..9f7785b85cd 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cfront.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp index 385c2197000..6294200104b 100644 --- a/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_cindex.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp index 15985facac1..ff675bc5c21 100644 --- a/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_front.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp index 82b11904369..b20e2018802 100644 --- a/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/db_index.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.access/front.pass.cpp b/libcxx/test/strings/basic.string/string.access/front.pass.cpp index 807e936ab15..ed80916f16f 100644 --- a/libcxx/test/strings/basic.string/string.access/front.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/front.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.access/index.pass.cpp b/libcxx/test/strings/basic.string/string.access/index.pass.cpp index 567eeee05ba..cd316238516 100644 --- a/libcxx/test/strings/basic.string/string.access/index.pass.cpp +++ b/libcxx/test/strings/basic.string/string.access/index.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp index 22ca1f3be14..4a447d5a8f0 100644 --- a/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp index ba8ba245d29..b73af759934 100644 --- a/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp index 29f62cdf76b..ac65f514485 100644 --- a/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp index 5ddb5c1e0cc..d3ae1aaee03 100644 --- a/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp index 0fe7f123c89..e6a3aa42dde 100644 --- a/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp index 6fdb457e3f8..a155825be75 100644 --- a/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp index d1b66a41bab..14fe209fd59 100644 --- a/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp index 9fb0c8cc7a6..f293df971f2 100644 --- a/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp index 310cceca45e..aacbffd098f 100644 --- a/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp b/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp index 9d51ca1705a..21b475a8113 100644 --- a/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp index 3a8c571344f..b15b56977ec 100644 --- a/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp index 4d750d8555c..1c582bc5163 100644 --- a/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp index 3ebb22862dc..fb6001f85b6 100644 --- a/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp index 693ecf38b77..d18241e565a 100644 --- a/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp index 10c49e55fff..ccb6c599974 100644 --- a/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp index 7654901b851..60e62cc288c 100644 --- a/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp index 6bbf51a8805..75307689535 100644 --- a/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp index ebd0974cd72..11f2b43c4ca 100644 --- a/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp @@ -19,7 +19,7 @@ #include "../test_allocator.h" #include "../input_iterator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class It> void diff --git a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp index ba68087aa5d..873e8891094 100644 --- a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp @@ -17,7 +17,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp index 80aadcb355a..1f0d5cd7ca7 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp @@ -17,7 +17,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp index 3e6626b60eb..60de3b029bf 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp @@ -18,7 +18,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp index befb143d973..8aa88c9fe72 100644 --- a/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class charT> void diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp index d035837cd97..c691613379a 100644 --- a/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp index dbfcec7e33e..629e2967b25 100644 --- a/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class charT> void diff --git a/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp index a427d72ba8f..a8e6fdf24f0 100644 --- a/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class charT> void diff --git a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp index 16072111c89..3e04a97bdcc 100644 --- a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp index fddd6e675bb..55f2eb30f80 100644 --- a/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp index 9a9f042d428..d0c6ddbb950 100644 --- a/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp index cca6ff622d7..6b86d263245 100644 --- a/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp index dbff2a57899..6f29f433f31 100644 --- a/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp index 109c583f070..1fb422c080a 100644 --- a/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp index d9011f523cc..6cac1875ce8 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_2.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp index 3773dba3566..d90387e3a46 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_3.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp index f82349a4e1d..c4a2d0a4baf 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_4.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp index 8324c873ccc..ce44cb1ba5b 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_5.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp index fff3907ab78..8fab8babc61 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_6.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp index c36644ba2c0..d1cac07e222 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_7.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp index d2b779b47aa..914c77d48c5 100644 --- a/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/db_iterators_8.pass.cpp @@ -21,7 +21,7 @@ #include <exception> #include <cstdlib> -#include "../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp index b3732da3e24..02180bbd73d 100644 --- a/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp index edb02d719ab..0111ad11363 100644 --- a/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp b/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp index 630565b7d77..750173dc342 100644 --- a/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp +++ b/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp index 0a1a412921d..fb28e498c32 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp index 1e5307b2dca..3bf2afa2552 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S, class It> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp index ab813612058..5ae15f0a0a4 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp index 64f7bb6f6f0..5a9e8e2b814 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp index 7a6a276fe7a..b0a2eb5e5cb 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp index 920a0bc7ea2..00e6ae375cc 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp index 2568af4ef06..31f174b4f30 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp index 9f4081f4f89..ac74f202654 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp index b2c083415da..2dae1074596 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp index 3eefb7b8cac..83b5dd14b3f 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S, class It> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp index f9d0614126e..adf24ac4987 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp index 5a8f9ce09fc..476fe963de7 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp index 8c8dc6225c5..ac0e535eea2 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp index 486161256fb..a8f747091c6 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp index f58a8a49a13..d7ddb77b8e0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp index 5430be3227a..116673cc4dd 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp index f1e5a4ba22b..33801352816 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp index c9033dabdeb..6c2929d7f1d 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db1.pass.cpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <exception> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp index be95fe2d415..d20fcd4623b 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_db2.pass.cpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <exception> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp index 1479171acdd..5015241ad63 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db1.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp index 13f97b45b66..6a23bf88ca5 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db2.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp index be3ee641b9f..a8443818aea 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db3.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp index c008196dcf0..0549e816b44 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/erase_iter_iter_db4.pass.cpp @@ -20,7 +20,7 @@ #include <exception> #include <cstdlib> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp index 60d54965332..c44db71ae3b 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp index b9bc6ca184b..dbe6d7ba0e7 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp index e84a3ba12ec..790ce40b0a0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp @@ -18,7 +18,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp index a1c37a90542..bc9ec1cf825 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp index 9eff67e7f01..b9e5fa8bc06 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp @@ -19,7 +19,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp index 8fc469e3133..e091662eae0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp @@ -18,7 +18,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp index 593279cdbf5..38353dd2f4e 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S, class It> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp index e104072c73b..739c89404c1 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp @@ -18,7 +18,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp index 25016ae4719..734dd8dffb7 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp index 7f360993da1..29b00ec55b9 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp index 5fad9b703d7..fd85696704c 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp index 37ac686fa07..8c18941cf46 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp index b1c4f4bc29c..b7317a32b41 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp @@ -17,7 +17,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp index bea51ea3797..7384ae7f1d3 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp index 04d588322d6..c291028998d 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp index 9bdd2aa2a76..77b20d1bc08 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp index 8d5a949f337..33649792521 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp index 6bc7148be4b..20455b258c0 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp index bdc4519305b..9295c5bde9f 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S, class It> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp index 6d552f0e747..cb4ce61d094 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp index a8968ef7a3a..b1d6ab1ba57 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp index b1b3d96ff94..b0e2234a7e5 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp index 95ef8be2de3..0f95492fdb1 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp index 4dd1a828af7..914081bbc45 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp @@ -19,7 +19,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp index 0b4aeafdab1..d9870428732 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp @@ -19,7 +19,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp index f8e13b83b58..33f57fd3b86 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp @@ -17,7 +17,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp index 08e906884df..c130780dc9d 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp @@ -17,7 +17,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp index 099980015ee..25e5c4433cc 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp b/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp index adc65cc5ab3..4973bda4ddf 100644 --- a/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp +++ b/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp index 2a3b03df6f7..4a912eaec6f 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp index a1ca8ce6ee7..6596f2fffa7 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp index 47e66efd8b9..84f52bb2e50 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp index 0565b37e732..a3c9911abe9 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp index 689fb7281e0..af806bc0457 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp index 5f777ba1c56..102e8ea0815 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp @@ -18,7 +18,7 @@ #include <sstream> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int main() { diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp index 264494cb719..cee538800dd 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp index 6810c4f7600..cc08982a5ca 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp index e47214e6c08..b496d70dc2f 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp index 864da89d103..069b305111d 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp index 2d095a2b51f..4e09bf2464c 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp index a06157de8aa..9dc8a510beb 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp index fa5d0becf3f..4d72db595b1 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp index 0be44c752e2..47fc1ca51b8 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp index 4a9fabe381a..bf2ddd51f72 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp @@ -32,7 +32,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp index a64881cf502..19a5bdd977e 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp index 77ebe081d38..22006bb1be6 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp index 5946839b929..0bff70a977a 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp index 56af158ed96..f9fa204b9ee 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp index 0577ed0e594..daa6f40ae3c 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp index 3074bc93e71..95073bf7644 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp index 2105af0472c..eab117a843f 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp index 69359f765c3..56b3b35b3d9 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp index 32c340685bc..c02b202c49e 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp index 28e8db934fd..86f6a2db119 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp index 66063bb25cc..b935da5426f 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp index 3c5d115543d..487e2056f2c 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp index 05ab3196b02..21959405194 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp index 964d71c54be..bb1bce8d404 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp index 5758ae3c01f..2b975f160d5 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp @@ -16,7 +16,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp index 3326b35a057..3bdb800bf73 100644 --- a/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp index c2c57f6f13d..917248fa691 100644 --- a/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp index 8d998171c64..b3892d72de5 100644 --- a/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp index c13905e206f..dda7428992a 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp index ca4b067a1ce..9ed58a3e9bb 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp index c94eaef37db..ee804d9cc6e 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp index 4312e276541..3deb617e8d8 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp @@ -15,7 +15,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp index 8fa23b7ec25..29eba9a9767 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp @@ -16,7 +16,7 @@ #include <stdexcept> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp index 58f576084c3..7de95a8cda5 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" int sign(int x) { diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp index 302f725dced..590173eddf4 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp index 66b21aea39d..53d3a95292c 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp index 4416b826420..14ac4b2a153 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp index 3d28c2479be..4fb072fa474 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp index fd64fdf7802..32d0e86f3d8 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp index 59e00de36aa..6dd176df016 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp index 0c21a02fb5a..9e98a6ad20f 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp index d7db16f6e35..e409edc25f4 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp index f6ce46acf56..b130f9287ba 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp index 47c6d7ffd9b..3e6bd9d093e 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp index f131b962217..4db7762b275 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp index 6de632670c3..ba93adbe445 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp index 32aa77d5083..12765b71f28 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp index cfe71d2e787..f1b447c43f4 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp index 7d82dc0fe22..7f96e6351aa 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp index 98f78f80738..351c6727de2 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp index 3c48a77045d..24e58fc5f1a 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp index c3ea07976bf..e00d7fd8a3d 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp index f936651eb20..3006c466eed 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp index dc280d0aca2..a89df4e3ffa 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp index 8db67d9fa95..cbc0c9b3536 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp index 2b1efd336dc..450aebedd59 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp index 5699cabfbeb..47baf40b265 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp index d7c2e8503a6..05e6e517423 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp b/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp index 9612b583899..a73f70cd4b8 100644 --- a/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp +++ b/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../../min_allocator.h" +#include "min_allocator.h" template <class S> void diff --git a/libcxx/test/containers/min_allocator.h b/libcxx/test/support/min_allocator.h index c0d28e5faa2..c0d28e5faa2 100644 --- a/libcxx/test/containers/min_allocator.h +++ b/libcxx/test/support/min_allocator.h |
