diff options
| author | Pavel Janík <[email protected]> | 2017-03-15 15:40:37 +0100 |
|---|---|---|
| committer | Pavel Janík <[email protected]> | 2017-03-18 07:59:50 +0100 |
| commit | b42ff60c7e5b71a135b622602a01fc3bf0bd99bf (patch) | |
| tree | 2597e70fb1ba6a53dc39d86fa5fa845cf8ecdb43 /src/test/checkqueue_tests.cpp | |
| parent | Make some global variables less-global (static) (diff) | |
| download | discoin-b42ff60c7e5b71a135b622602a01fc3bf0bd99bf.tar.xz discoin-b42ff60c7e5b71a135b622602a01fc3bf0bd99bf.zip | |
Fix shadowing of local variables.
Diffstat (limited to 'src/test/checkqueue_tests.cpp')
| -rw-r--r-- | src/test/checkqueue_tests.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp index d89f9b770..2f958c885 100644 --- a/src/test/checkqueue_tests.cpp +++ b/src/test/checkqueue_tests.cpp @@ -46,7 +46,7 @@ struct FakeCheckCheckCompletion { struct FailingCheck { bool fails; - FailingCheck(bool fails) : fails(fails){}; + FailingCheck(bool _fails) : fails(_fails){}; FailingCheck() : fails(true){}; bool operator()() { @@ -411,15 +411,15 @@ BOOST_AUTO_TEST_CASE(test_CheckQueueControl_Locks) std::unique_lock<std::mutex> l(m); tg.create_thread([&]{ CCheckQueueControl<FakeCheck> control(queue.get()); - std::unique_lock<std::mutex> l(m); + std::unique_lock<std::mutex> ll(m); has_lock = true; cv.notify_one(); - cv.wait(l, [&]{return has_tried;}); + cv.wait(ll, [&]{return has_tried;}); done = true; cv.notify_one(); // Wait until the done is acknowledged // - cv.wait(l, [&]{return done_ack;}); + cv.wait(ll, [&]{return done_ack;}); }); // Wait for thread to get the lock cv.wait(l, [&](){return has_lock;}); |