summaryrefslogtreecommitdiffstats
path: root/libcxx/test/thread
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-05-17 19:12:55 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-05-17 19:12:55 +0000
commitfe7e3eeddcd8ccb6ed1bb4f7589ffaa87139b135 (patch)
treed60d35be9b031c770858134b62c98acf2b964bd1 /libcxx/test/thread
parent35ab91cc8927706480fd6c802ff3615e1226f376 (diff)
downloadbcm5719-llvm-fe7e3eeddcd8ccb6ed1bb4f7589ffaa87139b135.tar.gz
bcm5719-llvm-fe7e3eeddcd8ccb6ed1bb4f7589ffaa87139b135.zip
Clean up a bunch of warnings in the tests, 3 of which actually turned out to be test bugs.
llvm-svn: 131479
Diffstat (limited to 'libcxx/test/thread')
-rw-r--r--libcxx/test/thread/futures/futures.overview/launch.pass.cpp2
-rw-r--r--libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp2
-rw-r--r--libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/test/thread/futures/futures.overview/launch.pass.cpp b/libcxx/test/thread/futures/futures.overview/launch.pass.cpp
index 63eebe9f2d7..f4c4ca11c7f 100644
--- a/libcxx/test/thread/futures/futures.overview/launch.pass.cpp
+++ b/libcxx/test/thread/futures/futures.overview/launch.pass.cpp
@@ -20,7 +20,7 @@
int main()
{
- static_assert(std::launch::any == std::launch::async | std::launch::deferred, "");
+ static_assert(std::launch::any == (std::launch::async | std::launch::deferred), "");
static_assert(std::launch::async == 1, "");
static_assert(std::launch::deferred == 2, "");
}
diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
index 8ae59216316..7009f306d2a 100644
--- a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
+++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
@@ -46,7 +46,7 @@ int main()
assert(A::n_copies == 0);
assert(A::n_moves > 0);
}
- A::n_copies == 0;
+ A::n_copies = 0;
A::n_copies = 0;
{
A a(5);
diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
index 63042e8c5f8..2e0cf5d723e 100644
--- a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
+++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
@@ -51,7 +51,7 @@ int main()
assert(A::n_moves > 0);
}
assert(test_alloc_base::count == 0);
- A::n_copies == 0;
+ A::n_copies = 0;
A::n_copies = 0;
{
A a(5);
OpenPOWER on IntegriCloud