From fc91e6a75afa8c5c80de8dd0af24e2edb50b7ab9 Mon Sep 17 00:00:00 2001 From: NanoAkron Date: Mon, 30 Jan 2017 03:05:24 +0000 Subject: [PATCH] Fixed a deadlock issue with easylogger++ Ubuntu 16.04/GCC 5.4.0/ARMv8 fix to match previous recursive mutex fix for GCC --- external/easylogging++/easylogging++.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index 3395c2cb..d2815266 100644 --- 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 ScopedLock; + typedef std::recursive_mutex Mutex; + typedef std::lock_guard ScopedLock; # endif // !ELPP_USE_STD_THREADING #else namespace internal {