Fixed a deadlock issue with easylogger++
Ubuntu 16.04/GCC 5.4.0/ARMv8 fix to match previous recursive mutex fix for GCC
This commit is contained in:
parent
4629ead8c5
commit
fc91e6a75a
1 changed files with 2 additions and 2 deletions
4
external/easylogging++/easylogging++.h
vendored
4
external/easylogging++/easylogging++.h
vendored
|
@ -1104,8 +1104,8 @@ namespace el {
|
||||||
ELPP_UNUSED(ms);
|
ELPP_UNUSED(ms);
|
||||||
# endif // ELPP_ASYNC_LOGGING
|
# endif // ELPP_ASYNC_LOGGING
|
||||||
}
|
}
|
||||||
typedef std::mutex Mutex;
|
typedef std::recursive_mutex Mutex;
|
||||||
typedef std::lock_guard<std::mutex> ScopedLock;
|
typedef std::lock_guard<std::recursive_mutex> ScopedLock;
|
||||||
# endif // !ELPP_USE_STD_THREADING
|
# endif // !ELPP_USE_STD_THREADING
|
||||||
#else
|
#else
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
Loading…
Reference in a new issue