From df00d5e5ad672aa275a29c5a446072959134addd Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 28 Jan 2015 21:22:53 +0000 Subject: [PATCH] We had two identical files named 'MoveOnly.h' in the test suite. Move one to support/, remove the other, and update all the tests that included them. No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@227370 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../map/map.access/index_rv_key.pass.cpp | 2 +- .../map/map.cons/default_noexcept.pass.cpp | 2 +- .../map/map.cons/dtor_noexcept.pass.cpp | 2 +- .../map/map.cons/move_alloc.pass.cpp | 2 +- .../map/map.cons/move_assign.pass.cpp | 2 +- .../map.cons/move_assign_noexcept.pass.cpp | 2 +- .../map/map.cons/move_noexcept.pass.cpp | 2 +- .../map/map.modifiers/insert_iter_rv.pass.cpp | 2 +- .../map/map.modifiers/insert_rv.pass.cpp | 2 +- .../map/map.special/swap_noexcept.pass.cpp | 2 +- .../multimap.cons/default_noexcept.pass.cpp | 2 +- .../multimap.cons/dtor_noexcept.pass.cpp | 2 +- .../multimap.cons/move_alloc.pass.cpp | 2 +- .../multimap.cons/move_assign.pass.cpp | 2 +- .../move_assign_noexcept.pass.cpp | 2 +- .../multimap.cons/move_noexcept.pass.cpp | 2 +- .../insert_iter_rv.pass.cpp | 2 +- .../multimap.modifiers/insert_rv.pass.cpp | 2 +- .../multimap.special/swap_noexcept.pass.cpp | 2 +- .../multiset/insert_iter_rv.pass.cpp | 2 +- .../associative/multiset/insert_rv.pass.cpp | 2 +- .../multiset.cons/default_noexcept.pass.cpp | 2 +- .../multiset.cons/dtor_noexcept.pass.cpp | 2 +- .../multiset.cons/move_alloc.pass.cpp | 2 +- .../multiset.cons/move_assign.pass.cpp | 2 +- .../move_assign_noexcept.pass.cpp | 2 +- .../multiset.cons/move_noexcept.pass.cpp | 2 +- .../multiset.special/swap_noexcept.pass.cpp | 2 +- .../associative/set/insert_iter_rv.pass.cpp | 2 +- .../associative/set/insert_rv.pass.cpp | 2 +- .../set/set.cons/default_noexcept.pass.cpp | 2 +- .../set/set.cons/dtor_noexcept.pass.cpp | 2 +- .../set/set.cons/move_alloc.pass.cpp | 2 +- .../set/set.cons/move_assign.pass.cpp | 2 +- .../set.cons/move_assign_noexcept.pass.cpp | 2 +- .../set/set.cons/move_noexcept.pass.cpp | 2 +- .../set/set.special/swap_noexcept.pass.cpp | 2 +- .../ctor_move_alloc.pass.cpp | 2 +- .../priqueue.cons/assign_move.pass.cpp | 2 +- .../ctor_comp_rcontainer.pass.cpp | 2 +- .../ctor_iter_iter_comp_rcont.pass.cpp | 2 +- .../priqueue.cons/ctor_move.pass.cpp | 2 +- .../priqueue.cons/default_noexcept.pass.cpp | 2 +- .../priqueue.cons/dtor_noexcept.pass.cpp | 2 +- .../move_assign_noexcept.pass.cpp | 2 +- .../priqueue.cons/move_noexcept.pass.cpp | 2 +- .../priqueue.members/push_rvalue.pass.cpp | 2 +- .../priqueue.special/swap_noexcept.pass.cpp | 2 +- .../ctor_rcontainer_alloc.pass.cpp | 2 +- .../ctor_rqueue_alloc.pass.cpp | 2 +- .../queue/queue.cons/ctor_move.pass.cpp | 2 +- .../queue/queue.cons/ctor_rcontainer.pass.cpp | 2 +- .../queue.cons/default_noexcept.pass.cpp | 2 +- .../queue/queue.cons/dtor_noexcept.pass.cpp | 2 +- .../queue.cons/move_assign_noexcept.pass.cpp | 2 +- .../queue/queue.cons/move_noexcept.pass.cpp | 2 +- .../queue/queue.defn/assign_move.pass.cpp | 2 +- .../queue/queue.defn/push_rv.pass.cpp | 2 +- .../queue.special/swap_noexcept.pass.cpp | 2 +- .../ctor_rcontainer_alloc.pass.cpp | 2 +- .../ctor_rqueue_alloc.pass.cpp | 2 +- .../stack/stack.cons/ctor_move.pass.cpp | 2 +- .../stack/stack.cons/ctor_rcontainer.pass.cpp | 2 +- .../stack.cons/default_noexcept.pass.cpp | 2 +- .../stack/stack.cons/dtor_noexcept.pass.cpp | 2 +- .../stack.cons/move_assign_noexcept.pass.cpp | 2 +- .../stack/stack.cons/move_noexcept.pass.cpp | 2 +- .../stack/stack.defn/assign_move.pass.cpp | 2 +- .../stack/stack.defn/push_rv.pass.cpp | 2 +- .../stack.special/swap_noexcept.pass.cpp | 2 +- .../deque.cons/default_noexcept.pass.cpp | 2 +- .../deque/deque.cons/dtor_noexcept.pass.cpp | 2 +- .../sequences/deque/deque.cons/move.pass.cpp | 2 +- .../deque/deque.cons/move_alloc.pass.cpp | 2 +- .../deque/deque.cons/move_assign.pass.cpp | 2 +- .../deque.cons/move_assign_noexcept.pass.cpp | 2 +- .../deque/deque.cons/move_noexcept.pass.cpp | 2 +- .../deque.modifiers/insert_iter_iter.pass.cpp | 2 +- .../deque.modifiers/insert_rvalue.pass.cpp | 2 +- .../deque.modifiers/push_back_rvalue.pass.cpp | 2 +- .../push_front_rvalue.pass.cpp | 2 +- .../deque.special/swap_noexcept.pass.cpp | 2 +- .../forwardlist.cons/assign_move.pass.cpp | 2 +- .../default_noexcept.pass.cpp | 2 +- .../forwardlist.cons/dtor_noexcept.pass.cpp | 2 +- .../forwardlist.cons/move.pass.cpp | 2 +- .../forwardlist.cons/move_alloc.pass.cpp | 2 +- .../move_assign_noexcept.pass.cpp | 2 +- .../forwardlist.cons/move_noexcept.pass.cpp | 2 +- .../insert_after_rv.pass.cpp | 2 +- .../forwardlist.modifiers/pop_front.pass.cpp | 2 +- .../push_front_rv.pass.cpp | 2 +- .../forwardlist.spec/swap_noexcept.pass.cpp | 2 +- .../list/list.cons/assign_move.pass.cpp | 2 +- .../list/list.cons/default_noexcept.pass.cpp | 2 +- .../list/list.cons/dtor_noexcept.pass.cpp | 2 +- .../sequences/list/list.cons/move.pass.cpp | 2 +- .../list/list.cons/move_alloc.pass.cpp | 2 +- .../list.cons/move_assign_noexcept.pass.cpp | 2 +- .../list/list.cons/move_noexcept.pass.cpp | 2 +- .../insert_iter_rvalue.pass.cpp | 2 +- .../list.modifiers/push_back_rvalue.pass.cpp | 2 +- .../list.modifiers/push_front_rvalue.pass.cpp | 2 +- .../list/list.special/swap_noexcept.pass.cpp | 2 +- .../vector.capacity/resize_size.pass.cpp | 2 +- .../vector/vector.cons/assign_move.pass.cpp | 2 +- .../vector.cons/default_noexcept.pass.cpp | 2 +- .../vector/vector.cons/dtor_noexcept.pass.cpp | 2 +- .../vector/vector.cons/move.pass.cpp | 2 +- .../vector/vector.cons/move_alloc.pass.cpp | 2 +- .../vector.cons/move_assign_noexcept.pass.cpp | 2 +- .../vector/vector.cons/move_noexcept.pass.cpp | 2 +- .../insert_iter_rvalue.pass.cpp | 2 +- .../push_back_rvalue.pass.cpp | 2 +- .../vector.special/swap_noexcept.pass.cpp | 2 +- .../unord.map.cnstr/default_noexcept.pass.cpp | 2 +- .../unord.map.cnstr/dtor_noexcept.pass.cpp | 2 +- .../move_assign_noexcept.pass.cpp | 2 +- .../unord.map.cnstr/move_noexcept.pass.cpp | 2 +- .../unord.map/unord.map.elem/at.pass.cpp | 2 +- .../unord.map/unord.map.elem/index.pass.cpp | 2 +- .../unord.map.swap/swap_noexcept.pass.cpp | 2 +- .../insert_hint_rvalue.pass.cpp | 2 +- .../insert_rvalue.pass.cpp | 2 +- .../default_noexcept.pass.cpp | 2 +- .../dtor_noexcept.pass.cpp | 2 +- .../move_assign_noexcept.pass.cpp | 2 +- .../move_noexcept.pass.cpp | 2 +- .../insert_hint_rvalue.pass.cpp | 2 +- .../insert_rvalue.pass.cpp | 2 +- .../swap_noexcept.pass.cpp | 2 +- .../insert_hint_rvalue.pass.cpp | 2 +- .../unord.multiset/insert_rvalue.pass.cpp | 2 +- .../default_noexcept.pass.cpp | 2 +- .../dtor_noexcept.pass.cpp | 2 +- .../move_assign_noexcept.pass.cpp | 2 +- .../move_noexcept.pass.cpp | 2 +- .../swap_noexcept.pass.cpp | 2 +- .../unord.set/insert_hint_rvalue.pass.cpp | 2 +- .../unord/unord.set/insert_rvalue.pass.cpp | 2 +- .../unord.set.cnstr/default_noexcept.pass.cpp | 2 +- .../unord.set.cnstr/dtor_noexcept.pass.cpp | 2 +- .../move_assign_noexcept.pass.cpp | 2 +- .../unord.set.cnstr/move_noexcept.pass.cpp | 2 +- .../unord.set.swap/swap_noexcept.pass.cpp | 2 +- .../utilities/tuple/tuple.tuple/MoveOnly.h | 50 ------------------- .../tuple.tuple/tuple.assign/copy.fail.cpp | 2 +- .../tuple.tuple/tuple.assign/move.pass.cpp | 2 +- .../tuple.tuple/tuple.cnstr/UTypes.pass.cpp | 2 +- .../tuple.cnstr/alloc_UTypes.pass.cpp | 2 +- .../tuple.cnstr/alloc_move.pass.cpp | 2 +- .../tuple.tuple/tuple.cnstr/copy.fail.cpp | 2 +- .../tuple.tuple/tuple.cnstr/move.pass.cpp | 2 +- .../tuple.creation/tuple_cat.pass.cpp | 2 +- .../tuple.special/non_member_swap.pass.cpp | 2 +- .../tuple.swap/member_swap.pass.cpp | 2 +- test/{std/containers => support}/MoveOnly.h | 0 157 files changed, 155 insertions(+), 205 deletions(-) delete mode 100644 test/std/utilities/tuple/tuple.tuple/MoveOnly.h rename test/{std/containers => support}/MoveOnly.h (100%) diff --git a/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp b/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp index a58d50d8..d14603e1 100644 --- a/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp +++ b/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp b/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp index 6c6b6140..1f11fc95 100644 --- a/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp +++ b/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp b/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp index c60f2e7e..eed26d3a 100644 --- a/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp b/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp index 264afcfe..e5d43f26 100644 --- a/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp +++ b/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/associative/map/map.cons/move_assign.pass.cpp b/test/std/containers/associative/map/map.cons/move_assign.pass.cpp index 6d285fce..8ae8265c 100644 --- a/test/std/containers/associative/map/map.cons/move_assign.pass.cpp +++ b/test/std/containers/associative/map/map.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp b/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp index d12f9a97..f80b1d32 100644 --- a/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp b/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp index 6de4b67b..9347b832 100644 --- a/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp +++ b/test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp b/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp index 22164202..42b41fd7 100644 --- a/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp +++ b/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp b/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp index fea88957..a9d3277e 100644 --- a/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp +++ b/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp b/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp index b8b78635..c238ed2c 100644 --- a/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp +++ b/test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp b/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp index 315efd15..d1db40b1 100644 --- a/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp b/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp index 50d8f42a..cb55e3fb 100644 --- a/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp index 75f42bec..3ec79eea 100644 --- a/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp index 496e5357..48854e38 100644 --- a/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp b/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp index b2488180..8ad9e8b8 100644 --- a/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp b/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp index 84316a1e..66ea8737 100644 --- a/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp b/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp index 60ca7d4a..b44f4642 100644 --- a/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp b/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp index 2f198f8f..b1c04358 100644 --- a/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp b/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp index 687c4438..07882a42 100644 --- a/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp +++ b/test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp b/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp index 342c6fd5..ee631f00 100644 --- a/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp +++ b/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/associative/multiset/insert_rv.pass.cpp b/test/std/containers/associative/multiset/insert_rv.pass.cpp index 1030e088..29c233e9 100644 --- a/test/std/containers/associative/multiset/insert_rv.pass.cpp +++ b/test/std/containers/associative/multiset/insert_rv.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp b/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp index a0bdb078..bf8c53b9 100644 --- a/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp b/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp index 658af1a8..fd612c06 100644 --- a/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp index 40b40bfd..4408208f 100644 --- a/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "Counter.h" diff --git a/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp index 0b0ce44c..ca1ba971 100644 --- a/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp b/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp index cef3f202..211bb36e 100644 --- a/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp b/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp index e18f3f5f..31a34cbd 100644 --- a/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp b/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp index 531fe801..cd5be791 100644 --- a/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/set/insert_iter_rv.pass.cpp b/test/std/containers/associative/set/insert_iter_rv.pass.cpp index c149fa3c..296ead84 100644 --- a/test/std/containers/associative/set/insert_iter_rv.pass.cpp +++ b/test/std/containers/associative/set/insert_iter_rv.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/associative/set/insert_rv.pass.cpp b/test/std/containers/associative/set/insert_rv.pass.cpp index 39894514..32cede15 100644 --- a/test/std/containers/associative/set/insert_rv.pass.cpp +++ b/test/std/containers/associative/set/insert_rv.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp b/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp index 4d5754a9..2156169a 100644 --- a/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp +++ b/test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp b/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp index 25f5425c..b554d828 100644 --- a/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp b/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp index bad5e8f8..799f0e40 100644 --- a/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp +++ b/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "Counter.h" diff --git a/test/std/containers/associative/set/set.cons/move_assign.pass.cpp b/test/std/containers/associative/set/set.cons/move_assign.pass.cpp index 4e08f014..ed0e77ae 100644 --- a/test/std/containers/associative/set/set.cons/move_assign.pass.cpp +++ b/test/std/containers/associative/set/set.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp b/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp index 17ea7403..3999c55e 100644 --- a/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp b/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp index 7a8ae7bf..5ccfed46 100644 --- a/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp +++ b/test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp b/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp index c4f169aa..a478b254 100644 --- a/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp +++ b/test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp index d4df36cf..8bdf7db8 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp index 07726f60..d43e5381 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp index 40e36456..b61fb88a 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp index b81daf98..7abe796e 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp index ad23f262..aac8403e 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp index 48e07569..cdfa58b5 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp index 80ad8bdb..e3d071d9 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp index 7fd01d6d..590d82fe 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp index 1e7fcd86..05ff253d 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp index 2f737cec..4b20a9bf 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp index e40570a1..4d2b441c 100644 --- a/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp index b7522380..0163588e 100644 --- a/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp b/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp index 11b4ecd3..7237bf27 100644 --- a/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp b/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp index f168209f..8dd5d2f6 100644 --- a/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp b/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp index 2f6c3dab..f72067b0 100644 --- a/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp b/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp index 874577c7..39285343 100644 --- a/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp b/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp index 1af20ecb..d9b8f731 100644 --- a/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp b/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp index 1b45bfa9..beef0f12 100644 --- a/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp b/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp index 8fba28fc..2402e609 100644 --- a/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp b/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp index 828c0b78..af1b7e20 100644 --- a/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp b/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp index 11883d8c..d8992821 100644 --- a/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp b/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp index 5c9b7756..cfe4a1bb 100644 --- a/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp index 16ba9d76..374aa996 100644 --- a/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp b/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp index 19d968a0..5fa5bd2a 100644 --- a/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp b/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp index 173bfc2f..44fab41a 100644 --- a/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp b/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp index a6c424d9..ab08da93 100644 --- a/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp b/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp index 521d9567..bab55863 100644 --- a/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp b/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp index c502012c..477bd57a 100644 --- a/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp b/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp index 4952803d..dd836796 100644 --- a/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp b/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp index c9826834..cfc660b3 100644 --- a/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp b/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp index 54552990..75cbec1c 100644 --- a/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp b/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp index c769c5d4..67d0ea33 100644 --- a/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp b/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp index d0977f4e..80e024f5 100644 --- a/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp +++ b/test/std/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp b/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp index 3605a1b6..c612dbc5 100644 --- a/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp +++ b/test/std/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp b/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp index 0f459b2c..ecdc2404 100644 --- a/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/sequences/deque/deque.cons/move.pass.cpp b/test/std/containers/sequences/deque/deque.cons/move.pass.cpp index a20ad4ce..4a7aa8a0 100644 --- a/test/std/containers/sequences/deque/deque.cons/move.pass.cpp +++ b/test/std/containers/sequences/deque/deque.cons/move.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp b/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp index 0ba4a2da..1a5db6db 100644 --- a/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp +++ b/test/std/containers/sequences/deque/deque.cons/move_alloc.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp b/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp index bb01dc5c..e50cd8ed 100644 --- a/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp +++ b/test/std/containers/sequences/deque/deque.cons/move_assign.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp b/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp index c2bb40a8..24180b5b 100644 --- a/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp b/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp index 36f78070..0ea0431b 100644 --- a/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp +++ b/test/std/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp index 909390f8..08ac6704 100644 --- a/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp +++ b/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp @@ -18,7 +18,7 @@ #include #include "test_iterators.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../stack_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp b/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp index 0bde7d9b..fe7b0cf1 100644 --- a/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp +++ b/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp b/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp index d6c44391..ea5926c6 100644 --- a/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp +++ b/test/std/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp b/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp index 1670a44a..2f578184 100644 --- a/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp +++ b/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp b/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp index d55d719c..3c94eb04 100644 --- a/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp +++ b/test/std/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp index a3d270f0..1532b53e 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp index 6b0233d6..5167a065 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp index 1f7b05ef..da41bf4e 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp index 164801a0..8341f7ba 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp index ba0cb5d3..6bb575ef 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp index cc5b9d54..28ce2c12 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp index 3666c7d1..7b001ea6 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp index 4f0be520..f7f376ca 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp index 276f2c9f..7f14e54a 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp index 53181ec8..d7c9d758 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp index cde97d5f..e36ba5bd 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp b/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp index 99f0a982..0fd586f8 100644 --- a/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp +++ b/test/std/containers/sequences/list/list.cons/assign_move.pass.cpp @@ -13,7 +13,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp b/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp index f821fb4e..2455fb39 100644 --- a/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp +++ b/test/std/containers/sequences/list/list.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp b/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp index 13c7e5b5..ca7ade6d 100644 --- a/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/sequences/list/list.cons/move.pass.cpp b/test/std/containers/sequences/list/list.cons/move.pass.cpp index 44782b91..54209a55 100644 --- a/test/std/containers/sequences/list/list.cons/move.pass.cpp +++ b/test/std/containers/sequences/list/list.cons/move.pass.cpp @@ -13,7 +13,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp b/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp index 4730755d..8f82702b 100644 --- a/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp +++ b/test/std/containers/sequences/list/list.cons/move_alloc.pass.cpp @@ -13,7 +13,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" diff --git a/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp b/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp index d502e1c0..280d93d4 100644 --- a/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp b/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp index 2c10443f..e436a29f 100644 --- a/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp +++ b/test/std/containers/sequences/list/list.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp b/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp index 27d0411f..3d5dec29 100644 --- a/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp +++ b/test/std/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp b/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp index 070db9e8..a2837f81 100644 --- a/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp +++ b/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp b/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp index 8a317550..4f41c3dd 100644 --- a/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp +++ b/test/std/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/sequences/list/list.special/swap_noexcept.pass.cpp b/test/std/containers/sequences/list/list.special/swap_noexcept.pass.cpp index 7a23398e..54ae359c 100644 --- a/test/std/containers/sequences/list/list.special/swap_noexcept.pass.cpp +++ b/test/std/containers/sequences/list/list.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp b/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp index a47c5131..c7988d62 100644 --- a/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp +++ b/test/std/containers/sequences/vector/vector.capacity/resize_size.pass.cpp @@ -14,7 +14,7 @@ #include #include #include "../../../stack_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp b/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp index d87ac863..8c8b0a04 100644 --- a/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp +++ b/test/std/containers/sequences/vector/vector.cons/assign_move.pass.cpp @@ -13,7 +13,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp b/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp index 3fc33b68..471c1d40 100644 --- a/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp +++ b/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp b/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp index 0d73e9ef..0e2cae9e 100644 --- a/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp +++ b/test/std/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/sequences/vector/vector.cons/move.pass.cpp b/test/std/containers/sequences/vector/vector.cons/move.pass.cpp index bb61d549..fb419d82 100644 --- a/test/std/containers/sequences/vector/vector.cons/move.pass.cpp +++ b/test/std/containers/sequences/vector/vector.cons/move.pass.cpp @@ -13,7 +13,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp b/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp index 1923e68f..aef96917 100644 --- a/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp +++ b/test/std/containers/sequences/vector/vector.cons/move_alloc.pass.cpp @@ -13,7 +13,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp b/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp index 158370f4..1c4a4f7c 100644 --- a/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp b/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp index a2e36ccd..46cad992 100644 --- a/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp +++ b/test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp b/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp index cf3715cc..e12ec45f 100644 --- a/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp +++ b/test/std/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp @@ -18,7 +18,7 @@ #include #include #include "../../../stack_allocator.h" -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp b/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp index be488931..b143cd77 100644 --- a/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp +++ b/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp @@ -13,7 +13,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "../../../stack_allocator.h" #include "min_allocator.h" #include "asan_testing.h" diff --git a/test/std/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp b/test/std/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp index 996712a3..92d87568 100644 --- a/test/std/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp +++ b/test/std/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp index df8c7b57..30e0dc17 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "../../../test_hash.h" diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp index 1fc37f75..7fb42006 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp index f7fde378..fc3fc6f0 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp b/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp index 1c86dd39..f292011c 100644 --- a/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp b/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp index c4d71286..5fd9f9d6 100644 --- a/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.elem/at.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp b/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp index 7f4e067c..c072248f 100644 --- a/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp b/test/std/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp index 49ac757e..a986882e 100644 --- a/test/std/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp b/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp index 92f6c40e..1618c101 100644 --- a/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp +++ b/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp @@ -24,7 +24,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp b/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp index 6c5e8c8e..f53dc6c7 100644 --- a/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp +++ b/test/std/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp index 9812a452..fac3cec6 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "../../../test_hash.h" diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp index ae2a96e2..22078519 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp index 078693d5..47e61ab7 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp index 44565d11..37f17876 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp index bb89c3f1..7116fa02 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp @@ -24,7 +24,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp index f3637587..5a98467e 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp index a7700b4d..c690bb61 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp b/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp index 634e4f4a..481ec802 100644 --- a/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp +++ b/test/std/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp b/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp index 65a5bc2e..2718324b 100644 --- a/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp +++ b/test/std/containers/unord/unord.multiset/insert_rvalue.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp index 0effeed9..391609fd 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "../../../test_hash.h" diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp index c4c54a5a..a549288a 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp index 8a56d1a4..2f86f018 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp index aa7ad05a..8a4c3c94 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp index 40dac3cc..7dc653bc 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp b/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp index f612ec57..3f04dbb8 100644 --- a/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp +++ b/test/std/containers/unord/unord.set/insert_hint_rvalue.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp b/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp index d62308e7..e043579b 100644 --- a/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp +++ b/test/std/containers/unord/unord.set/insert_rvalue.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../MoveOnly.h" +#include "MoveOnly.h" #include "min_allocator.h" int main() diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp index b3cd9c3f..f419c31c 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #include "../../../test_hash.h" diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp index 68ef7f4f..1e196b2e 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" #if __has_feature(cxx_noexcept) diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp index c3c94fd1..02af34d8 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp b/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp index 791a67d2..b2d89ba5 100644 --- a/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp b/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp index 359e2968..cba09231 100644 --- a/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../../../MoveOnly.h" +#include "MoveOnly.h" #include "test_allocator.h" template diff --git a/test/std/utilities/tuple/tuple.tuple/MoveOnly.h b/test/std/utilities/tuple/tuple.tuple/MoveOnly.h deleted file mode 100644 index e4d9f649..00000000 --- a/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 -#include - -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 - : public std::unary_function -{ - std::size_t operator()(const MoveOnly& x) const {return x.get();} -}; - -} - -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES - -#endif // MOVEONLY_H diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp index 525dfe6e..5c827447 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp @@ -16,7 +16,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp index 59464fcc..b4ebc6d5 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp index 3d8b194e..7ac9deba 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" #if _LIBCPP_STD_VER > 11 diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp index 00bc5e05..864d5b50 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" #include "allocators.h" #include "../alloc_first.h" #include "../alloc_last.h" diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp index 575a9940..dd24f402 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" #include "allocators.h" #include "../alloc_first.h" #include "../alloc_last.h" diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp index 8b8ec0ca..711c7193 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp @@ -16,7 +16,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp index 92bff97d..60e6f7e6 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" struct ConstructsWithTupleLeaf { diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp index 3fca5738..d1e2ce3c 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp index 415e9641..fb7db20f 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp index c7c96f8b..b5c5bd48 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "../MoveOnly.h" +#include "MoveOnly.h" int main() { diff --git a/test/std/containers/MoveOnly.h b/test/support/MoveOnly.h similarity index 100% rename from test/std/containers/MoveOnly.h rename to test/support/MoveOnly.h