Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1651 

fc91e6a7 Fixed a deadlock issue with easylogger++ (NanoAkron)
This commit is contained in:
Riccardo Spagni 2017-02-02 21:36:07 +02:00
parent 011c5a8a7c fc91e6a75a
commit 345396e056
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/easylogging++/easylogging++.h vendored
View File

@ -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 {