summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/thread/thread.condition
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-12-24 00:40:45 +0000
committerEric Fiselier <eric@efcs.ca>2016-12-24 00:40:45 +0000
commit3777a33d71272871cb1bac22aaa182435c368feb (patch)
tree08f0fc08d91ad26d0d6deb91d64df7c4f3b6904b /libcxx/test/std/thread/thread.condition
parenta140cba79552ec4110643b5193b69228ea61d975 (diff)
downloadbcm5719-llvm-3777a33d71272871cb1bac22aaa182435c368feb.tar.gz
bcm5719-llvm-3777a33d71272871cb1bac22aaa182435c368feb.zip
fix newly failing c++03 tests
llvm-svn: 290472
Diffstat (limited to 'libcxx/test/std/thread/thread.condition')
-rw-r--r--libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
index d7066f4bff4..47da788335c 100644
--- a/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
+++ b/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
@@ -44,8 +44,9 @@ int test1 = 0;
int test2 = 0;
int runs = 0;
+bool expect_result = false;
-void f(bool expect_result)
+void f()
{
typedef std::chrono::system_clock Clock;
typedef std::chrono::milliseconds milliseconds;
@@ -73,8 +74,9 @@ void f(bool expect_result)
int main()
{
{
+ expect_result = true;
L1 lk(m0);
- std::thread t(f, /*expect_result*/true);
+ std::thread t(f);
assert(test1 == 0);
while (test1 == 0)
cv.wait(lk);
@@ -87,8 +89,9 @@ int main()
test1 = 0;
test2 = 0;
{
+ expect_result = false;
L1 lk(m0);
- std::thread t(f, /*expect_result*/false);
+ std::thread t(f);
assert(test1 == 0);
while (test1 == 0)
cv.wait(lk);
OpenPOWER on IntegriCloud