From 8bfec30d48a4c1d2b93b3417f2fcf5d7d83f1958 Mon Sep 17 00:00:00 2001
From: gabime <gmelman1@gmail.com>
Date: Fri, 3 Aug 2018 13:38:41 +0300
Subject: [PATCH] Fix deadlock issue with mingw in async logger

---
 include/spdlog/details/mpmc_blocking_q.h | 38 ++++++++++--------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/include/spdlog/details/mpmc_blocking_q.h b/include/spdlog/details/mpmc_blocking_q.h
index 9c649dbf..e8ff3b8e 100644
--- a/include/spdlog/details/mpmc_blocking_q.h
+++ b/include/spdlog/details/mpmc_blocking_q.h
@@ -32,37 +32,31 @@ public:
 
     // try to enqueue and block if no room left
     void enqueue(T &&item)
-    {
-        {
-            std::unique_lock<std::mutex> lock(queue_mutex_);
-            pop_cv_.wait(lock, [this] { return !this->q_.full(); });
-            q_.push_back(std::move(item));
-        }
-        push_cv_.notify_one();
+    {        
+        std::unique_lock<std::mutex> lock(queue_mutex_);
+        pop_cv_.wait(lock, [this] { return !this->q_.full(); });
+        q_.push_back(std::move(item));        
+		push_cv_.notify_one();
     }
 
     // enqueue immediately. overrun oldest message in the queue if no room left.
     void enqueue_nowait(T &&item)
-    {
-        {
-            std::unique_lock<std::mutex> lock(queue_mutex_);
-            q_.push_back(std::move(item));
-        }
-        push_cv_.notify_one();
+    {        
+        std::unique_lock<std::mutex> lock(queue_mutex_);
+        q_.push_back(std::move(item));       
+		push_cv_.notify_one();
     }
 
     // try to dequeue item. if no item found. wait upto timeout and try again
     // Return true, if succeeded dequeue item, false otherwise
     bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
-    {
-        {
-            std::unique_lock<std::mutex> lock(queue_mutex_);
-            if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
-            {
-                return false;
-            }
-            q_.pop_front(popped_item);
-        }
+    {        
+		std::unique_lock<std::mutex> lock(queue_mutex_);
+		if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
+		{
+			return false;
+		}
+		q_.pop_front(popped_item);        
         pop_cv_.notify_one();
         return true;
     }