Merge pull request #4828 from lioncash/lockguard

general: Use template deduction guides for lock_guard
merge-requests/60/head
Rodrigo Locatti 2020-10-25 16:55:54 +07:00 committed by GitHub
commit ae3a755d13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

@ -84,7 +84,7 @@ void ProgressServiceBackend::FinishDownload(ResultCode result) {
void ProgressServiceBackend::SignalUpdate() const { void ProgressServiceBackend::SignalUpdate() const {
if (need_hle_lock) { if (need_hle_lock) {
std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); std::lock_guard lock(HLE::g_hle_lock);
event.writable->Signal(); event.writable->Signal();
} else { } else {
event.writable->Signal(); event.writable->Signal();

@ -596,6 +596,6 @@ void QtControllerSelector::ReconfigureControllers(
void QtControllerSelector::MainWindowReconfigureFinished() { void QtControllerSelector::MainWindowReconfigureFinished() {
// Acquire the HLE mutex // Acquire the HLE mutex
std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); std::lock_guard lock(HLE::g_hle_lock);
callback(); callback();
} }