Replace std::lock_guard and std::lock with std::scoped_lock (#1758)

std::scoped_lock was introduced in C++17 and is strictly better than
std::lock_guard as it supports locking any number of mutexes safely.
It's also easier to use than std::lock for locking multiple mutexes at
once.
This commit is contained in:
Tyler Veness
2019-07-08 22:58:39 -07:00
committed by Peter Johnson
parent 24d31df55a
commit 62be0392b6
79 changed files with 472 additions and 476 deletions

View File

@@ -875,10 +875,10 @@ void UsbCameraImpl::DeviceCacheMode() {
// Default mode is not supported. Grab first supported image
auto&& firstSupported = m_windowsVideoModes[0];
m_currentMode = firstSupported.second;
std::lock_guard lock(m_mutex);
std::scoped_lock lock(m_mutex);
m_mode = firstSupported.first;
} else {
std::lock_guard lock(m_mutex);
std::scoped_lock lock(m_mutex);
m_mode = result->first;
}
}
@@ -960,7 +960,7 @@ void UsbCameraImpl::DeviceCacheVideoModes() {
count++;
}
{
std::lock_guard lock(m_mutex);
std::scoped_lock lock(m_mutex);
m_videoModes.swap(modes);
}
m_notifier.NotifySource(*this, CS_SOURCE_VIDEOMODES_UPDATED);