Use class template argument deduction for locks

src/test/jtx/impl/ManualTimeKeeper.cpp

@@ -39,7 +39,7 @@ auto
 ManualTimeKeeper::now() const ->
     time_point
 {
-    std::lock_guard<std::mutex> lock(mutex_);
+    std::lock_guard lock(mutex_);
     return now_;
 }
     
@@ -47,7 +47,7 @@ auto
 ManualTimeKeeper::closeTime() const ->
     time_point
 {
-    std::lock_guard<std::mutex> lock(mutex_);
+    std::lock_guard lock(mutex_);
     return now_ + closeOffset_;
 }
 
@@ -58,7 +58,7 @@ ManualTimeKeeper::adjustCloseTime(
     // Copied from TimeKeeper::adjustCloseTime
     using namespace std::chrono;
     auto const s = amount.count();
-    std::lock_guard<std::mutex> lock(mutex_);
+    std::lock_guard lock(mutex_);
     // Take large offsets, ignore small offsets,
     // push the close time towards our wall time.
     if (s > 1)
@@ -78,14 +78,14 @@ ManualTimeKeeper::nowOffset() const
 std::chrono::duration<std::int32_t>
 ManualTimeKeeper::closeOffset() const
 {
-    std::lock_guard<std::mutex> lock(mutex_);
+    std::lock_guard lock(mutex_);
     return closeOffset_;
 }
 
 void
 ManualTimeKeeper::set (time_point now)
 {
-    std::lock_guard<std::mutex> lock(mutex_);
+    std::lock_guard lock(mutex_);
     now_ = now;
 }
 

src/test/jtx/impl/WSClient.cpp

@@ -284,7 +284,7 @@ private:
         auto m = std::make_shared<msg>(
             std::move(jv));
         {
-            std::lock_guard<std::mutex> lock(m_);
+            std::lock_guard lock(m_);
             msgs_.push_front(m);
             cv_.notify_all();
         }
@@ -297,7 +297,7 @@ private:
     void
     on_read_done()
     {
-        std::lock_guard<std::mutex> lock(m0_);
+        std::lock_guard lock(m0_);
         b0_ = true;
         cv0_.notify_all();
     }