aboutsummaryrefslogtreecommitdiff
path: root/paludis/broken_linkage_finder.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-05-16 20:03:48 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-05-22 23:19:18 +0100
commit78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (patch)
tree1c0b25ba6358e80d0fe535fb49e3cce8d243e6a3 /paludis/broken_linkage_finder.cc
parent39834ca3b05fadb14f855a8ab6dcea98c35738a7 (diff)
downloadpaludis-78d9a9bf0758140e0e8c03c5e8d3288f74efbb51.tar.gz
paludis-78d9a9bf0758140e0e8c03c5e8d3288f74efbb51.tar.xz
Switch to std mutex and condition_variable
Diffstat (limited to 'paludis/broken_linkage_finder.cc')
-rw-r--r--paludis/broken_linkage_finder.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/paludis/broken_linkage_finder.cc b/paludis/broken_linkage_finder.cc
index 2cc0cbaa9..0ad1d3d8a 100644
--- a/paludis/broken_linkage_finder.cc
+++ b/paludis/broken_linkage_finder.cc
@@ -25,7 +25,6 @@
#include <paludis/util/realpath.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/mutex.hh>
#include <paludis/util/pimp-impl.hh>
#include <paludis/util/set-impl.hh>
#include <paludis/util/sequence-impl.hh>
@@ -54,6 +53,7 @@
#include <map>
#include <set>
#include <vector>
+#include <mutex>
using namespace paludis;
@@ -73,7 +73,7 @@ namespace paludis
std::vector<std::shared_ptr<LinkageChecker> > checkers;
std::set<FSPath, FSPathComparator> extra_lib_dirs;
- Mutex mutex;
+ std::mutex mutex;
bool has_files;
Files files;
@@ -237,7 +237,7 @@ Imp<BrokenLinkageFinder>::walk_directory(const FSPath & directory)
Log::get_instance()->message("broken_linkage_finder.entering", ll_debug, lc_context)
<< "Entering directory '" << directory << "'";
{
- Lock l(mutex);
+ std::unique_lock<std::mutex> l(mutex);
extra_lib_dirs.erase(without_root);
}
@@ -341,7 +341,7 @@ Imp<BrokenLinkageFinder>::gather_package(const std::shared_ptr<const PackageID>
const ContentsFileEntry * file(visitor_cast<const ContentsFileEntry>(**it));
if (0 != file)
{
- Lock l(mutex);
+ std::unique_lock<std::mutex> l(mutex);
files.insert(std::make_pair(file->location_key()->parse_value(), pkg));
}
}