summaryrefslogtreecommitdiff
path: root/zen/zstring.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:30:42 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:30:42 +0200
commit767bb3951c65e38627cb0bbad9a3756e1cda2520 (patch)
tree460b18606d2c3472d5aa08444db4db62c6410248 /zen/zstring.cpp
parent6.0 (diff)
downloadFreeFileSync-767bb3951c65e38627cb0bbad9a3756e1cda2520.tar.gz
FreeFileSync-767bb3951c65e38627cb0bbad9a3756e1cda2520.tar.bz2
FreeFileSync-767bb3951c65e38627cb0bbad9a3756e1cda2520.zip
6.1
Diffstat (limited to 'zen/zstring.cpp')
-rw-r--r--zen/zstring.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/zen/zstring.cpp b/zen/zstring.cpp
index 83eb5127..c33ea707 100644
--- a/zen/zstring.cpp
+++ b/zen/zstring.cpp
@@ -17,7 +17,7 @@
#endif
#ifndef NDEBUG
-#include "thread.h" //includes <boost/thread.hpp>
+#include <mutex>
#include <iostream>
#endif
@@ -32,14 +32,14 @@ class LeakChecker //small test for memory leaks
public:
void insert(const void* ptr, size_t size)
{
- boost::lock_guard<boost::mutex> dummy(lockActStrings);
+ std::lock_guard<std::mutex> dummy(lockActStrings);
if (!activeStrings.insert(std::make_pair(ptr, size)).second)
reportProblem("Serious Error: New memory points into occupied space: " + rawMemToString(ptr, size));
}
void remove(const void* ptr)
{
- boost::lock_guard<boost::mutex> dummy(lockActStrings);
+ std::lock_guard<std::mutex> dummy(lockActStrings);
if (activeStrings.erase(ptr) != 1)
reportProblem("Serious Error: No memory available for deallocation at this location!");
}
@@ -89,7 +89,7 @@ private:
throw std::logic_error("Memory leak! " + message);
}
- boost::mutex lockActStrings;
+ std::mutex lockActStrings;
zen::hash_map<const void*, size_t> activeStrings;
};
bgstack15