summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2020-07-28 13:23:08 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2020-10-21 16:15:40 +0100
commitf4c234579bc24237a2c860901be958aea3debb8a (patch)
treef5cdc36e6be06d980aa4bc661d511b23856459ec
parentbb27fbf253ecbcba9046bc69b94a2c0152137aad (diff)
libcamera: thread: Prevent shadowing of signal name
The Thread::wait() function creates a boolean flag 'finished' which shadows the internal member signal of the same name. Rename the boolean flag to prevent confusion and shadowing of the signal. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r--src/libcamera/thread.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp
index 87006a9c..b5d7103a 100644
--- a/src/libcamera/thread.cpp
+++ b/src/libcamera/thread.cpp
@@ -374,7 +374,7 @@ void Thread::exit(int code)
*/
bool Thread::wait(utils::duration duration)
{
- bool finished = true;
+ bool hasFinished = true;
{
MutexLocker locker(data_->mutex_);
@@ -382,14 +382,14 @@ bool Thread::wait(utils::duration duration)
if (duration == utils::duration::max())
data_->cv_.wait(locker, [&]() { return !data_->running_; });
else
- finished = data_->cv_.wait_for(locker, duration,
- [&]() { return !data_->running_; });
+ hasFinished = data_->cv_.wait_for(locker, duration,
+ [&]() { return !data_->running_; });
}
if (thread_.joinable())
thread_.join();
- return finished;
+ return hasFinished;
}
/**