summaryrefslogtreecommitdiffstats
path: root/libcxx/test/thread
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/thread')
-rw-r--r--libcxx/test/thread/futures/futures.atomic_future/copy_assign.pass.cpp4
-rw-r--r--libcxx/test/thread/futures/futures.promise/move_assign.pass.cpp4
-rw-r--r--libcxx/test/thread/futures/futures.promise/move_ctor.pass.cpp4
-rw-r--r--libcxx/test/thread/futures/futures.promise/set_rvalue.pass.cpp8
-rw-r--r--libcxx/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp8
-rw-r--r--libcxx/test/thread/futures/futures.shared_future/copy_assign.pass.cpp4
-rw-r--r--libcxx/test/thread/futures/futures.shared_future/move_assign.pass.cpp4
-rw-r--r--libcxx/test/thread/futures/futures.unique_future/copy_assign.fail.cpp4
-rw-r--r--libcxx/test/thread/futures/futures.unique_future/move_assign.pass.cpp4
-rw-r--r--libcxx/test/thread/futures/futures.unique_future/move_ctor.pass.cpp4
-rw-r--r--libcxx/test/thread/futures/test_allocator.h4
-rw-r--r--libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp4
-rw-r--r--libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp4
-rw-r--r--libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp4
-rw-r--r--libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp4
15 files changed, 34 insertions, 34 deletions
diff --git a/libcxx/test/thread/futures/futures.atomic_future/copy_assign.pass.cpp b/libcxx/test/thread/futures/futures.atomic_future/copy_assign.pass.cpp
index bd17f88d0d3..6c0bbd4716f 100644
--- a/libcxx/test/thread/futures/futures.atomic_future/copy_assign.pass.cpp
+++ b/libcxx/test/thread/futures/futures.atomic_future/copy_assign.pass.cpp
@@ -18,7 +18,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
typedef int T;
std::promise<T> p;
@@ -70,5 +70,5 @@ int main()
assert(!f0.valid());
assert(!f.valid());
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/futures.promise/move_assign.pass.cpp b/libcxx/test/thread/futures/futures.promise/move_assign.pass.cpp
index 4d2283f9059..f670fbe746b 100644
--- a/libcxx/test/thread/futures/futures.promise/move_assign.pass.cpp
+++ b/libcxx/test/thread/futures/futures.promise/move_assign.pass.cpp
@@ -20,7 +20,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
assert(test_alloc_base::count == 0);
{
std::promise<int> p0(std::allocator_arg, test_allocator<int>());
@@ -85,5 +85,5 @@ int main()
assert(test_alloc_base::count == 1);
}
assert(test_alloc_base::count == 0);
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/futures.promise/move_ctor.pass.cpp b/libcxx/test/thread/futures/futures.promise/move_ctor.pass.cpp
index caaaeebbf7c..c8228c229b6 100644
--- a/libcxx/test/thread/futures/futures.promise/move_ctor.pass.cpp
+++ b/libcxx/test/thread/futures/futures.promise/move_ctor.pass.cpp
@@ -20,7 +20,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
assert(test_alloc_base::count == 0);
{
std::promise<int> p0(std::allocator_arg, test_allocator<int>());
@@ -79,5 +79,5 @@ int main()
assert(test_alloc_base::count == 1);
}
assert(test_alloc_base::count == 0);
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/futures.promise/set_rvalue.pass.cpp b/libcxx/test/thread/futures/futures.promise/set_rvalue.pass.cpp
index 50c587bcbbe..61a66ad407c 100644
--- a/libcxx/test/thread/futures/futures.promise/set_rvalue.pass.cpp
+++ b/libcxx/test/thread/futures/futures.promise/set_rvalue.pass.cpp
@@ -17,7 +17,7 @@
#include <memory>
#include <cassert>
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
struct A
{
@@ -26,11 +26,11 @@ struct A
A(A&&) {throw 9;}
};
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
typedef std::unique_ptr<int> T;
T i(new int(3));
@@ -63,5 +63,5 @@ int main()
assert(j == 9);
}
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp b/libcxx/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp
index 6a996de0118..08ede45a77d 100644
--- a/libcxx/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp
+++ b/libcxx/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp
@@ -17,23 +17,23 @@
#include <memory>
#include <cassert>
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
void func(std::promise<std::unique_ptr<int>>& p)
{
p.set_value_at_thread_exit(std::unique_ptr<int>(new int(5)));
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
std::promise<std::unique_ptr<int>> p;
std::future<std::unique_ptr<int>> f = p.get_future();
std::thread(func, std::move(p)).detach();
assert(*f.get() == 5);
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/futures.shared_future/copy_assign.pass.cpp b/libcxx/test/thread/futures/futures.shared_future/copy_assign.pass.cpp
index 04dc1f86724..cf8d74b280c 100644
--- a/libcxx/test/thread/futures/futures.shared_future/copy_assign.pass.cpp
+++ b/libcxx/test/thread/futures/futures.shared_future/copy_assign.pass.cpp
@@ -18,7 +18,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
typedef int T;
std::promise<T> p;
@@ -70,5 +70,5 @@ int main()
assert(!f0.valid());
assert(!f.valid());
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/futures.shared_future/move_assign.pass.cpp b/libcxx/test/thread/futures/futures.shared_future/move_assign.pass.cpp
index 496bac5ae5e..a0802fc1ab5 100644
--- a/libcxx/test/thread/futures/futures.shared_future/move_assign.pass.cpp
+++ b/libcxx/test/thread/futures/futures.shared_future/move_assign.pass.cpp
@@ -18,7 +18,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
typedef int T;
std::promise<T> p;
@@ -70,5 +70,5 @@ int main()
assert(!f0.valid());
assert(!f.valid());
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/futures.unique_future/copy_assign.fail.cpp b/libcxx/test/thread/futures/futures.unique_future/copy_assign.fail.cpp
index e3745cdacd1..a5f18a241cf 100644
--- a/libcxx/test/thread/futures/futures.unique_future/copy_assign.fail.cpp
+++ b/libcxx/test/thread/futures/futures.unique_future/copy_assign.fail.cpp
@@ -18,7 +18,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
typedef int T;
std::promise<T> p;
@@ -70,5 +70,5 @@ int main()
assert(!f0.valid());
assert(!f.valid());
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/futures.unique_future/move_assign.pass.cpp b/libcxx/test/thread/futures/futures.unique_future/move_assign.pass.cpp
index 4c5d462d56c..d4b8f6d4cf3 100644
--- a/libcxx/test/thread/futures/futures.unique_future/move_assign.pass.cpp
+++ b/libcxx/test/thread/futures/futures.unique_future/move_assign.pass.cpp
@@ -18,7 +18,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
typedef int T;
std::promise<T> p;
@@ -70,5 +70,5 @@ int main()
assert(!f0.valid());
assert(!f.valid());
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/futures.unique_future/move_ctor.pass.cpp b/libcxx/test/thread/futures/futures.unique_future/move_ctor.pass.cpp
index dee66c59e75..10501ac68f1 100644
--- a/libcxx/test/thread/futures/futures.unique_future/move_ctor.pass.cpp
+++ b/libcxx/test/thread/futures/futures.unique_future/move_ctor.pass.cpp
@@ -18,7 +18,7 @@
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
typedef int T;
std::promise<T> p;
@@ -64,5 +64,5 @@ int main()
assert(!f0.valid());
assert(!f.valid());
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/futures/test_allocator.h b/libcxx/test/thread/futures/test_allocator.h
index 94a80e2db4b..7644bc7c968 100644
--- a/libcxx/test/thread/futures/test_allocator.h
+++ b/libcxx/test/thread/futures/test_allocator.h
@@ -59,10 +59,10 @@ public:
{return UINT_MAX / sizeof(T);}
void construct(pointer p, const T& val)
{::new(p) T(val);}
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
void construct(pointer p, T&& val)
{::new(p) T(std::move(val));}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
void destroy(pointer p) {p->~T();}
friend bool operator==(const test_allocator& x, const test_allocator& y)
diff --git a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp
index 125024ce040..33d93c9da5c 100644
--- a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp
+++ b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp
@@ -21,7 +21,7 @@ std::mutex m1;
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
std::unique_lock<std::mutex> lk0(m0);
std::unique_lock<std::mutex> lk1(m1);
lk1 = std::move(lk0);
@@ -29,5 +29,5 @@ int main()
assert(lk1.owns_lock() == true);
assert(lk0.mutex() == nullptr);
assert(lk0.owns_lock() == false);
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp
index 08cb78e64c9..fe44a457a05 100644
--- a/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp
+++ b/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp
@@ -20,12 +20,12 @@ std::mutex m;
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
std::unique_lock<std::mutex> lk0(m);
std::unique_lock<std::mutex> lk = std::move(lk0);
assert(lk.mutex() == &m);
assert(lk.owns_lock() == true);
assert(lk0.mutex() == nullptr);
assert(lk0.owns_lock() == false);
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp b/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
index ff1cf57fd70..a34723e7c76 100644
--- a/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
+++ b/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
@@ -56,7 +56,7 @@ void f1()
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
std::set_terminate(f1);
{
assert(G::n_alive == 0);
@@ -78,5 +78,5 @@ int main()
t0 = std::move(t1);
assert(false);
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
diff --git a/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp b/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
index a28fd69f8cd..647ae5ed57d 100644
--- a/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
+++ b/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
@@ -51,7 +51,7 @@ bool G::op_run = false;
int main()
{
-#ifdef _LIBCPP_MOVE
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{
assert(G::n_alive == 0);
assert(!G::op_run);
@@ -64,5 +64,5 @@ int main()
assert(G::n_alive == 0);
assert(G::op_run);
}
-#endif // _LIBCPP_MOVE
+#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}
OpenPOWER on IntegriCloud