feedc0de/sdbus-cpp
1
0
Fork 0
forked from Kistler-Group/sdbus-cpp
Code Pull Requests Activity

Fix lock_guard variable declaration (don't yet use newer C++17 features)

Browse Source
This commit is contained in:
sangelovic
2020-01-19 19:17:04 +01:00
parent 68b5eac9e9
commit b25534013f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Proxy.cpp
View File

@ -124,7 +124,7 @@ MethodReply Proxy::sendMethodCallMessageAndWaitForReply(const MethodCall& messag
void Proxy::SyncCallReplyData::sendMethodReplyToWaitingThread(MethodReply& reply, const Error* error) void Proxy::SyncCallReplyData::sendMethodReplyToWaitingThread(MethodReply& reply, const Error* error)
{ {
SCOPE_EXIT{ cond_.notify_one(); }; SCOPE_EXIT{ cond_.notify_one(); };
std::unique_lock lock{mutex_}; std::unique_lock<std::mutex> lock{mutex_};
SCOPE_EXIT{ arrived_ = true; }; SCOPE_EXIT{ arrived_ = true; };
//error_ = nullptr; // Necessary if SyncCallReplyData instance is thread_local //error_ = nullptr; // Necessary if SyncCallReplyData instance is thread_local
@ -137,7 +137,7 @@ void Proxy::SyncCallReplyData::sendMethodReplyToWaitingThread(MethodReply& reply
MethodReply Proxy::SyncCallReplyData::waitForMethodReply() MethodReply Proxy::SyncCallReplyData::waitForMethodReply()
{ {
std::unique_lock lock{mutex_}; std::unique_lock<std::mutex> lock{mutex_};
cond_.wait(lock, [this](){ return arrived_; }); cond_.wait(lock, [this](){ return arrived_; });
//arrived_ = false; // Necessary if SyncCallReplyData instance is thread_local //arrived_ = false; // Necessary if SyncCallReplyData instance is thread_local