zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix shadowing of local variables.

This commit is contained in:
Pavel Janík 2017-03-15 15:40:37 +01:00
parent c4b60b3d9c
commit b42ff60c7e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/checkqueue_tests.cpp
View File

@ -46,7 +46,7 @@ struct FakeCheckCheckCompletion {
struct FailingCheck { struct FailingCheck {
bool fails; bool fails;
FailingCheck(bool fails) : fails(fails){}; FailingCheck(bool _fails) : fails(_fails){};
FailingCheck() : fails(true){}; FailingCheck() : fails(true){};
bool operator()() bool operator()()
{ {
@ -411,15 +411,15 @@ BOOST_AUTO_TEST_CASE(test_CheckQueueControl_Locks)
std::unique_lock<std::mutex> l(m); std::unique_lock<std::mutex> l(m);
tg.create_thread([&]{ tg.create_thread([&]{
CCheckQueueControl<FakeCheck> control(queue.get()); CCheckQueueControl<FakeCheck> control(queue.get());
std::unique_lock<std::mutex> l(m); std::unique_lock<std::mutex> ll(m);
has_lock = true; has_lock = true;
cv.notify_one(); cv.notify_one();
cv.wait(l, [&]{return has_tried;}); cv.wait(ll, [&]{return has_tried;});
done = true; done = true;
cv.notify_one(); cv.notify_one();
// Wait until the done is acknowledged // 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 // Wait for thread to get the lock
cv.wait(l, [&](){return has_lock;}); cv.wait(l, [&](){return has_lock;});