diff options
324 files changed, 366 insertions, 719 deletions
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 92146734d21..2292c47ef74 100644 --- a/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../test_allocator.h" +#include "test_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 dcb0856a744..56b3c3315e0 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 @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 15d1a4eb507..be527413308 100644 --- a/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 1512e2dfdfb..fcbe5976d6d 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 @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 8bd45a3646d..ac05e291067 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 @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp index d673c6d673e..6c6b6140f0f 100644 --- a/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp index a563371aca9..c60f2e7e8ba 100644 --- a/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 93930fc9e85..765428a631e 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 @@ -16,7 +16,7 @@ #include <map> #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 81fa3c8225e..67fb5d64476 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 @@ -19,7 +19,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 0a0ca445585..c06f2ee5021 100644 --- a/libcxx/test/containers/associative/map/map.cons/move.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/move.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 d377ad87d85..1845e88b7a5 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 @@ -18,7 +18,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 8b0eca74256..6d285fce000 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 @@ -18,7 +18,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp index 3bc1e68585f..d12f9a9784f 100644 --- a/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp index e9ec1202927..6de4b67b326 100644 --- a/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 dc925fda87d..57588e6ff16 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 @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../test_compare.h" #include "min_allocator.h" diff --git a/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp b/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp index ef2ef040379..b8b78635166 100644 --- a/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 5b494c92303..87bf0447e5b 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../test_allocator.h" +#include "test_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 c578b20723a..1224884939c 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 @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 7edcc5121bf..3d6626eaadb 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 c5b87aaa0d9..22594e32d71 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 @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 c7a0e49588f..f00f0fed166 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 @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp index a144ba9406d..315efd15276 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp index 14e3f6400c2..50d8f42a9ab 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 c65c36b4aaa..0e73f72793e 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 @@ -16,7 +16,7 @@ #include <map> #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 dfd946e3be5..259fbd145ff 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 @@ -19,7 +19,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 06bab095f03..aed08867c3c 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 7f5f0f7f2b0..651993a769f 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 @@ -18,7 +18,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 e02a9888bb4..496e5357279 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 @@ -18,7 +18,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp index ddb4e484bd2..b2488180c5e 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp index 6ea06994940..84316a1ea06 100644 --- a/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 d403774b6e5..effec2be092 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 @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../test_compare.h" #include "min_allocator.h" diff --git a/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp index b07d56a2158..687c44385da 100644 --- a/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp index 0a5176a41c9..0a7572275af 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp index 41bf248bbad..76c9f8b2a8a 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp index c6b28226f14..dde36287210 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp index 3bde9d6d13f..04a769e7332 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp index 8636420f04c..19bdd713e9f 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp index 2e3e56ef5ef..a0bdb0786c2 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp index f04ae9457e1..658af1a89de 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp index d0eebadc6c5..83114893a1b 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp index b6d25d6ec5f..4ed00c7124c 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp @@ -20,7 +20,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 a5195f7eb6f..40321cd247e 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp index d518fb2b6d4..1a0b065f8b9 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp @@ -18,7 +18,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 2af24ce9d59..0b0ce44cb8d 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 @@ -18,7 +18,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp index e5ce3498164..cef3f202487 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp index 8f2b49604ca..e18f3f5f1bf 100644 --- a/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp index 0b4a7a70283..222985a08f7 100644 --- a/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp @@ -15,7 +15,7 @@ #include <set> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../test_compare.h" int main() diff --git a/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp index dd2878706be..531fe801a16 100644 --- a/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp index 4506eaf6517..67433ff88a0 100644 --- a/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp index fb7b36021ff..22b3328d4d7 100644 --- a/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp b/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp index df54cd3090b..a0e34e48de4 100644 --- a/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp index 9e244fe9d6d..1ad03dc1404 100644 --- a/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp b/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp index 0bf6d1be2c5..ae83eb3c9f8 100644 --- a/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp index 6cf394e6454..4d5754a9e6b 100644 --- a/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp index 66adff0a836..25f5425c75a 100644 --- a/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp index d4021acfc30..821820a1e0c 100644 --- a/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp @@ -17,7 +17,7 @@ #include <set> #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp index 1ae4634a5b7..5ccb6e5cbcd 100644 --- a/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp @@ -24,7 +24,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 53d4bd6dcfd..4026ec70c3e 100644 --- a/libcxx/test/containers/associative/set/set.cons/move.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/move.pass.cpp @@ -17,7 +17,7 @@ #include <cassert> #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp index f50ce006ab3..c4617f0b481 100644 --- a/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp @@ -18,7 +18,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_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 48a799e4983..4e08f014ebe 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 @@ -18,7 +18,7 @@ #include "../../../MoveOnly.h" #include "../../../test_compare.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp index 35683b1b67e..17ea74036db 100644 --- a/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp index c3df4cace68..7a8ae7bf2b5 100644 --- a/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp b/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp index 6f7d0bf5a98..c9cffc68a12 100644 --- a/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp +++ b/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp @@ -15,7 +15,7 @@ #include <set> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../test_compare.h" int main() diff --git a/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp b/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp index 2ce1d8c5eae..c4f169aa512 100644 --- a/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp index a0b17a152fd..b102f117d48 100644 --- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <queue> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct test diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp index 8a204d7d6f7..4d99fc14728 100644 --- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <queue> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct test diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp index 95ee9128e97..66ca614126f 100644 --- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <queue> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class C> C diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp index 26139fb76a0..643b0c625ab 100644 --- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <queue> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class C> C diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp index 84990851b9c..a5a073c079b 100644 --- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp @@ -25,7 +25,7 @@ make(int n) return c; } -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct test diff --git a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp index e102fd4b000..d4df36cf2af 100644 --- a/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp @@ -29,7 +29,7 @@ make(int n) return c; } -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct test diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp index c8a2d123814..b3ee758182a 100644 --- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <queue> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" struct test : private std::queue<int, std::deque<int, test_allocator<int> > > diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp index 4e07e3d04b0..16ba1747dd8 100644 --- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <queue> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class C> C diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp index 9ac82f7b89b..70eaa18f9e2 100644 --- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <queue> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class C> C diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp index a9bc8334b53..b752238056b 100644 --- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <queue> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp index 8e0efbbc3f6..11b4ecd3b0a 100644 --- a/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <queue> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp index 1a98cb5c830..94899d4f1b5 100644 --- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <stack> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" struct test : private std::stack<int, std::deque<int, test_allocator<int> > > diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp index 2fd06ee3a30..fe8622751c9 100644 --- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <stack> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class C> C diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp index 4a15c792057..33cb4dd52b3 100644 --- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <stack> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class C> C diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp index 87a7963cc79..16ba9d76cd0 100644 --- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <stack> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp index 98496d3c7cf..19d968a0854 100644 --- a/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp +++ b/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <stack> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES 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 1bb672cb1c2..841bfd9f8a7 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../NotConstructible.h" #include "min_allocator.h" 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 8f79e122609..fa0c1203ede 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp @@ -13,7 +13,7 @@ #include <deque> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class C> 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 9cf660cfb8c..efea4948eba 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 @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class C> diff --git a/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp index fef1bb01b01..3605a1b636f 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp index 15e082e4557..0f459b2c919 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 a2529b416a2..36c5af60ee3 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 @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() 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 89d9b34e5e9..b8c3e889929 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 @@ -16,7 +16,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class InputIterator, class Allocator> 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 e2fb7e61f15..a20ad4cecbd 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_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 f801ceb60e7..0ba4a2da330 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 @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_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 eaab0f7cc85..bb01dc5c54b 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 @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp index 87b0f0eeac0..c2bb40a8b6f 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp index 4375a27a172..36f780703c0 100644 --- a/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 4cbb0fb0249..3a6ec8370b8 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 @@ -13,7 +13,7 @@ #include <deque> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class 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 035bcea37c3..808144c9ebe 100644 --- a/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class C> diff --git a/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp index c41e88be17a..d55d719c762 100644 --- a/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/deque/types.pass.cpp b/libcxx/test/containers/sequences/deque/types.pass.cpp index 71cb54032f1..d32b65c9004 100644 --- a/libcxx/test/containers/sequences/deque/types.pass.cpp +++ b/libcxx/test/containers/sequences/deque/types.pass.cpp @@ -33,7 +33,7 @@ #include <iterator> #include <type_traits> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "../../Copyable.h" #include "min_allocator.h" diff --git a/libcxx/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp b/libcxx/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp index d9cedc48789..d274bc03088 100644 --- a/libcxx/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp +++ b/libcxx/test/containers/sequences/dynarray/dynarray.cons/alloc.pass.cpp @@ -31,7 +31,7 @@ #include <algorithm> #include <complex> #include <string> -#include "../../../test_allocator.h" +#include "test_allocator.h" using std::experimental::dynarray; diff --git a/libcxx/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp b/libcxx/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp index f0cd78434c8..9b8240d4cd8 100644 --- a/libcxx/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp +++ b/libcxx/test/containers/sequences/dynarray/dynarray.traits/default.pass.cpp @@ -18,7 +18,7 @@ #if _LIBCPP_STD_VER > 11 #include <experimental/dynarray> -#include "../../../test_allocator.h" +#include "test_allocator.h" using std::experimental::dynarray; diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp index 044197ad66e..cd4d1ede120 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../NotConstructible.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 07a8e22e016..7aba906ec20 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../NotConstructible.h" #include "min_allocator.h" 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 0de0d99fd52..0b9263db989 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 @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../test_allocator.h" +#include "test_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 ee4130127ee..a3d270f01d9 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 @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../MoveOnly.h" #include "min_allocator.h" 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 0759418a4b3..2fc53bc3a51 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../test_allocator.h" +#include "test_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 9ff8215ff8e..bcc24e1cc68 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 @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp index 2236048d038..6b0233d65b6 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp index 9f12ced1e33..1f7b05efd66 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 e6e2f124980..750486b829f 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 @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../test_allocator.h" +#include "test_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 41de1eb0559..164801a0b40 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../MoveOnly.h" #include "min_allocator.h" 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 c43b3c19079..ba0cb5d3beb 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 @@ -15,7 +15,7 @@ #include <cassert> #include <iterator> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../MoveOnly.h" #include "min_allocator.h" diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp index b19e6dcfe39..cc5b9d54ed3 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp index d3a3d523746..3666c7d169d 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 d0810f9df2f..d72c3581022 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 @@ -17,7 +17,7 @@ #include <cassert> #include <iterator> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "test_iterators.h" #include "min_allocator.h" 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 6d92c68165c..1d631ab12ba 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 @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() 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 9c3a5466d9f..2b2be7b6c22 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 @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../test_allocator.h" +#include "test_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 aa34ce95098..d6ba5a47cbe 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 @@ -15,7 +15,7 @@ #include <forward_list> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp index 777a6668882..cde97d5f738 100644 --- a/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 6426e01202d..b851eb9dc5a 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 @@ -13,7 +13,7 @@ #include <list> #include <cassert> -#include "../../../test_allocator.h" +#include "test_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 3bcd82414a8..99f0a98204f 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 @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_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 41e72f79de7..530690a925d 100644 --- a/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "DefaultOnly.h" -#include "../../../test_allocator.h" +#include "test_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 f11e870805b..99fe9f115f9 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 @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "DefaultOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp index 3967fd6fac1..f821fb4e7bb 100644 --- a/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp index 7ba1f461b42..13c7e5b5797 100644 --- a/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 9720a3d0d3c..4a85e378c1c 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 @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../test_allocator.h" +#include "test_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 ced38b47361..44782b91075 100644 --- a/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_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 78e144559b7..4730755db81 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 @@ -14,7 +14,7 @@ #include <list> #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp index 63e1b7ae47f..d502e1c09c8 100644 --- a/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp index f49c565b9fa..2c10443f76b 100644 --- a/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 9f790cd22f6..bc5f4857edc 100644 --- a/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp index f2d6cc1763a..7a23398e80a 100644 --- a/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 e524e1a9761..9501799ae3d 100644 --- a/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_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 b3bb0f157ee..df98c817fd5 100644 --- a/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_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 f7ec5db5e9b..51ecbb1d276 100644 --- a/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp @@ -15,7 +15,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class C> 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 65f2ed504d2..93ecbe87c38 100644 --- a/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "min_allocator.h" -#include "../../test_allocator.h" +#include "test_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp b/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp index b9ce87c216d..58822782ff8 100644 --- a/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class C> 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 2b5cae68a8b..2f0192b995a 100644 --- a/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class C> diff --git a/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp index 2f7720664e6..b94588ead93 100644 --- a/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp index 9c0b4e494e5..682e74ef03c 100644 --- a/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 c86b644ab44..aea3ad763cd 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 @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_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 1b3fe49eea7..e877292ced7 100644 --- a/libcxx/test/containers/sequences/vector.bool/move.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/move.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_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 7b157fb580e..deee9326197 100644 --- a/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp index 8aaa77096d4..b580eb4ae3b 100644 --- a/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp index 364c3024abb..ab32bd0677b 100644 --- a/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp b/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp index f30e3473c23..a92c6a6c165 100644 --- a/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp index 99fa51fa910..bcaf161119f 100644 --- a/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <vector> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/vector.bool/types.pass.cpp b/libcxx/test/containers/sequences/vector.bool/types.pass.cpp index 8cc9cb9990e..b266b3bbb92 100644 --- a/libcxx/test/containers/sequences/vector.bool/types.pass.cpp +++ b/libcxx/test/containers/sequences/vector.bool/types.pass.cpp @@ -31,7 +31,7 @@ #include <iterator> #include <type_traits> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "../../Copyable.h" #include "min_allocator.h" diff --git a/libcxx/test/containers/sequences/vector/types.pass.cpp b/libcxx/test/containers/sequences/vector/types.pass.cpp index c0645878f45..3504de6f75d 100644 --- a/libcxx/test/containers/sequences/vector/types.pass.cpp +++ b/libcxx/test/containers/sequences/vector/types.pass.cpp @@ -33,7 +33,7 @@ #include <iterator> #include <type_traits> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "../../Copyable.h" #include "min_allocator.h" 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 1ad4bfcf8be..6f02c3b7bc2 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 @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../../test_allocator.h" +#include "test_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 335525475c7..1365038cbc1 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 @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_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 7321f939751..f8b66f4b6da 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 @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../NotConstructible.h" #include "../../../stack_allocator.h" #include "min_allocator.h" 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 0cff78dd04f..c6bbf6eca8f 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 @@ -16,7 +16,7 @@ #include "DefaultOnly.h" #include "min_allocator.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class C> void diff --git a/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp index 78e7fac79ff..6962f7035ae 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class C> 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 b0e07db29b0..7ff2a1e1737 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 @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class C> diff --git a/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp index 5c378c5d14f..3fc33b68d39 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp index 843c067bb48..0d73e9ef4d4 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 d449f2a655e..b57d2ed17f6 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 @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../test_allocator.h" +#include "test_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 6b9be7b3df5..f09e3467ac3 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_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 2640593ec27..0aac64dc0c4 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 @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp index 30ff5be4741..158370f4e1a 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp index 57e03225af0..a2e36ccdf08 100644 --- a/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 9fa1274162a..a7d0c40d697 100644 --- a/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp b/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp index 714bd459105..996712a33aa 100644 --- a/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 d0e16206b59..6e6503e306a 100644 --- a/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp @@ -21,7 +21,7 @@ #include "../../test_compare.h" #include "../../test_hash.h" -#include "../../test_allocator.h" +#include "test_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 9267f1f927f..0fc76db0fb2 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 987d339cbb6..928377b3a04 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 a98c9007719..dd57c58214f 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 1aa67efa5a6..227343e6d5b 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 800bc59f44c..d1757d8a3c1 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 1adaba98587..42f1faaeade 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp index ebf8e1374ae..df8c7b57c93 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../test_hash.h" template <class T> diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp index 5d2e4c4ac24..1fc37f7594d 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 60895ddb7ef..dbc48f816c8 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 e1591054d79..ac09053b1eb 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 59b488f05aa..7a4130bde8f 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 e2c0de7cb5a..036008c0b86 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 @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 e7ae08eee12..7c83192b664 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 @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 379ce22a63e..18e6683011c 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 ae2f2f7dc68..091a72f0d16 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp index 27174b3288f..f7fde37869a 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp index 3a97097a155..1c86dd3902a 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 8026c0135ee..c1784d63b29 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 @@ -25,7 +25,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 2f01ba04d15..f914b306071 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 @@ -25,7 +25,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 0aaf1d453db..7a0dbceb17c 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 @@ -26,7 +26,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 cc07ff202a5..61eef5bc40a 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 @@ -26,7 +26,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 b67258734cc..99493fad32c 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 @@ -27,7 +27,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 7881f708a25..0a3ae3a117f 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 05d6937bf91..708dc236273 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 0d54d5e2c57..6c975ec7203 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 83e0ffc3fa5..8b2bb317987 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 0b7754606f0..bcf7b91503a 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp index 579b6d5505e..49ac757eefb 100644 --- a/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 44a6b8f6785..6993a7e3ffe 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() 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 e68fcd5216e..12822a9e329 100644 --- a/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp @@ -21,7 +21,7 @@ #include "../../test_compare.h" #include "../../test_hash.h" -#include "../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" 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 b8ceb36cce4..dc41fad29af 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 20b4da3f002..4f47c781e4b 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 4bac2a86c48..2d3c1434d69 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 f9aa41647a1..0c43fa8f06e 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 e89667394b6..d71838f1dfb 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 fc3f31add16..2a064c5b5f6 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 34b26f89333..b7a01a458d5 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp index cc8bb72198a..9812a45203b 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../test_hash.h" template <class T> diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp index f6c8551b8e1..ae2a96e2ac4 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 45a56d7c715..cc5532adbe0 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 1c1b5f25fda..48239db1fa2 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 45b4400d1ba..ff005467705 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 370bc53d6d3..095e9c327f0 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 @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 a115d167bca..d2f698ac2bc 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 @@ -23,7 +23,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 5f24df230a2..fd70ff10a70 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 25f11932a88..d958e23ddd0 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 @@ -24,7 +24,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp index ee69b33ae92..078693d52b2 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp index 7eb5f320148..44565d11503 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 5849ece238c..bb700ec565d 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 @@ -25,7 +25,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 58006fb16c3..a3fd4d14573 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 @@ -25,7 +25,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 a54bc5ba0ec..4e7b1ac17a2 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 @@ -26,7 +26,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 ca48b5e6cc0..879e6811f2d 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 @@ -26,7 +26,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 3208c7813b2..8e42ca7245e 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 @@ -27,7 +27,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 787e9304fec..44cf84ff323 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 cfc7b1ad6bb..bd56a41fd71 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 ea20b6bfe19..33460612ce3 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 5fb433ad113..c2420ce9e6f 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 1512f36e601..33886670b3b 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp index 227a700fe18..a7700b4de69 100644 --- a/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 286b574061f..a73d7fc51da 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() 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 5c2ea2358c1..275ff4094e8 100644 --- a/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp @@ -20,7 +20,7 @@ #include "../../test_compare.h" #include "../../test_hash.h" -#include "../../test_allocator.h" +#include "test_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 ca7169e5c78..ccd21a58b22 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 6a2cd8ef081..f63499485c6 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 7baf89a26c2..4eaf2c5779f 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 94b78c7434b..4b0e52c5930 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 d778861c029..94241830a06 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 37d8ed6541d..22e372bb3ad 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 220aa94edd0..6726bc127fb 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp index 84bd140e074..0effeed911b 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../test_hash.h" template <class T> diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp index 03b33fffa4d..c4c54a5a0dd 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 fbb39ea304f..416c28cf83d 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 e1331da9f11..a6543a0e6f4 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 2894700c696..7d0f37163a1 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 7644bd3750d..cd013f9554a 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 ef798657bd3..4621c7fbb3f 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 697ecf5518a..a68cfe8cd3b 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 daa26f28381..9eee69a58e5 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp index 8d601533174..8a56d1a4859 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp index 7ef3ca6dab8..aa7ad05afad 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 6f3caeedff0..cd2bb1e7bbc 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 @@ -23,7 +23,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 9538cde542c..4f5e03e28f4 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 @@ -23,7 +23,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 2b83cb0ea0a..6b83bde9bc5 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 @@ -24,7 +24,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 cccd74b97da..89e7c7fa2e3 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 @@ -24,7 +24,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 3675a240ef1..b712a96f05b 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 @@ -25,7 +25,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 61cfc5e97c9..e55db7ca2aa 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 6ffdbfd54e0..35bfbe331b4 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 c0ec5af41db..0171ea64ebb 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 4d7b3f61999..785cdf24636 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 9d913e739cb..50dd3c95ee5 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp index 95c84f48888..40dac3cc070 100644 --- a/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 c2e068edffa..624b81c5eb3 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 @@ -20,7 +20,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() 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 44976063c40..89ec986d08f 100644 --- a/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp @@ -20,7 +20,7 @@ #include "../../test_compare.h" #include "../../test_hash.h" -#include "../../test_allocator.h" +#include "test_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 3e2213432b2..30905aeb9fe 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 e53656a0fdd..a1f8c488200 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 55c8df6db97..69d19a4dac2 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 50ce419fe98..e8712b7431c 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 dbed56c37e4..ee05acd6be9 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 4265e3092f7..8e1ecd8167f 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 6eaa8c25b55..ee901fb1c1f 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp index 5063d51e334..b3cd9c3f1ff 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "../../../test_hash.h" template <class T> diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp index 3e468e9d6c7..68ef7f4f9ae 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp @@ -15,7 +15,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 8e5938eb62c..2c31d575b63 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 4872babc608..36dab799c78 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 2905c042cd0..81af2b41bae 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 04c7b8aa409..f35dd1afa87 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 e8875ab6e46..34ff62ea77b 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 @@ -22,7 +22,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 11191a1783a..6bda4afc99c 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 c9770579e1e..229e79925f2 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 @@ -21,7 +21,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp index 176e9c5b4d3..c3c94fd1a04 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp @@ -21,7 +21,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp index 67f16c3c6c0..791a67d2119 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 24a6e3579a2..40f3f4f4d7f 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 @@ -23,7 +23,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 e4ed1343b81..179f73d7e18 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 @@ -23,7 +23,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 b0e568ac117..60350de962c 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 @@ -24,7 +24,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 90c419b6ffc..70e82d03464 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 @@ -24,7 +24,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 0f8925868c5..a6fb2e667ae 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 @@ -25,7 +25,7 @@ #include "test_iterators.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp index d5d5706e349..389c54c58cd 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 450f2dd7bb9..8f6228ad8ec 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 b2b7da7fa3d..4c2c18edd1c 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 9a52988cd9c..e9368782ad9 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_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 d20e03fb600..96233e187af 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 @@ -21,7 +21,7 @@ #include "../../../NotConstructible.h" #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp b/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp index 508d567b16f..359e2968cc2 100644 --- a/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp +++ b/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <cassert> #include "../../../MoveOnly.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_comp 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 f529ad6325e..7415e297771 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 @@ -20,7 +20,7 @@ #include "../../../test_compare.h" #include "../../../test_hash.h" -#include "../../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp b/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp index d604d272800..04367953ad2 100644 --- a/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp +++ b/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp @@ -16,7 +16,7 @@ #include <regex> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" template <class CharT, class Allocator> void diff --git a/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp b/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp index 15c49157668..a24c669f657 100644 --- a/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp +++ b/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp @@ -16,7 +16,7 @@ #include <regex> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" template <class CharT, class Allocator> void diff --git a/libcxx/test/re/re.results/re.results.form/form2.pass.cpp b/libcxx/test/re/re.results/re.results.form/form2.pass.cpp index 9e82c1f6bfe..b18b7fb9f55 100644 --- a/libcxx/test/re/re.results/re.results.form/form2.pass.cpp +++ b/libcxx/test/re/re.results/re.results.form/form2.pass.cpp @@ -22,7 +22,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/re/re.results/re.results.form/form3.pass.cpp b/libcxx/test/re/re.results/re.results.form/form3.pass.cpp index d8e39585ee3..27f2388adce 100644 --- a/libcxx/test/re/re.results/re.results.form/form3.pass.cpp +++ b/libcxx/test/re/re.results/re.results.form/form3.pass.cpp @@ -21,7 +21,7 @@ #include <regex> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/re/test_allocator.h b/libcxx/test/re/test_allocator.h deleted file mode 100644 index eed33a0e3ea..00000000000 --- a/libcxx/test/re/test_allocator.h +++ /dev/null @@ -1,117 +0,0 @@ -#ifndef TEST_ALLOCATOR_H -#define TEST_ALLOCATOR_H - -#include <cstddef> -#include <type_traits> -#include <cstdlib> -#include <new> -#include <climits> - -class test_alloc_base -{ -protected: - static int count; -public: - static int throw_after; -}; - -int test_alloc_base::count = 0; -int test_alloc_base::throw_after = INT_MAX; - -template <class T> -class test_allocator - : public test_alloc_base -{ - int data_; - - template <class U> friend class test_allocator; -public: - - typedef unsigned size_type; - typedef int difference_type; - typedef T value_type; - typedef value_type* pointer; - typedef const value_type* const_pointer; - typedef typename std::add_lvalue_reference<value_type>::type reference; - typedef typename std::add_lvalue_reference<const value_type>::type const_reference; - - template <class U> struct rebind {typedef test_allocator<U> other;}; - - test_allocator() throw() : data_(-1) {} - explicit test_allocator(int i) throw() : data_(i) {} - test_allocator(const test_allocator& a) throw() - : data_(a.data_) {} - template <class U> test_allocator(const test_allocator<U>& a) throw() - : data_(a.data_) {} - ~test_allocator() throw() {data_ = 0;} - pointer address(reference x) const {return &x;} - const_pointer address(const_reference x) const {return &x;} - pointer allocate(size_type n, const void* = 0) - { - if (count >= throw_after) { -#ifndef _LIBCPP_NO_EXCEPTIONS - throw std::bad_alloc(); -#else - std::terminate(); -#endif - } - ++count; - return (pointer)std::malloc(n * sizeof(T)); - } - void deallocate(pointer p, size_type n) - {std::free(p);} - size_type max_size() const throw() - {return UINT_MAX / sizeof(T);} - void construct(pointer p, const T& val) - {::new(p) T(val);} -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES - void construct(pointer p, T&& val) - {::new(p) T(std::move(val));} -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES - void destroy(pointer p) {p->~T();} - - friend bool operator==(const test_allocator& x, const test_allocator& y) - {return x.data_ == y.data_;} - friend bool operator!=(const test_allocator& x, const test_allocator& y) - {return !(x == y);} -}; - -template <class T> -class other_allocator -{ - int data_; - - template <class U> friend class other_allocator; - -public: - typedef T value_type; - - other_allocator() : data_(-1) {} - explicit other_allocator(int i) : data_(i) {} - template <class U> other_allocator(const other_allocator<U>& a) - : data_(a.data_) {} - T* allocate(std::size_t n) - {return (T*)std::malloc(n * sizeof(T));} - void deallocate(T* p, std::size_t n) - {std::free(p);} - - other_allocator select_on_container_copy_construction() const - {return other_allocator(-2);} - - friend bool operator==(const other_allocator& x, const other_allocator& y) - {return x.data_ == y.data_;} - friend bool operator!=(const other_allocator& x, const other_allocator& y) - {return !(x == y);} - - typedef std::true_type propagate_on_container_copy_assignment; - typedef std::true_type propagate_on_container_move_assignment; - typedef std::true_type propagate_on_container_swap; - -#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE - std::size_t max_size() const - {return UINT_MAX / sizeof(T);} -#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE - -}; - -#endif // TEST_ALLOCATOR_H 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 4a447d5a8f0..bae76215552 100644 --- a/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp +++ b/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> 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 b15b56977ec..512d1182755 100644 --- a/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> 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 fb6001f85b6..9c9fc323066 100644 --- a/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> 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 d18241e565a..cf8021019a2 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 @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp index ed68c93c7f3..f935db83d73 100644 --- a/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc diff --git a/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp index c4550833fb2..b3cc127fbc4 100644 --- a/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #if __has_feature(cxx_noexcept) 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 60e62cc288c..d6ff8504e9d 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 @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_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 11f2b43c4ca..664cb80b10f 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 @@ -17,7 +17,7 @@ #include <iterator> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "../input_iterator.h" #include "min_allocator.h" 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 873e8891094..b94f189ecb4 100644 --- a/libcxx/test/strings/basic.string/string.cons/move.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move.pass.cpp @@ -16,7 +16,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> 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 1f0d5cd7ca7..4e8b038ee84 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 @@ -16,7 +16,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp index fdcf4785fbc..32c9514a915 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 60de3b029bf..5bc1c8a9153 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 @@ -17,7 +17,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp index 42e828b8838..556aabdc44a 100644 --- a/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <string> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 8aa88c9fe72..f6e9e00e590 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 @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class charT> 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 629e2967b25..f1f107af20b 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 @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class charT> 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 a8e6fdf24f0..4dfe9063a23 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 @@ -16,7 +16,7 @@ #include <algorithm> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class charT> 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 3e04a97bdcc..2a9bf2ac88b 100644 --- a/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp +++ b/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp index 01767e48e84..4d5d79693d0 100644 --- a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <string> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" template <class T> struct some_alloc 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 b3892d72de5..6ba040d2635 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 @@ -14,7 +14,7 @@ #include <string> #include <cassert> -#include "../../test_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" template <class S> diff --git a/libcxx/test/strings/basic.string/test_allocator.h b/libcxx/test/strings/basic.string/test_allocator.h deleted file mode 100644 index 89852159d3c..00000000000 --- a/libcxx/test/strings/basic.string/test_allocator.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef TEST_ALLOCATOR_H -#define TEST_ALLOCATOR_H - -#include <cstddef> -#include <type_traits> -#include <cstdlib> -#include <new> -#include <climits> - -class test_alloc_base -{ -protected: - static int count; -public: - static int throw_after; -}; - -int test_alloc_base::count = 0; -int test_alloc_base::throw_after = INT_MAX; - -template <class T> -class test_allocator - : public test_alloc_base -{ - int data_; - - template <class U> friend class test_allocator; -public: - - typedef unsigned size_type; - typedef int difference_type; - typedef T value_type; - typedef value_type* pointer; - typedef const value_type* const_pointer; - typedef typename std::add_lvalue_reference<value_type>::type reference; - typedef typename std::add_lvalue_reference<const value_type>::type const_reference; - - template <class U> struct rebind {typedef test_allocator<U> other;}; - - test_allocator() throw() : data_(-1) {} - explicit test_allocator(int i) throw() : data_(i) {} - test_allocator(const test_allocator& a) throw() - : data_(a.data_) {} - template <class U> test_allocator(const test_allocator<U>& a) throw() - : data_(a.data_) {} - ~test_allocator() throw() {data_ = 0;} - pointer address(reference x) const {return &x;} - const_pointer address(const_reference x) const {return &x;} - pointer allocate(size_type n, const void* = 0) - { - if (count >= throw_after) { -#ifndef _LIBCPP_NO_EXCEPTIONS - throw std::bad_alloc(); -#else - std::terminate(); -#endif - } - ++count; - return (pointer)std::malloc(n * sizeof(T)); - } - void deallocate(pointer p, size_type n) - {std::free(p);} - size_type max_size() const throw() - {return UINT_MAX / sizeof(T);} - void construct(pointer p, const T& val) - {::new(p) T(val);} - void destroy(pointer p) {p->~T();} - - friend bool operator==(const test_allocator& x, const test_allocator& y) - {return x.data_ == y.data_;} - friend bool operator!=(const test_allocator& x, const test_allocator& y) - {return !(x == y);} -}; - -#endif // TEST_ALLOCATOR_H diff --git a/libcxx/test/containers/test_allocator.h b/libcxx/test/support/test_allocator.h index eed33a0e3ea..3ec7f478801 100644 --- a/libcxx/test/containers/test_allocator.h +++ b/libcxx/test/support/test_allocator.h @@ -6,16 +6,21 @@ #include <cstdlib> #include <new> #include <climits> +#include <cassert> class test_alloc_base { protected: - static int count; + static int time_to_throw; public: static int throw_after; + static int count; + static int alloc_count; }; int test_alloc_base::count = 0; +int test_alloc_base::time_to_throw = 0; +int test_alloc_base::alloc_count = 0; int test_alloc_base::throw_after = INT_MAX; template <class T> @@ -37,29 +42,31 @@ public: template <class U> struct rebind {typedef test_allocator<U> other;}; - test_allocator() throw() : data_(-1) {} - explicit test_allocator(int i) throw() : data_(i) {} + test_allocator() throw() : data_(0) {++count;} + explicit test_allocator(int i) throw() : data_(i) {++count;} test_allocator(const test_allocator& a) throw() - : data_(a.data_) {} + : data_(a.data_) {++count;} template <class U> test_allocator(const test_allocator<U>& a) throw() - : data_(a.data_) {} - ~test_allocator() throw() {data_ = 0;} + : data_(a.data_) {++count;} + ~test_allocator() throw() {assert(data_ >= 0); --count; data_ = -1;} pointer address(reference x) const {return &x;} const_pointer address(const_reference x) const {return &x;} pointer allocate(size_type n, const void* = 0) { - if (count >= throw_after) { + assert(data_ >= 0); + if (time_to_throw >= throw_after) { #ifndef _LIBCPP_NO_EXCEPTIONS throw std::bad_alloc(); #else std::terminate(); #endif } - ++count; + ++time_to_throw; + ++alloc_count; return (pointer)std::malloc(n * sizeof(T)); } void deallocate(pointer p, size_type n) - {std::free(p);} + {assert(data_ >= 0); --alloc_count; std::free(p);} size_type max_size() const throw() {return UINT_MAX / sizeof(T);} void construct(pointer p, const T& val) @@ -76,6 +83,37 @@ public: {return !(x == y);} }; +template <> +class test_allocator<void> + : public test_alloc_base +{ + int data_; + + template <class U> friend class test_allocator; +public: + + typedef unsigned size_type; + typedef int difference_type; + typedef void value_type; + typedef value_type* pointer; + typedef const value_type* const_pointer; + + template <class U> struct rebind {typedef test_allocator<U> other;}; + + test_allocator() throw() : data_(-1) {} + explicit test_allocator(int i) throw() : data_(i) {} + test_allocator(const test_allocator& a) throw() + : data_(a.data_) {} + template <class U> test_allocator(const test_allocator<U>& a) throw() + : data_(a.data_) {} + ~test_allocator() throw() {data_ = 0;} + + friend bool operator==(const test_allocator& x, const test_allocator& y) + {return x.data_ == y.data_;} + friend bool operator!=(const test_allocator& x, const test_allocator& y) + {return !(x == y);} +}; + template <class T> class other_allocator { diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp index ea8830b7581..4feac30c300 100644 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp +++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp @@ -16,7 +16,7 @@ #include <functional> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp index 8a16313d9be..599092258da 100644 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp +++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp @@ -16,7 +16,7 @@ #include <functional> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" class A { diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp index d5364bf4283..79fc1512ac5 100644 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp +++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp @@ -18,7 +18,7 @@ #include <cstdlib> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" int new_called = 0; diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp index 89efeabe18b..956136be021 100644 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp +++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp @@ -16,7 +16,7 @@ #include <functional> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" int main() { diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp index cafc6e44946..570c27e3f85 100644 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp +++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp @@ -16,7 +16,7 @@ #include <functional> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" int new_called = 0; diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp index ae6498b9e36..e9ecfa5539c 100644 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp +++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <functional> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" class A { diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h deleted file mode 100644 index eed33a0e3ea..00000000000 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h +++ /dev/null @@ -1,117 +0,0 @@ -#ifndef TEST_ALLOCATOR_H -#define TEST_ALLOCATOR_H - -#include <cstddef> -#include <type_traits> -#include <cstdlib> -#include <new> -#include <climits> - -class test_alloc_base -{ -protected: - static int count; -public: - static int throw_after; -}; - -int test_alloc_base::count = 0; -int test_alloc_base::throw_after = INT_MAX; - -template <class T> -class test_allocator - : public test_alloc_base -{ - int data_; - - template <class U> friend class test_allocator; -public: - - typedef unsigned size_type; - typedef int difference_type; - typedef T value_type; - typedef value_type* pointer; - typedef const value_type* const_pointer; - typedef typename std::add_lvalue_reference<value_type>::type reference; - typedef typename std::add_lvalue_reference<const value_type>::type const_reference; - - template <class U> struct rebind {typedef test_allocator<U> other;}; - - test_allocator() throw() : data_(-1) {} - explicit test_allocator(int i) throw() : data_(i) {} - test_allocator(const test_allocator& a) throw() - : data_(a.data_) {} - template <class U> test_allocator(const test_allocator<U>& a) throw() - : data_(a.data_) {} - ~test_allocator() throw() {data_ = 0;} - pointer address(reference x) const {return &x;} - const_pointer address(const_reference x) const {return &x;} - pointer allocate(size_type n, const void* = 0) - { - if (count >= throw_after) { -#ifndef _LIBCPP_NO_EXCEPTIONS - throw std::bad_alloc(); -#else - std::terminate(); -#endif - } - ++count; - return (pointer)std::malloc(n * sizeof(T)); - } - void deallocate(pointer p, size_type n) - {std::free(p);} - size_type max_size() const throw() - {return UINT_MAX / sizeof(T);} - void construct(pointer p, const T& val) - {::new(p) T(val);} -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES - void construct(pointer p, T&& val) - {::new(p) T(std::move(val));} -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES - void destroy(pointer p) {p->~T();} - - friend bool operator==(const test_allocator& x, const test_allocator& y) - {return x.data_ == y.data_;} - friend bool operator!=(const test_allocator& x, const test_allocator& y) - {return !(x == y);} -}; - -template <class T> -class other_allocator -{ - int data_; - - template <class U> friend class other_allocator; - -public: - typedef T value_type; - - other_allocator() : data_(-1) {} - explicit other_allocator(int i) : data_(i) {} - template <class U> other_allocator(const other_allocator<U>& a) - : data_(a.data_) {} - T* allocate(std::size_t n) - {return (T*)std::malloc(n * sizeof(T));} - void deallocate(T* p, std::size_t n) - {std::free(p);} - - other_allocator select_on_container_copy_construction() const - {return other_allocator(-2);} - - friend bool operator==(const other_allocator& x, const other_allocator& y) - {return x.data_ == y.data_;} - friend bool operator!=(const other_allocator& x, const other_allocator& y) - {return !(x == y);} - - typedef std::true_type propagate_on_container_copy_assignment; - typedef std::true_type propagate_on_container_move_assignment; - typedef std::true_type propagate_on_container_swap; - -#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE - std::size_t max_size() const - {return UINT_MAX / sizeof(T);} -#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE - -}; - -#endif // TEST_ALLOCATOR_H diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h deleted file mode 100644 index d9b72bce49e..00000000000 --- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h +++ /dev/null @@ -1,82 +0,0 @@ -#ifndef TEST_ALLOCATOR_H -#define TEST_ALLOCATOR_H - -#include <cstddef> -#include <type_traits> -#include <cstdlib> -#include <new> -#include <climits> -#include <cassert> - -class test_alloc_base -{ -protected: - static int time_to_throw; -public: - static int throw_after; - static int count; - static int alloc_count; -}; - -int test_alloc_base::count = 0; -int test_alloc_base::time_to_throw = 0; -int test_alloc_base::alloc_count = 0; -int test_alloc_base::throw_after = INT_MAX; - -template <class T> -class test_allocator - : public test_alloc_base -{ - int data_; - - template <class U> friend class test_allocator; -public: - - typedef unsigned size_type; - typedef int difference_type; - typedef T value_type; - typedef value_type* pointer; - typedef const value_type* const_pointer; - typedef typename std::add_lvalue_reference<value_type>::type reference; - typedef typename std::add_lvalue_reference<const value_type>::type const_reference; - - template <class U> struct rebind {typedef test_allocator<U> other;}; - - test_allocator() throw() : data_(0) {++count;} - explicit test_allocator(int i) throw() : data_(i) {++count;} - test_allocator(const test_allocator& a) throw() - : data_(a.data_) {++count;} - template <class U> test_allocator(const test_allocator<U>& a) throw() - : data_(a.data_) {++count;} - ~test_allocator() throw() {assert(data_ >= 0); --count; data_ = -1;} - pointer address(reference x) const {return &x;} - const_pointer address(const_reference x) const {return &x;} - pointer allocate(size_type n, const void* = 0) - { - assert(data_ >= 0); - if (time_to_throw >= throw_after) { -#ifndef _LIBCPP_NO_EXCEPTIONS - throw std::bad_alloc(); -#else - std::terminate(); -#endif - } - ++time_to_throw; - ++alloc_count; - return (pointer)std::malloc(n * sizeof(T)); - } - void deallocate(pointer p, size_type n) - {assert(data_ >= 0); --alloc_count; std::free(p);} - size_type max_size() const throw() - {return UINT_MAX / sizeof(T);} - void construct(pointer p, const T& val) - {::new(p) T(val);} - void destroy(pointer p) {p->~T();} - - friend bool operator==(const test_allocator& x, const test_allocator& y) - {return x.data_ == y.data_;} - friend bool operator!=(const test_allocator& x, const test_allocator& y) - {return !(x == y);} -}; - -#endif // TEST_ALLOCATOR_H diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp index 509752e12b5..7966e00e0c5 100644 --- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp +++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp @@ -14,7 +14,7 @@ #include <memory> #include <cassert> #include "../test_deleter.h" -#include "../test_allocator.h" +#include "test_allocator.h" struct A { diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp index 6d14920d6ae..ab2c73e0c5f 100644 --- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp +++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp @@ -14,7 +14,7 @@ #include <memory> #include <cassert> #include "../test_deleter.h" -#include "../test_allocator.h" +#include "test_allocator.h" struct A { diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp index 98ecd1307ff..23d3f10ed35 100644 --- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp +++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp @@ -14,7 +14,7 @@ #include <memory> #include <cassert> #include "../test_deleter.h" -#include "../test_allocator.h" +#include "test_allocator.h" struct A { diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp index 9b93a7cca36..4220993a5fd 100644 --- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp +++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp @@ -14,7 +14,7 @@ #include <memory> #include <cassert> #include "../test_deleter.h" -#include "../test_allocator.h" +#include "test_allocator.h" struct A { diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp index 5c9d9a309e4..e019837d707 100644 --- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp +++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp @@ -18,7 +18,7 @@ #include <new> #include <cstdlib> #include <cassert> -#include "../test_allocator.h" +#include "test_allocator.h" int new_count = 0; diff --git a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp index 42360d6ed42..09070e2c059 100644 --- a/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp +++ b/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp @@ -16,7 +16,7 @@ #include <memory> #include <cassert> #include "../test_deleter.h" -#include "../test_allocator.h" +#include "test_allocator.h" struct B { |
