diff options
Diffstat (limited to 'libcxx')
157 files changed, 155 insertions, 205 deletions
diff --git a/libcxx/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp b/libcxx/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp index a58d50d8499..d14603e1a28 100644 --- a/libcxx/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp index 6c6b6140f0f..1f11fc9582e 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp index c60f2e7e8ba..eed26d3a613 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp index 264afcfef3f..e5d43f266c0 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp index 6d285fce000..8ae8265cdc1 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp index d12f9a9784f..f80b1d32317 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp index 6de4b67b326..9347b8329ae 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp index 22164202932..42b41fd7b86 100644 --- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp index fea88957a70..a9d3277e6d9 100644 --- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp index b8b78635166..c238ed2c4b6 100644 --- a/libcxx/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp index 315efd15276..d1db40b1fc7 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp index 50d8f42a9ab..cb55e3fb33e 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp index 75f42becc19..3ec79eea355 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp index 496e5357279..48854e388e1 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp index b2488180c5e..8ad9e8b82fd 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp index 84316a1ea06..66ea8737fb7 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp index 60ca7d4a5b4..b44f46429ec 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp index 2f198f8f7c2..b1c043586d6 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp @@ -17,7 +17,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp index 687c44385da..07882a42289 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp b/libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp index 342c6fd53d7..ee631f005c9 100644 --- a/libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp b/libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp index 1030e0886eb..29c233e9a11 100644 --- a/libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp index a0bdb0786c2..bf8c53b9ee5 100644 --- a/libcxx/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp index 658af1a89de..fd612c06dbb 100644 --- a/libcxx/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp index 40b40bfdd02..4408208f2ac 100644 --- a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "Counter.h" diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp index 0b0ce44cb8d..ca1ba971f5a 100644 --- a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp index cef3f202487..211bb36e7e9 100644 --- a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp index e18f3f5f1bf..31a34cbde30 100644 --- a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp index 531fe801a16..cd5be791cda 100644 --- a/libcxx/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp b/libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp index c149fa3c68e..296ead84914 100644 --- a/libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp +++ b/libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/associative/set/insert_rv.pass.cpp b/libcxx/test/std/containers/associative/set/insert_rv.pass.cpp index 39894514ee9..32cede15495 100644 --- a/libcxx/test/std/containers/associative/set/insert_rv.pass.cpp +++ b/libcxx/test/std/containers/associative/set/insert_rv.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp index 4d5754a9e6b..2156169acbc 100644 --- a/libcxx/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp index 25f5425c75a..b554d828d48 100644 --- a/libcxx/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp index bad5e8f8c9e..799f0e402d6 100644 --- a/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "Counter.h" diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_assign.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_assign.pass.cpp index 4e08f014ebe..ed0e77ae179 100644 --- a/libcxx/test/std/containers/associative/set/set.cons/move_assign.pass.cpp +++ b/libcxx/test/std/containers/associative/set/set.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp index 17ea74036db..3999c55e9e7 100644 --- a/libcxx/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp index 7a8ae7bf2b5..5ccfed4675c 100644 --- a/libcxx/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp index c4f169aa512..a478b254908 100644 --- a/libcxx/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp index d4df36cf2af..8bdf7db863e 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp @@ -15,7 +15,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp index 07726f60b84..d43e5381997 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp @@ -14,7 +14,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp index 40e36456f1f..b61fb88a5a3 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp @@ -14,7 +14,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp index b81daf98d8e..7abe796e53e 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp @@ -16,7 +16,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp index ad23f262545..aac8403e592 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp @@ -14,7 +14,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp index 48e075698ad..cdfa58b5855 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp index 80ad8bdb28b..e3d071d9aad 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp index 7fd01d6dcb6..590d82fe6da 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp index 1e7fcd86b46..05ff253d31b 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp index 2f737cecd6a..4b20a9bf905 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp @@ -16,7 +16,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp index e40570a120b..4d2b441c60e 100644 --- a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp index b752238056b..0163588efa5 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp index 11b4ecd3b0a..7237bf271b0 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp index f168209f83d..8dd5d2f64ec 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp @@ -14,7 +14,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp index 2f6c3dab1c6..f72067b0adc 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp @@ -14,7 +14,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp index 874577c7632..39285343266 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp index 1af20ecb04b..d9b8f731f28 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp index 1b45bfa93ee..beef0f12ffb 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp index 8fba28fc534..2402e609b98 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp index 828c0b78dc6..af1b7e20c33 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp @@ -14,7 +14,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp index 11883d8cf70..d8992821f1f 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp @@ -14,7 +14,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp index 5c9b7756b8a..cfe4a1bb707 100644 --- a/libcxx/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <queue> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp index 16ba9d76cd0..374aa996ffe 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp index 19d968a0854..5fa5bd2a8bd 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <cassert> #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp index 173bfc2fe09..44fab41a6c5 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp @@ -14,7 +14,7 @@ #include <stack> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp index a6c424d9abb..ab08da93831 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp @@ -14,7 +14,7 @@ #include <stack> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp index 521d9567758..bab55863b55 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <stack> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp index c502012c8eb..477bd57a6d1 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <stack> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp index 4952803d042..dd836796dc1 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <stack> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp index c9826834311..cfc660b36de 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <stack> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp index 5455299058a..75cbec1c47c 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp @@ -14,7 +14,7 @@ #include <stack> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp index c769c5d4749..67d0ea3385f 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp @@ -14,7 +14,7 @@ #include <stack> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp index d0977f4e3e5..80e024f5f1e 100644 --- a/libcxx/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <stack> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp index 3605a1b636f..c612dbc5e83 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp index 0f459b2c919..ecdc2404c85 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/move.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/move.pass.cpp index a20ad4cecbd..4a7aa8a058e 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.cons/move.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.cons/move.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp index 0ba4a2da330..1a5db6db650 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp index bb01dc5c54b..e50cd8ed508 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp index c2bb40a8b6f..24180b5b5bd 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp index 36f780703c0..0ea0431be8e 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp index 909390f85ca..08ac6704f7f 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include "test_iterators.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../stack_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp index 0bde7d9b7e3..fe7b0cf11a6 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp index d6c44391477..ea5926c65e1 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp @@ -16,7 +16,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp index 1670a44aa07..2f578184e3d 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp @@ -14,7 +14,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp index d55d719c762..3c94eb04bff 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <deque> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp index a3d270f01d9..1532b53e7a8 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp index 6b0233d65b6..5167a065a9a 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <forward_list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp index 1f7b05efd66..da41bf4eb1f 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp index 164801a0b40..8341f7ba0cb 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp index ba0cb5d3beb..6bb575ef80f 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include <iterator> #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp index cc5b9d54ed3..28ce2c12b61 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <forward_list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp index 3666c7d169d..7b001ea67b1 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <forward_list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp index 4f0be520c30..f7f376caa09 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp index 276f2c9f8ed..7f14e54a2e6 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp index 53181ec881e..d7c9d758aa0 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp @@ -14,7 +14,7 @@ #include <forward_list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp index cde97d5f738..e36ba5bddf9 100644 --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <forward_list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp b/libcxx/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp index 99f0a98204f..0fd586f84af 100644 --- a/libcxx/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp @@ -13,7 +13,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp index f821fb4e7bb..2455fb39a79 100644 --- a/libcxx/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp index 13c7e5b5797..ca7ade6d19c 100644 --- a/libcxx/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/sequences/list/list.cons/move.pass.cpp b/libcxx/test/std/containers/sequences/list/list.cons/move.pass.cpp index 44782b91075..54209a55f7e 100644 --- a/libcxx/test/std/containers/sequences/list/list.cons/move.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.cons/move.pass.cpp @@ -13,7 +13,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp index 4730755db81..8f82702b296 100644 --- a/libcxx/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp @@ -13,7 +13,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/libcxx/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp index d502e1c09c8..280d93d486e 100644 --- a/libcxx/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp index 2c10443f76b..e436a29f5d4 100644 --- a/libcxx/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp index 27d0411fb04..3d5dec299b9 100644 --- a/libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp @@ -18,7 +18,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp index 070db9e8d6b..a2837f813be 100644 --- a/libcxx/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp index 8a3175504eb..4f41c3dd390 100644 --- a/libcxx/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp @@ -14,7 +14,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/sequences/list/list.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/list/list.special/swap_noexcept.pass.cpp index 7a23398e80a..54ae359c20b 100644 --- a/libcxx/test/std/containers/sequences/list/list.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <list> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp index a47c5131d8a..c7988d62060 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp index d87ac8636b0..8c8b0a04715 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp index 3fc33b68d39..471c1d407ec 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <vector> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp index 0d73e9ef4d4..0e2cae9ee93 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <vector> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/move.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/move.pass.cpp index bb61d54948b..fb419d825d2 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.cons/move.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.cons/move.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp index 1923e68f75e..aef96917cb3 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp index 158370f4e1a..1c4a4f7c928 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include <vector> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp index a2e36ccdf08..46cad9925d0 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include <vector> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp index cf3715ccb6f..e12ec45febf 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp @@ -18,7 +18,7 @@ #include <vector> #include <cassert> #include "../../../stack_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp index be488931263..b143cd773b4 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp @@ -13,7 +13,7 @@ #include <vector> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../stack_allocator.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/libcxx/test/std/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp index 996712a33aa..92d87568fc8 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <vector> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp index df8c7b57c93..30e0dc1705a 100644 --- a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "../../../test_hash.h" diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp index 1fc37f7594d..7fb4200605c 100644 --- a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp index f7fde37869a..fc3fc6f05f8 100644 --- a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp index 1c86dd3902a..f292011cd7b 100644 --- a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp index c4d7128698e..5fd9f9d6114 100644 --- a/libcxx/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp @@ -20,7 +20,7 @@ #include <string> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp index 7f4e067c515..c072248f866 100644 --- a/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp index 49ac757eefb..a986882eae3 100644 --- a/libcxx/test/std/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp index 92f6c40e4de..1618c1019e1 100644 --- a/libcxx/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp @@ -24,7 +24,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp index 6c5e8c8ee84..f53dc6c7e97 100644 --- a/libcxx/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp index 9812a45203b..fac3cec63d7 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "../../../test_hash.h" diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp index ae2a96e2ac4..22078519679 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp index 078693d52b2..47e61ab70b8 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp index 44565d11503..37f17876973 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp index bb89c3f1bca..7116fa02b6f 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp @@ -24,7 +24,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp index f3637587efe..5a98467e9d0 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp index a7700b4de69..c690bb61bb3 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_map> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp index 634e4f4a176..481ec80231c 100644 --- a/libcxx/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp index 65a5bc2eb2a..2718324b4d0 100644 --- a/libcxx/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp index 0effeed911b..391609fd144 100644 --- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "../../../test_hash.h" diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp index c4c54a5a0dd..a549288afc1 100644 --- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp index 8a56d1a4859..2f86f018d9f 100644 --- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp index aa7ad05afad..8a4c3c94536 100644 --- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp index 40dac3cc070..7dc653bca69 100644 --- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp b/libcxx/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp index f612ec57249..3f04dbb8998 100644 --- a/libcxx/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp @@ -22,7 +22,7 @@ #include <unordered_set> #include <cassert> -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp b/libcxx/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp index d62308e7357..e043579bf97 100644 --- a/libcxx/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp index b3cd9c3f1ff..f419c31c479 100644 --- a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "../../../test_hash.h" diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp index 68ef7f4f9ae..1e196b2e119 100644 --- a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp index c3c94fd1a04..02af34d8f88 100644 --- a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp index 791a67d2119..b2d89ba5c33 100644 --- a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp index 359e2968cc2..cba09231953 100644 --- a/libcxx/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include <unordered_set> #include <cassert> -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template <class T> diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/MoveOnly.h b/libcxx/test/std/utilities/tuple/tuple.tuple/MoveOnly.h deleted file mode 100644 index e4d9f649560..00000000000 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/MoveOnly.h +++ /dev/null @@ -1,50 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef MOVEONLY_H -#define MOVEONLY_H - -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES - -#include <cstddef> -#include <functional> - -class MoveOnly -{ - MoveOnly(const MoveOnly&); - MoveOnly& operator=(const MoveOnly&); - - int data_; -public: - MoveOnly(int data = 1) : data_(data) {} - MoveOnly(MoveOnly&& x) - : data_(x.data_) {x.data_ = 0;} - MoveOnly& operator=(MoveOnly&& x) - {data_ = x.data_; x.data_ = 0; return *this;} - - int get() const {return data_;} - - bool operator==(const MoveOnly& x) const {return data_ == x.data_;} - bool operator< (const MoveOnly& x) const {return data_ < x.data_;} -}; - -namespace std { - -template <> -struct hash<MoveOnly> - : public std::unary_function<MoveOnly, std::size_t> -{ - std::size_t operator()(const MoveOnly& x) const {return x.get();} -}; - -} - -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES - -#endif // MOVEONLY_H diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp index 525dfe6e309..5c827447dfb 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp @@ -16,7 +16,7 @@ #include <tuple> #include <cassert> -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp index 59464fccfde..b4ebc6d524b 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp @@ -17,7 +17,7 @@ #include <utility> #include <cassert> -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp index 3d8b194eb32..7ac9deba1f9 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp @@ -18,7 +18,7 @@ #include <cassert> #include <type_traits> -#include "../MoveOnly.h" +#include "MoveOnly.h" #if _LIBCPP_STD_VER > 11 diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp index 00bc5e05402..864d5b5079b 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp @@ -17,7 +17,7 @@ #include <tuple> #include <cassert> -#include "../MoveOnly.h" +#include "MoveOnly.h" #include "allocators.h" #include "../alloc_first.h" #include "../alloc_last.h" diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp index 575a99404eb..dd24f402ccd 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp @@ -17,7 +17,7 @@ #include <tuple> #include <cassert> -#include "../MoveOnly.h" +#include "MoveOnly.h" #include "allocators.h" #include "../alloc_first.h" #include "../alloc_last.h" diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp index 8b8ec0ca53f..711c7193f99 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp @@ -16,7 +16,7 @@ #include <tuple> #include <cassert> -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp index 92bff97d937..60e6f7e6421 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp @@ -17,7 +17,7 @@ #include <utility> #include <cassert> -#include "../MoveOnly.h" +#include "MoveOnly.h" struct ConstructsWithTupleLeaf { diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp index 3fca5738929..d1e2ce3ca95 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp @@ -19,7 +19,7 @@ #include <string> #include <cassert> -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp index 415e9641c34..fb7db20f55f 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp @@ -17,7 +17,7 @@ #include <tuple> #include <cassert> -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp index c7c96f8bc84..b5c5bd4818d 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp @@ -16,7 +16,7 @@ #include <tuple> #include <cassert> -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/libcxx/test/std/containers/MoveOnly.h b/libcxx/test/support/MoveOnly.h index e4d9f649560..e4d9f649560 100644 --- a/libcxx/test/std/containers/MoveOnly.h +++ b/libcxx/test/support/MoveOnly.h |
