From e34f6f6a12ab7e203144ff04b2d1940f52e2ec9b Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 26 Nov 2013 20:58:02 +0000 Subject: [PATCH] There were two identical files named 'min_allocator.h'. Move one of them to /support and delete the other. Then adjust all the tests that used them to include the moved one. No functionality change. llvm-svn: 195785 --- .../associative/map/map.access/at.pass.cpp | 2 +- .../associative/map/map.access/empty.pass.cpp | 2 +- .../map/map.access/index_key.pass.cpp | 2 +- .../map/map.access/index_rv_key.pass.cpp | 2 +- .../map/map.access/iterator.pass.cpp | 2 +- .../map/map.access/max_size.pass.cpp | 2 +- .../associative/map/map.access/size.pass.cpp | 2 +- .../associative/map/map.cons/alloc.pass.cpp | 2 +- .../map.cons/assign_initializer_list.pass.cpp | 2 +- .../associative/map/map.cons/compare.pass.cpp | 2 +- .../map/map.cons/compare_alloc.pass.cpp | 2 +- .../associative/map/map.cons/copy.pass.cpp | 2 +- .../map/map.cons/copy_alloc.pass.cpp | 2 +- .../map/map.cons/copy_assign.pass.cpp | 2 +- .../associative/map/map.cons/default.pass.cpp | 2 +- .../map/map.cons/initializer_list.pass.cpp | 2 +- .../initializer_list_compare.pass.cpp | 2 +- .../initializer_list_compare_alloc.pass.cpp | 2 +- .../map/map.cons/iter_iter.pass.cpp | 2 +- .../map/map.cons/iter_iter_comp.pass.cpp | 2 +- .../map.cons/iter_iter_comp_alloc.pass.cpp | 2 +- .../associative/map/map.cons/move.pass.cpp | 2 +- .../map/map.cons/move_alloc.pass.cpp | 2 +- .../map/map.cons/move_assign.pass.cpp | 2 +- .../map/map.modifiers/clear.pass.cpp | 2 +- .../map/map.modifiers/emplace.pass.cpp | 2 +- .../map/map.modifiers/emplace_hint.pass.cpp | 2 +- .../map/map.modifiers/erase_iter.pass.cpp | 2 +- .../map.modifiers/erase_iter_iter.pass.cpp | 2 +- .../map/map.modifiers/erase_key.pass.cpp | 2 +- .../map/map.modifiers/insert_cv.pass.cpp | 2 +- .../insert_initializer_list.pass.cpp | 2 +- .../map/map.modifiers/insert_iter_cv.pass.cpp | 2 +- .../map.modifiers/insert_iter_iter.pass.cpp | 2 +- .../map/map.modifiers/insert_iter_rv.pass.cpp | 2 +- .../map/map.modifiers/insert_rv.pass.cpp | 2 +- .../associative/map/map.ops/count.pass.cpp | 2 +- .../map/map.ops/equal_range.pass.cpp | 2 +- .../associative/map/map.ops/find.pass.cpp | 2 +- .../map/map.ops/lower_bound.pass.cpp | 2 +- .../map/map.ops/upper_bound.pass.cpp | 2 +- .../map/map.special/member_swap.pass.cpp | 2 +- .../map/map.special/non_member_swap.pass.cpp | 2 +- .../containers/associative/map/types.pass.cpp | 2 +- .../associative/multimap/empty.pass.cpp | 2 +- .../associative/multimap/iterator.pass.cpp | 2 +- .../associative/multimap/max_size.pass.cpp | 2 +- .../multimap/multimap.cons/alloc.pass.cpp | 2 +- .../assign_initializer_list.pass.cpp | 2 +- .../multimap/multimap.cons/compare.pass.cpp | 2 +- .../multimap.cons/compare_alloc.pass.cpp | 2 +- .../multimap/multimap.cons/copy.pass.cpp | 2 +- .../multimap.cons/copy_alloc.pass.cpp | 2 +- .../multimap.cons/copy_assign.pass.cpp | 2 +- .../multimap/multimap.cons/default.pass.cpp | 2 +- .../multimap.cons/initializer_list.pass.cpp | 2 +- .../initializer_list_compare.pass.cpp | 2 +- .../initializer_list_compare_alloc.pass.cpp | 2 +- .../multimap/multimap.cons/iter_iter.pass.cpp | 2 +- .../multimap.cons/iter_iter_comp.pass.cpp | 2 +- .../iter_iter_comp_alloc.pass.cpp | 2 +- .../multimap/multimap.cons/move.pass.cpp | 2 +- .../multimap.cons/move_alloc.pass.cpp | 2 +- .../multimap.cons/move_assign.pass.cpp | 2 +- .../multimap.modifiers/clear.pass.cpp | 2 +- .../multimap.modifiers/emplace.pass.cpp | 2 +- .../multimap.modifiers/emplace_hint.pass.cpp | 2 +- .../multimap.modifiers/erase_iter.pass.cpp | 2 +- .../erase_iter_iter.pass.cpp | 2 +- .../multimap.modifiers/erase_key.pass.cpp | 2 +- .../multimap.modifiers/insert_cv.pass.cpp | 2 +- .../insert_initializer_list.pass.cpp | 2 +- .../insert_iter_cv.pass.cpp | 2 +- .../insert_iter_iter.pass.cpp | 2 +- .../insert_iter_rv.pass.cpp | 2 +- .../multimap.modifiers/insert_rv.pass.cpp | 2 +- .../multimap/multimap.ops/count.pass.cpp | 2 +- .../multimap.ops/equal_range.pass.cpp | 2 +- .../multimap/multimap.ops/find.pass.cpp | 2 +- .../multimap.ops/lower_bound.pass.cpp | 2 +- .../multimap.ops/upper_bound.pass.cpp | 2 +- .../multimap.special/member_swap.pass.cpp | 2 +- .../multimap.special/non_member_swap.pass.cpp | 2 +- .../associative/multimap/size.pass.cpp | 2 +- .../associative/multimap/types.pass.cpp | 2 +- .../associative/multiset/clear.pass.cpp | 2 +- .../associative/multiset/count.pass.cpp | 2 +- .../associative/multiset/emplace.pass.cpp | 2 +- .../multiset/emplace_hint.pass.cpp | 2 +- .../associative/multiset/empty.pass.cpp | 2 +- .../associative/multiset/equal_range.pass.cpp | 2 +- .../associative/multiset/erase_iter.pass.cpp | 2 +- .../multiset/erase_iter_iter.pass.cpp | 2 +- .../associative/multiset/erase_key.pass.cpp | 2 +- .../associative/multiset/find.pass.cpp | 2 +- .../associative/multiset/insert_cv.pass.cpp | 2 +- .../multiset/insert_initializer_list.pass.cpp | 2 +- .../multiset/insert_iter_cv.pass.cpp | 2 +- .../multiset/insert_iter_iter.pass.cpp | 2 +- .../multiset/insert_iter_rv.pass.cpp | 2 +- .../associative/multiset/insert_rv.pass.cpp | 2 +- .../associative/multiset/iterator.pass.cpp | 2 +- .../associative/multiset/lower_bound.pass.cpp | 2 +- .../associative/multiset/max_size.pass.cpp | 2 +- .../assign_initializer_list.pass.cpp | 2 +- .../multiset/multiset.cons/default.pass.cpp | 2 +- .../multiset.cons/initializer_list.pass.cpp | 2 +- .../multiset/multiset.cons/iter_iter.pass.cpp | 2 +- .../multiset/multiset.cons/move.pass.cpp | 2 +- .../multiset.cons/move_assign.pass.cpp | 2 +- .../multiset.special/member_swap.pass.cpp | 2 +- .../associative/multiset/size.pass.cpp | 2 +- .../associative/multiset/types.pass.cpp | 2 +- .../associative/multiset/upper_bound.pass.cpp | 2 +- .../containers/associative/set/clear.pass.cpp | 2 +- .../containers/associative/set/count.pass.cpp | 2 +- .../associative/set/emplace.pass.cpp | 2 +- .../associative/set/emplace_hint.pass.cpp | 2 +- .../containers/associative/set/empty.pass.cpp | 2 +- .../associative/set/equal_range.pass.cpp | 2 +- .../associative/set/erase_iter.pass.cpp | 2 +- .../associative/set/erase_iter_iter.pass.cpp | 2 +- .../associative/set/erase_key.pass.cpp | 2 +- .../containers/associative/set/find.pass.cpp | 2 +- .../associative/set/insert_cv.pass.cpp | 2 +- .../set/insert_initializer_list.pass.cpp | 2 +- .../associative/set/insert_iter_cv.pass.cpp | 2 +- .../associative/set/insert_iter_iter.pass.cpp | 2 +- .../associative/set/insert_iter_rv.pass.cpp | 2 +- .../associative/set/insert_rv.pass.cpp | 2 +- .../associative/set/iterator.pass.cpp | 2 +- .../associative/set/lower_bound.pass.cpp | 2 +- .../associative/set/max_size.pass.cpp | 2 +- .../set.cons/assign_initializer_list.pass.cpp | 2 +- .../associative/set/set.cons/default.pass.cpp | 2 +- .../set/set.cons/initializer_list.pass.cpp | 2 +- .../set/set.cons/iter_iter.pass.cpp | 2 +- .../associative/set/set.cons/move.pass.cpp | 2 +- .../set/set.cons/move_assign.pass.cpp | 2 +- .../set/set.special/member_swap.pass.cpp | 2 +- .../containers/associative/set/size.pass.cpp | 2 +- .../containers/associative/set/types.pass.cpp | 2 +- .../associative/set/upper_bound.pass.cpp | 2 +- .../deque/deque.capacity/access.pass.cpp | 2 +- .../deque/deque.capacity/resize_size.pass.cpp | 2 +- .../deque.capacity/resize_size_value.pass.cpp | 2 +- .../deque.capacity/shrink_to_fit.pass.cpp | 2 +- .../sequences/deque/deque.cons/alloc.pass.cpp | 2 +- .../assign_initializer_list.pass.cpp | 2 +- .../deque.cons/assign_iter_iter.pass.cpp | 2 +- .../deque.cons/assign_size_value.pass.cpp | 2 +- .../sequences/deque/deque.cons/copy.pass.cpp | 2 +- .../deque/deque.cons/copy_alloc.pass.cpp | 2 +- .../deque/deque.cons/default.pass.cpp | 2 +- .../deque.cons/initializer_list.pass.cpp | 2 +- .../initializer_list_alloc.pass.cpp | 2 +- .../deque/deque.cons/iter_iter.pass.cpp | 2 +- .../deque/deque.cons/iter_iter_alloc.pass.cpp | 2 +- .../sequences/deque/deque.cons/move.pass.cpp | 2 +- .../deque/deque.cons/move_alloc.pass.cpp | 2 +- .../deque/deque.cons/move_assign.pass.cpp | 2 +- .../deque/deque.cons/op_equal.pass.cpp | 2 +- .../op_equal_initializer_list.pass.cpp | 2 +- .../sequences/deque/deque.cons/size.pass.cpp | 2 +- .../deque/deque.cons/size_value.pass.cpp | 2 +- .../deque.cons/size_value_alloc.pass.cpp | 2 +- .../deque/deque.modifiers/emplace.pass.cpp | 2 +- .../deque.modifiers/emplace_back.pass.cpp | 2 +- .../deque.modifiers/emplace_front.pass.cpp | 2 +- .../deque/deque.modifiers/erase_iter.pass.cpp | 2 +- .../deque.modifiers/erase_iter_iter.pass.cpp | 2 +- .../insert_iter_initializer_list.pass.cpp | 2 +- .../deque.modifiers/insert_iter_iter.pass.cpp | 2 +- .../deque.modifiers/insert_rvalue.pass.cpp | 2 +- .../insert_size_value.pass.cpp | 2 +- .../deque.modifiers/insert_value.pass.cpp | 2 +- .../deque/deque.modifiers/pop_back.pass.cpp | 2 +- .../deque/deque.modifiers/pop_front.pass.cpp | 2 +- .../deque/deque.modifiers/push_back.pass.cpp | 2 +- .../deque.modifiers/push_back_rvalue.pass.cpp | 2 +- .../deque/deque.modifiers/push_front.pass.cpp | 2 +- .../push_front_rvalue.pass.cpp | 2 +- .../deque/deque.special/copy.pass.cpp | 2 +- .../deque.special/copy_backward.pass.cpp | 2 +- .../deque/deque.special/move.pass.cpp | 2 +- .../deque.special/move_backward.pass.cpp | 2 +- .../deque/deque.special/swap.pass.cpp | 2 +- .../sequences/deque/iterators.pass.cpp | 2 +- .../containers/sequences/deque/types.pass.cpp | 2 +- .../forwardlist.access/front.pass.cpp | 2 +- .../forwardlist.cons/alloc.pass.cpp | 2 +- .../forwardlist.cons/assign_copy.pass.cpp | 2 +- .../forwardlist.cons/assign_init.pass.cpp | 2 +- .../forwardlist.cons/assign_move.pass.cpp | 2 +- .../forwardlist.cons/assign_op_init.pass.cpp | 2 +- .../forwardlist.cons/assign_range.pass.cpp | 2 +- .../assign_size_value.pass.cpp | 2 +- .../forwardlist.cons/copy.pass.cpp | 2 +- .../forwardlist.cons/copy_alloc.pass.cpp | 2 +- .../forwardlist.cons/default.pass.cpp | 2 +- .../forwardlist.cons/init.pass.cpp | 2 +- .../forwardlist.cons/init_alloc.pass.cpp | 2 +- .../forwardlist.cons/move.pass.cpp | 2 +- .../forwardlist.cons/move_alloc.pass.cpp | 2 +- .../forwardlist.cons/range.pass.cpp | 2 +- .../forwardlist.cons/range_alloc.pass.cpp | 2 +- .../forwardlist.cons/size.pass.cpp | 2 +- .../forwardlist.cons/size_value.pass.cpp | 2 +- .../size_value_alloc.pass.cpp | 2 +- .../forwardlist.iter/before_begin.pass.cpp | 2 +- .../forwardlist.iter/iterators.pass.cpp | 2 +- .../forwardlist.modifiers/clear.pass.cpp | 2 +- .../emplace_after.pass.cpp | 2 +- .../emplace_front.pass.cpp | 2 +- .../erase_after_many.pass.cpp | 2 +- .../erase_after_one.pass.cpp | 2 +- .../insert_after_const.pass.cpp | 2 +- .../insert_after_init.pass.cpp | 2 +- .../insert_after_range.pass.cpp | 2 +- .../insert_after_rv.pass.cpp | 2 +- .../insert_after_size_value.pass.cpp | 2 +- .../forwardlist.modifiers/pop_front.pass.cpp | 2 +- .../push_front_const.pass.cpp | 2 +- .../push_front_rv.pass.cpp | 2 +- .../resize_size.pass.cpp | 2 +- .../resize_size_value.pass.cpp | 2 +- .../forwardlist.ops/merge.pass.cpp | 2 +- .../forwardlist.ops/merge_pred.pass.cpp | 2 +- .../forwardlist.ops/remove.pass.cpp | 2 +- .../forwardlist.ops/remove_if.pass.cpp | 2 +- .../forwardlist.ops/reverse.pass.cpp | 2 +- .../forwardlist/forwardlist.ops/sort.pass.cpp | 2 +- .../forwardlist.ops/sort_pred.pass.cpp | 2 +- .../splice_after_flist.pass.cpp | 2 +- .../forwardlist.ops/splice_after_one.pass.cpp | 2 +- .../splice_after_range.pass.cpp | 2 +- .../forwardlist.ops/unique.pass.cpp | 2 +- .../forwardlist.ops/unique_pred.pass.cpp | 2 +- .../forwardlist.spec/equal.pass.cpp | 2 +- .../forwardlist.spec/member_swap.pass.cpp | 2 +- .../forwardlist.spec/non_member_swap.pass.cpp | 2 +- .../forwardlist.spec/relational.pass.cpp | 2 +- .../sequences/forwardlist/max_size.pass.cpp | 2 +- .../sequences/forwardlist/types.pass.cpp | 2 +- .../sequences/list/db_back.pass.cpp | 2 +- .../sequences/list/db_cback.pass.cpp | 2 +- .../sequences/list/db_cfront.pass.cpp | 2 +- .../sequences/list/db_front.pass.cpp | 2 +- .../sequences/list/db_iterators_6.pass.cpp | 2 +- .../sequences/list/db_iterators_7.pass.cpp | 2 +- .../sequences/list/db_iterators_8.pass.cpp | 2 +- .../sequences/list/iterators.pass.cpp | 2 +- .../list/list.capacity/resize_size.pass.cpp | 2 +- .../list.capacity/resize_size_value.pass.cpp | 2 +- .../list/list.cons/assign_copy.pass.cpp | 2 +- .../assign_initializer_list.pass.cpp | 2 +- .../list/list.cons/assign_move.pass.cpp | 2 +- .../sequences/list/list.cons/copy.pass.cpp | 2 +- .../list/list.cons/copy_alloc.pass.cpp | 2 +- .../sequences/list/list.cons/default.pass.cpp | 2 +- .../list.cons/default_stack_alloc.pass.cpp | 2 +- .../list/list.cons/initializer_list.pass.cpp | 2 +- .../list.cons/initializer_list_alloc.pass.cpp | 2 +- .../list/list.cons/input_iterator.pass.cpp | 2 +- .../sequences/list/list.cons/move.pass.cpp | 2 +- .../list/list.cons/move_alloc.pass.cpp | 2 +- .../op_equal_initializer_list.pass.cpp | 2 +- .../list/list.cons/size_type.pass.cpp | 2 +- .../list/list.cons/size_value_alloc.pass.cpp | 2 +- .../list/list.modifiers/clear.pass.cpp | 2 +- .../list/list.modifiers/emplace.pass.cpp | 2 +- .../list/list.modifiers/emplace_back.pass.cpp | 2 +- .../list.modifiers/emplace_front.pass.cpp | 2 +- .../list/list.modifiers/erase_iter.pass.cpp | 2 +- .../list.modifiers/erase_iter_db1.pass.cpp | 2 +- .../list.modifiers/erase_iter_db2.pass.cpp | 2 +- .../list.modifiers/erase_iter_iter.pass.cpp | 2 +- .../erase_iter_iter_db1.pass.cpp | 2 +- .../erase_iter_iter_db2.pass.cpp | 2 +- .../erase_iter_iter_db3.pass.cpp | 2 +- .../erase_iter_iter_db4.pass.cpp | 2 +- .../insert_iter_initializer_list.pass.cpp | 2 +- .../insert_iter_iter_iter.pass.cpp | 2 +- .../insert_iter_rvalue.pass.cpp | 2 +- .../insert_iter_size_value.pass.cpp | 2 +- .../list.modifiers/insert_iter_value.pass.cpp | 2 +- .../list/list.modifiers/pop_back.pass.cpp | 2 +- .../list/list.modifiers/pop_front.pass.cpp | 2 +- .../list/list.modifiers/push_back.pass.cpp | 2 +- .../list.modifiers/push_back_rvalue.pass.cpp | 2 +- .../list/list.modifiers/push_front.pass.cpp | 2 +- .../list.modifiers/push_front_rvalue.pass.cpp | 2 +- .../sequences/list/list.ops/merge.pass.cpp | 2 +- .../list/list.ops/merge_comp.pass.cpp | 2 +- .../sequences/list/list.ops/remove.pass.cpp | 2 +- .../list/list.ops/remove_if.pass.cpp | 2 +- .../sequences/list/list.ops/reverse.pass.cpp | 2 +- .../sequences/list/list.ops/sort.pass.cpp | 2 +- .../list/list.ops/sort_comp.pass.cpp | 2 +- .../list/list.ops/splice_pos_list.pass.cpp | 2 +- .../list.ops/splice_pos_list_iter.pass.cpp | 2 +- .../splice_pos_list_iter_iter.pass.cpp | 2 +- .../sequences/list/list.ops/unique.pass.cpp | 2 +- .../list/list.ops/unique_pred.pass.cpp | 2 +- .../list/list.special/db_swap_1.pass.cpp | 2 +- .../sequences/list/list.special/swap.pass.cpp | 2 +- .../containers/sequences/list/types.pass.cpp | 2 +- .../vector.bool/assign_copy.pass.cpp | 2 +- .../assign_initializer_list.pass.cpp | 2 +- .../vector.bool/assign_move.pass.cpp | 2 +- .../sequences/vector.bool/capacity.pass.cpp | 2 +- .../vector.bool/construct_default.pass.cpp | 2 +- .../vector.bool/construct_iter_iter.pass.cpp | 2 +- .../construct_iter_iter_alloc.pass.cpp | 2 +- .../vector.bool/construct_size.pass.cpp | 2 +- .../vector.bool/construct_size_value.pass.cpp | 2 +- .../construct_size_value_alloc.pass.cpp | 2 +- .../sequences/vector.bool/copy.pass.cpp | 2 +- .../sequences/vector.bool/copy_alloc.pass.cpp | 2 +- .../sequences/vector.bool/emplace.pass.cpp | 2 +- .../vector.bool/emplace_back.pass.cpp | 2 +- .../sequences/vector.bool/erase_iter.pass.cpp | 2 +- .../vector.bool/erase_iter_iter.pass.cpp | 2 +- .../vector.bool/initializer_list.pass.cpp | 2 +- .../initializer_list_alloc.pass.cpp | 2 +- .../insert_iter_initializer_list.pass.cpp | 2 +- .../insert_iter_iter_iter.pass.cpp | 2 +- .../insert_iter_size_value.pass.cpp | 2 +- .../vector.bool/insert_iter_value.pass.cpp | 2 +- .../sequences/vector.bool/iterators.pass.cpp | 2 +- .../sequences/vector.bool/move.pass.cpp | 2 +- .../sequences/vector.bool/move_alloc.pass.cpp | 2 +- .../op_equal_initializer_list.pass.cpp | 2 +- .../sequences/vector.bool/push_back.pass.cpp | 2 +- .../sequences/vector.bool/reserve.pass.cpp | 2 +- .../vector.bool/resize_size.pass.cpp | 2 +- .../vector.bool/resize_size_value.pass.cpp | 2 +- .../vector.bool/shrink_to_fit.pass.cpp | 2 +- .../sequences/vector.bool/swap.pass.cpp | 2 +- .../sequences/vector.bool/types.pass.cpp | 2 +- .../vector.bool/vector_bool.pass.cpp | 2 +- .../sequences/vector/db_back.pass.cpp | 2 +- .../sequences/vector/db_cback.pass.cpp | 2 +- .../sequences/vector/db_cfront.pass.cpp | 2 +- .../sequences/vector/db_cindex.pass.cpp | 2 +- .../sequences/vector/db_front.pass.cpp | 2 +- .../sequences/vector/db_index.pass.cpp | 2 +- .../sequences/vector/db_iterators_2.pass.cpp | 2 +- .../sequences/vector/db_iterators_3.pass.cpp | 2 +- .../sequences/vector/db_iterators_4.pass.cpp | 2 +- .../sequences/vector/db_iterators_5.pass.cpp | 2 +- .../sequences/vector/db_iterators_6.pass.cpp | 2 +- .../sequences/vector/db_iterators_7.pass.cpp | 2 +- .../sequences/vector/db_iterators_8.pass.cpp | 2 +- .../sequences/vector/iterators.pass.cpp | 2 +- .../sequences/vector/types.pass.cpp | 2 +- .../vector/vector.capacity/capacity.pass.cpp | 2 +- .../vector/vector.capacity/reserve.pass.cpp | 2 +- .../vector.capacity/resize_size.pass.cpp | 2 +- .../resize_size_value.pass.cpp | 2 +- .../vector.capacity/shrink_to_fit.pass.cpp | 2 +- .../vector/vector.capacity/swap.pass.cpp | 2 +- .../vector/vector.cons/assign_copy.pass.cpp | 2 +- .../assign_initializer_list.pass.cpp | 2 +- .../vector/vector.cons/assign_move.pass.cpp | 2 +- .../vector.cons/construct_default.pass.cpp | 2 +- .../vector.cons/construct_iter_iter.pass.cpp | 2 +- .../construct_iter_iter_alloc.pass.cpp | 2 +- .../vector.cons/construct_size.pass.cpp | 2 +- .../vector.cons/construct_size_value.pass.cpp | 2 +- .../construct_size_value_alloc.pass.cpp | 2 +- .../vector/vector.cons/copy.pass.cpp | 2 +- .../vector/vector.cons/copy_alloc.pass.cpp | 2 +- .../vector.cons/initializer_list.pass.cpp | 2 +- .../initializer_list_alloc.pass.cpp | 2 +- .../vector/vector.cons/move.pass.cpp | 2 +- .../vector/vector.cons/move_alloc.pass.cpp | 2 +- .../op_equal_initializer_list.pass.cpp | 2 +- .../vector/vector.data/data.pass.cpp | 2 +- .../vector/vector.data/data_const.pass.cpp | 2 +- .../vector/vector.modifiers/emplace.pass.cpp | 2 +- .../vector.modifiers/emplace_back.pass.cpp | 2 +- .../vector.modifiers/emplace_extra.pass.cpp | 2 +- .../vector.modifiers/erase_iter.pass.cpp | 2 +- .../vector.modifiers/erase_iter_db1.pass.cpp | 2 +- .../vector.modifiers/erase_iter_db2.pass.cpp | 2 +- .../vector.modifiers/erase_iter_iter.pass.cpp | 2 +- .../erase_iter_iter_db1.pass.cpp | 2 +- .../erase_iter_iter_db2.pass.cpp | 2 +- .../erase_iter_iter_db3.pass.cpp | 2 +- .../erase_iter_iter_db4.pass.cpp | 2 +- .../insert_iter_initializer_list.pass.cpp | 2 +- .../insert_iter_iter_iter.pass.cpp | 2 +- .../insert_iter_rvalue.pass.cpp | 2 +- .../insert_iter_size_value.pass.cpp | 2 +- .../insert_iter_value.pass.cpp | 2 +- .../vector/vector.modifiers/pop_back.pass.cpp | 2 +- .../vector.modifiers/push_back.pass.cpp | 2 +- .../push_back_rvalue.pass.cpp | 2 +- .../vector/vector.special/db_swap_1.pass.cpp | 2 +- .../vector/vector.special/swap.pass.cpp | 2 +- .../unord/unord.map/bucket.pass.cpp | 2 +- .../unord/unord.map/bucket_count.pass.cpp | 2 +- .../unord/unord.map/bucket_size.pass.cpp | 2 +- .../containers/unord/unord.map/count.pass.cpp | 2 +- .../unord/unord.map/db_iterators_7.pass.cpp | 2 +- .../unord/unord.map/db_iterators_8.pass.cpp | 2 +- .../unord.map/db_local_iterators_7.pass.cpp | 2 +- .../unord.map/db_local_iterators_8.pass.cpp | 2 +- .../containers/unord/unord.map/eq.pass.cpp | 2 +- .../unord.map/equal_range_const.pass.cpp | 2 +- .../unord.map/equal_range_non_const.pass.cpp | 2 +- .../unord/unord.map/find_const.pass.cpp | 2 +- .../unord/unord.map/find_non_const.pass.cpp | 2 +- .../unord/unord.map/iterators.pass.cpp | 2 +- .../unord/unord.map/load_factor.pass.cpp | 2 +- .../unord/unord.map/local_iterators.pass.cpp | 2 +- .../unord/unord.map/max_bucket_count.pass.cpp | 2 +- .../unord/unord.map/max_load_factor.pass.cpp | 2 +- .../unord/unord.map/max_size.pass.cpp | 2 +- .../unord/unord.map/rehash.pass.cpp | 2 +- .../unord/unord.map/reserve.pass.cpp | 2 +- .../unord/unord.map/swap_member.pass.cpp | 2 +- .../containers/unord/unord.map/types.pass.cpp | 2 +- .../unord.map.cnstr/allocator.pass.cpp | 2 +- .../unord.map.cnstr/assign_copy.pass.cpp | 2 +- .../unord.map.cnstr/assign_init.pass.cpp | 2 +- .../unord.map.cnstr/assign_move.pass.cpp | 2 +- .../unord.map/unord.map.cnstr/copy.pass.cpp | 2 +- .../unord.map.cnstr/copy_alloc.pass.cpp | 2 +- .../unord.map.cnstr/default.pass.cpp | 2 +- .../unord.map/unord.map.cnstr/init.pass.cpp | 2 +- .../unord.map.cnstr/init_size.pass.cpp | 2 +- .../unord.map.cnstr/init_size_hash.pass.cpp | 2 +- .../init_size_hash_equal.pass.cpp | 2 +- .../init_size_hash_equal_allocator.pass.cpp | 2 +- .../unord.map/unord.map.cnstr/move.pass.cpp | 2 +- .../unord.map.cnstr/move_alloc.pass.cpp | 2 +- .../unord.map/unord.map.cnstr/range.pass.cpp | 2 +- .../unord.map.cnstr/range_size.pass.cpp | 2 +- .../unord.map.cnstr/range_size_hash.pass.cpp | 2 +- .../range_size_hash_equal.pass.cpp | 2 +- .../range_size_hash_equal_allocator.pass.cpp | 2 +- .../unord.map/unord.map.cnstr/size.fail.cpp | 2 +- .../unord.map/unord.map.cnstr/size.pass.cpp | 2 +- .../unord.map.cnstr/size_hash.pass.cpp | 2 +- .../unord.map.cnstr/size_hash_equal.pass.cpp | 2 +- .../size_hash_equal_allocator.pass.cpp | 2 +- .../unord.map/unord.map.elem/at.pass.cpp | 2 +- .../unord.map/unord.map.elem/index.pass.cpp | 2 +- .../unord.map.swap/swap_non_member.pass.cpp | 2 +- .../unorder.map.modifiers/clear.pass.cpp | 2 +- .../unorder.map.modifiers/emplace.pass.cpp | 2 +- .../emplace_hint.pass.cpp | 2 +- .../erase_const_iter.pass.cpp | 2 +- .../unorder.map.modifiers/erase_key.pass.cpp | 2 +- .../erase_range.pass.cpp | 2 +- .../insert_const_lvalue.pass.cpp | 2 +- .../insert_hint_const_lvalue.pass.cpp | 2 +- .../insert_hint_rvalue.pass.cpp | 2 +- .../insert_init.pass.cpp | 2 +- .../insert_range.pass.cpp | 2 +- .../insert_rvalue.pass.cpp | 2 +- .../unord/unord.multimap/bucket.pass.cpp | 2 +- .../unord/unord.multimap/bucket_size.pass.cpp | 2 +- .../unord/unord.multimap/count.pass.cpp | 2 +- .../unord.multimap/db_iterators_7.pass.cpp | 2 +- .../unord.multimap/db_iterators_8.pass.cpp | 2 +- .../db_local_iterators_7.pass.cpp | 2 +- .../db_local_iterators_8.pass.cpp | 2 +- .../unord/unord.multimap/eq.pass.cpp | 2 +- .../unord.multimap/equal_range_const.pass.cpp | 2 +- .../equal_range_non_const.pass.cpp | 2 +- .../unord/unord.multimap/find_const.pass.cpp | 2 +- .../unord.multimap/find_non_const.pass.cpp | 2 +- .../unord/unord.multimap/iterators.pass.cpp | 2 +- .../unord/unord.multimap/load_factor.pass.cpp | 2 +- .../unord.multimap/local_iterators.pass.cpp | 2 +- .../unord.multimap/max_bucket_count.pass.cpp | 2 +- .../unord.multimap/max_load_factor.pass.cpp | 2 +- .../unord/unord.multimap/max_size.pass.cpp | 2 +- .../unord/unord.multimap/rehash.pass.cpp | 2 +- .../unord/unord.multimap/reserve.pass.cpp | 2 +- .../unord/unord.multimap/swap_member.pass.cpp | 2 +- .../unord/unord.multimap/types.pass.cpp | 2 +- .../unord.multimap.cnstr/allocator.pass.cpp | 2 +- .../unord.multimap.cnstr/assign_copy.pass.cpp | 2 +- .../unord.multimap.cnstr/assign_init.pass.cpp | 2 +- .../unord.multimap.cnstr/assign_move.pass.cpp | 2 +- .../unord.multimap.cnstr/copy.pass.cpp | 2 +- .../unord.multimap.cnstr/copy_alloc.pass.cpp | 2 +- .../unord.multimap.cnstr/default.pass.cpp | 2 +- .../unord.multimap.cnstr/init.pass.cpp | 2 +- .../unord.multimap.cnstr/init_size.pass.cpp | 2 +- .../init_size_hash.pass.cpp | 2 +- .../init_size_hash_equal.pass.cpp | 2 +- .../init_size_hash_equal_allocator.pass.cpp | 2 +- .../unord.multimap.cnstr/move.pass.cpp | 2 +- .../unord.multimap.cnstr/move_alloc.pass.cpp | 2 +- .../unord.multimap.cnstr/range.pass.cpp | 2 +- .../unord.multimap.cnstr/range_size.pass.cpp | 2 +- .../range_size_hash.pass.cpp | 2 +- .../range_size_hash_equal.pass.cpp | 2 +- .../range_size_hash_equal_allocator.pass.cpp | 2 +- .../unord.multimap.cnstr/size.fail.cpp | 2 +- .../unord.multimap.cnstr/size.pass.cpp | 2 +- .../unord.multimap.cnstr/size_hash.pass.cpp | 2 +- .../size_hash_equal.pass.cpp | 2 +- .../size_hash_equal_allocator.pass.cpp | 2 +- .../unord.multimap.modifiers/clear.pass.cpp | 2 +- .../unord.multimap.modifiers/emplace.pass.cpp | 2 +- .../emplace_hint.pass.cpp | 2 +- .../erase_const_iter.pass.cpp | 2 +- .../erase_key.pass.cpp | 2 +- .../erase_range.pass.cpp | 2 +- .../insert_const_lvalue.pass.cpp | 2 +- .../insert_hint_const_lvalue.pass.cpp | 2 +- .../insert_hint_rvalue.pass.cpp | 2 +- .../insert_init.pass.cpp | 2 +- .../insert_range.pass.cpp | 2 +- .../insert_rvalue.pass.cpp | 2 +- .../swap_non_member.pass.cpp | 2 +- .../unord/unord.multiset/bucket.pass.cpp | 2 +- .../unord.multiset/bucket_count.pass.cpp | 2 +- .../unord/unord.multiset/bucket_size.pass.cpp | 2 +- .../unord/unord.multiset/clear.pass.cpp | 2 +- .../unord/unord.multiset/count.pass.cpp | 2 +- .../unord.multiset/db_iterators_7.pass.cpp | 2 +- .../unord.multiset/db_iterators_8.pass.cpp | 2 +- .../db_local_iterators_7.pass.cpp | 2 +- .../db_local_iterators_8.pass.cpp | 2 +- .../unord/unord.multiset/emplace.pass.cpp | 2 +- .../unord.multiset/emplace_hint.pass.cpp | 2 +- .../unord/unord.multiset/eq.pass.cpp | 2 +- .../unord.multiset/equal_range_const.pass.cpp | 2 +- .../equal_range_non_const.pass.cpp | 2 +- .../unord.multiset/erase_const_iter.pass.cpp | 2 +- .../unord/unord.multiset/erase_key.pass.cpp | 2 +- .../unord/unord.multiset/erase_range.pass.cpp | 2 +- .../unord/unord.multiset/find_const.pass.cpp | 2 +- .../unord.multiset/find_non_const.pass.cpp | 2 +- .../insert_const_lvalue.pass.cpp | 2 +- .../insert_hint_const_lvalue.pass.cpp | 2 +- .../insert_hint_rvalue.pass.cpp | 2 +- .../unord/unord.multiset/insert_init.pass.cpp | 2 +- .../unord.multiset/insert_range.pass.cpp | 2 +- .../unord.multiset/insert_rvalue.pass.cpp | 2 +- .../unord/unord.multiset/iterators.pass.cpp | 2 +- .../unord/unord.multiset/load_factor.pass.cpp | 2 +- .../unord.multiset/local_iterators.pass.cpp | 2 +- .../unord.multiset/max_bucket_count.pass.cpp | 2 +- .../unord.multiset/max_load_factor.pass.cpp | 2 +- .../unord/unord.multiset/max_size.pass.cpp | 2 +- .../unord/unord.multiset/rehash.pass.cpp | 2 +- .../unord/unord.multiset/reserve.pass.cpp | 2 +- .../unord/unord.multiset/swap_member.pass.cpp | 2 +- .../unord/unord.multiset/types.pass.cpp | 2 +- .../unord.multiset.cnstr/allocator.pass.cpp | 2 +- .../unord.multiset.cnstr/assign_copy.pass.cpp | 2 +- .../unord.multiset.cnstr/assign_init.pass.cpp | 2 +- .../unord.multiset.cnstr/assign_move.pass.cpp | 2 +- .../unord.multiset.cnstr/copy.pass.cpp | 2 +- .../unord.multiset.cnstr/copy_alloc.pass.cpp | 2 +- .../unord.multiset.cnstr/default.pass.cpp | 2 +- .../unord.multiset.cnstr/init.pass.cpp | 2 +- .../unord.multiset.cnstr/init_size.pass.cpp | 2 +- .../init_size_hash.pass.cpp | 2 +- .../init_size_hash_equal.pass.cpp | 2 +- .../init_size_hash_equal_allocator.pass.cpp | 2 +- .../unord.multiset.cnstr/move.pass.cpp | 2 +- .../unord.multiset.cnstr/move_alloc.pass.cpp | 2 +- .../unord.multiset.cnstr/range.pass.cpp | 2 +- .../unord.multiset.cnstr/range_size.pass.cpp | 2 +- .../range_size_hash.pass.cpp | 2 +- .../range_size_hash_equal.pass.cpp | 2 +- .../range_size_hash_equal_allocator.pass.cpp | 2 +- .../unord.multiset.cnstr/size.fail.cpp | 2 +- .../unord.multiset.cnstr/size.pass.cpp | 2 +- .../unord.multiset.cnstr/size_hash.pass.cpp | 2 +- .../size_hash_equal.pass.cpp | 2 +- .../size_hash_equal_allocator.pass.cpp | 2 +- .../swap_non_member.pass.cpp | 2 +- .../unord/unord.set/bucket.pass.cpp | 2 +- .../unord/unord.set/bucket_count.pass.cpp | 2 +- .../unord/unord.set/bucket_size.pass.cpp | 2 +- .../containers/unord/unord.set/clear.pass.cpp | 2 +- .../containers/unord/unord.set/count.pass.cpp | 2 +- .../unord/unord.set/db_iterators_7.pass.cpp | 2 +- .../unord/unord.set/db_iterators_8.pass.cpp | 2 +- .../unord.set/db_local_iterators_7.pass.cpp | 2 +- .../unord.set/db_local_iterators_8.pass.cpp | 2 +- .../unord/unord.set/emplace.pass.cpp | 2 +- .../unord/unord.set/emplace_hint.pass.cpp | 2 +- .../containers/unord/unord.set/eq.pass.cpp | 2 +- .../unord.set/equal_range_const.pass.cpp | 2 +- .../unord.set/equal_range_non_const.pass.cpp | 2 +- .../unord/unord.set/erase_const_iter.pass.cpp | 2 +- .../unord/unord.set/erase_key.pass.cpp | 2 +- .../unord/unord.set/erase_range.pass.cpp | 2 +- .../unord/unord.set/find_const.pass.cpp | 2 +- .../unord/unord.set/find_non_const.pass.cpp | 2 +- .../unord.set/insert_const_lvalue.pass.cpp | 2 +- .../insert_hint_const_lvalue.pass.cpp | 2 +- .../unord.set/insert_hint_rvalue.pass.cpp | 2 +- .../unord/unord.set/insert_init.pass.cpp | 2 +- .../unord/unord.set/insert_range.pass.cpp | 2 +- .../unord/unord.set/insert_rvalue.pass.cpp | 2 +- .../unord/unord.set/iterators.pass.cpp | 2 +- .../unord/unord.set/load_factor.pass.cpp | 2 +- .../unord/unord.set/local_iterators.pass.cpp | 2 +- .../unord/unord.set/max_bucket_count.pass.cpp | 2 +- .../unord/unord.set/max_load_factor.pass.cpp | 2 +- .../unord/unord.set/max_size.pass.cpp | 2 +- .../unord/unord.set/rehash.pass.cpp | 2 +- .../unord/unord.set/reserve.pass.cpp | 2 +- .../unord/unord.set/swap_member.pass.cpp | 2 +- .../containers/unord/unord.set/types.pass.cpp | 2 +- .../unord.set.cnstr/allocator.pass.cpp | 2 +- .../unord.set.cnstr/assign_copy.pass.cpp | 2 +- .../unord.set.cnstr/assign_init.pass.cpp | 2 +- .../unord.set.cnstr/assign_move.pass.cpp | 2 +- .../unord.set/unord.set.cnstr/copy.pass.cpp | 2 +- .../unord.set.cnstr/copy_alloc.pass.cpp | 2 +- .../unord.set.cnstr/default.pass.cpp | 2 +- .../unord.set/unord.set.cnstr/init.pass.cpp | 2 +- .../unord.set.cnstr/init_size.pass.cpp | 2 +- .../unord.set.cnstr/init_size_hash.pass.cpp | 2 +- .../init_size_hash_equal.pass.cpp | 2 +- .../init_size_hash_equal_allocator.pass.cpp | 2 +- .../unord.set/unord.set.cnstr/move.pass.cpp | 2 +- .../unord.set.cnstr/move_alloc.pass.cpp | 2 +- .../unord.set/unord.set.cnstr/range.pass.cpp | 2 +- .../unord.set.cnstr/range_size.pass.cpp | 2 +- .../unord.set.cnstr/range_size_hash.pass.cpp | 2 +- .../range_size_hash_equal.pass.cpp | 2 +- .../range_size_hash_equal_allocator.pass.cpp | 2 +- .../unord.set/unord.set.cnstr/size.pass.cpp | 2 +- .../unord.set.cnstr/size_hash.pass.cpp | 2 +- .../unord.set.cnstr/size_hash_equal.pass.cpp | 2 +- .../size_hash_equal_allocator.pass.cpp | 2 +- .../unord.set.swap/swap_non_member.pass.cpp | 2 +- .../test/strings/basic.string/min_allocator.h | 252 ------------------ .../basic.string/string.access/at.pass.cpp | 2 +- .../basic.string/string.access/back.pass.cpp | 2 +- .../string.access/db_back.pass.cpp | 2 +- .../string.access/db_cback.pass.cpp | 2 +- .../string.access/db_cfront.pass.cpp | 2 +- .../string.access/db_cindex.pass.cpp | 2 +- .../string.access/db_front.pass.cpp | 2 +- .../string.access/db_index.pass.cpp | 2 +- .../basic.string/string.access/front.pass.cpp | 2 +- .../basic.string/string.access/index.pass.cpp | 2 +- .../string.capacity/capacity.pass.cpp | 2 +- .../string.capacity/clear.pass.cpp | 2 +- .../string.capacity/empty.pass.cpp | 2 +- .../string.capacity/length.pass.cpp | 2 +- .../string.capacity/max_size.pass.cpp | 2 +- .../string.capacity/reserve.pass.cpp | 2 +- .../string.capacity/resize_size.pass.cpp | 2 +- .../string.capacity/resize_size_char.pass.cpp | 2 +- .../string.capacity/shrink_to_fit.pass.cpp | 2 +- .../string.capacity/size.pass.cpp | 2 +- .../basic.string/string.cons/alloc.pass.cpp | 2 +- .../string.cons/char_assignment.pass.cpp | 2 +- .../basic.string/string.cons/copy.pass.cpp | 2 +- .../string.cons/copy_alloc.pass.cpp | 2 +- .../string.cons/copy_assignment.pass.cpp | 2 +- .../string.cons/initializer_list.pass.cpp | 2 +- .../initializer_list_assignment.pass.cpp | 2 +- .../string.cons/iter_alloc.pass.cpp | 2 +- .../basic.string/string.cons/move.pass.cpp | 2 +- .../string.cons/move_alloc.pass.cpp | 2 +- .../string.cons/move_assignment.pass.cpp | 2 +- .../string.cons/pointer_alloc.pass.cpp | 2 +- .../string.cons/pointer_assignment.pass.cpp | 2 +- .../string.cons/pointer_size_alloc.pass.cpp | 2 +- .../string.cons/size_char_alloc.pass.cpp | 2 +- .../basic.string/string.cons/substr.pass.cpp | 2 +- .../string.iterators/begin.pass.cpp | 2 +- .../string.iterators/cbegin.pass.cpp | 2 +- .../string.iterators/cend.pass.cpp | 2 +- .../string.iterators/crbegin.pass.cpp | 2 +- .../string.iterators/crend.pass.cpp | 2 +- .../string.iterators/db_iterators_2.pass.cpp | 2 +- .../string.iterators/db_iterators_3.pass.cpp | 2 +- .../string.iterators/db_iterators_4.pass.cpp | 2 +- .../string.iterators/db_iterators_5.pass.cpp | 2 +- .../string.iterators/db_iterators_6.pass.cpp | 2 +- .../string.iterators/db_iterators_7.pass.cpp | 2 +- .../string.iterators/db_iterators_8.pass.cpp | 2 +- .../string.iterators/end.pass.cpp | 2 +- .../string.iterators/rbegin.pass.cpp | 2 +- .../string.iterators/rend.pass.cpp | 2 +- .../string_append/initializer_list.pass.cpp | 2 +- .../string_append/iterator.pass.cpp | 2 +- .../string_append/pointer.pass.cpp | 2 +- .../string_append/pointer_size.pass.cpp | 2 +- .../string_append/push_back.pass.cpp | 2 +- .../string_append/size_char.pass.cpp | 2 +- .../string_append/string.pass.cpp | 2 +- .../string_append/string_size_size.pass.cpp | 2 +- .../string_assign/initializer_list.pass.cpp | 2 +- .../string_assign/iterator.pass.cpp | 2 +- .../string_assign/pointer.pass.cpp | 2 +- .../string_assign/pointer_size.pass.cpp | 2 +- .../string_assign/rv_string.pass.cpp | 2 +- .../string_assign/size_char.pass.cpp | 2 +- .../string_assign/string.pass.cpp | 2 +- .../string_assign/string_size_size.pass.cpp | 2 +- .../string_copy/copy.pass.cpp | 2 +- .../string_erase/erase_iter_db1.pass.cpp | 2 +- .../string_erase/erase_iter_db2.pass.cpp | 2 +- .../string_erase/erase_iter_iter_db1.pass.cpp | 2 +- .../string_erase/erase_iter_iter_db2.pass.cpp | 2 +- .../string_erase/erase_iter_iter_db3.pass.cpp | 2 +- .../string_erase/erase_iter_iter_db4.pass.cpp | 2 +- .../string_erase/iter.pass.cpp | 2 +- .../string_erase/iter_iter.pass.cpp | 2 +- .../string_erase/pop_back.pass.cpp | 2 +- .../string_erase/size_size.pass.cpp | 2 +- .../string_insert/iter_char.pass.cpp | 2 +- .../iter_initializer_list.pass.cpp | 2 +- .../string_insert/iter_iter_iter.pass.cpp | 2 +- .../string_insert/iter_size_char.pass.cpp | 2 +- .../string_insert/size_pointer.pass.cpp | 2 +- .../string_insert/size_pointer_size.pass.cpp | 2 +- .../string_insert/size_size_char.pass.cpp | 2 +- .../string_insert/size_string.pass.cpp | 2 +- .../size_string_size_size.pass.cpp | 2 +- .../string_op_plus_equal/char.pass.cpp | 2 +- .../initializer_list.pass.cpp | 2 +- .../string_op_plus_equal/pointer.pass.cpp | 2 +- .../string_op_plus_equal/string.pass.cpp | 2 +- .../iter_iter_initializer_list.pass.cpp | 2 +- .../iter_iter_iter_iter.pass.cpp | 2 +- .../string_replace/iter_iter_pointer.pass.cpp | 2 +- .../iter_iter_pointer_size.pass.cpp | 2 +- .../iter_iter_size_char.pass.cpp | 2 +- .../string_replace/iter_iter_string.pass.cpp | 2 +- .../string_replace/size_size_pointer.pass.cpp | 2 +- .../size_size_pointer_size.pass.cpp | 2 +- .../size_size_size_char.pass.cpp | 2 +- .../string_replace/size_size_string.pass.cpp | 2 +- .../size_size_string_size_size.pass.cpp | 2 +- .../string_swap/swap.pass.cpp | 2 +- .../string.io/get_line.pass.cpp | 2 +- .../string.io/get_line_delim.pass.cpp | 2 +- .../string.io/get_line_delim_rv.pass.cpp | 2 +- .../string.io/get_line_rv.pass.cpp | 2 +- .../string.io/stream_extract.pass.cpp | 2 +- .../string.io/stream_insert.pass.cpp | 2 +- .../string.special/swap.pass.cpp | 2 +- .../string_op!=/pointer_string.pass.cpp | 2 +- .../string_op!=/string_pointer.pass.cpp | 2 +- .../string_op!=/string_string.pass.cpp | 2 +- .../string_op+/char_string.pass.cpp | 2 +- .../string_op+/pointer_string.pass.cpp | 2 +- .../string_op+/string_char.pass.cpp | 2 +- .../string_op+/string_pointer.pass.cpp | 2 +- .../string_op+/string_string.pass.cpp | 2 +- .../string_operator==/pointer_string.pass.cpp | 2 +- .../string_operator==/string_pointer.pass.cpp | 2 +- .../string_operator==/string_string.pass.cpp | 2 +- .../string_opgt/pointer_string.pass.cpp | 2 +- .../string_opgt/string_pointer.pass.cpp | 2 +- .../string_opgt/string_string.pass.cpp | 2 +- .../string_opgt=/pointer_string.pass.cpp | 2 +- .../string_opgt=/string_pointer.pass.cpp | 2 +- .../string_opgt=/string_string.pass.cpp | 2 +- .../string_oplt/pointer_string.pass.cpp | 2 +- .../string_oplt/string_pointer.pass.cpp | 2 +- .../string_oplt/string_string.pass.cpp | 2 +- .../string_oplt=/pointer_string.pass.cpp | 2 +- .../string_oplt=/string_pointer.pass.cpp | 2 +- .../string_oplt=/string_string.pass.cpp | 2 +- .../string.accessors/c_str.pass.cpp | 2 +- .../string.ops/string.accessors/data.pass.cpp | 2 +- .../string.accessors/get_allocator.pass.cpp | 2 +- .../string_compare/pointer.pass.cpp | 2 +- .../string_compare/size_size_pointer.pass.cpp | 2 +- .../size_size_pointer_size.pass.cpp | 2 +- .../string_compare/size_size_string.pass.cpp | 2 +- .../size_size_string_size_size.pass.cpp | 2 +- .../string.ops/string_compare/string.pass.cpp | 2 +- .../char_size.pass.cpp | 2 +- .../pointer_size.pass.cpp | 2 +- .../pointer_size_size.pass.cpp | 2 +- .../string_size.pass.cpp | 2 +- .../string_find.first.of/char_size.pass.cpp | 2 +- .../pointer_size.pass.cpp | 2 +- .../pointer_size_size.pass.cpp | 2 +- .../string_find.first.of/string_size.pass.cpp | 2 +- .../char_size.pass.cpp | 2 +- .../pointer_size.pass.cpp | 2 +- .../pointer_size_size.pass.cpp | 2 +- .../string_size.pass.cpp | 2 +- .../string_find.last.of/char_size.pass.cpp | 2 +- .../string_find.last.of/pointer_size.pass.cpp | 2 +- .../pointer_size_size.pass.cpp | 2 +- .../string_find.last.of/string_size.pass.cpp | 2 +- .../string.ops/string_find/char_size.pass.cpp | 2 +- .../string_find/pointer_size.pass.cpp | 2 +- .../string_find/pointer_size_size.pass.cpp | 2 +- .../string_find/string_size.pass.cpp | 2 +- .../string_rfind/char_size.pass.cpp | 2 +- .../string_rfind/pointer_size.pass.cpp | 2 +- .../string_rfind/pointer_size_size.pass.cpp | 2 +- .../string_rfind/string_size.pass.cpp | 2 +- .../string.ops/string_substr/substr.pass.cpp | 2 +- .../{containers => support}/min_allocator.h | 0 810 files changed, 808 insertions(+), 1060 deletions(-) delete mode 100644 libcxx/test/strings/basic.string/min_allocator.h rename libcxx/test/{containers => support}/min_allocator.h (100%) 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 6c001a34428c..86b1e3d2dfa6 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 #include -#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 2e542ac8c321..b11e94c8042c 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 #include -#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 5dfdf400e5e7..ab1144c60afd 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 #include -#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 4c15f088fae5..a58d50d8499e 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 #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 64a6284eabef..7aa713cc5c13 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 #include -#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 6f86d0e9de84..551120d331e1 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 #include -#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 ab4b05baa5a6..07c12322a460 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 #include -#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 95d71da664a8..92146734d214 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 #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 a583f0d597fd..482d1acff840 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 #include -#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 2c4bb1a8cbc0..5a213c8e8b8f 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 #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 670acffc4580..dcb0856a7444 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 ce20d69d7c9a..15d1a4eb5070 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 849240408ab8..1512e2dfdfbd 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 fefb35ce7129..8bd45a3646d1 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 49fc223ffad5..2c6908e7b38e 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 #include -#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 63820beea13b..196943653a14 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 #include -#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 0c3bd23a6357..08f8a529f030 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 #include #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 d844624560ec..93930fc9e850 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 #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 d981ccff8899..c1029af6889e 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 #include -#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 0481de24ccd5..837fa8c6cdea 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 #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 2c767123af17..81fa3c8225e6 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 323a26548e93..0a0ca4455852 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 2bb2c0612586..d377ad87d85a 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 2e6ede7bec7f..8b0eca742562 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 77f50badfef9..c37499df307a 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 #include -#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 9a87becf684c..5ac44286376d 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 bf8173f770d8..7ce8c19805f7 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 086096b7c8ba..05fb988e991d 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 #include -#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 6589ace8ff1a..1b49956d8a5a 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 #include -#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 4a93173a7044..e41f5129140e 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 #include -#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 24d3f84ea305..3d28242fd322 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 #include -#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 bc7e760fad06..ab325ed45bfc 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 #include -#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 43ca35a099fe..278db4631a8c 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 #include -#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 d1acdf2b8269..964738b4a68a 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 #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 e84a82b609a8..22164202932e 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 #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 c5724c42980b..fea88957a703 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 #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 70eadac3f8f4..6628e3d89734 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 #include -#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 b08acb08693e..dff751c37246 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 #include -#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 4d1beabc8150..a7578449f5be 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 #include -#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 1ac175327c8c..87b84eef070a 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 #include -#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 20973e3e1631..037ceb962cd8 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 #include -#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 af5922526a08..4f7bd5154eda 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 #include -#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 e474a4661bb7..dc925fda87d9 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 #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 aca81dfb964d..487b69f8c375 100644 --- a/libcxx/test/containers/associative/map/types.pass.cpp +++ b/libcxx/test/containers/associative/map/types.pass.cpp @@ -32,7 +32,7 @@ #include #include -#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 cafdb7344c8f..2384960d10db 100644 --- a/libcxx/test/containers/associative/multimap/empty.pass.cpp +++ b/libcxx/test/containers/associative/multimap/empty.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 a58b58308370..1fdbfa1aa3ad 100644 --- a/libcxx/test/containers/associative/multimap/iterator.pass.cpp +++ b/libcxx/test/containers/associative/multimap/iterator.pass.cpp @@ -29,7 +29,7 @@ #include #include -#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 7bcb12a2e805..ccd8b10638c1 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 #include -#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 aa3b6e2e6d28..5b494c92303f 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 #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 8c658d4f61aa..0c8991832529 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 #include -#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 99265ef72f80..9a4e0f987fd0 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 #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 864a54299745..c578b20723a1 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 65a1e921a476..7edcc5121bfb 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 a9cba17de93c..c5b87aaa0d92 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 533338c9683d..c7a0e49588f7 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 ca8225f37384..2651d90a6fdf 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 #include -#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 139052c57304..937a202a55ea 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 #include -#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 f2545c0cbc16..e6677039c90c 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 #include #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 a2c0cdb858de..c65c36b4aaa2 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 #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 78fdbdb2022c..fa062e2be0b8 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 #include -#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 267edc210617..d6de59428dd6 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 #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 883f64c8e93d..dfd946e3be51 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 d6e835ca4772..06bab095f031 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 c807b4ff558f..7f5f0f7f2b0a 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 0aa7c185784f..e02a9888bb47 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 4864ec1141bd..fe9b8c8ba128 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 #include -#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 7af44261b43f..6fbcda922df5 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 3f94c03a3e56..7d5e5e89d15f 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 d2979b1eecc7..d91295b48c60 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 #include -#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 be1ab6f8d232..4d3789493110 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 #include -#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 c5dd6fbdcc7e..ebae10e6ebc7 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 #include -#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 c23d821e0bb2..d9afc9d0fdf0 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 #include -#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 8fc080d013f5..5e1a1d4125ef 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 #include -#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 0c8e91687315..b83c802c04cf 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 #include -#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 6e3d2f26bc34..70ff7ef6d6b8 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 #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 efc99e1e7620..60ca7d4a5b48 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 #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 1678c9de89e9..2f198f8f7c2f 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 #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 b0e4c58873ce..34c0413284af 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 #include -#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 4632eb1c4728..a408796d1fb3 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 #include -#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 e4dba289d09d..fb5afa241cab 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 #include -#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 5ec1210e8426..49cf6de853c5 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 #include -#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 aa5a525ae546..1920647705f9 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 #include -#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 1e1ab2335abf..c8f30aa7c71a 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 #include -#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 6f5b92fe1fec..d403774b6e56 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 #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 794c34a2846a..ac71d4c95b64 100644 --- a/libcxx/test/containers/associative/multimap/size.pass.cpp +++ b/libcxx/test/containers/associative/multimap/size.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 2fe8fe0eabf5..82132f15d097 100644 --- a/libcxx/test/containers/associative/multimap/types.pass.cpp +++ b/libcxx/test/containers/associative/multimap/types.pass.cpp @@ -32,7 +32,7 @@ #include #include -#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 f325a701abed..3069de5a300d 100644 --- a/libcxx/test/containers/associative/multiset/clear.pass.cpp +++ b/libcxx/test/containers/associative/multiset/clear.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 cba64301a335..12af167a19dc 100644 --- a/libcxx/test/containers/associative/multiset/count.pass.cpp +++ b/libcxx/test/containers/associative/multiset/count.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 08ac42b1d130..6b76cf05e03d 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 1510c0104778..1eddd1e920da 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 154180def468..32aef90d4188 100644 --- a/libcxx/test/containers/associative/multiset/empty.pass.cpp +++ b/libcxx/test/containers/associative/multiset/empty.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 6babfa1b9ae3..8c69d0c61ec5 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 #include -#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 3657f521cb1e..b6656668d407 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 #include -#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 de4c8783bf39..e1d7090d816f 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 #include -#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 170232904c4d..e9bce1e1b640 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 #include -#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 b4963e9dd0f8..364460a6ca3a 100644 --- a/libcxx/test/containers/associative/multiset/find.pass.cpp +++ b/libcxx/test/containers/associative/multiset/find.pass.cpp @@ -17,7 +17,7 @@ #include #include -#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 57e1e98f5003..179715753ab0 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 #include -#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 c609d242ae29..7e923f2516dd 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 #include -#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 fccc2b71960e..7d204024c212 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 #include -#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 3cfa9dd16c49..189c45498669 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 #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 f09d97de8277..342c6fd53d71 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 #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 e9e773ccd733..1030e0886ebe 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 #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 f801de7269eb..ccb6c6665ada 100644 --- a/libcxx/test/containers/associative/multiset/iterator.pass.cpp +++ b/libcxx/test/containers/associative/multiset/iterator.pass.cpp @@ -29,7 +29,7 @@ #include #include -#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 48e297ac6088..e466791d9356 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 #include -#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 a209d700ee60..5524f771b341 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 #include -#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 16ba28abfca9..7d76581d6d8e 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 #include -#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 cf24bf771ce6..b6176c92d2a2 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 #include -#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 60e6940e7237..dadafec7c3b1 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 #include -#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 3f0053996f3e..f6c1fd76de14 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 #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 97f593bb32b6..a5195f7eb6f6 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 e02942ffeeab..2af24ce9d597 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 8d5b1e822bc3..ce906896b9a4 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 #include -#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 8129a9c3675b..68099b566dfd 100644 --- a/libcxx/test/containers/associative/multiset/size.pass.cpp +++ b/libcxx/test/containers/associative/multiset/size.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 e3331cddc6db..da9c8d6b5fe0 100644 --- a/libcxx/test/containers/associative/multiset/types.pass.cpp +++ b/libcxx/test/containers/associative/multiset/types.pass.cpp @@ -32,7 +32,7 @@ #include #include -#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 932ab0b1044a..7ad3d6ced3d6 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 #include -#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 c6e01023f650..4439ad3b1e4e 100644 --- a/libcxx/test/containers/associative/set/clear.pass.cpp +++ b/libcxx/test/containers/associative/set/clear.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 7d7a31ad0dbb..a2dc177f2dab 100644 --- a/libcxx/test/containers/associative/set/count.pass.cpp +++ b/libcxx/test/containers/associative/set/count.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 69fdbeeb6b2d..731382f8d2cd 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 8e7fbbc40330..f06cfeceaf20 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 305ae39ff900..eb1080263f4f 100644 --- a/libcxx/test/containers/associative/set/empty.pass.cpp +++ b/libcxx/test/containers/associative/set/empty.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 5b83887e61fb..8a180ef49248 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 #include -#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 f05d4819e075..21666c36401e 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 #include -#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 953d1be8bd49..479950316655 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 #include -#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 12ee0af980ed..9d92bd70d700 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 #include -#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 6ce47f8dea08..d08d2fb1e245 100644 --- a/libcxx/test/containers/associative/set/find.pass.cpp +++ b/libcxx/test/containers/associative/set/find.pass.cpp @@ -17,7 +17,7 @@ #include #include -#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 eabd1a8722ae..18d5c2e03395 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 #include -#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 d75e8a8bcbda..fc6d612b2ebe 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 #include -#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 d86d40e89092..718e720559f4 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 #include -#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 d99dbe365acd..ff729a0e7b9b 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 #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 cf2dcbf91bb6..c149fa3c68e3 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 #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 0b58af6cad0e..39894514ee95 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 #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 f52e8451c5f8..39c8cc6723e4 100644 --- a/libcxx/test/containers/associative/set/iterator.pass.cpp +++ b/libcxx/test/containers/associative/set/iterator.pass.cpp @@ -29,7 +29,7 @@ #include #include -#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 1562dfa9041d..df202f31a4c3 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 #include -#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 b744b9eb16a4..cde4397c7178 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 #include -#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 26f38e94b19f..892ae5a0a799 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 #include -#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 300b4fc6873a..d047b12a9d17 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 #include -#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 7d981a11a858..2ad538e143f8 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 #include -#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 3248257fe2a6..7ca7fe14d6c4 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 #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 2d1b37f4e077..53d4bd6dcfd9 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 3e82e28d5164..48a799e49833 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 aa38fe03577c..f72abd7eb4a5 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 #include -#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 e1b6b6ce7c8c..e78654735508 100644 --- a/libcxx/test/containers/associative/set/size.pass.cpp +++ b/libcxx/test/containers/associative/set/size.pass.cpp @@ -16,7 +16,7 @@ #include #include -#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 04b9ead0381c..8d7bb68f0782 100644 --- a/libcxx/test/containers/associative/set/types.pass.cpp +++ b/libcxx/test/containers/associative/set/types.pass.cpp @@ -32,7 +32,7 @@ #include #include -#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 5e889d280d05..10a28f064698 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 #include -#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 1215f9582b06..77aaf3c131e5 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 fee4a8955c62..15f49df395e3 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 b05bffae93e4..727b5d5d8645 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 b823ace58bed..0ac1d5a680ce 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 e23e50003aa0..1bb672cb1c2f 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 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 27b8bbbed5f4..c760b4372444 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 #include -#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 0c60d75a8e87..6594984fc0d3 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 #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 7401f042efb2..fd6dd6e4ab63 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 #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 4029bcc724b7..8f79e122609c 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 #include #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 156e011343c1..9cf660cfb8c8 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 #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 910421c6fc3c..f8754f1df158 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 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 537ded5e0345..a9e0218e2e0b 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 #include -#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 66ee3abdaeb6..a2529b416a2e 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 #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 1a85871f9d58..faadf2b1a1db 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 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 2070f4a957a6..89d9b34e5e91 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 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 5764c61d54e8..e2fb7e61f154 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 def1fc396f70..f801ceb60e73 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 a9e760f2fbd6..eaab0f7cc85f 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 bb169c1f836e..4cbb0fb0249f 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 #include #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 577b51cf05f9..6468e4329bda 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 #include -#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 1f07caf4860c..8ce1ab2fd9fa 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 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 782c0ed5d0df..859deba1e1ae 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 #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 c61ce155e6d6..5693be702de7 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 d332bb45d729..806f7280332e 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 #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 892418e935f6..aa977eb84bf2 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 #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 6eebfa8e1a13..cf09d6e19b6e 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 #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 1b4da3faa9dd..bfab2a3a4fc6 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 37b6c1c157c8..b7fa4f6c5a5f 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 487db6bd564c..5f7804023c7f 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 #include -#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 1cf507c5d741..6ab948e7c3de 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 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 e1cac32357ed..0bde7d9b7e3a 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 #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 71129bf98e30..7b7786161db3 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 87be595b67b9..97827c1183a0 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 51812cf268f6..e642f7132f5c 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 17597abc7f51..e27edf51f797 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 cb7155a59f42..444ab9ba955b 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 c60fdfc55d10..d6c443914779 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 #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 e3b2d98f7a5a..700edd3abdb0 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 650a9b8a050c..1670a44aa076 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 #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 e8bf4daf0b73..7dfb4bc5c2de 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 #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 616812659086..b484a865c57b 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 #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 2da742f6d76e..b100ba487ea7 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 #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 6fe094f7b480..072d7a78a308 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 #include "test_iterators.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 d4da735a4083..035bcea37c3f 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 #include #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template C diff --git a/libcxx/test/containers/sequences/deque/iterators.pass.cpp b/libcxx/test/containers/sequences/deque/iterators.pass.cpp index a83a16b3a2f7..9140e02ba2b2 100644 --- a/libcxx/test/containers/sequences/deque/iterators.pass.cpp +++ b/libcxx/test/containers/sequences/deque/iterators.pass.cpp @@ -20,7 +20,7 @@ #include #include -#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 9e70299787f3..71cb54032f19 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 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 9a201aafd0cd..2ec9b8713326 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 #include -#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 318328753f82..07a8e22e0165 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 0379e47f4d17..0de0d99fd526 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 #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 088ed6d961b8..e0382a10db49 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 #include -#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 480350becc27..ee4130127eec 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 5efe79ff3ba6..551908fea166 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 #include -#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 ccbd7ce5b42f..fb3765d20306 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 #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 7e7dbb63aa71..ea53e1c37320 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 #include -#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 0c3f16237688..0759418a4b34 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 #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 764967931d17..9ff8215ff8ed 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 #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 aa002360619c..dcc438c3ed2d 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 #include -#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 987185dca059..5b31c4dad0a0 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 #include -#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 4b62a42e697f..e6e2f1249800 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 #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 01b12597c41d..41de1eb05598 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 b659e88ed90b..c43b3c19079d 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 57d345060af3..763952439f00 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 #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 8f3b39a64cf4..d0810f9df2f5 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 fb71b318581d..1bebcd4dec07 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 #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 4981d7e4214a..05ab98bb205d 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 #include -#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 da4e80dad928..6d92c68165c5 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 #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 1b89177220e5..083cec2886da 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 #include -#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 2e9951456b9a..02e17d72e5f3 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 #include -#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 33db9e9e5ce0..2739b49d8eb2 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 #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 680b5b848f24..e305c5b6ab52 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 #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 f3c7f4aac84b..c02337e0562d 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 #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 f3265930538f..bd9b15300efa 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 #include -#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 e36089e3b619..4f51498bc651 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 #include -#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 b6785e72f2f2..ec650b695727 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 #include -#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 7afaacdb3f6c..4d3018199809 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 #include -#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 dde6a13dcf5c..103475f1edab 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 #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 59f67701921b..4f0be520c30f 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 #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 42977535231a..b2da2ecd3bbd 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 #include -#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 0b73c7a09b09..276f2c9f8ed0 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 #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 bcf2865f89c8..85958afc1ce3 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 #include -#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 f2e99e1e3632..53181ec881e2 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 #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 e93728084890..20861368b43b 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 #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 89775d15a575..d722b925e196 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 #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 280d92ca5e8a..3b6f853c84cd 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 #include -#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 6d6c40ef3741..7e873bdddd09 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 #include -#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 98748033f9a8..a15e786cd283 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 #include -#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 93b8ad8090e4..4c4e80c3df25 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 #include -#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 b707c191d97e..9bf0d03a8855 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 9a8bd17d3e27..06e40c595ecb 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 8524439d2089..8b6ca39b2aab 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 0fee4a492174..51da651970cd 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 #include -#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 6e75d49fdfec..296ffcd6955d 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 #include -#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 0c6128055f47..90a159959632 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 #include -#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 9c95dc9369f4..25db6e64b8a9 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 #include -#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 f956f270aa81..b7dce20b7092 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 #include -#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 485d89ef0579..ca673b583683 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 da27cc9d9947..9c3a5466d9f8 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 #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 115a369e53cf..aa34ce95098b 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 #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 7823693d0ed0..42e245d007b0 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 96883b515179..be7ebaf44b03 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 #include -#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 d812f8a9e4a5..68cebf978cb9 100644 --- a/libcxx/test/containers/sequences/forwardlist/types.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/types.pass.cpp @@ -28,7 +28,7 @@ #include #include -#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 22a7eac48897..b16c0e90701e 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 #include -#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 613b4f1b8183..ba3977e16f48 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 #include -#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 2646fe1d1eec..d42290c43c08 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 #include -#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 f7c3dfcf34ab..037b16035c66 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 #include -#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 9528d75dce1d..a5b8020b3733 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 #include -#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 795ffa7d46c7..76a491b1184d 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 #include -#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 2c347231b861..1d1ee23a393a 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 #include -#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 9f6a51b951f6..a843334e42cb 100644 --- a/libcxx/test/containers/sequences/list/iterators.pass.cpp +++ b/libcxx/test/containers/sequences/list/iterators.pass.cpp @@ -20,7 +20,7 @@ #include #include -#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 d5135eef8c7f..7f0ebc980b43 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 #include #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 dbe2c3f66e13..ab171d5cc7e1 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 #include #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 422436ad05cd..6426e01202d3 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 #include #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 e438f4062de0..24bd140c4e4f 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 #include -#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 da788dd7ee56..3bcd82414a89 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 #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 b490ebaf8bfc..0d093bd2a552 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 #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 30eb9ff38f2f..910021c6853d 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 #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 a6e193c2ea86..e992dca9c7f2 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 #include #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 ef42e522fb3f..9d9946b68966 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 #include #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 f862eedf3920..3307017989eb 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 #include -#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 649610abc0a2..9720a3d0d3c2 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 #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 b5d8dcba72ab..09eae8ab43c1 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 #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 f1c5a98f1b55..ced38b47361a 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 #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 94711d4b1db1..78e144559b75 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 #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 f090043844b0..7b7b8a327b88 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 #include -#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 864b5adcf8a2..b72c9ca70e15 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 #include "../../../DefaultOnly.h" #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 89cdf0e1602b..e1d768e4446b 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 #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 5bfab6fe20c3..38696b6eb503 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 #include -#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 9f5edf5113d3..6476d1d6c6ae 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 #include -#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 71bc671e23e9..5983efc59ad1 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 #include -#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 2eee9da2deb0..e2e68e331381 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 #include -#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 0c2e5a1cceed..c1cc90043670 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 #include -#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 d5fd0449092d..18c15eb02c85 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 #include -#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 df567aa6e526..61ff8409c964 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 #include -#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 e1a6e5aef5d1..bd3f66b4116a 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 #include -#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 18b825beec42..71ad497e7d97 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 #include -#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 84fbf3755542..db76b4de4865 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 #include -#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 4bdee44faf3d..25c5c6147a01 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 #include -#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 5b1d3e1ac2f9..35a4ceb4848a 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 #include -#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 9afb506fea53..a82a2696e82a 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 #include -#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 9e23df3aa630..625004b5c7d6 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 #include #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 e575753e7fab..27d0411fb04d 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 #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 0de5a9f04fb3..ce2d386e91fa 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 #include -#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 bf9ed8b8770b..1b097e362e9f 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 #include -#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 a687b1b8fbbc..3add8518809c 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 #include -#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 cc1462cb422c..aec17cc08f43 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 #include -#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 2022bb05a541..2638c541fa1c 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 #include -#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 3f0dddd49244..070db9e8d6ba 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 #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 7042829eac68..b7f4febcd385 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 #include -#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 e7976fa4cd5a..8a3175504ebe 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 #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 9b8d2ad23897..d226ed5dc642 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 #include -#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 b09e2dcdbc55..ce861a5dcb88 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 #include -#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 f17dfc8ded67..76d878d02c37 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 #include -#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 e6366072ae69..b45562abdd31 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 #include -#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 3eafeee6e2bd..046453ae5386 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 #include -#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 a79f0a69ba20..1c11227237a7 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 #include -#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 c107e1fb9b4b..28125ab83c00 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 #include -#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 81916e0fcedf..354871c20afa 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 #include -#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 f4c04896fb09..5082c3f85175 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 #include -#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 5745af5181ff..fcc4acceec57 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 #include -#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 cfd9d03ab42b..48cad1ddd156 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 #include -#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 a9687a9e5ed5..f8935b81f6a7 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 #include -#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 e440f695f289..f7171795cd5f 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 #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 a8283fdeb59a..9f790cd22f6c 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 #include #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 9fa3a0573edc..95d7f5010f0d 100644 --- a/libcxx/test/containers/sequences/list/types.pass.cpp +++ b/libcxx/test/containers/sequences/list/types.pass.cpp @@ -25,7 +25,7 @@ #include #include -#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 7cf927b75531..e524e1a97614 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 #include #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 2cf929704746..2925fbc66745 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 #include -#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 5edd3137c5f5..b3bb0f157eea 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 #include #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 87c98987dbc1..63bff25f9f9a 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 #include -#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 fa396abddb7f..f7ec5db5e9bd 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 #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 3225d8732ae4..94e6801825d8 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 #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 12f1caec4b0d..ea9d41d342f8 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 #include "test_iterators.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 aa4ca0e27a45..65f2ed504d2a 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" #include "../../test_allocator.h" template 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 dc950a26c26d..fc772f10dfc4 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 5e0b22af19ce..6cca948ed834 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp b/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp index f0e2c7980ef7..b9ce87c216d5 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 #include #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 58e71ddca02c..2b5cae68a8b2 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 #include #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp b/libcxx/test/containers/sequences/vector.bool/emplace.pass.cpp index c57544085040..f3fd1e9926f0 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 #include -#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 86e0d7a8d3bc..57aa47822f8a 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 #include -#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 776b43ec4d73..cbf26dd570a5 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 #include -#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 8778c32d7246..2c2c4cc48616 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 #include -#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 7c1a5de61abd..b9b468654497 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 #include -#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 19b5b57fe15e..c86b644ab44c 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 #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 4865b2891422..c081cc81c592 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 #include -#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 5099ebc2e143..c49ef9bfaced 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 #include #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 9d49816c7d13..f9cb65cb8087 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 #include -#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 37bdebcb14ab..1213985f53f9 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 #include -#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 98f725e25cef..b63f6a60e98e 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 #include -#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 49d8e2378834..1b3fe49eea7c 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 #include #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 2b890d72ca23..7b157fb580eb 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 #include #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 6f201770dbed..ef3dc5d10796 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 #include -#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 21b3907b36a7..c6b0fbf41853 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 #include -#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 4e7fbeffebef..be717a3be8a8 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 #include -#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 17032458118a..77d54e5efc17 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 #include -#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 1413f5cd022d..8cecf44d2fb0 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 #include -#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 0b4cf4937cbd..1f9fcac3d9bf 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 #include -#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 ce5a10e7b687..f30e3473c23a 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 #include #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 ef33d04219c9..8cc9cb9990eb 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 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 e2bc48a8da8c..ea2262cd9c13 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 #include -#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 054445281824..05f3d07712eb 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 #include -#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 b8fd0326f20e..5eb1a353e8b0 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 #include -#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 36ba0dd47922..5e54da1d444e 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 #include -#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 18ef2cfa8157..133aa5652824 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 #include -#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 97cdb2428de7..388058fb3159 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 #include -#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 785263b8ce36..1daf076da67c 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 #include -#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 26700027848a..2d43843067b7 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 #include -#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 d47e3d456e14..051d66c33394 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 #include -#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 bba222e31f11..4c2aa628de14 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 #include -#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 c5d96c520f23..1b1090499c27 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 #include -#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 d33f29d0024c..424bc939b136 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 #include -#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 25555b491da5..72cdb10cbc85 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 #include -#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 d891630a13f9..7b898533197c 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 #include -#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 4ee16e9fd24a..82de6654abcb 100644 --- a/libcxx/test/containers/sequences/vector/iterators.pass.cpp +++ b/libcxx/test/containers/sequences/vector/iterators.pass.cpp @@ -20,7 +20,7 @@ #include #include -#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 5e1dc9b9ec4a..c0645878f45c 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 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 861ec9ab78d1..a22c6dae37c6 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 #include -#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 4b91711dfc34..2914af91a078 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 #include #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 7a3389fd0fae..e415cee04da3 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 #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 fb267617820c..49f373a09cb2 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 #include #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 7a8d0c71a388..6b0cce4eb679 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 #include #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 8152802bfa5d..46d84033a9ed 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 #include -#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 9623d0f328af..1ad4bfcf8beb 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 #include #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 13c3e4920137..c0dafce02a13 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 #include -#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 1a29db939ee0..335525475c70 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 #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 ec66c0d8545e..7321f9397515 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 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 6841319920e1..8dde17fb3017 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 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 afc8ea5d3d21..9edc10c80477 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 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 19d2760227b5..800c732194bd 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 #include "../../../DefaultOnly.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #include "../../../test_allocator.h" template 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 35adaed2fb1a..6a52d52afb5c 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 #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 27da426f82c2..5653521f2615 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 #include -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 34008ae3bde2..78e7fac79ffc 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 #include #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 22fca55f74cd..b0e07db29b0e 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 #include #include "../../../test_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" template 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 938c03611573..f231fcf8a2a3 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 #include -#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 12d27c67454c..d449f2a655e4 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 #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 0514f31a5a2f..6b9be7b3df50 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 #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 2f590dcdf895..2640593ec275 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 #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 916ddaa9fc86..13ec845eca82 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 #include -#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 9ae324332a64..4bda599a85ba 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 #include -#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 77e8b83af99d..7cb64f85d0d0 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 #include -#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 7cca940859ac..37298a534377 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 #include #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 1d024d452d60..a399433ce656 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 #include #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 d70320716bbf..04ff228313c2 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 #include -#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 6fcd189bdacb..fb9d8084f2b3 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 #include -#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 bd20844c02d2..0478d24c79f6 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 #include -#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 bbad13b05e36..c394f197402b 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 #include -#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 8a382edba671..e82d3a0dda62 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 #include -#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 395d97b1ebce..af6d0f757892 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 #include -#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 1f87c8000df7..eee2c66c5c8c 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 #include -#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 ab9cc370ee5e..505067d05a1a 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 #include -#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 141598ec477c..c7e4131cb49c 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 #include -#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 caba7844390b..386a4f6b37c5 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 #include -#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 41566a8d1491..97255b0b139a 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 #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 2f4b8e81ea3e..7ceb9332be2b 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 #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 e4232ff3746f..322c9ff71ae4 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 #include #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 d24847b588ea..28c7718175d6 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 #include #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 16891ae00267..62fa60103baa 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 #include #include "../../../stack_allocator.h" -#include "../../../min_allocator.h" +#include "min_allocator.h" #if _LIBCPP_DEBUG >= 1 #include 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 3170fe86363c..5446b7409b98 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 #include #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 0127dbc65907..bb1af29d3ac0 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 #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 7443fecc4d59..e7f6a0011e1a 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 #include -#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 8e2ea3720367..9fa1274162a9 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 #include #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 aa69708e3199..6837294e35bc 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 #include -#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 dbc24eed7377..9b8b4abf5eef 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 #include -#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 6000ab920e36..f3ab8fff4e43 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 #include -#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 04d169912607..ebacf2baa207 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 #include -#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 4e1ad1e045b3..b8db0a35ffc3 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 #include -#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 dbf0ddeb7552..c923dd77862e 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 #include -#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 95797f2484e1..fa1886bfff18 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 #include -#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 8a2ae7641d75..4b071cad7b47 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 #include -#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 ec1378577a08..17184e6a6da7 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 #include -#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 8f9c58e44f2f..d61c2e22c896 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 #include -#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 9291eb4fda7a..508205aa64c5 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 #include -#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 c049d2392c89..ee897d9ca222 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 #include -#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 04126938815a..efab12bba29c 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 #include -#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 c780a6631ce4..4ac126a596d8 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 #include -#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 70e6048c59a7..3b12480b0786 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 #include -#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 ec10f50b8b1f..770b1ace7a3e 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 #include -#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 a1f1c3c3faa7..b4ca8eb04472 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 #include -#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 925997bd7529..69fd70d2a172 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 #include -#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 1993741d0dc2..7d5ae3a8e46d 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 #include -#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 c516872c6179..84ece2355511 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 753316f7f0c9..48667cdc7f92 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 311a9a541e41..d0e16206b59b 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 4bf459169d12..2f3eab15186c 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 #include -#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 b49d6bfe994e..9267f1f927f6 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 8e8f97d95862..987d339cbb62 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 86d44f20642a..3a854e106543 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 f722249b6f60..a98c9007719a 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 398f2fd822b1..1aa67efa5a61 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 c7d5396e77ab..800bc59f44c0 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 b32c260e8207..1adaba985874 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 594331c3d0d2..60895ddb7ef2 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 fd28845f243b..e1591054d79b 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 bcc97b67dce6..59b488f05aa7 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 5e21873796d5..e2c0de7cb5a6 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 0f5e7b587298..e7ae08eee123 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 41055c40e223..379ce22a63ec 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 0f7348087f9b..ae2f2f7dc681 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 bc316d325a5b..8026c0135ee3 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 42822bc6e8fb..2f01ba04d15b 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 f6f294fded98..0aaf1d453db2 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 16b7f8bf34e8..cc07ff202a54 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 82825ce5f854..b67258734cc6 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 71303660cc39..7881f708a25a 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 81cb07ddb7e6..05d6937bf912 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 783189c7aa45..0d54d5e2c574 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 9c7f2b57359e..83e0ffc3fa5b 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 139ffad1295b..0b7754606f04 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 c8eade2fba16..c4d7128698e0 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 #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 bbee80d938cc..7f4e067c5157 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 #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 224286ab9648..44a6b8f6785d 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 0e0f188be788..9f320e949479 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 #include -#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 a115101d761e..5de74d2e6c92 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 #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 7cd14c63047f..21a4689658ae 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 #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 977581cdf1c9..422dbe45b435 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 #include -#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 c2a8666b1dcb..e6741a80efa0 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 #include -#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 ad915fd63c9b..f0664c3c3ffc 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 #include -#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 8bf66caf806e..a16f097b4c01 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 #include -#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 2e4230af16dd..981b8fb18a0a 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 #include -#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 5a4fd23aaf0e..92f6c40e4de0 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 #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 b667c7e45332..81e8a468d83f 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 #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 68cb25c8e87f..fc44e7828ffa 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 #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 3e050e943017..6c5e8c8ee84f 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 #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 46f7334027bc..be5acc196308 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 #include -#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 1528a347b60c..a02f72efc6c2 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 #include -#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 a1d0432b3c5d..66ac28c6b6f1 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 #include -#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 e7f06fe4d2ca..b6ba8d6194a4 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 #include -#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 2f7a0d91ebcc..f5ea5089349b 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 #include -#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 330374f576c0..93cbd5433f47 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 #include -#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 9185147404c4..159ae4963532 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 #include -#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 b069ded55afb..3e6eaf64cdb5 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 #include -#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 bc0c703bf81f..11116e95f193 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 #include -#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 8b78f70b5158..98d6862341c6 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 #include -#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 b967a5132f45..0d9ccaa692a0 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 #include -#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 8da85ba9aa5b..fd623d99f711 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 #include -#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 9abb196b368c..8a3faa8b3896 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 #include -#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 29cf689e0018..0d25ef52e417 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 #include -#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 695953d0012a..35e4c772fd33 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 #include -#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 0504db0666ea..23b90579ec41 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 #include -#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 0a208452dd65..39b7feeba4e5 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 #include -#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 ac247d7674c5..caba5932b23c 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 #include -#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 e722c04ac9ee..1d99208596c1 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 f13ae73b0bdc..801c74457d74 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 41b34ddae75d..e68fcd5216ec 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 369063cffd4a..5235415c4c58 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 #include -#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 dbcdca44a6ea..b8ceb36cce44 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 5c074ec4ed41..20b4da3f0028 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 a48f2ea05e5f..4bac2a86c489 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 8c7bc76ec24a..f9aa41647a1f 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 d46ba1c05bee..e89667394b65 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 0e0d864d7a55..fc3f31add16e 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 f450455d97a6..34b26f893331 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 bcde6666eb24..45a56d7c7152 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 7cb292744c5c..1c1b5f25fda3 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 7a2faaa66f43..45b4400d1bad 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 73c0ec2851e0..370bc53d6d3b 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 bc59d64b0e8c..a115d167bcad 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 b4983eaf3d54..5f24df230a27 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 6f0cba8fb68c..25f11932a885 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 a43148131118..5849ece238c6 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 53a50de40186..58006fb16c36 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 02cfb2fa52d6..a54bc5ba0ec3 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 e4fdfd3d9121..ca48b5e6cc01 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 640de3556e8f..3208c7813b29 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 95ba70bbea73..787e9304fec1 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 d9fac2ff3f18..cfc7b1ad6bb8 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 d691dd9cd65e..ea20b6bfe196 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 9f9027518202..5fb433ad113d 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 23fae577503b..1512f36e601b 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 a731f5b04c44..4efcfaa6ce53 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 #include -#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 80453b199d7d..4f2e8ef061fa 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 #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 13776deea55d..4d141ad137c8 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 #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 2b1d4d206671..25d6a7a010d5 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 #include -#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 d59609a20a81..3c099f322842 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 #include -#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 3ca3a3610fdf..f60ec071ff70 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 #include -#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 0528714d79e4..e7e7cb03b6d0 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 #include -#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 f7149a5a4033..c7cb1f4c014b 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 #include -#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 0489fc71e89c..bb89c3f1bca9 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 #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 0a7d8ea55ac9..23dbe84a3c51 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 #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 bda1958c251c..2820639b4ea0 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 #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 c8bd1284ab41..f3637587efe0 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 #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 0b5c5c3cd9fb..286b574061f6 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 2d8927d6710c..0293133d494a 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 #include -#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 36c45b0554b0..c7842e5c1977 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 #include -#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 8718223fbc96..639d7ac37965 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 #include -#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 73916312d6ea..61ca847e7c4a 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 #include -#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 426b5f88b56b..e548324d9545 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 #include -#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 92611ca767c2..c8ef2fbca163 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 #include -#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 635e2115d889..eef799787947 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 #include -#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 8bfe0fcd01fa..c1de95cace71 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 #include -#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 1adc686b81da..962b85298ae1 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 #include -#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 78478831bd26..13787d9b4037 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 #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 eddffc40df24..8885cc03cf03 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 #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 7350e4444ae3..bbedbc905a4b 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 #include -#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 3fe242f58eb2..a0aaac2bd868 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 #include -#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 ebda719bdcb5..73d44f7a56b7 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 #include -#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 6cb2c72cccd4..6a005d3e3ba6 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 #include -#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 b0b681586665..646d3562582f 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 #include -#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 601c4b3be1e9..baac08eddc1e 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 #include -#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 dbe4eae54f23..5caaf207aaf2 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 #include -#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 af6301807414..030487863f98 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 #include -#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 ce469976c827..0051e497fd7a 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 #include -#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 d3a3d767218a..25b4bc1aa04a 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 #include -#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 fb95ea32f3d5..634e4f4a176e 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 #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 7a9d3f7cfbd9..6941d86f6197 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 #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 28637f5f47c8..41c9d8136feb 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 #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 7cddb0d9094c..65a5bc2eb2a2 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 #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 e51b3e1c85fa..fd7077b40ac0 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 #include -#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 c6e4825fcbaa..07980c2afc85 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 #include -#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 6cc07b600d84..3471707e42a1 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 #include -#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 fa55a1f8ef22..619a8cf1266f 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 #include -#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 00cd1b1f3a93..08f52bb70840 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 #include -#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 23171294d711..a5d0b5538bce 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 #include -#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 9358c327c570..bc8d461c60bf 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 e1c9e0a0f38d..0c17583d371d 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 3a7c506f56a6..5c2ea2358c1b 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 5d7fa3aa6afb..82b403daa5eb 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 #include -#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 af9dd01bf323..ca7169e5c786 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 5f5cac2ffe84..6a2cd8ef0813 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 23ca1fc4b784..7baf89a26c27 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 942ab86ae641..94b78c7434b5 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 300a4db8bba6..d778861c0290 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 636f644944da..37d8ed6541d8 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 4546d5971392..220aa94edd0b 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 3578d35e534d..fbb39ea304f0 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 f16c2321211e..e1331da9f111 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 53bf1953345e..2894700c6964 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 bd2c3188d80e..7644bd3750d9 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 d7c69359527b..ef798657bd32 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 593ba0dae5c0..697ecf5518a4 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 e5283168ac73..daa26f28381d 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 1286eeef1ce0..6f3caeedff03 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 5fa494b91fbd..9538cde542c9 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 bace36a85387..2b83cb0ea0a1 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 a97750eb5678..cccd74b97da4 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 41f2e27797e6..3675a240ef19 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 1916b6b8072a..61cfc5e97c9a 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 4e9903745c00..6ffdbfd54e03 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 19f4440a8f6f..c0ec5af41dba 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 59eba5321a07..4d7b3f61999a 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 ca71ab3709b4..9d913e739cb2 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 b75816a9ab47..c2e068edffaf 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 b2bf2e1cd599..0dae664e0b23 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 #include -#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 649aaa150e61..caaa5a6011a9 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 #include -#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 26f05dbd3d80..628d55737a82 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 #include -#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 1f97ab75b133..6da15308508c 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 #include -#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 d850a7e57544..83bb8aaa2be0 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 #include -#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 3247f01a3914..80b1a49c5758 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 #include -#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 4ee888335c78..8b266bbf664f 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 #include -#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 e6df2a471d58..b9fcb8c4ae0c 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 #include -#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 0c5a1677b448..74d131b19abe 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 #include -#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 a6faecb3a75d..d105e7ac0f4e 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 #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 0d8a57aa9951..50b0035165d2 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 #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 7b5569e24bb8..54a9c2eced34 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 #include -#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 c64e0af34bfe..4168903e0200 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 #include -#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 6d7e044b5f5b..5a55083ba8ab 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 #include -#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 ff746016a976..3a9cb5817df9 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 #include -#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 187f11826f38..d97374a4d1ee 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 #include -#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 98b7d4d42971..a8a900551c7b 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 #include -#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 ca8b9e6a0324..e2238e5665f9 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 #include -#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 a2ab80425fc9..8afe32abd72f 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 #include -#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 b5d2733e1220..321e9054af6c 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 #include -#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 c195e522ddff..1393f5420111 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 #include -#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 ff7d742bb624..f612ec57249b 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 #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 18a97a15314e..2d8eafba4891 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 #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 aa3b38bbe2a0..72a83abf74e9 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 #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 9ed2cda99054..d62308e7357e 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 #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 7bb9770d8e04..d88310ece945 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 #include -#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 959f384cc37a..e0ed1694b05b 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 #include -#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 5b82228a3b1e..2ffd93f30d19 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 #include -#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 80398b8f8bd3..8b5e265de3f2 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 #include -#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 982c6b578c90..d326f4a2d7e2 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 #include -#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 43d66bb6d80a..1c6e74125c7d 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 #include -#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 bf4d31759389..30fffa561f78 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 525f94384128..7d6656a18674 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 9a972b725eb1..44976063c401 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 11d992f9fa0a..be0b359b2429 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 #include -#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 5d7897b90f78..3e2213432b2b 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 e7fa903636e4..e53656a0fdd1 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 256f4447c927..55c8df6db972 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 a197fca8376a..50ce419fe98e 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 7fe0e15df7ce..dbed56c37e48 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 67995b3abdc7..4265e3092f71 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 e53264fc5709..6eaa8c25b550 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 fcee4007ee0b..8e5938eb62c8 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 3cc3cf0ab8c0..4872babc6086 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 9dc61fbb0821..2905c042cd04 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 a191c7c2f0b1..04c7b8aa4099 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 4a1fc6cd8a8e..e8875ab6e467 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 3f1685c79753..11191a1783ab 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 1e58dbd7a26e..c9770579e1e8 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 d0166fab8931..24a6e3579a29 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 87e62a005d12..e4ed1343b814 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 6f6f1782f98e..b0e568ac1174 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 ac2aafd73508..90c419b6ffc2 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 5a051e827122..0f8925868c51 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 fe019669b2e2..450f2dd7bb9e 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 2bda6cc2fd24..b2b7da7fa3db 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 bd5e7545d363..9a52988cd9ce 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 e3378ce856b1..d20e03fb6000 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 57899aeffbde..f529ad6325ef 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 c0d28e5faa2a..000000000000 --- 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 - -template class min_pointer; -template class min_pointer; -template <> class min_pointer; -template <> class min_pointer; -template class min_allocator; - -template <> -class min_pointer -{ - const void* ptr_; -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - template - min_pointer(min_pointer 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 friend class min_pointer; -}; - -template <> -class min_pointer -{ - void* ptr_; -public: - min_pointer() noexcept = default; - min_pointer(std::nullptr_t) : ptr_(nullptr) {} - template ::value - >::type - > - min_pointer(min_pointer 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 friend class min_pointer; -}; - -template -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 p) : ptr_(static_cast(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 friend class min_pointer; - template friend class min_allocator; -}; - -template -class min_pointer -{ - 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 p) : ptr_(p.ptr_) {} - explicit min_pointer(min_pointer p) : ptr_(static_cast(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 friend class min_pointer; -}; - -template -inline -bool -operator==(min_pointer x, std::nullptr_t) -{ - return !static_cast(x); -} - -template -inline -bool -operator==(std::nullptr_t, min_pointer x) -{ - return !static_cast(x); -} - -template -inline -bool -operator!=(min_pointer x, std::nullptr_t) -{ - return static_cast(x); -} - -template -inline -bool -operator!=(std::nullptr_t, min_pointer x) -{ - return static_cast(x); -} - -template -class min_allocator -{ -public: - typedef T value_type; - typedef min_pointer pointer; - - min_allocator() = default; - template - min_allocator(min_allocator) {} - - pointer allocate(std::ptrdiff_t n) - { - return pointer(static_cast(::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 e24b560d3c9b..8fada8fb1eea 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 ed0d327f52d1..e91521441b80 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 b153249a717f..2b31fabc7c70 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 #include -#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 ece27a6d6547..7feb4239f07a 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 #include -#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 d36885e36b76..9f7785b85cda 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 #include -#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 385c21970000..6294200104ba 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 #include -#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 15985facac18..ff675bc5c217 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 #include -#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 82b119043692..b20e20188023 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 #include -#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 807e936ab151..ed80916f16f0 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 567eeee05ba1..cd3162385160 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 #include -#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 22ca1f3be147..4a447d5a8f05 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 #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template 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 ba8ba245d295..b73af7599344 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 29f62cdf76b3..ac65f5144858 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 5ddb5c1e0cc3..d3ae1aaee036 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 0fe7f123c897..e6a3aa42dde5 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 6fdb457e3f8f..a155825be752 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 d1b66a41bab4..14fe209fd59a 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 9fb0c8cc7a6f..f293df971f21 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 310cceca45ee..aacbffd098f0 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 9d51ca1705ac..21b475a8113f 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 3a8c571344f3..b15b56977ecb 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 #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template 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 4d750d8555c3..1c582bc51637 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 3ebb22862dc9..fb6001f85b60 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 #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template 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 693ecf38b771..d18241e565ae 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 #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template 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 10c49e55fff1..ccb6c599974b 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 7654901b8510..60e62cc288c4 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 #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 6bbf51a8805b..753076895359 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 #include -#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 ebd0974cd722..11f2b43c4cab 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 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 ba68087aa5d3..873e8891094d 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 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 80aadcb355a0..1f0d5cd7ca7d 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 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 3e6626b60eba..60de3b029bfc 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 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 befb143d9736..8aa88c9fe726 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 #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template 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 d035837cd972..c691613379a2 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 dbfcec7e33ee..629e2967b25f 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 #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template 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 a427d72ba8f9..a8e6fdf24f0f 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 #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template 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 16072111c89e..3e04a97bdcc6 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 #include "../test_allocator.h" -#include "../min_allocator.h" +#include "min_allocator.h" template 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 fddd6e675bb2..55f2eb30f80a 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 9a9f042d428e..d0c6ddbb9508 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 cca6ff622d7a..6b86d263245b 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 dbff2a57899d..6f29f433f314 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 109c583f070c..1fb422c080ac 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 d9011f523cc8..6cac1875ce81 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 #include -#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 3773dba35661..d90387e3a46d 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 #include -#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 f82349a4e1d3..c4a2d0a4baf6 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 #include -#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 8324c873ccc6..ce44cb1ba5b4 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 #include -#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 fff3907ab788..8fab8babc613 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 #include -#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 c36644ba2c0e..d1cac07e222b 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 #include -#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 d2b779b47aac..914c77d48c5c 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 #include -#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 b3732da3e24e..02180bbd73de 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 edb02d719abc..0111ad113638 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 630565b7d77f..750173dc342e 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 #include -#include "../min_allocator.h" +#include "min_allocator.h" template 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 0a1a412921d6..fb28e498c321 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 #include -#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 1e5307b2dca8..3bf2afa25521 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 #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 ab8136120583..5ae15f0a0a4a 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 64f7bb6f6f0d..5a9e8e2b814b 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 7a6a276fe7a5..b0a2eb5e5cbd 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 920a0bc7ea2e..00e6ae375cce 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 2568af4ef061..31f174b4f305 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 9f4081f4f890..ac74f2026545 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 b2c083415da7..2dae10745965 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 #include -#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 3eefb7b8cac7..83b5dd14b3f6 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 #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 f9d0614126ea..adf24ac49877 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 5a8f9ce09fc0..476fe963de73 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 8c8dc6225c51..ac0e535eea25 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 486161256fbb..a8f747091c6d 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 f58a8a49a13a..d7ddb77b8e0f 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 5430be3227a8..116673cc4dda 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 f1e5a4ba22bb..33801352816f 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 c9033dabdeba..6c2929d7f1d3 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 #include -#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 be95fe2d415d..d20fcd4623b7 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 #include -#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 1479171acdd7..5015241ad63e 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 #include -#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 13f97b45b66b..6a23bf88ca5c 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 #include -#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 be3ee641b9ff..a8443818aea5 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 #include -#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 c008196dcf0d..0549e816b44c 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 #include -#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 60d54965332c..c44db71ae3b0 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 b9bc6ca184be..dbe6d7ba0e73 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 e84a3ba12ec6..790ce40b0a00 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 a1c37a905424..bc9ec1cf8255 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 9eff67e7f01c..b9e5fa8bc064 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 8fc469e31336..e091662eae06 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 #include -#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 593279cdbf5d..38353dd2f4e4 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 #include "../../input_iterator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 e104072c73b6..739c89404c1d 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 25016ae4719c..734dd8dffb78 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 7f360993da12..29b00ec55b9f 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 5fad9b703d70..fd85696704cd 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 37ac686fa071..8c18941cf46a 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 b1c4f4bc29c3..b7317a32b418 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 bea51ea3797d..7384ae7f1d3c 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 04d588322d68..c291028998df 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 #include -#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 9bdd2aa2a76e..77b20d1bc080 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 8d5a949f3370..33649792521c 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 6bc7148be4b8..20455b258c0a 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 #include -#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 bdc4519305b0..9295c5bde9fa 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 6d552f0e747f..cb4ce61d0942 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 a8968ef7a3a4..b1d6ab1ba579 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 b1b3d96ff940..b0e2234a7e53 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 95ef8be2de33..0f95492fdb1a 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 4dd1a828af7d..914081bbc456 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 0b4aeafdab1f..d98704287327 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 f8e13b83b582..33f57fd3b86c 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 08e906884df5..c130780dc9d1 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 099980015eea..25e5c4433ccf 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 adc65cc5ab31..4973bda4ddf0 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 2a3b03df6f71..4a912eaec6fa 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 #include -#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 a1ca8ce6ee76..6596f2fffa79 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 #include -#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 47e66efd8b92..84f52bb2e50f 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 #include -#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 0565b37e7324..a3c9911abe9b 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 #include -#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 689fb7281e05..af806bc04570 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 #include -#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 5f777ba1c566..102e8ea08159 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 #include -#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 264494cb7193..cee538800dd0 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 6810c4f7600e..cc08982a5ca3 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 e47214e6c089..b496d70dc2f0 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 864da89d1033..069b305111d4 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 2d095a2b51f0..4e09bf2464c1 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 a06157de8aa7..9dc8a510bebc 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 fa5d0becf3f8..4d72db595b13 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 0be44c752e2c..47fc1ca51b85 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 4a9fabe381ab..bf2ddd51f728 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 a64881cf5029..19a5bdd977e4 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 77ebe081d387..22006bb1be68 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 5946839b9299..0bff70a977a6 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 56af158ed965..f9fa204b9eea 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 0577ed0e594e..daa6f40ae3c0 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 3074bc93e719..95073bf7644c 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 2105af0472cd..eab117a843fa 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 69359f765c3a..56b3b35b3d94 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 32c340685bcd..c02b202c49e6 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 28e8db934fd1..86f6a2db119a 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 66063bb25cce..b935da5426fd 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 3c5d115543df..487e2056f2ca 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 05ab3196b02a..21959405194d 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 964d71c54be7..bb1bce8d4043 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 5758ae3c01ff..2b975f160d5d 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 3326b35a0577..3bdb800bf736 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 c2c57f6f13d0..917248fa6916 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 8d998171c64a..b3892d72de57 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 #include "../../test_allocator.h" -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 c13905e206f8..dda7428992a1 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 #include -#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 ca4b067a1ce5..9ed58a3e9bbc 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 #include -#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 c94eaef37dbe..ee804d9cc6e5 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 #include -#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 4312e276541f..3deb617e8d84 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 #include -#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 8fa23b7ec257..29eba9a97675 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 #include -#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 58f576084c36..7de95a8cda56 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 #include -#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 302f725dced2..590173eddf41 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 66b21aea39dd..53d3a95292c2 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 4416b8264204..14ac4b2a153b 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 3d28c2479bee..4fb072fa4744 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 fd64fdf7802e..32d0e86f3d84 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 59e00de36aaf..6dd176df0165 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 0c21a02fb5a8..9e98a6ad20f7 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 d7db16f6e356..e409edc25f48 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 f6ce46acf56d..b130f9287ba3 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 47c6d7ffd9b4..3e6bd9d093ea 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 f131b962217f..4db7762b2755 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 6de632670c36..ba93adbe445e 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 32aa77d5083d..12765b71f28f 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 cfe71d2e787b..f1b447c43f4b 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 7d82dc0fe22e..7f96e6351aa6 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 98f78f80738b..351c6727de2d 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 3c48a77045d7..24e58fc5f1ad 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 c3ea07976bf9..e00d7fd8a3dc 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 f936651eb203..3006c466eed3 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 dc280d0aca29..a89df4e3ffa1 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 8db67d9fa955..cbc0c9b35367 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 2b1efd336dc0..450aebedd59c 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 5699cabfbebd..47baf40b265b 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 d7c2e8503a6f..05e6e5174232 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template 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 9612b5838995..a73f70cd4b89 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 #include -#include "../../min_allocator.h" +#include "min_allocator.h" template void diff --git a/libcxx/test/containers/min_allocator.h b/libcxx/test/support/min_allocator.h similarity index 100% rename from libcxx/test/containers/min_allocator.h rename to libcxx/test/support/min_allocator.h