Use std::lock_guard instead of std::unique_lock.

2 files changed, 10 insertions, 10 deletions

diff --git a/fastlib/src/vespa/fastlib/net/httpserver.cpp b/fastlib/src/vespa/fastlib/net/httpserver.cpp
index a9bba95a8ff..0d1b75ec7fe 100644
--- a/fastlib/src/vespa/fastlib/net/httpserver.cpp
+++ b/fastlib/src/vespa/fastlib/net/httpserver.cpp
@@ -367,7 +367,7 @@ int Fast_HTTPServer::Start(void)
     int retCode = FASTLIB_SUCCESS;
 
     {
-        std::unique_lock<std::mutex> runningGuard(_runningMutex);
+        std::lock_guard<std::mutex> runningGuard(_runningMutex);
         if (!_isRunning) {
             // Try listening
             retCode = Listen();
@@ -391,7 +391,7 @@ int Fast_HTTPServer::Start(void)
 void
 Fast_HTTPServer::Stop(void) {
     {
-        std::unique_lock<std::mutex> runningGuard(_runningMutex);
+        std::lock_guard<std::mutex> runningGuard(_runningMutex);
         _stopSignalled = true;
         if (_acceptThread) {
             _acceptThread->SetBreakFlag();
@@ -407,7 +407,7 @@ Fast_HTTPServer::Stop(void) {
 bool Fast_HTTPServer::StopSignalled(void)
 {
     bool retVal;
-    std::unique_lock<std::mutex> runningGuard(_runningMutex);
+    std::lock_guard<std::mutex> runningGuard(_runningMutex);
     retVal = _stopSignalled;
     return retVal;
 }
@@ -458,7 +458,7 @@ void Fast_HTTPServer::Run(FastOS_ThreadInterface *thisThread, void *params)
     Fast_Socket *mySocket;
 
     {
-        std::unique_lock<std::mutex> runningGuard(_runningMutex);
+        std::lock_guard<std::mutex> runningGuard(_runningMutex);
         _isRunning = true;
         _stopSignalled = false;
     }
@@ -516,7 +516,7 @@ void Fast_HTTPServer::Run(FastOS_ThreadInterface *thisThread, void *params)
         _serverSocket.SetSocketEvent(NULL);
     }
 
-    std::unique_lock<std::mutex> runningGuard(_runningMutex);
+    std::lock_guard<std::mutex> runningGuard(_runningMutex);
     _isRunning = false;
 }
 
@@ -1040,7 +1040,7 @@ void Fast_HTTPServer::HandleFileRequest(const string & url, Fast_HTTPConnection&
 
 void Fast_HTTPServer::SetBaseDir(const char *baseDir)
 {
-    std::unique_lock<std::mutex> runningGuard(_runningMutex);
+    std::lock_guard<std::mutex> runningGuard(_runningMutex);
     if (!_isRunning) {
         _baseDir = baseDir;
 
@@ -1178,14 +1178,14 @@ void Fast_HTTPServer::OutputNotFound(Fast_HTTPConnection& conn,
 void
 Fast_HTTPServer::AddConnection(Fast_HTTPConnection* connection)
 {
-    std::unique_lock<std::mutex> connectionGuard(_connectionLock);
+    std::lock_guard<std::mutex> connectionGuard(_connectionLock);
     _connections.Insert(connection);
 }
 
 void
 Fast_HTTPServer::RemoveConnection(Fast_HTTPConnection* connection)
 {
-    std::unique_lock<std::mutex> connectionGuard(_connectionLock);
+    std::lock_guard<std::mutex> connectionGuard(_connectionLock);
     _connections.RemoveElement(connection);
     _connectionCond.notify_one();
  }
diff --git a/fastlib/src/vespa/fastlib/text/normwordfolder.cpp b/fastlib/src/vespa/fastlib/text/normwordfolder.cpp
index f383ff85df5..ca1f260515f 100644
--- a/fastlib/src/vespa/fastlib/text/normwordfolder.cpp
+++ b/fastlib/src/vespa/fastlib/text/normwordfolder.cpp
@@ -29,7 +29,7 @@ Fast_NormalizeWordFolder::Setup(uint32_t flags)
 {
     // Only allow setting these when not initialized or initializing...
     {
-        std::unique_lock<std::mutex> initGuard(_initMutex);
+        std::lock_guard<std::mutex> initGuard(_initMutex);
         _doAccentRemoval         = (DO_ACCENT_REMOVAL           & flags) != 0;
 //        _doSmallToNormalKana     = (DO_SMALL_TO_NORMAL_KANA     & flags) != 0;
 //        _doKatakanaToHiragana    = (DO_KATAKANA_TO_HIRAGANA     & flags) != 0;
@@ -48,7 +48,7 @@ Fast_NormalizeWordFolder::Initialize()
 {
     unsigned int i;
     if (!_isInitialized) {
-        std::unique_lock<std::mutex> initGuard(_initMutex);
+        std::lock_guard<std::mutex> initGuard(_initMutex);
         if (!_isInitialized) {
 
             for (i = 0; i < 128; i++)