aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/vdb_unmerger.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/vdb_unmerger.cc
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/repositories/e/vdb_unmerger.cc')
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index a6c062fad..fa0f0aa6e 100644
--- a/paludis/repositories/e/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -86,7 +86,7 @@ VDBUnmerger::~VDBUnmerger()
Hook
VDBUnmerger::extend_hook(const Hook & h) const
{
- std::tr1::shared_ptr<const FSEntrySequence> bashrc_files(_imp->options.environment()->bashrc_files());
+ std::shared_ptr<const FSEntrySequence> bashrc_files(_imp->options.environment()->bashrc_files());
Hook result(Unmerger::extend_hook(h)
("CONFIG_PROTECT", _imp->options.config_protect())
@@ -192,7 +192,7 @@ VDBUnmerger::populate_unmerge_set()
if (! _imp->options.package_id()->contents_key()->value())
throw VDBUnmergerError("Id '" + stringify(*_imp->options.package_id()) + "' has no contents key");
- std::tr1::shared_ptr<const Contents> contents(_imp->options.package_id()->contents_key()->value());
+ std::shared_ptr<const Contents> contents(_imp->options.package_id()->contents_key()->value());
for (Contents::ConstIterator c(contents->begin()), c_end(contents->end()) ;
c != c_end ; ++c)
add_unmerge_entry(get_et(**c), *c);
@@ -216,7 +216,7 @@ namespace
}
bool
-VDBUnmerger::check_file(const std::tr1::shared_ptr<const ContentsEntry> & e) const
+VDBUnmerger::check_file(const std::shared_ptr<const ContentsEntry> & e) const
{
const FSEntry f(e->location_key()->value());
if (! (_imp->options.root() / f).exists())
@@ -249,7 +249,7 @@ VDBUnmerger::check_file(const std::tr1::shared_ptr<const ContentsEntry> & e) con
}
bool
-VDBUnmerger::check_sym(const std::tr1::shared_ptr<const ContentsEntry> & e) const
+VDBUnmerger::check_sym(const std::shared_ptr<const ContentsEntry> & e) const
{
const FSEntry f(e->location_key()->value());
@@ -268,7 +268,7 @@ VDBUnmerger::check_sym(const std::tr1::shared_ptr<const ContentsEntry> & e) cons
}
bool
-VDBUnmerger::check_misc(const std::tr1::shared_ptr<const ContentsEntry> & e) const
+VDBUnmerger::check_misc(const std::shared_ptr<const ContentsEntry> & e) const
{
const FSEntry f(e->location_key()->value());
@@ -278,7 +278,7 @@ VDBUnmerger::check_misc(const std::tr1::shared_ptr<const ContentsEntry> & e) con
}
bool
-VDBUnmerger::check_dir(const std::tr1::shared_ptr<const ContentsEntry> & e) const
+VDBUnmerger::check_dir(const std::shared_ptr<const ContentsEntry> & e) const
{
const FSEntry f(e->location_key()->value());