aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPavel Janík <Pavel@Janik.cz>2017-03-15 15:40:37 +0100
committerPavel Janík <Pavel@Janik.cz>2017-03-18 07:59:50 +0100
commitb42ff60c7e5b71a135b622602a01fc3bf0bd99bf (patch)
tree2597e70fb1ba6a53dc39d86fa5fa845cf8ecdb43 /src
parentc4b60b3d9c1b45240f45842e0f39ae8a8467ce58 (diff)
downloadbitcoin-b42ff60c7e5b71a135b622602a01fc3bf0bd99bf.tar.xz
Fix shadowing of local variables.
Diffstat (limited to 'src')
-rw-r--r--src/test/checkqueue_tests.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index d89f9b770b..2f958c885c 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;});