summaryrefslogtreecommitdiffstats
path: root/libcxx/test/numerics/numeric.ops
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-08-22 18:02:34 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-08-22 18:02:34 +0000
commit9ff3203fccd7a496fd1ee16ac94e380d768d6177 (patch)
treefe0eb53b473c5c5ecf94bd9ff3129c27b83c8446 /libcxx/test/numerics/numeric.ops
parent89732e136273e747f6aaea6bfdee31fa66ada880 (diff)
downloadbcm5719-llvm-9ff3203fccd7a496fd1ee16ac94e380d768d6177.tar.gz
bcm5719-llvm-9ff3203fccd7a496fd1ee16ac94e380d768d6177.zip
Zhihao Yuan noted that a move assignment operation was missing from std::adjacent_difference. Fixed.
llvm-svn: 189036
Diffstat (limited to 'libcxx/test/numerics/numeric.ops')
-rw-r--r--libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp43
-rw-r--r--libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp44
2 files changed, 87 insertions, 0 deletions
diff --git a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
index 623371edc97..46741e1e41b 100644
--- a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
@@ -38,6 +38,43 @@ test()
assert(ib[i] == ir[i]);
}
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+
+class Y;
+
+class X
+{
+ int i_;
+
+ X& operator=(const X&);
+public:
+ explicit X(int i) : i_(i) {}
+ X(const X& x) : i_(x.i_) {}
+ X& operator=(X&& x)
+ {
+ i_ = x.i_;
+ x.i_ = -1;
+ return *this;
+ }
+
+ friend X operator-(const X& x, const X& y) {return X(x.i_ - y.i_);}
+
+ friend class Y;
+};
+
+class Y
+{
+ int i_;
+
+ Y& operator=(const Y&);
+public:
+ explicit Y(int i) : i_(i) {}
+ Y(const Y& y) : i_(y.i_) {}
+ void operator=(const X& x) {i_ = x.i_;}
+};
+
+#endif
+
int main()
{
test<input_iterator<const int*>, output_iterator<int*> >();
@@ -69,4 +106,10 @@ int main()
test<const int*, bidirectional_iterator<int*> >();
test<const int*, random_access_iterator<int*> >();
test<const int*, int*>();
+
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+ X x[3] = {X(1), X(2), X(3)};
+ Y y[3] = {Y(1), Y(2), Y(3)};
+ std::adjacent_difference(x, x+3, y);
+#endif
}
diff --git a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
index a8fbfbe00f6..fb0bbdc2836 100644
--- a/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
+++ b/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
@@ -40,6 +40,44 @@ test()
assert(ib[i] == ir[i]);
}
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+
+class Y;
+
+class X
+{
+ int i_;
+
+ X& operator=(const X&);
+public:
+ explicit X(int i) : i_(i) {}
+ X(const X& x) : i_(x.i_) {}
+ X& operator=(X&& x)
+ {
+ i_ = x.i_;
+ x.i_ = -1;
+ return *this;
+ }
+
+ friend X operator-(const X& x, const X& y) {return X(x.i_ - y.i_);}
+
+ friend class Y;
+};
+
+class Y
+{
+ int i_;
+
+ Y& operator=(const Y&);
+public:
+ explicit Y(int i) : i_(i) {}
+ Y(const Y& y) : i_(y.i_) {}
+ void operator=(const X& x) {i_ = x.i_;}
+};
+
+#endif
+
+
int main()
{
test<input_iterator<const int*>, output_iterator<int*> >();
@@ -71,4 +109,10 @@ int main()
test<const int*, bidirectional_iterator<int*> >();
test<const int*, random_access_iterator<int*> >();
test<const int*, int*>();
+
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+ X x[3] = {X(1), X(2), X(3)};
+ Y y[3] = {Y(1), Y(2), Y(3)};
+ std::adjacent_difference(x, x+3, y, std::minus<X>());
+#endif
}
OpenPOWER on IntegriCloud