1 files changed, 30 insertions, 0 deletions
diff --git a/libcxx/test/support/MoveOnly.h b/libcxx/test/support/MoveOnly.h
index e4d9f649560..b9653516cfd 100644
--- a/libcxx/test/support/MoveOnly.h
+++ b/libcxx/test/support/MoveOnly.h
@@ -17,6 +17,7 @@
 
 class MoveOnly
 {
+    friend class MoveOnly2;
     MoveOnly(const MoveOnly&);
     MoveOnly& operator=(const MoveOnly&);
 
@@ -34,6 +35,29 @@ public:
     bool operator< (const MoveOnly& x) const {return data_ <  x.data_;}
 };
 
+class MoveOnly2
+{
+    MoveOnly2(const MoveOnly&);
+    MoveOnly2& operator=(const MoveOnly2&);
+
+    int data_;
+public:
+    MoveOnly2(int data = 1) : data_(data) {}
+    MoveOnly2(MoveOnly2&& x)
+        : data_(x.data_) {x.data_ = 0;}
+    MoveOnly2& operator=(MoveOnly2&& x)
+        {data_ = x.data_; x.data_ = 0; return *this;}
+    MoveOnly2(MoveOnly&& x)
+        : data_(x.data_) {x.data_ = 0;}
+    MoveOnly2& operator=(MoveOnly&& x)
+        {data_ = x.data_; x.data_ = 0; return *this;}
+
+    int get() const {return data_;}
+
+    bool operator==(const MoveOnly2& x) const {return data_ == x.data_;}
+    bool operator< (const MoveOnly2& x) const {return data_ <  x.data_;}
+};
+
 namespace std {
 
 template <>
@@ -43,6 +67,12 @@ struct hash<MoveOnly>
     std::size_t operator()(const MoveOnly& x) const {return x.get();}
 };
 
+template <>
+struct hash<MoveOnly2>
+    : public std::unary_function<MoveOnly, std::size_t>
+{
+    std::size_t operator()(const MoveOnly2& x) const {return x.get();}
+};
 }
 
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES