diff options
| author | NanoAkron <nanoakron@users.noreply.github.com> | 2017-01-30 03:05:24 +0000 |
|---|---|---|
| committer | NanoAkron <nanoakron@users.noreply.github.com> | 2017-02-01 10:16:57 +0000 |
| commit | fc91e6a75afa8c5c80de8dd0af24e2edb50b7ab9 (patch) | |
| tree | e5b92835efcc197d1499b5ea1f0f89bba7f88913 /external/easylogging++ | |
| parent | Merge pull request #1618 (diff) | |
| download | monero-fc91e6a75afa8c5c80de8dd0af24e2edb50b7ab9.tar.xz | |
Fixed a deadlock issue with easylogger++
Ubuntu 16.04/GCC 5.4.0/ARMv8 fix to match previous recursive mutex fix for GCC
Diffstat (limited to 'external/easylogging++')
| -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 { |