aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-20 16:22:51 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-20 16:22:51 +0000
commit4762032193e34e16b70ad04a029257ae61faee1f (patch)
treef4c079355526d80fc311682c639ce74140ba6b73 /src
parent7c70a0fc4a77810859f26adaf35969f00dbdd60c (diff)
downloadpaludis-4762032193e34e16b70ad04a029257ae61faee1f.tar.gz
paludis-4762032193e34e16b70ad04a029257ae61faee1f.tar.xz
Change how we access tr1 to make things easier for third party clients. Fixes: ticket:238
Diffstat (limited to 'src')
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.cc2
-rw-r--r--src/clients/adjutrix/downgrade_check.cc12
-rw-r--r--src/clients/adjutrix/find_dropped_keywords.cc10
-rw-r--r--src/clients/adjutrix/find_insecure_packages.cc4
-rw-r--r--src/clients/adjutrix/find_reverse_deps.cc24
-rw-r--r--src/clients/adjutrix/find_stable_candidates.cc10
-rw-r--r--src/clients/adjutrix/find_unused_packages.cc6
-rw-r--r--src/clients/adjutrix/keywords_graph.cc28
-rw-r--r--src/clients/adjutrix/what_needs_keywording.cc12
-rw-r--r--src/clients/contrarius/contrarius.cc18
-rw-r--r--src/clients/contrarius/contrarius_stage_options.sr12
-rw-r--r--src/clients/contrarius/install.cc20
-rw-r--r--src/clients/contrarius/install.hh2
-rw-r--r--src/clients/contrarius/stage.cc20
-rw-r--r--src/clients/contrarius/stage.hh18
-rw-r--r--src/clients/contrarius/stage_builder.cc10
-rw-r--r--src/clients/contrarius/stage_builder.hh10
-rw-r--r--src/clients/inquisitio/do_search.cc16
-rw-r--r--src/clients/inquisitio/extractor.cc6
-rw-r--r--src/clients/inquisitio/extractor.hh2
-rw-r--r--src/clients/inquisitio/inquisitio.cc2
-rw-r--r--src/clients/inquisitio/matcher.cc6
-rw-r--r--src/clients/inquisitio/matcher.hh2
-rw-r--r--src/clients/paludis/applets.cc34
-rw-r--r--src/clients/paludis/applets.hh12
-rw-r--r--src/clients/paludis/do_config.cc18
-rw-r--r--src/clients/paludis/do_config.hh4
-rw-r--r--src/clients/paludis/do_contents.cc14
-rw-r--r--src/clients/paludis/do_contents.hh4
-rw-r--r--src/clients/paludis/install.cc32
-rw-r--r--src/clients/paludis/install.hh2
-rw-r--r--src/clients/paludis/list.cc22
-rw-r--r--src/clients/paludis/list.hh8
-rw-r--r--src/clients/paludis/owner.cc12
-rw-r--r--src/clients/paludis/owner.hh4
-rw-r--r--src/clients/paludis/paludis.cc6
-rw-r--r--src/clients/paludis/query.cc20
-rw-r--r--src/clients/paludis/query.hh2
-rw-r--r--src/clients/paludis/report.cc4
-rw-r--r--src/clients/paludis/report.hh2
-rw-r--r--src/clients/paludis/sync.cc4
-rw-r--r--src/clients/paludis/sync.hh2
-rw-r--r--src/clients/paludis/uninstall.cc10
-rw-r--r--src/clients/paludis/uninstall.hh4
-rw-r--r--src/clients/qualudis/qualudis.cc6
-rw-r--r--src/output/console_install_task.cc70
-rw-r--r--src/output/console_install_task.hh30
-rw-r--r--src/output/console_query_task.cc14
-rw-r--r--src/output/console_query_task.hh6
-rw-r--r--src/output/use_flag_pretty_printer.cc14
-rw-r--r--src/output/use_flag_pretty_printer.hh18
51 files changed, 315 insertions, 315 deletions
diff --git a/src/clients/adjutrix/display_default_system_resolution.cc b/src/clients/adjutrix/display_default_system_resolution.cc
index e1aa8bd22..ccaf577f4 100644
--- a/src/clients/adjutrix/display_default_system_resolution.cc
+++ b/src/clients/adjutrix/display_default_system_resolution.cc
@@ -114,7 +114,7 @@ int do_display_default_system_resolution(NoConfigEnvironment & env)
if (env.default_destinations()->empty())
{
- std::tr1::shared_ptr<Repository> fake_destination(new FakeInstalledRepository(&env,
+ tr1::shared_ptr<Repository> fake_destination(new FakeInstalledRepository(&env,
RepositoryName("fake_destination")));
env.package_database()->add_repository(1, fake_destination);
}
diff --git a/src/clients/adjutrix/downgrade_check.cc b/src/clients/adjutrix/downgrade_check.cc
index b275e5153..6b1ccced7 100644
--- a/src/clients/adjutrix/downgrade_check.cc
+++ b/src/clients/adjutrix/downgrade_check.cc
@@ -42,7 +42,7 @@ namespace
int
build_one_list(NoConfigEnvironment & env, std::ostream & f)
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> matches(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> matches(
env.package_database()->query(query::NotMasked(), qo_group_by_slot));
QualifiedPackageName old_package("dummy/dummy");
@@ -136,12 +136,12 @@ namespace
if (after.end() == a)
{
if (! env.package_database()->query(query::Matches(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(b->first.name)),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(b->first.name)),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(new SlotName(b->first.slot)))),
+ tr1::shared_ptr<SlotName>(new SlotName(b->first.slot)))),
qo_whatever)->empty())
{
results.insert(std::make_pair(b->first, stringify(b->second) + " -> nothing on " + desc));
diff --git a/src/clients/adjutrix/find_dropped_keywords.cc b/src/clients/adjutrix/find_dropped_keywords.cc
index e7cff1daa..087a0ff31 100644
--- a/src/clients/adjutrix/find_dropped_keywords.cc
+++ b/src/clients/adjutrix/find_dropped_keywords.cc
@@ -115,15 +115,15 @@ namespace
typedef std::map<SlotName, VersionsEntry> VersionsInSlots;
VersionsInSlots versions_in_slots;
- std::tr1::shared_ptr<const VersionSpecCollection> versions(repo.version_specs(package));
+ tr1::shared_ptr<const VersionSpecCollection> versions(repo.version_specs(package));
for (VersionSpecCollection::Iterator v(versions->begin()), v_end(versions->end()) ;
v != v_end ; ++v)
{
- std::tr1::shared_ptr<const VersionMetadata> metadata(repo.version_metadata(package, *v));
+ tr1::shared_ptr<const VersionMetadata> metadata(repo.version_metadata(package, *v));
if (! metadata->ebuild_interface)
continue;
- std::tr1::shared_ptr<const KeywordNameCollection> keywords(metadata->ebuild_interface->keywords());;
+ tr1::shared_ptr<const KeywordNameCollection> keywords(metadata->ebuild_interface->keywords());;
/* ensure that there's an entry for this SLOT */
versions_in_slots.insert(std::make_pair(metadata->slot, VersionsEntry(
VersionsEntry::create()
@@ -177,7 +177,7 @@ void do_find_dropped_keywords(const Environment & env)
write_repository_header(keyword, r->name());
- std::tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
for (CategoryNamePartCollection::Iterator c(cat_names->begin()), c_end(cat_names->end()) ;
c != c_end ; ++c)
{
@@ -188,7 +188,7 @@ void do_find_dropped_keywords(const Environment & env)
stringify(*c)))
continue;
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(pkg_names->begin()), p_end(pkg_names->end()) ;
p != p_end ; ++p)
{
diff --git a/src/clients/adjutrix/find_insecure_packages.cc b/src/clients/adjutrix/find_insecure_packages.cc
index 2c06ee5d9..3452e890e 100644
--- a/src/clients/adjutrix/find_insecure_packages.cc
+++ b/src/clients/adjutrix/find_insecure_packages.cc
@@ -85,7 +85,7 @@ namespace
void visit(const PackageDepSpec * const a)
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> insecure(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> insecure(
_env.package_database()->query(query::Matches(*a), qo_order_by_version));
for (PackageDatabaseEntryCollection::Iterator i(insecure->begin()),
i_end(insecure->end()) ; i != i_end ; ++i)
@@ -148,7 +148,7 @@ void do_find_insecure_packages(const Environment & env)
write_repository_header(r->name());
- std::tr1::shared_ptr<const DepSpec> all_insecure(r->sets_interface->package_set(SetName("insecurity")));
+ tr1::shared_ptr<const DepSpec> all_insecure(r->sets_interface->package_set(SetName("insecurity")));
if (! all_insecure)
continue;
ListInsecureVisitor v(env);
diff --git a/src/clients/adjutrix/find_reverse_deps.cc b/src/clients/adjutrix/find_reverse_deps.cc
index db65d29f1..77c0ffeeb 100644
--- a/src/clients/adjutrix/find_reverse_deps.cc
+++ b/src/clients/adjutrix/find_reverse_deps.cc
@@ -47,7 +47,7 @@ namespace
public DepSpecVisitorTypes::ConstVisitor::VisitChildren<ReverseDepChecker, AllDepSpec>
{
private:
- std::tr1::shared_ptr<const PackageDatabase> _db;
+ tr1::shared_ptr<const PackageDatabase> _db;
const PackageDatabaseEntryCollection & _entries;
std::string _depname;
std::string _p;
@@ -61,7 +61,7 @@ namespace
public:
using DepSpecVisitorTypes::ConstVisitor::VisitChildren<ReverseDepChecker, AllDepSpec>::visit;
- ReverseDepChecker(std::tr1::shared_ptr<const PackageDatabase> db,
+ ReverseDepChecker(tr1::shared_ptr<const PackageDatabase> db,
const PackageDatabaseEntryCollection & entries,
const std::string & p) :
_db(db),
@@ -74,7 +74,7 @@ namespace
{
}
- void check(std::tr1::shared_ptr<const DepSpec> spec, const std::string & depname)
+ void check(tr1::shared_ptr<const DepSpec> spec, const std::string & depname)
{
_depname = depname;
spec->accept(this);
@@ -120,9 +120,9 @@ namespace
void
ReverseDepChecker::visit(const PackageDepSpec * const a)
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> dep_entries(_db->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> dep_entries(_db->query(
query::Matches(*a), qo_order_by_version));
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> matches(new PackageDatabaseEntryCollection::Concrete);
+ tr1::shared_ptr<PackageDatabaseEntryCollection> matches(new PackageDatabaseEntryCollection::Concrete);
bool header_written = false;
@@ -180,7 +180,7 @@ namespace
{
Context context("When checking package '" + stringify(p) + "':");
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> p_entries(env.package_database()->query(
+ tr1::shared_ptr<PackageDatabaseEntryCollection> p_entries(env.package_database()->query(
query::Package(p), qo_order_by_version));
bool found_matches(false);
@@ -190,7 +190,7 @@ namespace
{
try
{
- std::tr1::shared_ptr<const VersionMetadata> metadata(r.version_metadata(e->name, e->version));
+ tr1::shared_ptr<const VersionMetadata> metadata(r.version_metadata(e->name, e->version));
ReverseDepChecker checker(env.package_database(), entries,
stringify(p) + "-" + stringify(e->version));
@@ -221,13 +221,13 @@ int do_find_reverse_deps(NoConfigEnvironment & env)
{
Context context("When performing find-reverse-deps action:");
- std::tr1::shared_ptr<PackageDepSpec> spec;
+ tr1::shared_ptr<PackageDepSpec> spec;
try
{
if (std::string::npos == CommandLine::get_instance()->begin_parameters()->find('/'))
{
spec.reset(new PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
env.package_database()->fetch_unique_qualified_package_name(
PackageNamePart(*CommandLine::get_instance()->begin_parameters()))))));
}
@@ -247,7 +247,7 @@ int do_find_reverse_deps(NoConfigEnvironment & env)
return 4;
}
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> entries(env.package_database()->query(
+ tr1::shared_ptr<PackageDatabaseEntryCollection> entries(env.package_database()->query(
query::Matches(*spec), qo_order_by_version));
int ret(0);
@@ -267,7 +267,7 @@ int do_find_reverse_deps(NoConfigEnvironment & env)
write_repository_header(stringify(*spec), stringify(r->name()));
- std::tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
for (CategoryNamePartCollection::Iterator c(cat_names->begin()), c_end(cat_names->end()) ;
c != c_end ; ++c)
{
@@ -280,7 +280,7 @@ int do_find_reverse_deps(NoConfigEnvironment & env)
stringify(*c)))
continue;
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(pkg_names->begin()), p_end(pkg_names->end()) ;
p != p_end ; ++p)
{
diff --git a/src/clients/adjutrix/find_stable_candidates.cc b/src/clients/adjutrix/find_stable_candidates.cc
index f88f6d478..17715ecf1 100644
--- a/src/clients/adjutrix/find_stable_candidates.cc
+++ b/src/clients/adjutrix/find_stable_candidates.cc
@@ -114,15 +114,15 @@ namespace
typedef std::map<SlotName, SlotsEntry> SlotsToVersions;
SlotsToVersions slots_to_versions;
- std::tr1::shared_ptr<const VersionSpecCollection> versions(repo.version_specs(package));
+ tr1::shared_ptr<const VersionSpecCollection> versions(repo.version_specs(package));
for (VersionSpecCollection::Iterator v(versions->begin()), v_end(versions->end()) ;
v != v_end ; ++v)
{
- std::tr1::shared_ptr<const VersionMetadata> metadata(repo.version_metadata(package, *v));
+ tr1::shared_ptr<const VersionMetadata> metadata(repo.version_metadata(package, *v));
if (! metadata->ebuild_interface)
continue;
- std::tr1::shared_ptr<const KeywordNameCollection> keywords(metadata->ebuild_interface->keywords());
+ tr1::shared_ptr<const KeywordNameCollection> keywords(metadata->ebuild_interface->keywords());
if (keywords->end() != keywords->find(keyword))
{
@@ -181,7 +181,7 @@ void do_find_stable_candidates(const Environment & env)
write_repository_header(keyword, r->name());
- std::tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
for (CategoryNamePartCollection::Iterator c(cat_names->begin()), c_end(cat_names->end()) ;
c != c_end ; ++c)
{
@@ -192,7 +192,7 @@ void do_find_stable_candidates(const Environment & env)
stringify(*c)))
continue;
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(pkg_names->begin()), p_end(pkg_names->end()) ;
p != p_end ; ++p)
{
diff --git a/src/clients/adjutrix/find_unused_packages.cc b/src/clients/adjutrix/find_unused_packages.cc
index d775dbac4..d0ad58529 100644
--- a/src/clients/adjutrix/find_unused_packages.cc
+++ b/src/clients/adjutrix/find_unused_packages.cc
@@ -53,7 +53,7 @@ void do_find_unused_packages(const Environment & env)
cout << "Searching for unused packages in repository " << stringify(r->name()) << endl;
- std::tr1::shared_ptr<const CategoryNamePartCollection> categories(r->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> categories(r->category_names());
for (CategoryNamePartCollection::Iterator c(categories->begin()), c_end(categories->end()) ;
c != c_end ; ++c)
{
@@ -67,7 +67,7 @@ void do_find_unused_packages(const Environment & env)
continue;
cout << " In category " << stringify(*c) << ":" << endl;
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> packages(r->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> packages(r->package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(packages->begin()), p_end(packages->end()) ;
p != p_end ; ++p)
@@ -81,7 +81,7 @@ void do_find_unused_packages(const Environment & env)
stringify(*c)))
continue;
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> unused(task.execute(*p));
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> unused(task.execute(*p));
for (PackageDatabaseEntryCollection::Iterator u(unused->begin()), u_end(unused->end()) ;
u != u_end ; ++u)
cout << stringify(*u) << endl;
diff --git a/src/clients/adjutrix/keywords_graph.cc b/src/clients/adjutrix/keywords_graph.cc
index c0db78b05..f81dde8ad 100644
--- a/src/clients/adjutrix/keywords_graph.cc
+++ b/src/clients/adjutrix/keywords_graph.cc
@@ -58,19 +58,19 @@ namespace
cout << "Keywords for " << package << ":" << endl;
cout << endl;
- std::tr1::shared_ptr<const VersionSpecCollection> versions(repo.version_specs(package));
+ tr1::shared_ptr<const VersionSpecCollection> versions(repo.version_specs(package));
FindUnusedPackagesTask task(&e, &repo);
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> packages(e.package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> packages(e.package_database()->query(
query::Matches(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(package)),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(package)),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(),
- std::tr1::shared_ptr<RepositoryName>(new RepositoryName(repo.name())))),
+ tr1::shared_ptr<SlotName>(),
+ tr1::shared_ptr<RepositoryName>(new RepositoryName(repo.name())))),
qo_group_by_slot));
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> unused(task.execute(package));
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> unused(task.execute(package));
if (packages->empty())
return;
@@ -78,7 +78,7 @@ namespace
if (! repo.use_interface)
throw InternalError(PALUDIS_HERE, "Repository has no use_interface");
- std::tr1::shared_ptr<const UseFlagNameCollection> arch_flags(repo.use_interface->arch_flags());
+ tr1::shared_ptr<const UseFlagNameCollection> arch_flags(repo.use_interface->arch_flags());
if (arch_flags->empty())
return;
@@ -128,7 +128,7 @@ namespace
for (PackageDatabaseEntryCollection::Iterator p(packages->begin()), p_end(packages->end()) ;
p != p_end ; ++p)
{
- std::tr1::shared_ptr<const VersionMetadata> metadata(repo.version_metadata(package, p->version));
+ tr1::shared_ptr<const VersionMetadata> metadata(repo.version_metadata(package, p->version));
if (! metadata->ebuild_interface)
continue;
@@ -140,7 +140,7 @@ namespace
cout << std::left << std::setw(version_specs_columns_width) << p->version << "| ";
- std::tr1::shared_ptr<const KeywordNameCollection> keywords(metadata->ebuild_interface->keywords());
+ tr1::shared_ptr<const KeywordNameCollection> keywords(metadata->ebuild_interface->keywords());
for (UseFlagNameCollection::Iterator a(arch_flags->begin()), a_end(arch_flags->end()) ;
a != a_end ; ++a)
@@ -183,7 +183,7 @@ void do_keywords_graph(const Environment & env)
if (r->name() == RepositoryName("virtuals"))
continue;
- std::tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
for (CategoryNamePartCollection::Iterator c(cat_names->begin()), c_end(cat_names->end()) ;
c != c_end ; ++c)
{
@@ -194,7 +194,7 @@ void do_keywords_graph(const Environment & env)
stringify(*c)))
continue;
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(pkg_names->begin()), p_end(pkg_names->end()) ;
p != p_end ; ++p)
{
diff --git a/src/clients/adjutrix/what_needs_keywording.cc b/src/clients/adjutrix/what_needs_keywording.cc
index df356e954..0c9a62402 100644
--- a/src/clients/adjutrix/what_needs_keywording.cc
+++ b/src/clients/adjutrix/what_needs_keywording.cc
@@ -45,7 +45,7 @@ int do_what_needs_keywording(NoConfigEnvironment & env)
if (env.default_destinations()->empty())
{
- std::tr1::shared_ptr<Repository> fake_destination(new FakeInstalledRepository(&env,
+ tr1::shared_ptr<Repository> fake_destination(new FakeInstalledRepository(&env,
RepositoryName("fake_destination")));
env.package_database()->add_repository(1, fake_destination);
}
@@ -72,12 +72,12 @@ int do_what_needs_keywording(NoConfigEnvironment & env)
p_end(CommandLine::get_instance()->end_parameters()) ; p != p_end ; ++p)
{
if (std::string::npos == p->find('/'))
- d.add(std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
+ d.add(tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
env.package_database()->fetch_unique_qualified_package_name(PackageNamePart(*p)))))),
env.default_destinations());
else
- d.add(std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(*p, pds_pm_permissive)),
+ d.add(tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(*p, pds_pm_permissive)),
env.default_destinations());
}
@@ -100,12 +100,12 @@ int do_what_needs_keywording(NoConfigEnvironment & env)
std::string current;
- std::tr1::shared_ptr<const VersionMetadata> m(env.package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> m(env.package_database()->fetch_repository(
p->package.repository)->version_metadata(p->package.name,
p->package.version));
if (m->ebuild_interface)
{
- std::tr1::shared_ptr<const KeywordNameCollection> keywords(m->ebuild_interface->keywords());
+ tr1::shared_ptr<const KeywordNameCollection> keywords(m->ebuild_interface->keywords());
for (KeywordNameCollection::Iterator k(keywords->begin()), k_end(keywords->end()) ;
k != k_end ; ++k)
if (*k == KeywordName("-*")
diff --git a/src/clients/contrarius/contrarius.cc b/src/clients/contrarius/contrarius.cc
index c44e8359e..632777231 100644
--- a/src/clients/contrarius/contrarius.cc
+++ b/src/clients/contrarius/contrarius.cc
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
else
stage = "cxx";
- std::tr1::shared_ptr<AdaptedEnvironment> env(
+ tr1::shared_ptr<AdaptedEnvironment> env(
new AdaptedEnvironment(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument())));
@@ -86,9 +86,9 @@ int main(int argc, char *argv[])
do
{
if (! TargetConfig::get_instance()->aux().empty())
- builder.queue_stage(std::tr1::shared_ptr<const StageBase>(new AuxiliaryStage(env)));
+ builder.queue_stage(tr1::shared_ptr<const StageBase>(new AuxiliaryStage(env)));
- builder.queue_stage(std::tr1::shared_ptr<const StageBase>(new BinutilsStage(env)));
+ builder.queue_stage(tr1::shared_ptr<const StageBase>(new BinutilsStage(env)));
if (stage == "binutils")
break;
@@ -97,28 +97,28 @@ int main(int argc, char *argv[])
{
if (TargetConfig::get_instance()->headers().empty())
throw DoHelp("--headers specified though CTARGET does not need any headers");
- builder.queue_stage(std::tr1::shared_ptr<const StageBase>(new KernelHeadersStage(env)));
- builder.queue_stage(std::tr1::shared_ptr<const StageBase>(new LibCHeadersStage(env)));
+ builder.queue_stage(tr1::shared_ptr<const StageBase>(new KernelHeadersStage(env)));
+ builder.queue_stage(tr1::shared_ptr<const StageBase>(new LibCHeadersStage(env)));
}
- builder.queue_stage(std::tr1::shared_ptr<const StageBase>(new MinimalStage(env)));
+ builder.queue_stage(tr1::shared_ptr<const StageBase>(new MinimalStage(env)));
if (stage == "minimal")
break;
if ((! CommandLine::get_instance()->a_headers.specified()) &&
(! TargetConfig::get_instance()->headers().empty()))
- builder.queue_stage(std::tr1::shared_ptr<const StageBase>(new KernelHeadersStage(env)));
+ builder.queue_stage(tr1::shared_ptr<const StageBase>(new KernelHeadersStage(env)));
if (stage == "headers")
break;
- builder.queue_stage(std::tr1::shared_ptr<const StageBase>(new LibCStage(env)));
+ builder.queue_stage(tr1::shared_ptr<const StageBase>(new LibCStage(env)));
if (stage == "libc")
break;
- builder.queue_stage(std::tr1::shared_ptr<const StageBase>(new FullStage(env)));
+ builder.queue_stage(tr1::shared_ptr<const StageBase>(new FullStage(env)));
} while (false);
diff --git a/src/clients/contrarius/contrarius_stage_options.sr b/src/clients/contrarius/contrarius_stage_options.sr
index 7e35d7e77..39fb07657 100644
--- a/src/clients/contrarius/contrarius_stage_options.sr
+++ b/src/clients/contrarius/contrarius_stage_options.sr
@@ -3,17 +3,17 @@
make_class_ContrariusStageOptions()
{
- key environment "std::tr1::shared_ptr<Environment>"
+ key environment "tr1::shared_ptr<Environment>"
key target HostTupleName
- key binutils "std::tr1::shared_ptr<const PackageDepSpec>"
- key gcc "std::tr1::shared_ptr<const PackageDepSpec>"
- key headers "std::tr1::shared_ptr<const PackageDepSpec>"
- key libc "std::tr1::shared_ptr<const PackageDepSpec>"
+ key binutils "tr1::shared_ptr<const PackageDepSpec>"
+ key gcc "tr1::shared_ptr<const PackageDepSpec>"
+ key headers "tr1::shared_ptr<const PackageDepSpec>"
+ key libc "tr1::shared_ptr<const PackageDepSpec>"
extra_constructors <<END
ContrariusStageOptions(
- std::tr1::shared_ptr<Environment>,
+ tr1::shared_ptr<Environment>,
const HostTupleName & target,
const std::string & binutils_name,
const std::string & binutils_version,
diff --git a/src/clients/contrarius/install.cc b/src/clients/contrarius/install.cc
index 358726961..1cfb6f7a8 100644
--- a/src/clients/contrarius/install.cc
+++ b/src/clients/contrarius/install.cc
@@ -54,7 +54,7 @@ namespace
public ConsoleInstallTask
{
public:
- OurInstallTask(std::tr1::shared_ptr<Environment> env, const DepListOptions & options) :
+ OurInstallTask(tr1::shared_ptr<Environment> env, const DepListOptions & options) :
ConsoleInstallTask(env.get(), options, env->default_destinations())
{
}
@@ -96,7 +96,7 @@ namespace
}
};
- void show_resume_command(std::tr1::shared_ptr<Environment> env, const InstallTask & task)
+ void show_resume_command(tr1::shared_ptr<Environment> env, const InstallTask & task)
{
if (CommandLine::get_instance()->a_fetch.specified() ||
CommandLine::get_instance()->a_pretend.specified())
@@ -141,14 +141,14 @@ namespace
private:
static const InstallTask * _task;
- static std::tr1::shared_ptr<Environment> _env;
+ static tr1::shared_ptr<Environment> _env;
static void _signal_handler(int sig) PALUDIS_ATTRIBUTE((noreturn));
sig_t _old;
public:
- InstallKilledCatcher(std::tr1::shared_ptr<Environment> env, const InstallTask & task) :
+ InstallKilledCatcher(tr1::shared_ptr<Environment> env, const InstallTask & task) :
_old(signal(SIGINT, &InstallKilledCatcher::_signal_handler))
{
_task = &task;
@@ -163,7 +163,7 @@ namespace
};
const InstallTask * InstallKilledCatcher::_task(0);
- std::tr1::shared_ptr<Environment> InstallKilledCatcher::_env;
+ tr1::shared_ptr<Environment> InstallKilledCatcher::_env;
void
InstallKilledCatcher::_signal_handler(int sig)
@@ -203,7 +203,7 @@ namespace
}
int
-do_install(std::tr1::shared_ptr<Environment> env, std::string spec_str)
+do_install(tr1::shared_ptr<Environment> env, std::string spec_str)
{
int return_code(0);
@@ -293,7 +293,7 @@ do_install(std::tr1::shared_ptr<Environment> env, std::string spec_str)
{
try
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> p(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> p(
env->package_database()->query(
query::Matches(e.query()) &
query::RepositoryHasInstallableInterface(),
@@ -337,7 +337,7 @@ do_install(std::tr1::shared_ptr<Environment> env, std::string spec_str)
}
else if (mr_license == mm)
{
- std::tr1::shared_ptr<const VersionMetadata> meta(env->
+ tr1::shared_ptr<const VersionMetadata> meta(env->
package_database()->fetch_repository(
pp->repository)->version_metadata(
pp->name, pp->version));
@@ -352,13 +352,13 @@ do_install(std::tr1::shared_ptr<Environment> env, std::string spec_str)
}
else if (mr_keyword == mm)
{
- std::tr1::shared_ptr<const VersionMetadata> meta(env->
+ tr1::shared_ptr<const VersionMetadata> meta(env->
package_database()->fetch_repository(
pp->repository)->version_metadata(
pp->name, pp->version));
if (meta->ebuild_interface)
{
- std::tr1::shared_ptr<const KeywordNameCollection> keywords(meta->ebuild_interface->keywords());
+ tr1::shared_ptr<const KeywordNameCollection> keywords(meta->ebuild_interface->keywords());
cerr << " ( " << colour(cl_masked, join(keywords->begin(),
keywords->end(), " ")) << " )";
}
diff --git a/src/clients/contrarius/install.hh b/src/clients/contrarius/install.hh
index 2061ef4a8..da2b779cb 100644
--- a/src/clients/contrarius/install.hh
+++ b/src/clients/contrarius/install.hh
@@ -29,7 +29,7 @@
*/
/// Handle --install.
-int do_install(std::tr1::shared_ptr<paludis::Environment>,
+int do_install(paludis::tr1::shared_ptr<paludis::Environment>,
std::string spec_str);
#endif
diff --git a/src/clients/contrarius/stage.cc b/src/clients/contrarius/stage.cc
index 4619ccbb3..8d6cefd5f 100644
--- a/src/clients/contrarius/stage.cc
+++ b/src/clients/contrarius/stage.cc
@@ -25,7 +25,7 @@
#include <paludis/environments/adapted/adapted_environment.hh>
#include <paludis/query.hh>
#include <string>
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
#include "stage.hh"
#include "target_config.hh"
@@ -63,7 +63,7 @@ BinutilsStage::build(const StageOptions &) const
{
Context context("When building BinutilsStage:");
- std::tr1::shared_ptr<PackageDepSpec> binutils(new PackageDepSpec(TargetConfig::get_instance()->binutils(),
+ tr1::shared_ptr<PackageDepSpec> binutils(new PackageDepSpec(TargetConfig::get_instance()->binutils(),
pds_pm_permissive));
_env->clear_adaptions();
@@ -85,7 +85,7 @@ KernelHeadersStage::build(const StageOptions &) const
{
Context context("When building KernelHeadersStage:");
- std::tr1::shared_ptr<PackageDepSpec> headers(new PackageDepSpec(TargetConfig::get_instance()->headers(),
+ tr1::shared_ptr<PackageDepSpec> headers(new PackageDepSpec(TargetConfig::get_instance()->headers(),
pds_pm_permissive));
_env->clear_adaptions();
@@ -109,7 +109,7 @@ MinimalStage::build(const StageOptions &) const
{
Context context("When executing MinimalStage:");
- std::tr1::shared_ptr<PackageDepSpec> gcc(new PackageDepSpec(TargetConfig::get_instance()->gcc(),
+ tr1::shared_ptr<PackageDepSpec> gcc(new PackageDepSpec(TargetConfig::get_instance()->gcc(),
pds_pm_permissive));
_env->clear_adaptions();
@@ -141,7 +141,7 @@ LibCHeadersStage::build(const StageOptions &) const
{
Context context("When building LIbCHeaderStage:");
- std::tr1::shared_ptr<PackageDepSpec> libc(new PackageDepSpec(TargetConfig::get_instance()->libc(),
+ tr1::shared_ptr<PackageDepSpec> libc(new PackageDepSpec(TargetConfig::get_instance()->libc(),
pds_pm_unspecific));
_env->clear_adaptions();
@@ -154,7 +154,7 @@ LibCHeadersStage::build(const StageOptions &) const
bool
LibCHeadersStage::is_rebuild() const
{
- return (! std::tr1::shared_ptr<const PackageDatabaseEntryCollection>(_env->package_database()->query(
+ return (! tr1::shared_ptr<const PackageDatabaseEntryCollection>(_env->package_database()->query(
query::Matches(PackageDepSpec(TargetConfig::get_instance()->libc(), pds_pm_unspecific)) &
query::InstalledAtRoot(_env->root()),
qo_whatever))->empty());
@@ -165,7 +165,7 @@ LibCStage::build(const StageOptions &) const
{
Context context("When building LibCStage:");
- std::tr1::shared_ptr<PackageDepSpec> libc(new PackageDepSpec(TargetConfig::get_instance()->libc(),
+ tr1::shared_ptr<PackageDepSpec> libc(new PackageDepSpec(TargetConfig::get_instance()->libc(),
pds_pm_permissive));
_env->clear_adaptions();
@@ -176,7 +176,7 @@ LibCStage::build(const StageOptions &) const
bool
LibCStage::is_rebuild() const
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> c(_env->package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> c(_env->package_database()->query(
query::Matches(PackageDepSpec(TargetConfig::get_instance()->libc(), pds_pm_permissive)) &
query::InstalledAtRoot(_env->root()),
qo_whatever));
@@ -192,7 +192,7 @@ FullStage::build(const StageOptions &) const
{
Context context("When building FullStage:");
- std::tr1::shared_ptr<PackageDepSpec> gcc(new PackageDepSpec(TargetConfig::get_instance()->gcc(),
+ tr1::shared_ptr<PackageDepSpec> gcc(new PackageDepSpec(TargetConfig::get_instance()->gcc(),
pds_pm_permissive));
_env->clear_adaptions();
@@ -210,7 +210,7 @@ FullStage::build(const StageOptions &) const
bool
FullStage::is_rebuild() const
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> c(_env->package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> c(_env->package_database()->query(
query::Matches(PackageDepSpec(TargetConfig::get_instance()->gcc(), pds_pm_permissive)) &
query::InstalledAtRoot(_env->root()),
qo_whatever));
diff --git a/src/clients/contrarius/stage.hh b/src/clients/contrarius/stage.hh
index 722cd59c5..e931e8f07 100644
--- a/src/clients/contrarius/stage.hh
+++ b/src/clients/contrarius/stage.hh
@@ -37,10 +37,10 @@ namespace paludis
public StageBase
{
protected:
- std::tr1::shared_ptr<AdaptedEnvironment> _env;
+ tr1::shared_ptr<AdaptedEnvironment> _env;
public:
- ContrariusStage(std::tr1::shared_ptr<AdaptedEnvironment> e) :
+ ContrariusStage(tr1::shared_ptr<AdaptedEnvironment> e) :
_env(e)
{
}
@@ -50,7 +50,7 @@ namespace paludis
public ContrariusStage
{
public:
- AuxiliaryStage(std::tr1::shared_ptr<AdaptedEnvironment> e) :
+ AuxiliaryStage(tr1::shared_ptr<AdaptedEnvironment> e) :
ContrariusStage(e)
{
}
@@ -74,7 +74,7 @@ namespace paludis
public ContrariusStage
{
public:
- BinutilsStage(std::tr1::shared_ptr<AdaptedEnvironment> e) :
+ BinutilsStage(tr1::shared_ptr<AdaptedEnvironment> e) :
ContrariusStage(e)
{
}
@@ -98,7 +98,7 @@ namespace paludis
public ContrariusStage
{
public:
- KernelHeadersStage(std::tr1::shared_ptr<AdaptedEnvironment> e) :
+ KernelHeadersStage(tr1::shared_ptr<AdaptedEnvironment> e) :
ContrariusStage(e)
{
}
@@ -122,7 +122,7 @@ namespace paludis
public ContrariusStage
{
public:
- MinimalStage(std::tr1::shared_ptr<AdaptedEnvironment> e) :
+ MinimalStage(tr1::shared_ptr<AdaptedEnvironment> e) :
ContrariusStage(e)
{
}
@@ -146,7 +146,7 @@ namespace paludis
public ContrariusStage
{
public:
- LibCHeadersStage(std::tr1::shared_ptr<AdaptedEnvironment> e) :
+ LibCHeadersStage(tr1::shared_ptr<AdaptedEnvironment> e) :
ContrariusStage(e)
{
}
@@ -170,7 +170,7 @@ namespace paludis
public ContrariusStage
{
public:
- LibCStage(std::tr1::shared_ptr<AdaptedEnvironment> e) :
+ LibCStage(tr1::shared_ptr<AdaptedEnvironment> e) :
ContrariusStage(e)
{
}
@@ -195,7 +195,7 @@ namespace paludis
public ContrariusStage
{
public:
- FullStage(std::tr1::shared_ptr<AdaptedEnvironment> e) :
+ FullStage(tr1::shared_ptr<AdaptedEnvironment> e) :
ContrariusStage(e)
{
}
diff --git a/src/clients/contrarius/stage_builder.cc b/src/clients/contrarius/stage_builder.cc
index 5575ce1ea..2d800c408 100644
--- a/src/clients/contrarius/stage_builder.cc
+++ b/src/clients/contrarius/stage_builder.cc
@@ -54,19 +54,19 @@ OurStageBuilderTask::on_build_all_pre()
}
void
-OurStageBuilderTask::on_build_pre(std::tr1::shared_ptr<const StageBase> s)
+OurStageBuilderTask::on_build_pre(tr1::shared_ptr<const StageBase> s)
{
cout << colour(cl_heading, "Contents of stage ")
<< colour(cl_stage_short_name, s->short_name()) << endl;
}
void
-OurStageBuilderTask::on_build_post(std::tr1::shared_ptr<const StageBase>)
+OurStageBuilderTask::on_build_post(tr1::shared_ptr<const StageBase>)
{
}
void
-OurStageBuilderTask::on_build_fail(std::tr1::shared_ptr<const StageBase> s, const StageBuildError & e)
+OurStageBuilderTask::on_build_fail(tr1::shared_ptr<const StageBase> s, const StageBuildError & e)
{
cout << "Build of stage '" << s->short_name() << "' failed:" << endl;
cout << "Error: " << e.message() << endl << endl;
@@ -74,13 +74,13 @@ OurStageBuilderTask::on_build_fail(std::tr1::shared_ptr<const StageBase> s, cons
}
void
-OurStageBuilderTask::on_build_succeed(std::tr1::shared_ptr<const StageBase> s)
+OurStageBuilderTask::on_build_succeed(tr1::shared_ptr<const StageBase> s)
{
cout << "Build of stage '" << s->short_name() << "' succeeded." << endl << endl;
}
void
-OurStageBuilderTask::on_build_skipped(std::tr1::shared_ptr<const StageBase> s)
+OurStageBuilderTask::on_build_skipped(tr1::shared_ptr<const StageBase> s)
{
cout << "Skipped rebuild of stage '" << s->short_name() << "'" << endl << endl;
}
diff --git a/src/clients/contrarius/stage_builder.hh b/src/clients/contrarius/stage_builder.hh
index ad2565381..7206e4eab 100644
--- a/src/clients/contrarius/stage_builder.hh
+++ b/src/clients/contrarius/stage_builder.hh
@@ -38,12 +38,12 @@ namespace paludis
}
virtual void on_build_all_pre();
- virtual void on_build_pre(std::tr1::shared_ptr<const StageBase>);
- virtual void on_build_post(std::tr1::shared_ptr<const StageBase>);
- virtual void on_build_fail(std::tr1::shared_ptr<const StageBase>, const StageBuildError &)
+ virtual void on_build_pre(tr1::shared_ptr<const StageBase>);
+ virtual void on_build_post(tr1::shared_ptr<const StageBase>);
+ virtual void on_build_fail(tr1::shared_ptr<const StageBase>, const StageBuildError &)
PALUDIS_ATTRIBUTE((noreturn));
- virtual void on_build_succeed(std::tr1::shared_ptr<const StageBase>);
- virtual void on_build_skipped(std::tr1::shared_ptr<const StageBase>);
+ virtual void on_build_succeed(tr1::shared_ptr<const StageBase>);
+ virtual void on_build_skipped(tr1::shared_ptr<const StageBase>);
virtual void on_build_all_post();
};
}
diff --git a/src/clients/inquisitio/do_search.cc b/src/clients/inquisitio/do_search.cc
index ff4624be8..6f3a52539 100644
--- a/src/clients/inquisitio/do_search.cc
+++ b/src/clients/inquisitio/do_search.cc
@@ -38,8 +38,8 @@ using namespace inquisitio;
int
do_search(const Environment & env)
{
- std::list<std::tr1::shared_ptr<Matcher> > matchers;
- std::list<std::tr1::shared_ptr<Extractor> > extractors;
+ std::list<tr1::shared_ptr<Matcher> > matchers;
+ std::list<tr1::shared_ptr<Extractor> > extractors;
for (CommandLine::ParametersIterator p(CommandLine::get_instance()->begin_parameters()),
p_end(CommandLine::get_instance()->end_parameters()) ; p != p_end ; ++p)
@@ -72,7 +72,7 @@ do_search(const Environment & env)
r->format()))
continue;
- std::tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
for (CategoryNamePartCollection::Iterator c(cat_names->begin()), c_end(cat_names->end()) ;
c != c_end ; ++c)
{
@@ -83,7 +83,7 @@ do_search(const Environment & env)
stringify(*c)))
continue;
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(pkg_names->begin()), p_end(pkg_names->end()) ;
p != p_end ; ++p)
pkgs.insert(*p);
@@ -93,7 +93,7 @@ do_search(const Environment & env)
for (std::set<QualifiedPackageName>::const_iterator p(pkgs.begin()), p_end(pkgs.end()) ;
p != p_end ; ++p)
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>
+ tr1::shared_ptr<const PackageDatabaseEntryCollection>
entries(env.package_database()->query(
query::Package(*p), qo_order_by_version)),
preferred_entries(env.package_database()->query(query::Package(*p) &
@@ -111,11 +111,11 @@ do_search(const Environment & env)
display_entry = *i;
bool match(false);
- for (std::list<std::tr1::shared_ptr<Extractor> >::const_iterator x(extractors.begin()),
+ for (std::list<tr1::shared_ptr<Extractor> >::const_iterator x(extractors.begin()),
x_end(extractors.end()) ; x != x_end && ! match ; ++x)
{
std::string xx((**x)(display_entry));
- for (std::list<std::tr1::shared_ptr<Matcher> >::const_iterator m(matchers.begin()),
+ for (std::list<tr1::shared_ptr<Matcher> >::const_iterator m(matchers.begin()),
m_end(matchers.end()) ; m != m_end && ! match ; ++m)
if ((**m)(xx))
match = true;
@@ -126,7 +126,7 @@ do_search(const Environment & env)
InquisitioQueryTask query(&env);
query.show(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(display_entry.name))),
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(display_entry.name))),
&display_entry);
}
diff --git a/src/clients/inquisitio/extractor.cc b/src/clients/inquisitio/extractor.cc
index 82d7bf6f7..2762f9c69 100644
--- a/src/clients/inquisitio/extractor.cc
+++ b/src/clients/inquisitio/extractor.cc
@@ -26,7 +26,7 @@ using namespace inquisitio;
using namespace paludis;
template class paludis::VirtualConstructor<std::string,
- std::tr1::shared_ptr<Extractor> (*) (const paludis::Environment &),
+ tr1::shared_ptr<Extractor> (*) (const paludis::Environment &),
paludis::virtual_constructor_not_found::ThrowException<NoSuchExtractorError> >;
NoSuchExtractorError::NoSuchExtractorError(const std::string & m) throw () :
@@ -37,10 +37,10 @@ NoSuchExtractorError::NoSuchExtractorError(const std::string & m) throw () :
namespace
{
template <typename M_>
- std::tr1::shared_ptr<Extractor>
+ tr1::shared_ptr<Extractor>
make(const Environment & e)
{
- return std::tr1::shared_ptr<Extractor>(new M_(e));
+ return tr1::shared_ptr<Extractor>(new M_(e));
}
}
diff --git a/src/clients/inquisitio/extractor.hh b/src/clients/inquisitio/extractor.hh
index 6c53349da..4a1fb7879 100644
--- a/src/clients/inquisitio/extractor.hh
+++ b/src/clients/inquisitio/extractor.hh
@@ -51,7 +51,7 @@ namespace inquisitio
public paludis::InstantiationPolicy<ExtractorMaker, paludis::instantiation_method::SingletonTag>,
public paludis::VirtualConstructor<
std::string,
- std::tr1::shared_ptr<Extractor> (*) (const paludis::Environment &),
+ paludis::tr1::shared_ptr<Extractor> (*) (const paludis::Environment &),
paludis::virtual_constructor_not_found::ThrowException<NoSuchExtractorError> >
{
friend class paludis::InstantiationPolicy<ExtractorMaker, paludis::instantiation_method::SingletonTag>;
diff --git a/src/clients/inquisitio/inquisitio.cc b/src/clients/inquisitio/inquisitio.cc
index 21861524c..f1b598b6b 100644
--- a/src/clients/inquisitio/inquisitio.cc
+++ b/src/clients/inquisitio/inquisitio.cc
@@ -103,7 +103,7 @@ main(int argc, char *argv[])
if (CommandLine::get_instance()->a_no_color.specified())
paludis_command.append(" --" + CommandLine::get_instance()->a_no_color.long_name());
- std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(env_spec));
+ tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(env_spec));
env->set_paludis_command(paludis_command);
if (CommandLine::get_instance()->begin_parameters() == CommandLine::get_instance()->end_parameters())
diff --git a/src/clients/inquisitio/matcher.cc b/src/clients/inquisitio/matcher.cc
index c734441de..2a24fca1b 100644
--- a/src/clients/inquisitio/matcher.cc
+++ b/src/clients/inquisitio/matcher.cc
@@ -26,7 +26,7 @@ using namespace inquisitio;
using namespace paludis;
template class paludis::VirtualConstructor<std::string,
- std::tr1::shared_ptr<Matcher> (*) (const std::string &),
+ tr1::shared_ptr<Matcher> (*) (const std::string &),
paludis::virtual_constructor_not_found::ThrowException<NoSuchMatcherError> >;
Matcher::Matcher()
@@ -45,10 +45,10 @@ NoSuchMatcherError::NoSuchMatcherError(const std::string & msg) throw () :
namespace
{
template <typename M_>
- static std::tr1::shared_ptr<Matcher>
+ static tr1::shared_ptr<Matcher>
make(const std::string & s)
{
- return std::tr1::shared_ptr<Matcher>(new M_(s));
+ return tr1::shared_ptr<Matcher>(new M_(s));
}
}
diff --git a/src/clients/inquisitio/matcher.hh b/src/clients/inquisitio/matcher.hh
index 765244f16..e1f3be0e0 100644
--- a/src/clients/inquisitio/matcher.hh
+++ b/src/clients/inquisitio/matcher.hh
@@ -50,7 +50,7 @@ namespace inquisitio
public paludis::InstantiationPolicy<MatcherMaker, paludis::instantiation_method::SingletonTag>,
public paludis::VirtualConstructor<
std::string,
- std::tr1::shared_ptr<Matcher> (*) (const std::string &),
+ paludis::tr1::shared_ptr<Matcher> (*) (const std::string &),
paludis::virtual_constructor_not_found::ThrowException<NoSuchMatcherError> >
{
friend class paludis::InstantiationPolicy<MatcherMaker, paludis::instantiation_method::SingletonTag>;
diff --git a/src/clients/paludis/applets.cc b/src/clients/paludis/applets.cc
index 493ab34e5..3bf22fd2c 100644
--- a/src/clients/paludis/applets.cc
+++ b/src/clients/paludis/applets.cc
@@ -41,15 +41,15 @@
using namespace paludis;
-int do_has_version(std::tr1::shared_ptr<Environment> env)
+int do_has_version(tr1::shared_ptr<Environment> env)
{
int return_code(0);
Context context("When performing has-version action from command line:");
std::string query(*CommandLine::get_instance()->begin_parameters());
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(query, pds_pm_permissive));
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> entries(env->package_database()->query(
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(query, pds_pm_permissive));
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> entries(env->package_database()->query(
query::Matches(*spec) & query::InstalledAtRoot(env->root()), qo_whatever));
if (entries->empty())
@@ -58,21 +58,21 @@ int do_has_version(std::tr1::shared_ptr<Environment> env)
return return_code;
}
-int do_best_version(std::tr1::shared_ptr<Environment> env)
+int do_best_version(tr1::shared_ptr<Environment> env)
{
int return_code(0);
Context context("When performing best-version action from command line:");
std::string query(*CommandLine::get_instance()->begin_parameters());
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(query, pds_pm_permissive));
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> entries(env->package_database()->query(
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(query, pds_pm_permissive));
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> entries(env->package_database()->query(
query::Matches(*spec) & query::InstalledAtRoot(env->root()), qo_order_by_version));
/* make built_with_use work for virtuals... icky... */
while (! entries->empty())
{
- std::tr1::shared_ptr<const VersionMetadata> metadata(env->package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> metadata(env->package_database()->fetch_repository(
entries->last()->repository)->version_metadata(entries->last()->name,
entries->last()->version));
if (! metadata->virtual_interface)
@@ -82,7 +82,7 @@ int do_best_version(std::tr1::shared_ptr<Environment> env)
"' resolves to '" + stringify(*entries->last()) + "', which is a virtual for '"
+ stringify(metadata->virtual_interface->virtual_for) + "'. This will break with "
"new style virtuals.");
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> new_entries(
+ tr1::shared_ptr<PackageDatabaseEntryCollection> new_entries(
new PackageDatabaseEntryCollection::Concrete);
new_entries->push_back(metadata->virtual_interface->virtual_for);
entries = new_entries;
@@ -102,7 +102,7 @@ int do_best_version(std::tr1::shared_ptr<Environment> env)
return return_code;
}
-int do_environment_variable(std::tr1::shared_ptr<Environment> env)
+int do_environment_variable(tr1::shared_ptr<Environment> env)
{
int return_code(0);
@@ -110,9 +110,9 @@ int do_environment_variable(std::tr1::shared_ptr<Environment> env)
std::string spec_str(*CommandLine::get_instance()->begin_parameters());
std::string var_str(* next(CommandLine::get_instance()->begin_parameters()));
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(spec_str, pds_pm_permissive));
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(spec_str, pds_pm_permissive));
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> entries(env->package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> entries(env->package_database()->query(
query::Matches(*spec) & query::InstalledAtRoot(env->root()), qo_order_by_version));
if (entries->empty())
@@ -121,7 +121,7 @@ int do_environment_variable(std::tr1::shared_ptr<Environment> env)
if (entries->empty())
throw NoSuchPackageError(spec_str);
- std::tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(
+ tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(
entries->begin()->repository));
RepositoryEnvironmentVariableInterface * env_if(
repo->environment_variable_interface);
@@ -138,7 +138,7 @@ int do_environment_variable(std::tr1::shared_ptr<Environment> env)
return return_code;
}
-int do_configuration_variable(std::tr1::shared_ptr<Environment> env)
+int do_configuration_variable(tr1::shared_ptr<Environment> env)
{
int return_code(0);
@@ -147,7 +147,7 @@ int do_configuration_variable(std::tr1::shared_ptr<Environment> env)
std::string repo_str(*CommandLine::get_instance()->begin_parameters());
std::string var_str(* next(CommandLine::get_instance()->begin_parameters()));
- std::tr1::shared_ptr<const RepositoryInfo> info(env->package_database()->fetch_repository(
+ tr1::shared_ptr<const RepositoryInfo> info(env->package_database()->fetch_repository(
RepositoryName(repo_str))->info(false));
return_code = 1;
@@ -183,11 +183,11 @@ int do_list_repository_formats()
return return_code;
}
-int do_list_sync_protocols(std::tr1::shared_ptr<Environment> env)
+int do_list_sync_protocols(tr1::shared_ptr<Environment> env)
{
std::map<std::string, std::string> syncers;
- std::tr1::shared_ptr<const FSEntryCollection> sd(env->syncers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> sd(env->syncers_dirs());
for (FSEntryCollection::Iterator d(sd->begin()),
d_end(sd->end()) ; d != d_end ; ++d)
{
@@ -246,7 +246,7 @@ int do_list_dep_tag_categories()
return return_code;
}
-int do_regenerate_cache(std::tr1::shared_ptr<Environment> env, bool installed)
+int do_regenerate_cache(tr1::shared_ptr<Environment> env, bool installed)
{
Context context("When performing cache regeneration action from command line:");
diff --git a/src/clients/paludis/applets.hh b/src/clients/paludis/applets.hh
index 7c93813f3..3d5d99cc7 100644
--- a/src/clients/paludis/applets.hh
+++ b/src/clients/paludis/applets.hh
@@ -32,28 +32,28 @@ namespace paludis
}
/// Handle --has-version.
-int do_has_version(std::tr1::shared_ptr<paludis::Environment>);
+int do_has_version(paludis::tr1::shared_ptr<paludis::Environment>);
/// Handle --best-version.
-int do_best_version(std::tr1::shared_ptr<paludis::Environment>);
+int do_best_version(paludis::tr1::shared_ptr<paludis::Environment>);
/// Handle --environment-variable.
-int do_environment_variable(std::tr1::shared_ptr<paludis::Environment>);
+int do_environment_variable(paludis::tr1::shared_ptr<paludis::Environment>);
/// Handle --configuration-variable.
-int do_configuration_variable(std::tr1::shared_ptr<paludis::Environment>);
+int do_configuration_variable(paludis::tr1::shared_ptr<paludis::Environment>);
/// Handle --list-repository-formats
int do_list_repository_formats();
/// Handle --list-sync-protocols
-int do_list_sync_protocols(std::tr1::shared_ptr<paludis::Environment>);
+int do_list_sync_protocols(paludis::tr1::shared_ptr<paludis::Environment>);
/// Handle --list-dep-tag-categories
int do_list_dep_tag_categories();
/// Handle cache regeneration
-int do_regenerate_cache(std::tr1::shared_ptr<paludis::Environment>, bool installed);
+int do_regenerate_cache(paludis::tr1::shared_ptr<paludis::Environment>, bool installed);
#endif
diff --git a/src/clients/paludis/do_config.cc b/src/clients/paludis/do_config.cc
index 833f2212a..b3d7ef8bb 100644
--- a/src/clients/paludis/do_config.cc
+++ b/src/clients/paludis/do_config.cc
@@ -33,9 +33,9 @@ namespace
struct AmbiguousConfigTarget :
public Exception
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> matches;
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> matches;
- AmbiguousConfigTarget(std::tr1::shared_ptr<const PackageDatabaseEntryCollection> & m) throw () :
+ AmbiguousConfigTarget(tr1::shared_ptr<const PackageDatabaseEntryCollection> & m) throw () :
Exception("Ambiguous config target"),
matches(m)
{
@@ -47,11 +47,11 @@ namespace
};
int
- do_one_config_entry(std::tr1::shared_ptr<Environment> env, const PackageDatabaseEntry & p)
+ do_one_config_entry(tr1::shared_ptr<Environment> env, const PackageDatabaseEntry & p)
{
int return_code(0);
- std::tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(p.repository));
+ tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(p.repository));
const RepositoryConfigInterface * conf_if(repo->config_interface);
if (! conf_if)
@@ -67,19 +67,19 @@ namespace
}
int
- do_one_config(std::tr1::shared_ptr<Environment> env, const std::string & target)
+ do_one_config(tr1::shared_ptr<Environment> env, const std::string & target)
{
Context local_context("When handling query '" + target + "':");
/* we might have a dep spec, but we might just have a simple package name
* without a category. either should work. */
- std::tr1::shared_ptr<PackageDepSpec> spec(std::string::npos == target.find('/') ?
- new PackageDepSpec(std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
+ tr1::shared_ptr<PackageDepSpec> spec(std::string::npos == target.find('/') ?
+ new PackageDepSpec(tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
env->package_database()->fetch_unique_qualified_package_name(
PackageNamePart(target))))) :
new PackageDepSpec(target, pds_pm_permissive));
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>
+ tr1::shared_ptr<const PackageDatabaseEntryCollection>
entries(env->package_database()->query(query::Matches(*spec) & query::InstalledAtRoot(env->root()), qo_order_by_version));
if (entries->empty())
@@ -93,7 +93,7 @@ namespace
}
int
-do_config(std::tr1::shared_ptr<Environment> env)
+do_config(tr1::shared_ptr<Environment> env)
{
int ret_code(0);
diff --git a/src/clients/paludis/do_config.hh b/src/clients/paludis/do_config.hh
index 648c0402a..3e1eb7a80 100644
--- a/src/clients/paludis/do_config.hh
+++ b/src/clients/paludis/do_config.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_CONFIG_HH
#define PALUDIS_GUARD_SRC_CONFIG_HH 1
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
/** \file
* Declaration for the do_config function.
@@ -32,7 +32,7 @@ namespace paludis
}
/// Handle --config.
-int do_config(std::tr1::shared_ptr<paludis::Environment>);
+int do_config(paludis::tr1::shared_ptr<paludis::Environment>);
#endif
diff --git a/src/clients/paludis/do_contents.cc b/src/clients/paludis/do_contents.cc
index f1268bbd8..eeaa12470 100644
--- a/src/clients/paludis/do_contents.cc
+++ b/src/clients/paludis/do_contents.cc
@@ -68,7 +68,7 @@ namespace
void
do_one_contents_entry(
- const std::tr1::shared_ptr<Environment> env,
+ const tr1::shared_ptr<Environment> env,
const PackageDatabaseEntry & e)
{
cout << "* " << colour(cl_package_name, e) << endl;
@@ -78,7 +78,7 @@ do_one_contents_entry(
contents_interface);
if (contents_interface)
{
- std::tr1::shared_ptr<const Contents> contents(contents_interface->contents(
+ tr1::shared_ptr<const Contents> contents(contents_interface->contents(
e.name, e.version));
ContentsDisplayer d;
std::for_each(contents->begin(), contents->end(), accept_visitor(&d));
@@ -91,19 +91,19 @@ do_one_contents_entry(
void
do_one_contents(
- const std::tr1::shared_ptr<Environment> env,
+ const tr1::shared_ptr<Environment> env,
const std::string & q)
{
Context local_context("When handling query '" + q + "':");
/* we might have a dep spec, but we might just have a simple package name
* without a category. either should work. */
- std::tr1::shared_ptr<PackageDepSpec> spec(std::string::npos == q.find('/') ?
- new PackageDepSpec(std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
+ tr1::shared_ptr<PackageDepSpec> spec(std::string::npos == q.find('/') ?
+ new PackageDepSpec(tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
env->package_database()->fetch_unique_qualified_package_name(PackageNamePart(q))))) :
new PackageDepSpec(q, pds_pm_permissive));
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>
+ tr1::shared_ptr<const PackageDatabaseEntryCollection>
entries(env->package_database()->query(query::Matches(*spec) & query::InstalledAtRoot(
env->root()), qo_order_by_version));
@@ -116,7 +116,7 @@ do_one_contents(
}
int
-do_contents(std::tr1::shared_ptr<Environment> env)
+do_contents(tr1::shared_ptr<Environment> env)
{
int return_code(0);
diff --git a/src/clients/paludis/do_contents.hh b/src/clients/paludis/do_contents.hh
index 3a03a5087..6ec0916d3 100644
--- a/src/clients/paludis/do_contents.hh
+++ b/src/clients/paludis/do_contents.hh
@@ -24,7 +24,7 @@
* Declaration for the do_contents function.
*/
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
namespace paludis
{
@@ -32,6 +32,6 @@ namespace paludis
}
/// Handle --contents.
-int do_contents(std::tr1::shared_ptr<paludis::Environment>);
+int do_contents(paludis::tr1::shared_ptr<paludis::Environment>);
#endif
diff --git a/src/clients/paludis/install.cc b/src/clients/paludis/install.cc
index 13a9c744b..fe2870730 100644
--- a/src/clients/paludis/install.cc
+++ b/src/clients/paludis/install.cc
@@ -58,7 +58,7 @@ using std::endl;
namespace
{
- std::string make_resume_command(std::tr1::shared_ptr<Environment> env, const InstallTask & task, bool skip_first)
+ std::string make_resume_command(tr1::shared_ptr<Environment> env, const InstallTask & task, bool skip_first)
{
std::string resume_command = env->paludis_command()
+ " --" + CommandLine::get_instance()->dl_deps_default.long_name() + " discard --"
@@ -99,7 +99,7 @@ namespace
return resume_command;
}
- void show_resume_command(std::tr1::shared_ptr<Environment> env, const InstallTask & task)
+ void show_resume_command(tr1::shared_ptr<Environment> env, const InstallTask & task)
{
if (CommandLine::get_instance()->a_fetch.specified() ||
CommandLine::get_instance()->a_pretend.specified())
@@ -161,11 +161,11 @@ namespace
public ConsoleInstallTask
{
private:
- std::tr1::shared_ptr<Environment> _env;
+ tr1::shared_ptr<Environment> _env;
public:
- OurInstallTask(std::tr1::shared_ptr<Environment> env, const DepListOptions & options,
- std::tr1::shared_ptr<const DestinationsCollection> destinations) :
+ OurInstallTask(tr1::shared_ptr<Environment> env, const DepListOptions & options,
+ tr1::shared_ptr<const DestinationsCollection> destinations) :
ConsoleInstallTask(env.get(), options, destinations),
_env(env)
{
@@ -247,14 +247,14 @@ namespace
private:
static const InstallTask * _task;
- static std::tr1::shared_ptr<Environment> _env;
+ static tr1::shared_ptr<Environment> _env;
static void _signal_handler(int sig) PALUDIS_ATTRIBUTE((noreturn));
sig_t _old;
public:
- InstallKilledCatcher(std::tr1::shared_ptr<Environment> env, const InstallTask & task) :
+ InstallKilledCatcher(tr1::shared_ptr<Environment> env, const InstallTask & task) :
_old(signal(SIGINT, &InstallKilledCatcher::_signal_handler))
{
_task = &task;
@@ -269,7 +269,7 @@ namespace
};
const InstallTask * InstallKilledCatcher::_task(0);
- std::tr1::shared_ptr<Environment> InstallKilledCatcher::_env;
+ tr1::shared_ptr<Environment> InstallKilledCatcher::_env;
void
InstallKilledCatcher::_signal_handler(int sig)
@@ -326,7 +326,7 @@ namespace
}
int
-do_install(std::tr1::shared_ptr<Environment> env)
+do_install(tr1::shared_ptr<Environment> env)
{
int return_code(0);
@@ -497,17 +497,17 @@ do_install(std::tr1::shared_ptr<Environment> env)
(CommandLine::get_instance()->a_show_reasons.argument() == "full"))
options.dependency_tags = true;
- std::tr1::shared_ptr<const DestinationsCollection> destinations;
+ tr1::shared_ptr<const DestinationsCollection> destinations;
if (CommandLine::get_instance()->a_destinations.specified())
{
Context local_context("When building destinations collection:");
- std::tr1::shared_ptr<DestinationsCollection> d(new DestinationsCollection::Concrete);
+ tr1::shared_ptr<DestinationsCollection> d(new DestinationsCollection::Concrete);
for (args::StringSetArg::Iterator i(CommandLine::get_instance()->a_destinations.begin_args()),
i_end(CommandLine::get_instance()->a_destinations.end_args()) ;
i != i_end ; ++i)
{
- std::tr1::shared_ptr<Repository> repo(env->package_database()->fetch_repository(
+ tr1::shared_ptr<Repository> repo(env->package_database()->fetch_repository(
RepositoryName(*i)));
if (repo->destination_interface)
d->insert(repo);
@@ -611,7 +611,7 @@ do_install(std::tr1::shared_ptr<Environment> env)
{
try
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> p(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> p(
env->package_database()->query(
query::Matches(e.query()) & query::RepositoryHasInstallableInterface(), qo_order_by_version));
if (p->empty())
@@ -655,7 +655,7 @@ do_install(std::tr1::shared_ptr<Environment> env)
}
else if (mr_license == mm)
{
- std::tr1::shared_ptr<const VersionMetadata> meta(
+ tr1::shared_ptr<const VersionMetadata> meta(
env->package_database()->fetch_repository(
pp->repository)->version_metadata(
pp->name, pp->version));
@@ -670,13 +670,13 @@ do_install(std::tr1::shared_ptr<Environment> env)
}
else if (mr_keyword == mm)
{
- std::tr1::shared_ptr<const VersionMetadata> meta(env->
+ tr1::shared_ptr<const VersionMetadata> meta(env->
package_database()->fetch_repository(
pp->repository)->version_metadata(
pp->name, pp->version));
if (meta->ebuild_interface)
{
- std::tr1::shared_ptr<const KeywordNameCollection> keywords(meta->ebuild_interface->keywords());
+ tr1::shared_ptr<const KeywordNameCollection> keywords(meta->ebuild_interface->keywords());
cerr << " ( " << colour(cl_masked, join(keywords->begin(),
keywords->end(), " ")) << " )";
}
diff --git a/src/clients/paludis/install.hh b/src/clients/paludis/install.hh
index 724e6db6f..8d51de8cd 100644
--- a/src/clients/paludis/install.hh
+++ b/src/clients/paludis/install.hh
@@ -32,6 +32,6 @@ namespace paludis
}
/// Handle --install.
-int do_install(std::tr1::shared_ptr<paludis::Environment>);
+int do_install(paludis::tr1::shared_ptr<paludis::Environment>);
#endif
diff --git a/src/clients/paludis/list.cc b/src/clients/paludis/list.cc
index 20408ad67..25bca2c53 100644
--- a/src/clients/paludis/list.cc
+++ b/src/clients/paludis/list.cc
@@ -26,7 +26,7 @@
#include <paludis/util/visitor.hh>
#include <src/output/colour.hh>
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
#include <iomanip>
#include <iostream>
#include <list>
@@ -36,7 +36,7 @@
using namespace paludis;
int
-do_list_repositories(std::tr1::shared_ptr<Environment> env)
+do_list_repositories(tr1::shared_ptr<Environment> env)
{
int ret_code(1);
@@ -63,7 +63,7 @@ do_list_repositories(std::tr1::shared_ptr<Environment> env)
std::cout << "* " << colour(cl_repository_name, r->name()) << std::endl;
- std::tr1::shared_ptr<const RepositoryInfo> ii(r->info(false));
+ tr1::shared_ptr<const RepositoryInfo> ii(r->info(false));
for (RepositoryInfo::SectionIterator i(ii->begin_sections()),
i_end(ii->end_sections()) ; i != i_end ; ++i)
{
@@ -80,7 +80,7 @@ do_list_repositories(std::tr1::shared_ptr<Environment> env)
}
int
-do_list_categories(std::tr1::shared_ptr<Environment> env)
+do_list_categories(tr1::shared_ptr<Environment> env)
{
int ret_code(1);
@@ -105,7 +105,7 @@ do_list_categories(std::tr1::shared_ptr<Environment> env)
r->format()))
continue;
- std::tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
for (CategoryNamePartCollection::Iterator c(cat_names->begin()), c_end(cat_names->end()) ;
c != c_end ; ++c)
cats[*c].push_back(r->name());
@@ -133,7 +133,7 @@ do_list_categories(std::tr1::shared_ptr<Environment> env)
}
int
-do_list_packages(std::tr1::shared_ptr<Environment> env)
+do_list_packages(tr1::shared_ptr<Environment> env)
{
int ret_code(1);
@@ -158,7 +158,7 @@ do_list_packages(std::tr1::shared_ptr<Environment> env)
r->format()))
continue;
- std::tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cat_names(r->category_names());
for (CategoryNamePartCollection::Iterator c(cat_names->begin()), c_end(cat_names->end()) ;
c != c_end ; ++c)
{
@@ -169,7 +169,7 @@ do_list_packages(std::tr1::shared_ptr<Environment> env)
stringify(*c)))
continue;
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkg_names(r->package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(pkg_names->begin()), p_end(pkg_names->end()) ;
p != p_end ; ++p)
pkgs[*p].push_back(r->name());
@@ -198,7 +198,7 @@ do_list_packages(std::tr1::shared_ptr<Environment> env)
}
int
-do_list_sets(std::tr1::shared_ptr<Environment> env)
+do_list_sets(tr1::shared_ptr<Environment> env)
{
int ret_code(1);
@@ -226,7 +226,7 @@ do_list_sets(std::tr1::shared_ptr<Environment> env)
r->format()))
continue;
- std::tr1::shared_ptr<const SetNameCollection> set_names(r->sets_interface->sets_list());
+ tr1::shared_ptr<const SetNameCollection> set_names(r->sets_interface->sets_list());
for (SetNameCollection::Iterator s(set_names->begin()), s_end(set_names->end()) ;
s != s_end ; ++s)
sets[*s].push_back(stringify(r->name()));
@@ -234,7 +234,7 @@ do_list_sets(std::tr1::shared_ptr<Environment> env)
if (! CommandLine::get_instance()->a_repository.specified())
{
- std::tr1::shared_ptr<const SetNameCollection> set_names(env->set_names());
+ tr1::shared_ptr<const SetNameCollection> set_names(env->set_names());
for (SetNameCollection::Iterator s(set_names->begin()), s_end(set_names->end()) ;
s != s_end ; ++s)
sets[*s].push_back("environment");
diff --git a/src/clients/paludis/list.hh b/src/clients/paludis/list.hh
index 4248a4385..055bb4d6a 100644
--- a/src/clients/paludis/list.hh
+++ b/src/clients/paludis/list.hh
@@ -30,15 +30,15 @@ namespace paludis
}
/// Handle --list-repositories.
-int do_list_repositories(std::tr1::shared_ptr<paludis::Environment>);
+int do_list_repositories(paludis::tr1::shared_ptr<paludis::Environment>);
/// Handle --list-categories.
-int do_list_categories(std::tr1::shared_ptr<paludis::Environment>);
+int do_list_categories(paludis::tr1::shared_ptr<paludis::Environment>);
/// Handle --list-packages.
-int do_list_packages(std::tr1::shared_ptr<paludis::Environment>);
+int do_list_packages(paludis::tr1::shared_ptr<paludis::Environment>);
/// Handle --list-sets.
-int do_list_sets(std::tr1::shared_ptr<paludis::Environment>);
+int do_list_sets(paludis::tr1::shared_ptr<paludis::Environment>);
#endif
diff --git a/src/clients/paludis/owner.cc b/src/clients/paludis/owner.cc
index ac95ab696..4d824886f 100644
--- a/src/clients/paludis/owner.cc
+++ b/src/clients/paludis/owner.cc
@@ -87,7 +87,7 @@ namespace
int
do_one_owner(
- const std::tr1::shared_ptr<Environment> env,
+ const tr1::shared_ptr<Environment> env,
const std::string & query)
{
bool found_owner=false;
@@ -101,20 +101,20 @@ do_one_owner(
if (! (*r)->contents_interface)
continue;
- std::tr1::shared_ptr<const CategoryNamePartCollection> cats((*r)->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cats((*r)->category_names());
for (CategoryNamePartCollection::Iterator c(cats->begin()),
c_end(cats->end()) ; c != c_end ; ++c)
{
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs((*r)->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs((*r)->package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(pkgs->begin()),
p_end(pkgs->end()) ; p != p_end ; ++p)
{
- std::tr1::shared_ptr<const VersionSpecCollection> vers((*r)->version_specs(*p));
+ tr1::shared_ptr<const VersionSpecCollection> vers((*r)->version_specs(*p));
for (VersionSpecCollection::Iterator v(vers->begin()),
v_end(vers->end()) ; v != v_end ; ++v)
{
PackageDatabaseEntry e(*p, *v, (*r)->name());
- std::tr1::shared_ptr<const Contents> contents((*r)->contents_interface->contents(*p, *v));
+ tr1::shared_ptr<const Contents> contents((*r)->contents_interface->contents(*p, *v));
ContentsFinder d(query, CommandLine::get_instance()->a_full_match.specified());
std::for_each(contents->begin(), contents->end(), accept_visitor(&d));
if (d.found)
@@ -133,7 +133,7 @@ do_one_owner(
int
-do_owner(std::tr1::shared_ptr<Environment> env)
+do_owner(tr1::shared_ptr<Environment> env)
{
int return_code(0);
Context context("When performing owner action from command line:");
diff --git a/src/clients/paludis/owner.hh b/src/clients/paludis/owner.hh
index cb190ee3a..4d3da0cce 100644
--- a/src/clients/paludis/owner.hh
+++ b/src/clients/paludis/owner.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_OWNER_HH
#define PALUDIS_GUARD_SRC_OWNER_HH 1
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
/** \file
* Declaration for the do_owner function.
@@ -32,6 +32,6 @@ namespace paludis
}
/// Handle --owner.
-int do_owner(std::tr1::shared_ptr<paludis::Environment>);
+int do_owner(paludis::tr1::shared_ptr<paludis::Environment>);
#endif
diff --git a/src/clients/paludis/paludis.cc b/src/clients/paludis/paludis.cc
index 31014b988..33683b85e 100644
--- a/src/clients/paludis/paludis.cc
+++ b/src/clients/paludis/paludis.cc
@@ -107,7 +107,7 @@ namespace
#endif
}
- void display_info(std::tr1::shared_ptr<Environment> env)
+ void display_info(tr1::shared_ptr<Environment> env)
{
for (IndirectIterator<PackageDatabase::RepositoryIterator, const Repository>
r(env->package_database()->begin_repositories()), r_end(env->package_database()->end_repositories()) ;
@@ -115,7 +115,7 @@ namespace
{
cout << "Repository " << colour(cl_repository_name, r->name()) << ":" << endl;
- std::tr1::shared_ptr<const RepositoryInfo> ii(r->info(true));
+ tr1::shared_ptr<const RepositoryInfo> ii(r->info(true));
for (RepositoryInfo::SectionIterator i(ii->begin_sections()),
i_end(ii->end_sections()) ; i != i_end ; ++i)
{
@@ -341,7 +341,7 @@ main(int argc, char *argv[])
if (CommandLine::get_instance()->a_no_safe_resume.specified())
paludis_command.append(" --" + CommandLine::get_instance()->a_no_safe_resume.long_name());
- std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(env_spec));
+ tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(env_spec));
env->set_paludis_command(paludis_command);
try
diff --git a/src/clients/paludis/query.cc b/src/clients/paludis/query.cc
index 82e0666f2..2a8289a4d 100644
--- a/src/clients/paludis/query.cc
+++ b/src/clients/paludis/query.cc
@@ -44,7 +44,7 @@ namespace
public ConsoleQueryTask
{
public:
- QueryTask(const std::tr1::shared_ptr<Environment> e) :
+ QueryTask(const tr1::shared_ptr<Environment> e) :
ConsoleQueryTask(e.get())
{
}
@@ -62,9 +62,9 @@ namespace
}
void do_one_package_query(
- const std::tr1::shared_ptr<Environment> env,
+ const tr1::shared_ptr<Environment> env,
MaskReasons & mask_reasons_to_explain,
- std::tr1::shared_ptr<PackageDepSpec> spec)
+ tr1::shared_ptr<PackageDepSpec> spec)
{
QueryTask query(env);
query.show(*spec);
@@ -73,10 +73,10 @@ void do_one_package_query(
}
void do_one_set_query(
- const std::tr1::shared_ptr<Environment>,
+ const tr1::shared_ptr<Environment>,
const std::string & q,
MaskReasons &,
- std::tr1::shared_ptr<DepSpec> set)
+ tr1::shared_ptr<DepSpec> set)
{
cout << "* " << colour(cl_package_name, q) << endl;
DepSpecPrettyPrinter packages(12);
@@ -86,7 +86,7 @@ void do_one_set_query(
}
void do_one_query(
- const std::tr1::shared_ptr<Environment> env,
+ const tr1::shared_ptr<Environment> env,
const std::string & q,
MaskReasons & mask_reasons_to_explain)
{
@@ -94,8 +94,8 @@ void do_one_query(
/* we might have a dep spec, but we might just have a simple package name
* without a category. or it might be a set... all should work. */
- std::tr1::shared_ptr<PackageDepSpec> spec;
- std::tr1::shared_ptr<DepSpec> set;
+ tr1::shared_ptr<PackageDepSpec> spec;
+ tr1::shared_ptr<DepSpec> set;
if (std::string::npos == q.find('/'))
{
try
@@ -106,7 +106,7 @@ void do_one_query(
{
}
if (0 == set)
- spec.reset(new PackageDepSpec(std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
+ spec.reset(new PackageDepSpec(tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
env->package_database()->fetch_unique_qualified_package_name(PackageNamePart(q))))));
}
else
@@ -118,7 +118,7 @@ void do_one_query(
do_one_set_query(env, q, mask_reasons_to_explain, set);
}
-int do_query(std::tr1::shared_ptr<Environment> env)
+int do_query(tr1::shared_ptr<Environment> env)
{
int return_code(0);
diff --git a/src/clients/paludis/query.hh b/src/clients/paludis/query.hh
index ee132a8fd..9f742e164 100644
--- a/src/clients/paludis/query.hh
+++ b/src/clients/paludis/query.hh
@@ -32,6 +32,6 @@ namespace paludis
}
/// Handle --query.
-int do_query(std::tr1::shared_ptr<paludis::Environment>);
+int do_query(paludis::tr1::shared_ptr<paludis::Environment>);
#endif
diff --git a/src/clients/paludis/report.cc b/src/clients/paludis/report.cc
index 66a7b1c76..8020265a4 100644
--- a/src/clients/paludis/report.cc
+++ b/src/clients/paludis/report.cc
@@ -40,7 +40,7 @@ namespace
int _n_errors;
public:
- OurReportTask(std::tr1::shared_ptr<Environment> env) :
+ OurReportTask(tr1::shared_ptr<Environment> env) :
ReportTask(env.get()),
_n_packages(0),
_n_errors(0)
@@ -159,7 +159,7 @@ namespace
}
}
-int do_report(std::tr1::shared_ptr<Environment> env)
+int do_report(tr1::shared_ptr<Environment> env)
{
Context context("When performing report action from command line:");
diff --git a/src/clients/paludis/report.hh b/src/clients/paludis/report.hh
index c3b94a526..75d21df40 100644
--- a/src/clients/paludis/report.hh
+++ b/src/clients/paludis/report.hh
@@ -32,7 +32,7 @@ namespace paludis
}
/// Handle --report.
-int do_report(std::tr1::shared_ptr<paludis::Environment>);
+int do_report(paludis::tr1::shared_ptr<paludis::Environment>);
#endif
diff --git a/src/clients/paludis/sync.cc b/src/clients/paludis/sync.cc
index f05db2983..cfa3c2bc0 100644
--- a/src/clients/paludis/sync.cc
+++ b/src/clients/paludis/sync.cc
@@ -43,7 +43,7 @@ namespace
int _return_code;
public:
- OurSyncTask(std::tr1::shared_ptr<Environment> env) :
+ OurSyncTask(tr1::shared_ptr<Environment> env) :
SyncTask(env.get()),
_return_code(0)
{
@@ -110,7 +110,7 @@ namespace
}
}
-int do_sync(std::tr1::shared_ptr<Environment> env)
+int do_sync(tr1::shared_ptr<Environment> env)
{
Context context("When performing sync action from command line:");
diff --git a/src/clients/paludis/sync.hh b/src/clients/paludis/sync.hh
index 6c2fe9e1f..74495777b 100644
--- a/src/clients/paludis/sync.hh
+++ b/src/clients/paludis/sync.hh
@@ -32,7 +32,7 @@ namespace paludis
}
/// Handle --sync.
-int do_sync(std::tr1::shared_ptr<paludis::Environment>);
+int do_sync(paludis::tr1::shared_ptr<paludis::Environment>);
#endif
diff --git a/src/clients/paludis/uninstall.cc b/src/clients/paludis/uninstall.cc
index 81b60c7be..3caff7260 100644
--- a/src/clients/paludis/uninstall.cc
+++ b/src/clients/paludis/uninstall.cc
@@ -47,7 +47,7 @@ namespace
int _count, _current_count;
public:
- OurUninstallTask(std::tr1::shared_ptr<Environment> e) :
+ OurUninstallTask(tr1::shared_ptr<Environment> e) :
UninstallTask(e.get()),
_count(0),
_current_count(0)
@@ -95,7 +95,7 @@ namespace
else
max_count = std::numeric_limits<long>::max();
- for (SortedCollection<std::tr1::shared_ptr<DepTag> >::Iterator
+ for (SortedCollection<tr1::shared_ptr<DepTag> >::Iterator
tag(d.tags->begin()),
tag_end(d.tags->end()) ;
tag != tag_end ; ++tag)
@@ -176,7 +176,7 @@ namespace
}
};
- int real_uninstall(std::tr1::shared_ptr<Environment> env, bool unused)
+ int real_uninstall(tr1::shared_ptr<Environment> env, bool unused)
{
int return_code(0);
@@ -263,13 +263,13 @@ namespace
}
int
-do_uninstall(std::tr1::shared_ptr<Environment> env)
+do_uninstall(tr1::shared_ptr<Environment> env)
{
return real_uninstall(env, false);
}
int
-do_uninstall_unused(std::tr1::shared_ptr<Environment> env)
+do_uninstall_unused(tr1::shared_ptr<Environment> env)
{
return real_uninstall(env, true);
}
diff --git a/src/clients/paludis/uninstall.hh b/src/clients/paludis/uninstall.hh
index 124a53535..85047d50e 100644
--- a/src/clients/paludis/uninstall.hh
+++ b/src/clients/paludis/uninstall.hh
@@ -32,10 +32,10 @@ namespace paludis
}
/// Handle --uninstall.
-int do_uninstall(std::tr1::shared_ptr<paludis::Environment>);
+int do_uninstall(paludis::tr1::shared_ptr<paludis::Environment>);
/// Handle --uninstall-unused.
-int do_uninstall_unused(std::tr1::shared_ptr<paludis::Environment>);
+int do_uninstall_unused(paludis::tr1::shared_ptr<paludis::Environment>);
#endif
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index b280e8ecc..723c7b19e 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -31,7 +31,7 @@
#include <iostream>
#include <algorithm>
#include <set>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
#include <libebt/libebt.hh>
#include <libwrapiter/libwrapiter.hh>
@@ -525,7 +525,7 @@ namespace
bool
do_check(const FSEntry & dir)
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
Context context("When checking directory '" + stringify(dir) + "':");
@@ -544,7 +544,7 @@ namespace
}
if (std::count_if(DirIterator(dir), DirIterator(),
- std::tr1::bind(&is_file_with_prefix_extension, _1, dir.basename() + "-", ".ebuild", IsFileWithOptions())))
+ tr1::bind(&is_file_with_prefix_extension, _1, dir.basename() + "-", ".ebuild", IsFileWithOptions())))
{
qa::QAEnvironment env(dir.dirname().dirname(), QualudisCommandLine::get_instance()->a_write_cache_dir.argument(),
QualudisCommandLine::get_instance()->a_master_repository_dir.argument());
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index 921683bbc..0cd6457d0 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -67,7 +67,7 @@ UseDescriptionComparator::operator() (const UseDescription & lhs, const UseDescr
ConsoleInstallTask::ConsoleInstallTask(Environment * const env,
const DepListOptions & options,
- std::tr1::shared_ptr<const DestinationsCollection> d) :
+ tr1::shared_ptr<const DestinationsCollection> d) :
InstallTask(env, options, d),
_all_tags(new SortedCollection<DepTagEntry>::Concrete),
_all_use_descriptions(new SortedCollection<UseDescription, UseDescriptionComparator>::Concrete),
@@ -213,29 +213,29 @@ ConsoleInstallTask::on_display_merge_list_entry(const DepListEntry & d)
throw InternalError(PALUDIS_HERE, "Bad d.kind");
} while (false);
- std::tr1::shared_ptr<RepositoryName> repo;
+ tr1::shared_ptr<RepositoryName> repo;
if (d.destinations && ! d.destinations->empty())
repo.reset(new RepositoryName((d.destinations->begin()->destination)->name()));
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> existing_repo(environment()->package_database()->
+ tr1::shared_ptr<PackageDatabaseEntryCollection> existing_repo(environment()->package_database()->
query(query::Matches(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(d.package.name)),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(d.package.name)),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(),
+ tr1::shared_ptr<SlotName>(),
repo)),
qo_order_by_version));
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> existing_slot_repo(environment()->package_database()->
+ tr1::shared_ptr<PackageDatabaseEntryCollection> existing_slot_repo(environment()->package_database()->
query(query::Matches(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(d.package.name)),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(d.package.name)),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(new SlotName(d.metadata->slot)),
+ tr1::shared_ptr<SlotName>(new SlotName(d.metadata->slot)),
repo)),
qo_order_by_version));
@@ -471,7 +471,7 @@ ConsoleInstallTask::display_merge_list_post_tags()
for (std::set<std::string>::iterator cat(tag_categories.begin()),
cat_end(tag_categories.end()) ; cat != cat_end ; ++cat)
{
- std::tr1::shared_ptr<const DepTagCategory> c(DepTagCategoryMaker::get_instance()->
+ tr1::shared_ptr<const DepTagCategory> c(DepTagCategoryMaker::get_instance()->
find_maker(*cat)());
if (! c->visible())
@@ -503,7 +503,7 @@ ConsoleInstallTask::display_merge_list_post_use_descriptions(const std::string &
bool started(false);
UseFlagName old_flag("OFTEN_NOT_BEEN_ON_BOATS");
- std::tr1::shared_ptr<SortedCollection<UseDescription, UseDescriptionComparator> > group(
+ tr1::shared_ptr<SortedCollection<UseDescription, UseDescriptionComparator> > group(
new SortedCollection<UseDescription, UseDescriptionComparator>::Concrete);
for (SortedCollection<UseDescription, UseDescriptionComparator>::Iterator i(all_use_descriptions()->begin()),
i_end(all_use_descriptions()->end()) ; i != i_end ; ++i)
@@ -644,9 +644,9 @@ ConsoleInstallTask::display_tag_summary_tag_pre_text(const DepTagCategory & c)
}
void
-ConsoleInstallTask::display_tag_summary_tag(std::tr1::shared_ptr<const DepTag> t)
+ConsoleInstallTask::display_tag_summary_tag(tr1::shared_ptr<const DepTag> t)
{
- std::tr1::shared_ptr<DepTagSummaryDisplayer> displayer(make_dep_tag_summary_displayer());
+ tr1::shared_ptr<DepTagSummaryDisplayer> displayer(make_dep_tag_summary_displayer());
t->accept(displayer.get());
}
@@ -801,8 +801,8 @@ ConsoleInstallTask::display_merge_list_entry_slot(const DepListEntry & d, const
void
ConsoleInstallTask::display_merge_list_entry_status_and_update_counts(const DepListEntry & d,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> existing_repo,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> existing_slot_repo,
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> existing_repo,
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> existing_slot_repo,
const DisplayMode m)
{
bool need_comma(false);
@@ -830,7 +830,7 @@ ConsoleInstallTask::display_merge_list_entry_status_and_update_counts(const DepL
output_no_endl(render_as_update_mode(", "));
std::string destination_str;
- std::tr1::shared_ptr<const DestinationsCollection> default_destinations(environment()->default_destinations());
+ tr1::shared_ptr<const DestinationsCollection> default_destinations(environment()->default_destinations());
if (default_destinations->end() == default_destinations->find(dest->destination))
destination_str = " ::" + stringify(dest->destination->name());
@@ -903,7 +903,7 @@ ConsoleInstallTask::display_merge_list_entry_status_and_update_counts(const DepL
}
void
-ConsoleInstallTask::_add_descriptions(std::tr1::shared_ptr<const UseFlagNameCollection> c,
+ConsoleInstallTask::_add_descriptions(tr1::shared_ptr<const UseFlagNameCollection> c,
const PackageDatabaseEntry & p, UseDescriptionState s)
{
for (UseFlagNameCollection::Iterator f(c->begin()), f_end(c->end()) ;
@@ -926,15 +926,15 @@ ConsoleInstallTask::_add_descriptions(std::tr1::shared_ptr<const UseFlagNameColl
void
ConsoleInstallTask::display_merge_list_entry_use(const DepListEntry & d,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> existing_repo,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> existing_slot_repo,
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> existing_repo,
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> existing_slot_repo,
const DisplayMode m)
{
if (normal_entry != m && suggested_entry != m)
return;
output_no_endl(" ");
- std::tr1::shared_ptr<UseFlagPrettyPrinter> printer(make_use_flag_pretty_printer());
+ tr1::shared_ptr<UseFlagPrettyPrinter> printer(make_use_flag_pretty_printer());
printer->print_package_flags(d.package, ! existing_slot_repo->empty() ? &*existing_slot_repo->last() :
! existing_repo->empty() ? &*existing_repo->last() : 0);
@@ -963,7 +963,7 @@ ConsoleInstallTask::display_merge_list_entry_tags(const DepListEntry & d, const
all_tags()->insert(*tag);
- std::tr1::shared_ptr<EntryDepTagDisplayer> displayer(make_entry_dep_tag_displayer());
+ tr1::shared_ptr<EntryDepTagDisplayer> displayer(make_entry_dep_tag_displayer());
tag->tag->accept(displayer.get());
tag_titles.append(displayer->text());
tag_titles.append(", ");
@@ -1039,22 +1039,22 @@ ConsoleInstallTask::display_merge_list_entry_end(const DepListEntry &, const Dis
output_endl();
}
-std::tr1::shared_ptr<DepTagSummaryDisplayer>
+tr1::shared_ptr<DepTagSummaryDisplayer>
ConsoleInstallTask::make_dep_tag_summary_displayer()
{
- return std::tr1::shared_ptr<DepTagSummaryDisplayer>(new DepTagSummaryDisplayer(this));
+ return tr1::shared_ptr<DepTagSummaryDisplayer>(new DepTagSummaryDisplayer(this));
}
-std::tr1::shared_ptr<EntryDepTagDisplayer>
+tr1::shared_ptr<EntryDepTagDisplayer>
ConsoleInstallTask::make_entry_dep_tag_displayer()
{
- return std::tr1::shared_ptr<EntryDepTagDisplayer>(new EntryDepTagDisplayer());
+ return tr1::shared_ptr<EntryDepTagDisplayer>(new EntryDepTagDisplayer());
}
-std::tr1::shared_ptr<UseFlagPrettyPrinter>
+tr1::shared_ptr<UseFlagPrettyPrinter>
ConsoleInstallTask::make_use_flag_pretty_printer()
{
- return std::tr1::shared_ptr<UseFlagPrettyPrinter>(new UseFlagPrettyPrinter(environment()));
+ return tr1::shared_ptr<UseFlagPrettyPrinter>(new UseFlagPrettyPrinter(environment()));
}
EntryDepTagDisplayer::EntryDepTagDisplayer()
@@ -1109,7 +1109,7 @@ ConsoleInstallTask::display_merge_list_entry_mask_reasons(const DepListEntry & e
}
else if (mr_license == mm)
{
- std::tr1::shared_ptr<const VersionMetadata> metadata(environment()->package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> metadata(environment()->package_database()->fetch_repository(
e.package.repository)->version_metadata(e.package.name, e.package.version));
if (metadata->license_interface)
@@ -1122,11 +1122,11 @@ ConsoleInstallTask::display_merge_list_entry_mask_reasons(const DepListEntry & e
}
else if (mr_keyword == mm)
{
- std::tr1::shared_ptr<const VersionMetadata> meta(environment()->package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> meta(environment()->package_database()->fetch_repository(
e.package.repository)->version_metadata(e.package.name, e.package.version));
if (meta->ebuild_interface)
{
- std::tr1::shared_ptr<const KeywordNameCollection> keywords(meta->ebuild_interface->keywords());
+ tr1::shared_ptr<const KeywordNameCollection> keywords(meta->ebuild_interface->keywords());
output_no_endl(" ( " + render_as_masked(join(keywords->begin(), keywords->end(), " ")) + " )");
}
}
diff --git a/src/output/console_install_task.hh b/src/output/console_install_task.hh
index 4f5bc36f8..93f0ac2e0 100644
--- a/src/output/console_install_task.hh
+++ b/src/output/console_install_task.hh
@@ -113,16 +113,16 @@ namespace paludis
private:
int _counts[last_count];
- std::tr1::shared_ptr<SortedCollection<DepTagEntry> > _all_tags;
- std::tr1::shared_ptr<SortedCollection<UseDescription, UseDescriptionComparator> > _all_use_descriptions;
- std::tr1::shared_ptr<UseFlagNameCollection> _all_expand_prefixes;
+ tr1::shared_ptr<SortedCollection<DepTagEntry> > _all_tags;
+ tr1::shared_ptr<SortedCollection<UseDescription, UseDescriptionComparator> > _all_use_descriptions;
+ tr1::shared_ptr<UseFlagNameCollection> _all_expand_prefixes;
- void _add_descriptions(std::tr1::shared_ptr<const UseFlagNameCollection>,
+ void _add_descriptions(tr1::shared_ptr<const UseFlagNameCollection>,
const PackageDatabaseEntry &, UseDescriptionState);
protected:
ConsoleInstallTask(Environment * const env, const DepListOptions & options,
- std::tr1::shared_ptr<const DestinationsCollection>);
+ tr1::shared_ptr<const DestinationsCollection>);
public:
virtual void on_build_deplist_pre();
@@ -187,11 +187,11 @@ namespace paludis
virtual void display_merge_list_entry_slot(const DepListEntry &, const DisplayMode);
virtual void display_merge_list_entry_for(const PackageDatabaseEntry &, const DisplayMode);
virtual void display_merge_list_entry_status_and_update_counts(const DepListEntry &,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>, const DisplayMode);
+ tr1::shared_ptr<const PackageDatabaseEntryCollection>,
+ tr1::shared_ptr<const PackageDatabaseEntryCollection>, const DisplayMode);
virtual void display_merge_list_entry_use(const DepListEntry &,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>, const DisplayMode);
+ tr1::shared_ptr<const PackageDatabaseEntryCollection>,
+ tr1::shared_ptr<const PackageDatabaseEntryCollection>, const DisplayMode);
virtual void display_merge_list_entry_tags(const DepListEntry &, const DisplayMode);
virtual void display_merge_list_entry_end(const DepListEntry &, const DisplayMode);
@@ -200,7 +200,7 @@ namespace paludis
virtual void display_tag_summary_start();
virtual void display_tag_summary_tag_title(const DepTagCategory &);
virtual void display_tag_summary_tag_pre_text(const DepTagCategory &);
- virtual void display_tag_summary_tag(std::tr1::shared_ptr<const DepTag>);
+ virtual void display_tag_summary_tag(tr1::shared_ptr<const DepTag>);
virtual void display_tag_summary_tag_post_text(const DepTagCategory &);
virtual void display_tag_summary_end();
@@ -228,12 +228,12 @@ namespace paludis
_counts[count_] = value;
}
- std::tr1::shared_ptr<SortedCollection<DepTagEntry> > all_tags()
+ tr1::shared_ptr<SortedCollection<DepTagEntry> > all_tags()
{
return _all_tags;
}
- std::tr1::shared_ptr<SortedCollection<UseDescription, UseDescriptionComparator> > all_use_descriptions()
+ tr1::shared_ptr<SortedCollection<UseDescription, UseDescriptionComparator> > all_use_descriptions()
{
return _all_use_descriptions;
}
@@ -257,9 +257,9 @@ namespace paludis
///\name Makers
///\{
- std::tr1::shared_ptr<DepTagSummaryDisplayer> make_dep_tag_summary_displayer();
- std::tr1::shared_ptr<EntryDepTagDisplayer> make_entry_dep_tag_displayer();
- std::tr1::shared_ptr<UseFlagPrettyPrinter> make_use_flag_pretty_printer();
+ tr1::shared_ptr<DepTagSummaryDisplayer> make_dep_tag_summary_displayer();
+ tr1::shared_ptr<EntryDepTagDisplayer> make_entry_dep_tag_displayer();
+ tr1::shared_ptr<UseFlagPrettyPrinter> make_use_flag_pretty_printer();
///\}
};
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index a45eed7f1..40f0e6127 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -57,7 +57,7 @@ ConsoleQueryTask::show(const PackageDepSpec & a, const PackageDatabaseEntry * di
{
/* prefer the best installed version, then the best visible version, then
* the best version */
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>
+ tr1::shared_ptr<const PackageDatabaseEntryCollection>
entries(_imp->env->package_database()->query(query::Matches(a), qo_order_by_version)),
preferred_entries(_imp->env->package_database()->query(
query::Matches(a) & query::InstalledAtRoot(_imp->env->root()), qo_order_by_version));
@@ -93,7 +93,7 @@ ConsoleQueryTask::display_header(const PackageDepSpec & a, const PackageDatabase
void
ConsoleQueryTask::display_versions_by_repository(const PackageDepSpec &,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> entries,
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> entries,
const PackageDatabaseEntry & display_entry) const
{
/* find all repository names. */
@@ -115,7 +115,7 @@ ConsoleQueryTask::display_versions_by_repository(const PackageDepSpec &,
if (e->repository == *r)
{
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
_imp->env->package_database()->fetch_repository(e->repository)->version_metadata(e->name,
e->version));
@@ -196,7 +196,7 @@ ConsoleQueryTask::display_versions_by_repository(const PackageDepSpec &,
void
ConsoleQueryTask::display_metadata(const PackageDepSpec &, const PackageDatabaseEntry & e) const
{
- std::tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(e.repository)->
+ tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(e.repository)->
version_metadata(e.name, e.version));
display_metadata_dep("Homepage", "HOMEPAGE", metadata->homepage(), true);
@@ -264,7 +264,7 @@ ConsoleQueryTask::display_metadata_key(const std::string & k, const std::string
}
void
-ConsoleQueryTask::display_metadata_license(const std::string & k, const std::string & kk, std::tr1::shared_ptr<const DepSpec> l,
+ConsoleQueryTask::display_metadata_license(const std::string & k, const std::string & kk, tr1::shared_ptr<const DepSpec> l,
const PackageDatabaseEntry & display_entry) const
{
output_left_column((want_raw() ? kk : k) + ":");
@@ -318,7 +318,7 @@ namespace
}
};
- bool is_spec_empty(std::tr1::shared_ptr<const DepSpec> d)
+ bool is_spec_empty(tr1::shared_ptr<const DepSpec> d)
{
IsEmpty e;
d->accept(&e);
@@ -328,7 +328,7 @@ namespace
void
ConsoleQueryTask::display_metadata_dep(const std::string & k, const std::string & kk,
- std::tr1::shared_ptr<const DepSpec> d, const bool one_line) const
+ tr1::shared_ptr<const DepSpec> d, const bool one_line) const
{
if (is_spec_empty(d))
return;
diff --git a/src/output/console_query_task.hh b/src/output/console_query_task.hh
index a61a06003..054c2db23 100644
--- a/src/output/console_query_task.hh
+++ b/src/output/console_query_task.hh
@@ -40,15 +40,15 @@ namespace paludis
virtual void display_header(const PackageDepSpec &, const PackageDatabaseEntry &) const;
virtual void display_versions_by_repository(const PackageDepSpec &,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>, const PackageDatabaseEntry &) const;
+ tr1::shared_ptr<const PackageDatabaseEntryCollection>, const PackageDatabaseEntry &) const;
virtual void display_metadata(const PackageDepSpec &, const PackageDatabaseEntry &) const;
virtual void display_metadata_key(const std::string &, const std::string &,
const std::string &) const;
virtual void display_metadata_license(const std::string &, const std::string &,
- std::tr1::shared_ptr<const DepSpec>, const PackageDatabaseEntry &) const;
+ tr1::shared_ptr<const DepSpec>, const PackageDatabaseEntry &) const;
virtual void display_metadata_dep(const std::string &, const std::string &,
- std::tr1::shared_ptr<const DepSpec>, const bool one_line) const;
+ tr1::shared_ptr<const DepSpec>, const bool one_line) const;
virtual void display_metadata_pde(const std::string &, const std::string &, const PackageDatabaseEntry &) const;
virtual void display_metadata_time(const std::string &, const std::string &, time_t) const;
virtual void display_metadata_iuse(const std::string &, const std::string &, const std::string &,
diff --git a/src/output/use_flag_pretty_printer.cc b/src/output/use_flag_pretty_printer.cc
index 3dec23c07..8b8f873c5 100644
--- a/src/output/use_flag_pretty_printer.cc
+++ b/src/output/use_flag_pretty_printer.cc
@@ -45,7 +45,7 @@ UseFlagPrettyPrinter::~UseFlagPrettyPrinter()
std::string::size_type
UseFlagPrettyPrinter::use_expand_delim_pos(const UseFlagName & u,
- const std::tr1::shared_ptr<const UseFlagNameCollection> c) const
+ const tr1::shared_ptr<const UseFlagNameCollection> c) const
{
for (UseFlagNameCollection::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
if (0 == u.data().compare(0, i->data().length(), i->data(), 0, i->data().length()))
@@ -59,7 +59,7 @@ UseFlagPrettyPrinter::print_package_flags(const PackageDatabaseEntry & pkg,
{
std::set<UseFlagName> iuse, old_iuse;
- std::tr1::shared_ptr<const VersionMetadata> metadata(environment()->package_database()->
+ tr1::shared_ptr<const VersionMetadata> metadata(environment()->package_database()->
fetch_repository(pkg.repository)->version_metadata(pkg.name, pkg.version));
if (! metadata->ebuild_interface)
@@ -71,7 +71,7 @@ UseFlagPrettyPrinter::print_package_flags(const PackageDatabaseEntry & pkg,
if (old_pkg)
{
- std::tr1::shared_ptr<const VersionMetadata> old_metadata(environment()->package_database()->
+ tr1::shared_ptr<const VersionMetadata> old_metadata(environment()->package_database()->
fetch_repository(old_pkg->repository)->version_metadata(old_pkg->name, old_pkg->version));
if (old_metadata->ebuild_interface)
std::copy(old_metadata->ebuild_interface->iuse()->begin(), old_metadata->ebuild_interface->iuse()->end(),
@@ -267,25 +267,25 @@ UseFlagPrettyPrinter::environment() const
return _env;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
UseFlagPrettyPrinter::new_flags() const
{
return _new_flags;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
UseFlagPrettyPrinter::changed_flags() const
{
return _changed_flags;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
UseFlagPrettyPrinter::unchanged_flags() const
{
return _unchanged_flags;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
UseFlagPrettyPrinter::expand_prefixes() const
{
return _expand_prefixes;
diff --git a/src/output/use_flag_pretty_printer.hh b/src/output/use_flag_pretty_printer.hh
index aec0ce9c8..3b93e06ef 100644
--- a/src/output/use_flag_pretty_printer.hh
+++ b/src/output/use_flag_pretty_printer.hh
@@ -34,14 +34,14 @@ namespace paludis
const Environment * const _env;
bool _need_space;
- std::tr1::shared_ptr<UseFlagNameCollection> _new_flags;
- std::tr1::shared_ptr<UseFlagNameCollection> _changed_flags;
- std::tr1::shared_ptr<UseFlagNameCollection> _unchanged_flags;
- std::tr1::shared_ptr<UseFlagNameCollection> _expand_prefixes;
+ tr1::shared_ptr<UseFlagNameCollection> _new_flags;
+ tr1::shared_ptr<UseFlagNameCollection> _changed_flags;
+ tr1::shared_ptr<UseFlagNameCollection> _unchanged_flags;
+ tr1::shared_ptr<UseFlagNameCollection> _expand_prefixes;
protected:
std::string::size_type use_expand_delim_pos(const UseFlagName & u,
- const std::tr1::shared_ptr<const UseFlagNameCollection> c) const;
+ const tr1::shared_ptr<const UseFlagNameCollection> c) const;
public:
UseFlagPrettyPrinter(const Environment * const);
@@ -65,10 +65,10 @@ namespace paludis
const Environment * environment() const;
bool need_space() const;
- std::tr1::shared_ptr<const UseFlagNameCollection> new_flags() const;
- std::tr1::shared_ptr<const UseFlagNameCollection> changed_flags() const;
- std::tr1::shared_ptr<const UseFlagNameCollection> unchanged_flags() const;
- std::tr1::shared_ptr<const UseFlagNameCollection> expand_prefixes() const;
+ tr1::shared_ptr<const UseFlagNameCollection> new_flags() const;
+ tr1::shared_ptr<const UseFlagNameCollection> changed_flags() const;
+ tr1::shared_ptr<const UseFlagNameCollection> unchanged_flags() const;
+ tr1::shared_ptr<const UseFlagNameCollection> expand_prefixes() const;
};
}