Merge pull request #4785

0cfd2ae5 mlocker: fix dtor ordering problem (moneromooo-monero)
2018-11-16 11:06:09 +02:00 · 2018-11-16 11:06:09 +02:00 · 42dbb3aa1b
parent 4561119846 0cfd2ae5e7
commit 42dbb3aa1b
1 changed files with 2 additions and 2 deletions
--- 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()
  {