From 90be8fafb39469bd2c318c033e63294ebaad2ca4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 30 Nov 2025 14:25:32 +0100 Subject: Core/Misc: Use std::scoped_lock instead of unique_lock where possible (and old lock_guard) --- src/server/shared/Secrets/SecretMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/shared/Secrets/SecretMgr.cpp') diff --git a/src/server/shared/Secrets/SecretMgr.cpp b/src/server/shared/Secrets/SecretMgr.cpp index b0ade7be0fe..08adaa5797e 100644 --- a/src/server/shared/Secrets/SecretMgr.cpp +++ b/src/server/shared/Secrets/SecretMgr.cpp @@ -93,7 +93,7 @@ void SecretMgr::Initialize(SecretOwner owner) { if (secret_info[i].flags() & SECRET_FLAG_DEFER_LOAD) continue; - std::unique_lock lock(_secrets[i].lock); + std::scoped_lock lock(_secrets[i].lock); AttemptLoad(Secrets(i), LOG_LEVEL_FATAL, lock); if (!_secrets[i].IsAvailable()) ABORT(); // load failed @@ -102,14 +102,14 @@ void SecretMgr::Initialize(SecretOwner owner) SecretMgr::Secret const& SecretMgr::GetSecret(Secrets i) { - std::unique_lock lock(_secrets[i].lock); + std::scoped_lock lock(_secrets[i].lock); if (_secrets[i].state == Secret::NOT_LOADED_YET) AttemptLoad(i, LOG_LEVEL_ERROR, lock); return _secrets[i]; } -void SecretMgr::AttemptLoad(Secrets i, LogLevel errorLevel, std::unique_lock const&) +void SecretMgr::AttemptLoad(Secrets i, LogLevel errorLevel, std::scoped_lock const&) { auto const& info = secret_info[i]; Optional oldDigest; -- cgit v1.2.3