diff options
Diffstat (limited to 'libcxx/test/std/utilities/tuple')
11 files changed, 10 insertions, 60 deletions
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() { |
