Skip to content

Commit b42ff60

Browse files
committed
Fix shadowing of local variables.
1 parent c4b60b3 commit b42ff60

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/test/checkqueue_tests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ struct FakeCheckCheckCompletion {
4646

4747
struct FailingCheck {
4848
bool fails;
49-
FailingCheck(bool fails) : fails(fails){};
49+
FailingCheck(bool _fails) : fails(_fails){};
5050
FailingCheck() : fails(true){};
5151
bool operator()()
5252
{
@@ -411,15 +411,15 @@ BOOST_AUTO_TEST_CASE(test_CheckQueueControl_Locks)
411411
std::unique_lock<std::mutex> l(m);
412412
tg.create_thread([&]{
413413
CCheckQueueControl<FakeCheck> control(queue.get());
414-
std::unique_lock<std::mutex> l(m);
414+
std::unique_lock<std::mutex> ll(m);
415415
has_lock = true;
416416
cv.notify_one();
417-
cv.wait(l, [&]{return has_tried;});
417+
cv.wait(ll, [&]{return has_tried;});
418418
done = true;
419419
cv.notify_one();
420420
// Wait until the done is acknowledged
421421
//
422-
cv.wait(l, [&]{return done_ack;});
422+
cv.wait(ll, [&]{return done_ack;});
423423
});
424424
// Wait for thread to get the lock
425425
cv.wait(l, [&](){return has_lock;});

0 commit comments

Comments
 (0)