diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:07:11 +0000 |
| commit | 3703150d56ff6ee557ab330e55637c9c23835902 (patch) | |
| tree | b3f13dd5416c38c508ee785dd3e543e381cc03a2 /src/util.cpp | |
| parent | 1bc2f0a37b68aa99e90437105a48c47046b6c0d0 (diff) | |
| parent | ca39829ecb90e392b9722292739585124ba0d7c1 (diff) | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
doc/release-process.txt
src/serialize.h
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/util.cpp b/src/util.cpp index be6267688c..6314b53627 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -22,6 +22,7 @@ namespace boost { #include <boost/interprocess/sync/interprocess_mutex.hpp> #include <boost/interprocess/sync/interprocess_recursive_mutex.hpp> #include <boost/foreach.hpp> +#include <boost/thread.hpp> using namespace std; using namespace boost; @@ -193,6 +194,8 @@ inline int OutputDebugStringF(const char* pszFormat, ...) if (fileout) { static bool fStartedNewLine = true; + static boost::mutex mutexDebugLog; + boost::mutex::scoped_lock scoped_lock(mutexDebugLog); // Debug print useful for profiling if (fLogTimestamps && fStartedNewLine) |