Merge pull request #1651

fc91e6a7 Fixed a deadlock issue with easylogger++ (NanoAkron)
2017-02-02 21:36:07 +02:00 · 2017-02-02 21:36:07 +02:00 · 345396e056
parent 011c5a8a7c fc91e6a75a
commit 345396e056
1 changed files with 2 additions and 2 deletions
--- a/external/easylogging++/easylogging++.h
+++ b/external/easylogging++/easylogging++.h
@ -1104,8 +1104,8 @@ namespace el {
                                    ELPP_UNUSED(ms);
 #      endif  // ELPP_ASYNC_LOGGING
                                }
-                                typedef std::mutex Mutex;
-                                typedef std::lock_guard<std::mutex> ScopedLock;
+                                typedef std::recursive_mutex Mutex;
+                                typedef std::lock_guard<std::recursive_mutex> ScopedLock;
 #   endif  // !ELPP_USE_STD_THREADING
 #else
                                namespace internal {