diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-11-16 11:06:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-11-16 11:06:09 +0200 |
| commit | 42dbb3aa1b99976c3b04fae184139c1148718287 (patch) | |
| tree | 247136d255b52f882342e9961463077c733f9d0e /contrib | |
| parent | Merge pull request #4784 (diff) | |
| parent | mlocker: fix dtor ordering problem (diff) | |
| download | monero-42dbb3aa1b99976c3b04fae184139c1148718287.tar.xz | |
Merge pull request #4785
0cfd2ae5 mlocker: fix dtor ordering problem (moneromooo-monero)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/src/mlocker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/epee/src/mlocker.cpp b/contrib/epee/src/mlocker.cpp index 5573d591a..c3262e8f4 100644 --- a/contrib/epee/src/mlocker.cpp +++ b/contrib/epee/src/mlocker.cpp @@ -84,8 +84,8 @@ namespace epee boost::mutex &mlocker::mutex() { - static boost::mutex vmutex; - return vmutex; + static boost::mutex *vmutex = new boost::mutex(); + return *vmutex; } std::map<size_t, unsigned int> &mlocker::map() { |