diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-02 21:36:07 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-02 21:36:07 +0200 |
| commit | 345396e05674bcb8089093624e2ce01ce4041972 (patch) | |
| tree | f4c9531c09f2fc9f87bb42140efd3d33736340fb | |
| parent | 011c5a8a7ca2bc3ced9e185c514a39ba71e38370 (diff) | |
| parent | fc91e6a75afa8c5c80de8dd0af24e2edb50b7ab9 (diff) | |
| download | monzero-core-345396e05674bcb8089093624e2ce01ce4041972.tar.gz monzero-core-345396e05674bcb8089093624e2ce01ce4041972.tar.xz monzero-core-345396e05674bcb8089093624e2ce01ce4041972.zip | |
Merge pull request #1651
fc91e6a7 Fixed a deadlock issue with easylogger++ (NanoAkron)
| -rw-r--r-- | external/easylogging++/easylogging++.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h index 3395c2cb2..d28152667 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<std::mutex> ScopedLock; + typedef std::recursive_mutex Mutex; + typedef std::lock_guard<std::recursive_mutex> ScopedLock; # endif // !ELPP_USE_STD_THREADING #else namespace internal { |