commit 024c46fb1f14276d4adf15764ed97b733890826e
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sat Mar 02 23:53:18 2024 -0500
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sun Mar 17 15:59:48 2024 -0400
tree 89c0cde9b9562263cc5fbe5c61e519ed1599de62
parent 4cf587e6741b62b144247321fcc77c07f06249f5

lock_guard: remove explicit template

Change-Id: Iec6d57d6a66557a66096c7a8f67e025c6ca5a64c

src/turn/turn_cache.cpp

diff --git a/src/turn/turn_cache.cpp b/src/turn/turn_cache.cpp
index 65862cb..0cf9267 100644
--- a/src/turn/turn_cache.cpp
+++ b/src/turn/turn_cache.cpp
@@ -43,7 +43,7 @@
 
 TurnCache::~TurnCache() {
     {
-        std::lock_guard<std::mutex> lock(shutdownMtx_);
+        std::lock_guard lock(shutdownMtx_);
         if (refreshTimer_) {
             refreshTimer_->cancel();
             refreshTimer_.reset();
@@ -54,7 +54,7 @@
         }
     }
     {
-        std::lock_guard<std::mutex> lock(cachedTurnMutex_);
+        std::lock_guard lock(cachedTurnMutex_);
         testTurnV4_.reset();
         testTurnV6_.reset();
         cacheTurnV4_.reset();
@@ -79,7 +79,7 @@
     params_ = params;
     enabled_ = enabled;
     {
-        std::lock_guard<std::mutex> lk(cachedTurnMutex_);
+        std::lock_guard lk(cachedTurnMutex_);
         // Force re-resolution
         isRefreshing_ = false;
         cacheTurnV4_.reset();
@@ -87,7 +87,7 @@
         testTurnV4_.reset();
         testTurnV6_.reset();
     }
-    std::lock_guard<std::mutex> lock(shutdownMtx_);
+    std::lock_guard lock(shutdownMtx_);
     if (refreshTimer_) {
         refreshTimer_->expires_at(std::chrono::steady_clock::now());
         refreshTimer_->async_wait(std::bind(&TurnCache::refresh, shared_from_this(), std::placeholders::_1));
@@ -106,7 +106,7 @@
         return;
     if (!enabled_) {
         // In this case, we do not use any TURN server
-        std::lock_guard<std::mutex> lk(cachedTurnMutex_);
+        std::lock_guard lk(cachedTurnMutex_);
         cacheTurnV4_.reset();
         cacheTurnV6_.reset();
         isRefreshing_ = false;
@@ -177,7 +177,7 @@
 {
     TurnTransportParams params = params_;
     params.server = server;
-    std::lock_guard<std::mutex> lk(cachedTurnMutex_);
+    std::lock_guard lk(cachedTurnMutex_);
     auto& turn = server.isIpv4() ? testTurnV4_ : testTurnV6_;
     turn.reset(); // Stop previous TURN
     try {
@@ -185,7 +185,7 @@
             params, [this, server](bool ok) {
                 // Stop server in an async job, because this callback can be called
                 // immediately and cachedTurnMutex_ must not be locked.
-                std::lock_guard<std::mutex> lock(shutdownMtx_);
+                std::lock_guard lock(shutdownMtx_);
                 if (onConnectedTimer_) {
                     onConnectedTimer_->expires_at(std::chrono::steady_clock::now());
                     onConnectedTimer_->async_wait(std::bind(&TurnCache::onConnected, shared_from_this(), std::placeholders::_1, ok, server));
@@ -202,7 +202,7 @@
     if (ec == asio::error::operation_aborted)
         return;
 
-    std::lock_guard<std::mutex> lk(cachedTurnMutex_);
+    std::lock_guard lk(cachedTurnMutex_);
     auto& cacheTurn = server.isIpv4() ? cacheTurnV4_ : cacheTurnV6_;
     if (!ok) {
         if(logger_) logger_->error("Connection to {:s} failed - reset", server.toString());
@@ -222,7 +222,7 @@
 {
     isRefreshing_ = false;
     if (scheduleNext) {
-        std::lock_guard<std::mutex> lock(shutdownMtx_);
+        std::lock_guard lock(shutdownMtx_);
         if(logger_) logger_->warn("[Account {:s}] Cache for TURN resolution failed.", accountId_);
         if (refreshTimer_) {
             refreshTimer_->expires_at(std::chrono::steady_clock::now() + turnRefreshDelay_);