aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/eclass_mtimes.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 10:11:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:54:57 +0100
commit7a8a792ae878e2b432e0c67a813022117faa4e60 (patch)
treed9eac8e45ccc206bc6920d14e25f5613b54be02f /paludis/repositories/e/eclass_mtimes.cc
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/repositories/e/eclass_mtimes.cc')
-rw-r--r--paludis/repositories/e/eclass_mtimes.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/paludis/repositories/e/eclass_mtimes.cc b/paludis/repositories/e/eclass_mtimes.cc
index 546537ea8..a058cec0a 100644
--- a/paludis/repositories/e/eclass_mtimes.cc
+++ b/paludis/repositories/e/eclass_mtimes.cc
@@ -28,7 +28,7 @@
#include <paludis/util/mutex.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/hashes.hh>
-#include <tr1/unordered_map>
+#include <unordered_map>
using namespace paludis;
@@ -36,10 +36,10 @@ namespace
{
struct Cache
{
- std::tr1::shared_ptr<const FSEntrySequence> dirs;
- std::tr1::unordered_map<std::string, FSEntry, Hash<std::string> > files;
+ std::shared_ptr<const FSEntrySequence> dirs;
+ std::unordered_map<std::string, FSEntry, Hash<std::string> > files;
- Cache(const std::tr1::shared_ptr<const FSEntrySequence> & d) :
+ Cache(const std::shared_ptr<const FSEntrySequence> & d) :
dirs(d)
{
}
@@ -48,7 +48,7 @@ namespace
const FSEntry *
lookup(const std::string & e, Cache & c)
{
- std::tr1::unordered_map<std::string, FSEntry, Hash<std::string> >::const_iterator i(c.files.find(e));
+ std::unordered_map<std::string, FSEntry, Hash<std::string> >::const_iterator i(c.files.find(e));
if (i != c.files.end())
return & i->second;
@@ -71,10 +71,10 @@ namespace paludis
{
const ERepository * repo;
mutable Cache eclasses;
- mutable std::tr1::unordered_map<QualifiedPackageName, Cache, Hash<QualifiedPackageName> > exlibs;
+ mutable std::unordered_map<QualifiedPackageName, Cache, Hash<QualifiedPackageName> > exlibs;
mutable Mutex mutex;
- Implementation(const ERepository * r, const std::tr1::shared_ptr<const FSEntrySequence> & d) :
+ Implementation(const ERepository * r, const std::shared_ptr<const FSEntrySequence> & d) :
repo(r),
eclasses(d)
{
@@ -82,7 +82,7 @@ namespace paludis
};
}
-EclassMtimes::EclassMtimes(const ERepository * r, const std::tr1::shared_ptr<const FSEntrySequence> & d) :
+EclassMtimes::EclassMtimes(const ERepository * r, const std::shared_ptr<const FSEntrySequence> & d) :
PrivateImplementationPattern<EclassMtimes>(new Implementation<EclassMtimes>(r, d))
{
}
@@ -102,7 +102,7 @@ const FSEntry *
EclassMtimes::exlib(const std::string & e, const QualifiedPackageName & qpn) const
{
Lock l(_imp->mutex);
- std::tr1::unordered_map<QualifiedPackageName, Cache, Hash<QualifiedPackageName> >::iterator cache(_imp->exlibs.find(qpn));
+ std::unordered_map<QualifiedPackageName, Cache, Hash<QualifiedPackageName> >::iterator cache(_imp->exlibs.find(qpn));
if (_imp->exlibs.end() == cache)
cache = _imp->exlibs.insert(std::make_pair(qpn, Cache(_imp->repo->layout()->exlibsdirs(qpn)))).first;
return lookup(e + ".exlib", cache->second);