diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-02-20 17:10:51 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-02-20 17:10:51 +0200 |
| commit | c3baa82ac8e60da16ff0ad3af58c4ee495e898ab (patch) | |
| tree | 398ec9d6e58debe889b76a51f743658c6c63fa67 /src/common | |
| parent | a903d9c3f6da8f368c369c5b51af7380d7ac17aa (diff) | |
| parent | 11d555cebe70053479f8c7ce8a8a993821b634b9 (diff) | |
| download | monzero-core-c3baa82ac8e60da16ff0ad3af58c4ee495e898ab.tar.gz monzero-core-c3baa82ac8e60da16ff0ad3af58c4ee495e898ab.tar.xz monzero-core-c3baa82ac8e60da16ff0ad3af58c4ee495e898ab.zip | |
Merge pull request #678
11d555c Fix crash in std::map for connections_map (Howard Chu)
014f886 std::condvar is broken on Win32 with gcc/g++ 4.8 too (Howard Chu)
7c86c59 Use boost::thread instead of std::thread (Howard Chu)
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/dns_utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp index eb7b6608b..eb0a7de1f 100644 --- a/src/common/dns_utils.cpp +++ b/src/common/dns_utils.cpp @@ -38,7 +38,7 @@ using namespace epee; namespace bf = boost::filesystem; -static std::mutex instance_lock; +static boost::mutex instance_lock; namespace { @@ -304,7 +304,7 @@ std::string DNSResolver::get_dns_format_from_oa_address(const std::string& oa_ad DNSResolver& DNSResolver::instance() { - std::lock_guard<std::mutex> lock(instance_lock); + boost::lock_guard<boost::mutex> lock(instance_lock); static DNSResolver* staticInstance = NULL; if (staticInstance == NULL) |