aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-26 13:59:04 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-26 13:59:04 +0000
commit118de550d2dc5508ff4446bdf7f2ddf7b497b9ba (patch)
tree5ced2de062474cb8e6537e68d71cbc7c5a80e802 /paludis/repositories
parentf76a3a0a7b38b5a3652a9e9bcb13942483f7c53a (diff)
downloadpaludis-118de550d2dc5508ff4446bdf7f2ddf7b497b9ba.tar.gz
paludis-118de550d2dc5508ff4446bdf7f2ddf7b497b9ba.tar.xz
paludis::tr1:: is dead. We no longer support compilers that don't do tr1 (that means you, gcc-3).
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/cran/cran_dep_parser.cc10
-rw-r--r--paludis/repositories/cran/cran_dep_parser.hh4
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc71
-rw-r--r--paludis/repositories/cran/cran_installed_repository.hh18
-rw-r--r--paludis/repositories/cran/cran_installed_repository_TEST.cc6
-rw-r--r--paludis/repositories/cran/cran_package_id.cc121
-rw-r--r--paludis/repositories/cran/cran_package_id.hh50
-rw-r--r--paludis/repositories/cran/cran_repository.cc78
-rw-r--r--paludis/repositories/cran/cran_repository.hh22
-rw-r--r--paludis/repositories/cran/cran_repository_TEST.cc10
-rw-r--r--paludis/repositories/cran/keys.cc28
-rw-r--r--paludis/repositories/cran/keys.hh16
-rw-r--r--paludis/repositories/cran/package_dep_spec.cc30
-rw-r--r--paludis/repositories/e/aa_visitor_TEST.cc4
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.cc12
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.hh6
-rw-r--r--paludis/repositories/e/conditional_dep_spec.cc6
-rw-r--r--paludis/repositories/e/conditional_dep_spec.hh2
-rw-r--r--paludis/repositories/e/dep_parser.cc164
-rw-r--r--paludis/repositories/e/dep_parser.hh28
-rw-r--r--paludis/repositories/e/dep_parser_TEST.cc98
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.cc6
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.hh2
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer_TEST.cc30
-rw-r--r--paludis/repositories/e/dependencies_rewriter.cc10
-rw-r--r--paludis/repositories/e/e_installed_repository.cc70
-rw-r--r--paludis/repositories/e/e_installed_repository.hh22
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc154
-rw-r--r--paludis/repositories/e/e_installed_repository_id.hh66
-rw-r--r--paludis/repositories/e/e_key.cc186
-rw-r--r--paludis/repositories/e/e_key.hh68
-rw-r--r--paludis/repositories/e/e_mask.cc18
-rw-r--r--paludis/repositories/e/e_mask.hh10
-rw-r--r--paludis/repositories/e/e_repository.cc211
-rw-r--r--paludis/repositories/e/e_repository.hh42
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc285
-rw-r--r--paludis/repositories/e/e_repository_entries.cc2
-rw-r--r--paludis/repositories/e/e_repository_entries.hh30
-rw-r--r--paludis/repositories/e/e_repository_id.cc4
-rw-r--r--paludis/repositories/e/e_repository_id.hh14
-rw-r--r--paludis/repositories/e/e_repository_mask_file.cc10
-rw-r--r--paludis/repositories/e/e_repository_mask_file.hh2
-rw-r--r--paludis/repositories/e/e_repository_news.cc4
-rw-r--r--paludis/repositories/e/e_repository_params.sr6
-rw-r--r--paludis/repositories/e/e_repository_profile.cc57
-rw-r--r--paludis/repositories/e/e_repository_profile.hh8
-rw-r--r--paludis/repositories/e/e_repository_profile_file.cc6
-rw-r--r--paludis/repositories/e/e_repository_sets.cc45
-rw-r--r--paludis/repositories/e/e_repository_sets.hh8
-rw-r--r--paludis/repositories/e/e_repository_sets_TEST.cc34
-rw-r--r--paludis/repositories/e/e_stripper.hh2
-rw-r--r--paludis/repositories/e/eapi-fwd.hh4
-rw-r--r--paludis/repositories/e/eapi.cc22
-rw-r--r--paludis/repositories/e/eapi.hh6
-rw-r--r--paludis/repositories/e/eapi.sr6
-rw-r--r--paludis/repositories/e/eapi_phase.cc4
-rw-r--r--paludis/repositories/e/ebuild.cc43
-rw-r--r--paludis/repositories/e/ebuild.hh30
-rw-r--r--paludis/repositories/e/ebuild_entries.cc109
-rw-r--r--paludis/repositories/e/ebuild_entries.hh28
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc16
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.hh8
-rw-r--r--paludis/repositories/e/ebuild_id.cc180
-rw-r--r--paludis/repositories/e/ebuild_id.hh68
-rw-r--r--paludis/repositories/e/eclass_mtimes.cc15
-rw-r--r--paludis/repositories/e/eclass_mtimes.hh6
-rw-r--r--paludis/repositories/e/exheres_layout.cc109
-rw-r--r--paludis/repositories/e/exheres_layout.hh32
-rw-r--r--paludis/repositories/e/exndbam_id.cc22
-rw-r--r--paludis/repositories/e/exndbam_id.hh4
-rw-r--r--paludis/repositories/e/exndbam_repository.cc46
-rw-r--r--paludis/repositories/e/exndbam_repository.hh22
-rw-r--r--paludis/repositories/e/exndbam_repository_TEST.cc4
-rw-r--r--paludis/repositories/e/fetch_visitor.cc22
-rw-r--r--paludis/repositories/e/fetch_visitor.hh6
-rw-r--r--paludis/repositories/e/fetch_visitor_TEST.cc6
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.cc66
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.hh8
-rw-r--r--paludis/repositories/e/fix_locked_dependencies_TEST.cc20
-rw-r--r--paludis/repositories/e/glsa.cc12
-rw-r--r--paludis/repositories/e/glsa.hh9
-rw-r--r--paludis/repositories/e/layout.cc20
-rw-r--r--paludis/repositories/e/layout.hh42
-rw-r--r--paludis/repositories/e/make_ebuild_repository.cc24
-rw-r--r--paludis/repositories/e/make_ebuild_repository.hh10
-rw-r--r--paludis/repositories/e/package_dep_spec.cc7
-rw-r--r--paludis/repositories/e/package_dep_spec.hh4
-rw-r--r--paludis/repositories/e/pipe_command_handler.cc28
-rw-r--r--paludis/repositories/e/pipe_command_handler.hh4
-rw-r--r--paludis/repositories/e/pretend_fetch_visitor.cc12
-rw-r--r--paludis/repositories/e/pretend_fetch_visitor.hh4
-rw-r--r--paludis/repositories/e/qa/categories.cc2
-rw-r--r--paludis/repositories/e/qa/categories.hh4
-rw-r--r--paludis/repositories/e/qa/default_functions.cc2
-rw-r--r--paludis/repositories/e/qa/default_functions.hh4
-rw-r--r--paludis/repositories/e/qa/default_functions_TEST.cc14
-rw-r--r--paludis/repositories/e/qa/deprecated_functions.cc4
-rw-r--r--paludis/repositories/e/qa/deprecated_functions.hh4
-rw-r--r--paludis/repositories/e/qa/eapi_supported.cc2
-rw-r--r--paludis/repositories/e/qa/eapi_supported.hh4
-rw-r--r--paludis/repositories/e/qa/ebuild_count.cc4
-rw-r--r--paludis/repositories/e/qa/ebuild_count.hh4
-rw-r--r--paludis/repositories/e/qa/extractors.cc6
-rw-r--r--paludis/repositories/e/qa/extractors.hh4
-rw-r--r--paludis/repositories/e/qa/extractors_TEST.cc22
-rw-r--r--paludis/repositories/e/qa/fetches_key.cc10
-rw-r--r--paludis/repositories/e/qa/fetches_key.hh4
-rw-r--r--paludis/repositories/e/qa/function_keyword.cc4
-rw-r--r--paludis/repositories/e/qa/function_keyword.hh4
-rw-r--r--paludis/repositories/e/qa/function_keyword_TEST.cc4
-rw-r--r--paludis/repositories/e/qa/header.cc4
-rw-r--r--paludis/repositories/e/qa/header.hh4
-rw-r--r--paludis/repositories/e/qa/homepage_key.cc10
-rw-r--r--paludis/repositories/e/qa/homepage_key.hh4
-rw-r--r--paludis/repositories/e/qa/homepage_key_TEST.cc14
-rw-r--r--paludis/repositories/e/qa/inherited_key.cc2
-rw-r--r--paludis/repositories/e/qa/inherited_key.hh4
-rw-r--r--paludis/repositories/e/qa/iuse_key.cc4
-rw-r--r--paludis/repositories/e/qa/iuse_key.hh6
-rw-r--r--paludis/repositories/e/qa/keywords_key.cc2
-rw-r--r--paludis/repositories/e/qa/keywords_key.hh4
-rw-r--r--paludis/repositories/e/qa/kv_variables.cc2
-rw-r--r--paludis/repositories/e/qa/kv_variables.hh4
-rw-r--r--paludis/repositories/e/qa/kv_variables_TEST.cc10
-rw-r--r--paludis/repositories/e/qa/license_key.cc12
-rw-r--r--paludis/repositories/e/qa/license_key.hh6
-rw-r--r--paludis/repositories/e/qa/manifest.cc32
-rw-r--r--paludis/repositories/e/qa/manifest.hh4
-rw-r--r--paludis/repositories/e/qa/manifest_TEST.cc36
-rw-r--r--paludis/repositories/e/qa/metadata_keys.cc38
-rw-r--r--paludis/repositories/e/qa/metadata_keys.hh4
-rw-r--r--paludis/repositories/e/qa/qa.cc6
-rw-r--r--paludis/repositories/e/qa/qa_checks.cc102
-rw-r--r--paludis/repositories/e/qa/qa_checks.hh47
-rw-r--r--paludis/repositories/e/qa/qa_checks_group.cc13
-rw-r--r--paludis/repositories/e/qa/qa_controller.cc111
-rw-r--r--paludis/repositories/e/qa/qa_controller.hh12
-rw-r--r--paludis/repositories/e/qa/restrict_key.cc10
-rw-r--r--paludis/repositories/e/qa/restrict_key.hh4
-rw-r--r--paludis/repositories/e/qa/root_variable.cc2
-rw-r--r--paludis/repositories/e/qa/root_variable.hh4
-rw-r--r--paludis/repositories/e/qa/short_description_key.cc2
-rw-r--r--paludis/repositories/e/qa/short_description_key.hh4
-rw-r--r--paludis/repositories/e/qa/spec_keys.cc52
-rw-r--r--paludis/repositories/e/qa/spec_keys.hh4
-rw-r--r--paludis/repositories/e/qa/spec_keys_TEST.cc42
-rw-r--r--paludis/repositories/e/qa/stray_files.cc8
-rw-r--r--paludis/repositories/e/qa/stray_files.hh10
-rw-r--r--paludis/repositories/e/qa/subshell_die.cc4
-rw-r--r--paludis/repositories/e/qa/subshell_die.hh4
-rw-r--r--paludis/repositories/e/qa/subshell_die_TEST.cc4
-rw-r--r--paludis/repositories/e/qa/variable_assigns.cc4
-rw-r--r--paludis/repositories/e/qa/variable_assigns.hh4
-rw-r--r--paludis/repositories/e/qa/visibility.cc28
-rw-r--r--paludis/repositories/e/qa/visibility.hh6
-rw-r--r--paludis/repositories/e/qa/visibility_TEST.cc24
-rw-r--r--paludis/repositories/e/qa/whitespace.cc4
-rw-r--r--paludis/repositories/e/qa/whitespace.hh4
-rw-r--r--paludis/repositories/e/registration.cc4
-rw-r--r--paludis/repositories/e/source_uri_finder.cc6
-rw-r--r--paludis/repositories/e/source_uri_finder_TEST.cc6
-rw-r--r--paludis/repositories/e/traditional_layout.cc108
-rw-r--r--paludis/repositories/e/traditional_layout.hh32
-rw-r--r--paludis/repositories/e/use_desc.cc11
-rw-r--r--paludis/repositories/e/use_requirements.cc14
-rw-r--r--paludis/repositories/e/use_requirements.hh18
-rw-r--r--paludis/repositories/e/vdb_id.cc4
-rw-r--r--paludis/repositories/e/vdb_id.hh4
-rw-r--r--paludis/repositories/e/vdb_merger.cc7
-rw-r--r--paludis/repositories/e/vdb_merger.hh4
-rw-r--r--paludis/repositories/e/vdb_merger_TEST.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.cc114
-rw-r--r--paludis/repositories/e/vdb_repository.hh28
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc166
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc24
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh10
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc2
-rw-r--r--paludis/repositories/e/xml_things.cc18
-rw-r--r--paludis/repositories/e/xml_things_TEST.cc6
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc18
-rw-r--r--paludis/repositories/fake/fake_installed_repository.hh6
-rw-r--r--paludis/repositories/fake/fake_installed_repository_TEST.cc4
-rw-r--r--paludis/repositories/fake/fake_package_id.cc226
-rw-r--r--paludis/repositories/fake/fake_package_id.hh104
-rw-r--r--paludis/repositories/fake/fake_repository.cc14
-rw-r--r--paludis/repositories/fake/fake_repository.hh8
-rw-r--r--paludis/repositories/fake/fake_repository_TEST.cc4
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc60
-rw-r--r--paludis/repositories/fake/fake_repository_base.hh28
-rw-r--r--paludis/repositories/gems/gem_specification.cc108
-rw-r--r--paludis/repositories/gems/gem_specification.hh54
-rw-r--r--paludis/repositories/gems/gem_specification_TEST.cc2
-rw-r--r--paludis/repositories/gems/gem_specifications.cc20
-rw-r--r--paludis/repositories/gems/gem_specifications.hh8
-rw-r--r--paludis/repositories/gems/gems_repository.cc57
-rw-r--r--paludis/repositories/gems/gems_repository.hh14
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc39
-rw-r--r--paludis/repositories/gems/installed_gems_repository.hh14
-rw-r--r--paludis/repositories/gems/registration.cc8
-rw-r--r--paludis/repositories/gems/yaml.cc16
-rw-r--r--paludis/repositories/unpackaged/dep_parser.cc10
-rw-r--r--paludis/repositories/unpackaged/dep_parser.hh4
-rw-r--r--paludis/repositories/unpackaged/dep_parser_TEST.cc4
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc128
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh48
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc48
-rw-r--r--paludis/repositories/unpackaged/installed_repository.hh16
-rw-r--r--paludis/repositories/unpackaged/installed_repository_TEST.cc76
-rw-r--r--paludis/repositories/unpackaged/registration.cc8
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc94
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.hh48
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.cc14
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.hh8
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.cc40
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.hh12
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository_TEST.cc28
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.hh2
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc51
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh20
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc4
-rw-r--r--paludis/repositories/virtuals/package_id.cc128
-rw-r--r--paludis/repositories/virtuals/package_id.hh58
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc91
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh24
-rw-r--r--paludis/repositories/virtuals/virtuals_repository_TEST.cc26
225 files changed, 3262 insertions, 3243 deletions
diff --git a/paludis/repositories/cran/cran_dep_parser.cc b/paludis/repositories/cran/cran_dep_parser.cc
index 307d1cadf..e48ef79a8 100644
--- a/paludis/repositories/cran/cran_dep_parser.cc
+++ b/paludis/repositories/cran/cran_dep_parser.cc
@@ -31,13 +31,13 @@
using namespace paludis;
-tr1::shared_ptr<DependencySpecTree::ConstItem>
+std::tr1::shared_ptr<DependencySpecTree::ConstItem>
cranrepository::parse_depends(const std::string & s)
{
Context context("When parsing CRAN 'Depends:' string: '" + s + "':");
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > result(
- new ConstTreeSequence<DependencySpecTree, AllDepSpec>(tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > result(
+ new ConstTreeSequence<DependencySpecTree, AllDepSpec>(std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
std::list<std::string> specs;
@@ -67,8 +67,8 @@ cranrepository::parse_depends(const std::string & s)
{
Context local_context("When processing token '" + *a + "':");
- tr1::shared_ptr<TreeLeaf<DependencySpecTree, PackageDepSpec> > spec(
- new TreeLeaf<DependencySpecTree, PackageDepSpec>(tr1::shared_ptr<PackageDepSpec>(
+ std::tr1::shared_ptr<TreeLeaf<DependencySpecTree, PackageDepSpec> > spec(
+ new TreeLeaf<DependencySpecTree, PackageDepSpec>(std::tr1::shared_ptr<PackageDepSpec>(
new PackageDepSpec(cranrepository::parse_cran_package_dep_spec(
strip_leading(strip_trailing(*a, " \r\n\t"), " \r\n\t"))))));
result->add(spec);
diff --git a/paludis/repositories/cran/cran_dep_parser.hh b/paludis/repositories/cran/cran_dep_parser.hh
index 1490dc1ea..eadede504 100644
--- a/paludis/repositories/cran/cran_dep_parser.hh
+++ b/paludis/repositories/cran/cran_dep_parser.hh
@@ -2,7 +2,7 @@
/*
* Copyright (c) 2006 Danny van Dyk
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -28,7 +28,7 @@ namespace paludis
{
namespace cranrepository
{
- tr1::shared_ptr<DependencySpecTree::ConstItem> parse_depends(const std::string & s) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<DependencySpecTree::ConstItem> parse_depends(const std::string & s) PALUDIS_VISIBLE;
}
}
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index aa0c1a64d..a3f6bce21 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -18,7 +18,6 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/hashed_containers.hh>
#include <paludis/environment.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/dep_spec.hh>
@@ -43,9 +42,10 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/visitor-impl.hh>
-
+#include <paludis/util/hashes.hh>
+#include <tr1/functional>
+#include <tr1/unordered_map>
#include <functional>
#include <algorithm>
#include <fstream>
@@ -54,7 +54,10 @@ using namespace paludis;
#include <paludis/repositories/cran/cran_installed_repository-sr.cc>
-typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<const cranrepository::CRANPackageID> >::Type IDMap;
+typedef std::tr1::unordered_map<
+ QualifiedPackageName,
+ std::tr1::shared_ptr<const cranrepository::CRANPackageID>,
+ Hash<QualifiedPackageName> > IDMap;
namespace paludis
{
@@ -69,9 +72,9 @@ namespace paludis
Implementation(const CRANInstalledRepositoryParams &);
~Implementation();
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
};
}
@@ -206,39 +209,39 @@ CRANInstalledRepository::has_package_named(const QualifiedPackageName & q) const
return _imp->ids.end() != _imp->ids.find(q);
}
-tr1::shared_ptr<const CategoryNamePartSet>
+std::tr1::shared_ptr<const CategoryNamePartSet>
CRANInstalledRepository::category_names() const
{
- tr1::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
+ std::tr1::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
result->insert(CategoryNamePart("cran"));
return result;
}
-tr1::shared_ptr<const QualifiedPackageNameSet>
+std::tr1::shared_ptr<const QualifiedPackageNameSet>
CRANInstalledRepository::package_names(const CategoryNamePart & c) const
{
Context context("When fetching package names in category '" + stringify(c)
+ "' in " + stringify(name()) + ":");
- tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
+ std::tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
if (! has_category_named(c))
return result;
need_ids();
std::transform(_imp->ids.begin(), _imp->ids.end(), result->inserter(),
- tr1::mem_fn(&std::pair<const QualifiedPackageName, tr1::shared_ptr<const cranrepository::CRANPackageID> >::first));
+ std::tr1::mem_fn(&std::pair<const QualifiedPackageName, std::tr1::shared_ptr<const cranrepository::CRANPackageID> >::first));
return result;
}
-tr1::shared_ptr<const PackageIDSequence>
+std::tr1::shared_ptr<const PackageIDSequence>
CRANInstalledRepository::package_ids(const QualifiedPackageName & n) const
{
Context context("When fetching versions of '" + stringify(n) + "' in "
+ stringify(name()) + ":");
- tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
+ std::tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
if (! has_package_named(n))
return result;
@@ -251,12 +254,12 @@ CRANInstalledRepository::package_ids(const QualifiedPackageName & n) const
}
#if 0
-tr1::shared_ptr<const Contents>
+std::tr1::shared_ptr<const Contents>
CRANInstalledRepository::do_contents(const Package ID & id) const
{
Context context("When fetching contents for " + stringify(id) + ":");
- tr1::shared_ptr<Contents> result(new Contents);
+ std::tr1::shared_ptr<Contents> result(new Contents);
if (! _imp->entries_valid)
_imp->load_entries();
@@ -300,11 +303,11 @@ CRANInstalledRepository::do_contents(const Package ID & id) const
}
if ("obj" == tokens.at(0))
- result->add(tr1::shared_ptr<ContentsEntry>(new ContentsFileEntry(tokens.at(1))));
+ result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsFileEntry(tokens.at(1))));
else if ("dir" == tokens.at(0))
- result->add(tr1::shared_ptr<ContentsEntry>(new ContentsDirEntry(tokens.at(1))));
+ result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsDirEntry(tokens.at(1))));
else if ("misc" == tokens.at(0))
- result->add(tr1::shared_ptr<ContentsEntry>(new ContentsMiscEntry(tokens.at(1))));
+ result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsMiscEntry(tokens.at(1))));
else if ("sym" == tokens.at(0))
{
if (tokens.size() < 4)
@@ -316,7 +319,7 @@ CRANInstalledRepository::do_contents(const Package ID & id) const
continue;
}
- result->add(tr1::shared_ptr<ContentsEntry>(new ContentsSymEntry(
+ result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsSymEntry(
tokens.at(1), tokens.at(3))));
}
}
@@ -367,10 +370,10 @@ CRANInstalledRepository::do_installed_time(const QualifiedPackageName & q,
}
#endif
-tr1::shared_ptr<Repository>
+std::tr1::shared_ptr<Repository>
CRANInstalledRepository::make_cran_installed_repository(
Environment * const env,
- tr1::shared_ptr<const Map<std::string, std::string> > m)
+ std::tr1::shared_ptr<const Map<std::string, std::string> > m)
{
Context context("When making CRAN installed repository from repo_file '" +
(m->end() == m->find("repo_file") ? std::string("?") : m->find("repo_file")->second) + "':");
@@ -387,7 +390,7 @@ CRANInstalledRepository::make_cran_installed_repository(
if (m->end() != m->find("world") && ! ((world = m->find("world")->second)).empty())
throw CRANInstalledRepositoryConfigurationError("Key 'world' is no longer supported.");
- return tr1::shared_ptr<Repository>(new CRANInstalledRepository(CRANInstalledRepositoryParams::create()
+ return std::tr1::shared_ptr<Repository>(new CRANInstalledRepository(CRANInstalledRepositoryParams::create()
.environment(env)
.location(location)
.root(root)));
@@ -411,8 +414,8 @@ CRANInstalledRepository::do_uninstall(const QualifiedPackageName & q, const Vers
throw PackageInstallActionError("Couldn't uninstall '" + stringify(q) + "-" +
stringify(v) + "' because its location ('" + stringify(_imp->location) + "') is not a directory");
- tr1::shared_ptr<const VersionMetadata> vm(do_version_metadata(q, v));
- tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->env->bashrc_files());
+ std::tr1::shared_ptr<const VersionMetadata> vm(do_version_metadata(q, v));
+ std::tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->env->bashrc_files());
Command cmd(Command(LIBEXECDIR "/paludis/cran.bash unmerge")
.with_setenv("PN", vm->cran_interface->package)
@@ -426,7 +429,7 @@ CRANInstalledRepository::do_uninstall(const QualifiedPackageName & q, const Vers
}
#endif
-tr1::shared_ptr<SetSpecTree::ConstItem>
+std::tr1::shared_ptr<SetSpecTree::ConstItem>
CRANInstalledRepository::package_set(const SetName & s) const
{
Context context("When fetching package set '" + stringify(s) + "' from '" +
@@ -434,15 +437,15 @@ CRANInstalledRepository::package_set(const SetName & s) const
if ("everything" == s.data())
{
- tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > result(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
- tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
+ std::tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > result(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
+ std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
need_ids();
for (IDMap::const_iterator p(_imp->ids.begin()), p_end(_imp->ids.end()) ;
p != p_end ; ++p)
{
- tr1::shared_ptr<TreeLeaf<SetSpecTree, PackageDepSpec> > spec(
+ std::tr1::shared_ptr<TreeLeaf<SetSpecTree, PackageDepSpec> > spec(
new TreeLeaf<SetSpecTree, PackageDepSpec>(make_shared_ptr(
new PackageDepSpec(cranrepository::parse_cran_package_dep_spec(stringify(p->first.package))))));
result->add(spec);
@@ -451,15 +454,15 @@ CRANInstalledRepository::package_set(const SetName & s) const
return result;
}
else
- return tr1::shared_ptr<SetSpecTree::ConstItem>();
+ return std::tr1::shared_ptr<SetSpecTree::ConstItem>();
}
-tr1::shared_ptr<const SetNameSet>
+std::tr1::shared_ptr<const SetNameSet>
CRANInstalledRepository::sets_list() const
{
Context context("While generating the list of sets:");
- tr1::shared_ptr<SetNameSet> result(new SetNameSet);
+ std::tr1::shared_ptr<SetNameSet> result(new SetNameSet);
result->insert(SetName("everything"));
return result;
}
@@ -571,13 +574,13 @@ CRANInstalledRepository::need_keys_added() const
{
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
CRANInstalledRepository::format_key() const
{
return _imp->format_key;
}
-const tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
CRANInstalledRepository::installed_root_key() const
{
return _imp->installed_root_key;
diff --git a/paludis/repositories/cran/cran_installed_repository.hh b/paludis/repositories/cran/cran_installed_repository.hh
index 1ca3ea975..5cea94f7e 100644
--- a/paludis/repositories/cran/cran_installed_repository.hh
+++ b/paludis/repositories/cran/cran_installed_repository.hh
@@ -68,9 +68,9 @@ namespace paludis
/**
* Virtual constructor.
*/
- static tr1::shared_ptr<Repository> make_cran_installed_repository(
+ static std::tr1::shared_ptr<Repository> make_cran_installed_repository(
Environment * const env,
- tr1::shared_ptr<const Map<std::string, std::string> > m);
+ std::tr1::shared_ptr<const Map<std::string, std::string> > m);
/**
* Destructor.
@@ -82,7 +82,7 @@ namespace paludis
/* RepositorySetsInterface */
- virtual tr1::shared_ptr<const SetNameSet> sets_list() const
+ virtual std::tr1::shared_ptr<const SetNameSet> sets_list() const
PALUDIS_ATTRIBUTE((warn_unused_result));
/* RepositoryDestinationInterface */
@@ -100,15 +100,15 @@ namespace paludis
/* Repository */
- virtual tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool has_package_named(const QualifiedPackageName &) const
@@ -121,13 +121,13 @@ namespace paludis
/* RepositorySetsInterface */
- virtual tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName & id) const
+ virtual std::tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName & id) const
PALUDIS_ATTRIBUTE((warn_unused_result));
/* Keys */
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
};
/**
diff --git a/paludis/repositories/cran/cran_installed_repository_TEST.cc b/paludis/repositories/cran/cran_installed_repository_TEST.cc
index e84f786b8..d8a6180b1 100644
--- a/paludis/repositories/cran/cran_installed_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_installed_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -40,12 +40,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "cran_installed");
keys->insert("library", "cran_installed_repository_TEST_dir/library");
keys->insert("location", "cran_installed_repository_TEST_dir/repo1");
keys->insert("builddir", "cran_installed_repository_TEST_dir/tmp");
- tr1::shared_ptr<Repository> repo(CRANInstalledRepository::make_cran_installed_repository(&env, keys));
+ std::tr1::shared_ptr<Repository> repo(CRANInstalledRepository::make_cran_installed_repository(&env, keys));
TEST_CHECK(repo->has_category_named(CategoryNamePart("cran")));
}
} test_cran_repository_installed_packages;
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index 7726dca0e..3216d7687 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -43,8 +43,7 @@
#include <string>
#include <algorithm>
#include <list>
-
-#include <paludis/util/tr1_functional.hh>
+#include <tr1/functional>
using namespace paludis;
using namespace paludis::cranrepository;
@@ -56,28 +55,28 @@ namespace paludis
{
const Environment * const env;
- const tr1::shared_ptr<const Repository> repository;
- const tr1::shared_ptr<const CRANRepository> cran_repository;
- const tr1::shared_ptr<const CRANInstalledRepository> cran_installed_repository;
+ const std::tr1::shared_ptr<const Repository> repository;
+ const std::tr1::shared_ptr<const CRANRepository> cran_repository;
+ const std::tr1::shared_ptr<const CRANInstalledRepository> cran_installed_repository;
QualifiedPackageName name;
VersionSpec version;
- tr1::shared_ptr<LiteralMetadataValueKey<FSEntry> > fs_location_key;
- tr1::shared_ptr<LiteralMetadataValueKey<std::string> > url_key;
- tr1::shared_ptr<LiteralMetadataValueKey<std::string> > short_description_key;
- tr1::shared_ptr<LiteralMetadataValueKey<std::string> > long_description_key;
- tr1::shared_ptr<LiteralMetadataValueKey<std::string> > license_key;
- tr1::shared_ptr<PackageIDKey> contained_in_key;
- tr1::shared_ptr<PackageIDSequenceKey> contains_key;
- tr1::shared_ptr<DepKey> depends_key;
- tr1::shared_ptr<DepKey> suggests_key;
+ std::tr1::shared_ptr<LiteralMetadataValueKey<FSEntry> > fs_location_key;
+ std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > url_key;
+ std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > short_description_key;
+ std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > long_description_key;
+ std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > license_key;
+ std::tr1::shared_ptr<PackageIDKey> contained_in_key;
+ std::tr1::shared_ptr<PackageIDSequenceKey> contains_key;
+ std::tr1::shared_ptr<DepKey> depends_key;
+ std::tr1::shared_ptr<DepKey> suggests_key;
- tr1::shared_ptr<DependencyLabelSequence> suggests_labels;
- tr1::shared_ptr<DependencyLabelSequence> depends_labels;
+ std::tr1::shared_ptr<DependencyLabelSequence> suggests_labels;
+ std::tr1::shared_ptr<DependencyLabelSequence> depends_labels;
Implementation(const Environment * const e,
- const tr1::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
+ const std::tr1::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
env(e),
repository(r),
cran_repository(r),
@@ -92,7 +91,7 @@ namespace paludis
}
Implementation(const Environment * const e,
- const tr1::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
+ const std::tr1::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
env(e),
repository(c),
cran_repository(c),
@@ -109,7 +108,7 @@ namespace paludis
};
}
-CRANPackageID::CRANPackageID(const Environment * const env, const tr1::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
+CRANPackageID::CRANPackageID(const Environment * const env, const std::tr1::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
PrivateImplementationPattern<CRANPackageID>(new Implementation<CRANPackageID>(env, r, f)),
_imp(PrivateImplementationPattern<CRANPackageID>::_imp)
{
@@ -278,7 +277,7 @@ CRANPackageID::CRANPackageID(const Environment * const env, const tr1::shared_pt
}
CRANPackageID::CRANPackageID(const Environment * const e,
- const tr1::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
+ const std::tr1::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
PrivateImplementationPattern<CRANPackageID>(new Implementation<CRANPackageID>(e, c, r, t)),
_imp(PrivateImplementationPattern<CRANPackageID>::_imp)
{
@@ -320,106 +319,106 @@ CRANPackageID::slot() const
return SlotName("0");
}
-const tr1::shared_ptr<const Repository>
+const std::tr1::shared_ptr<const Repository>
CRANPackageID::repository() const
{
return _imp->repository;
}
-const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >
+const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
CRANPackageID::virtual_for_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
}
-const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
CRANPackageID::keywords_key() const
{
- return tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
+ return std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
CRANPackageID::iuse_key() const
{
- return tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >();
+ return std::tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
CRANPackageID::provide_key() const
{
- return tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
+ return std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
CRANPackageID::build_dependencies_key() const
{
- return tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
CRANPackageID::run_dependencies_key() const
{
- return tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
CRANPackageID::post_dependencies_key() const
{
- return tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
CRANPackageID::suggested_dependencies_key() const
{
- return tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
CRANPackageID::fetches_key() const
{
- return tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
+ return std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
CRANPackageID::homepage_key() const
{
- return tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >();
+ return std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >();
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
CRANPackageID::short_description_key() const
{
return _imp->short_description_key;
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
CRANPackageID::long_description_key() const
{
return _imp->long_description_key;
}
-const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > >
+const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
CRANPackageID::contents_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >();
}
-const tr1::shared_ptr<const MetadataTimeKey>
+const std::tr1::shared_ptr<const MetadataTimeKey>
CRANPackageID::installed_time_key() const
{
- return tr1::shared_ptr<const MetadataTimeKey>();
+ return std::tr1::shared_ptr<const MetadataTimeKey>();
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
CRANPackageID::source_origin_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<std::string> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
CRANPackageID::binary_origin_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<std::string> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
}
std::size_t
@@ -434,10 +433,10 @@ CRANPackageID::arbitrary_less_than_comparison(const PackageID &) const
return false;
}
-tr1::shared_ptr<const Set<std::string> >
+std::tr1::shared_ptr<const Set<std::string> >
CRANPackageID::breaks_portage() const
{
- tr1::shared_ptr<Set<std::string> > why(new Set<std::string>);
+ std::tr1::shared_ptr<Set<std::string> > why(new Set<std::string>);
why->insert("format");
return why;
}
@@ -469,10 +468,10 @@ namespace
ConstVisitor<SupportsActionTestVisitorTypes>
{
bool result;
- const tr1::shared_ptr<const CRANRepository> cran_repository;
- const tr1::shared_ptr<const CRANInstalledRepository> cran_installed_repository;
+ const std::tr1::shared_ptr<const CRANRepository> cran_repository;
+ const std::tr1::shared_ptr<const CRANInstalledRepository> cran_installed_repository;
- SupportsActionQuery(const tr1::shared_ptr<const CRANRepository> & c, const tr1::shared_ptr<const CRANInstalledRepository> & r) :
+ SupportsActionQuery(const std::tr1::shared_ptr<const CRANRepository> & c, const std::tr1::shared_ptr<const CRANInstalledRepository> & r) :
result(false),
cran_repository(c),
cran_installed_repository(r)
@@ -530,27 +529,27 @@ CRANPackageID::perform_action(Action & a) const
throw UnsupportedActionError(*this, a);
}
-const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
CRANPackageID::contains_key() const
{
return _imp->contains_key;
}
-const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >
+const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
CRANPackageID::contained_in_key() const
{
return _imp->contained_in_key;
}
-const tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
CRANPackageID::fs_location_key() const
{
return _imp->fs_location_key;
}
-const tr1::shared_ptr<const MetadataValueKey<bool> >
+const std::tr1::shared_ptr<const MetadataValueKey<bool> >
CRANPackageID::transient_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<bool> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<bool> >();
}
diff --git a/paludis/repositories/cran/cran_package_id.hh b/paludis/repositories/cran/cran_package_id.hh
index 026603ee5..e27caba35 100644
--- a/paludis/repositories/cran/cran_package_id.hh
+++ b/paludis/repositories/cran/cran_package_id.hh
@@ -34,7 +34,7 @@ namespace paludis
class PALUDIS_VISIBLE CRANPackageID :
public PackageID,
private PrivateImplementationPattern<CRANPackageID>,
- public tr1::enable_shared_from_this<CRANPackageID>
+ public std::tr1::enable_shared_from_this<CRANPackageID>
{
private:
PrivateImplementationPattern<CRANPackageID>::ImpPtr & _imp;
@@ -44,9 +44,9 @@ namespace paludis
virtual void need_masks_added() const;
public:
- CRANPackageID(const Environment * const, const tr1::shared_ptr<const CRANRepository> &,
+ CRANPackageID(const Environment * const, const std::tr1::shared_ptr<const CRANRepository> &,
const FSEntry &);
- CRANPackageID(const Environment * const, const tr1::shared_ptr<const CRANRepository> &,
+ CRANPackageID(const Environment * const, const std::tr1::shared_ptr<const CRANRepository> &,
const CRANPackageID * const, const std::string &);
~CRANPackageID();
@@ -55,34 +55,34 @@ namespace paludis
virtual const QualifiedPackageName name() const;
virtual const VersionSpec version() const;
virtual const SlotName slot() const;
- virtual const tr1::shared_ptr<const Repository> repository() const;
+ virtual const std::tr1::shared_ptr<const Repository> repository() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > > virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > > contents_key() const;
- virtual const tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > source_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > binary_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > > contained_in_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<bool> > transient_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > virtual_for_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > > contents_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > source_origin_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > binary_origin_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > contained_in_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<bool> > transient_key() const;
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn));
- virtual tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual std::tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index b5132f394..53adec0a2 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -18,7 +18,6 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/hashed_containers.hh>
#include <paludis/util/config_file.hh>
#include <paludis/dep_spec.hh>
#include <paludis/environment.hh>
@@ -43,10 +42,11 @@
#include <paludis/util/strip.hh>
#include <paludis/util/system.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/visitor-impl.hh>
-
+#include <paludis/util/hashes.hh>
+#include <tr1/unordered_map>
+#include <tr1/functional>
#include <functional>
#include <algorithm>
@@ -54,7 +54,11 @@ using namespace paludis;
#include <paludis/repositories/cran/cran_repository-sr.cc>
-typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<const cranrepository::CRANPackageID> >::Type IDMap;
+typedef std::tr1::unordered_map<
+ QualifiedPackageName,
+ std::tr1::shared_ptr<const cranrepository::CRANPackageID>,
+ Hash<QualifiedPackageName> >
+ IDMap;
namespace paludis
{
@@ -63,23 +67,23 @@ namespace paludis
{
CRANRepositoryParams params;
- mutable tr1::shared_ptr<Mutex> big_nasty_mutex;
+ mutable std::tr1::shared_ptr<Mutex> big_nasty_mutex;
mutable bool has_ids;
mutable IDMap ids;
- Implementation(const CRANRepositoryParams &, const tr1::shared_ptr<Mutex> &);
+ Implementation(const CRANRepositoryParams &, const std::tr1::shared_ptr<Mutex> &);
~Implementation();
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > distdir_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > builddir_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > library_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > sync_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > distdir_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > builddir_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > library_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_key;
};
}
-Implementation<CRANRepository>::Implementation(const CRANRepositoryParams & p, const tr1::shared_ptr<Mutex> & m) :
+Implementation<CRANRepository>::Implementation(const CRANRepositoryParams & p, const std::tr1::shared_ptr<Mutex> & m) :
params(p),
big_nasty_mutex(m),
has_ids(false),
@@ -154,45 +158,45 @@ CRANRepository::has_package_named(const QualifiedPackageName & q) const
return _imp->ids.end() != _imp->ids.find(q);
}
-tr1::shared_ptr<const CategoryNamePartSet>
+std::tr1::shared_ptr<const CategoryNamePartSet>
CRANRepository::category_names() const
{
Context context("When fetching category names in " + stringify(name()) + ":");
Lock l(*_imp->big_nasty_mutex);
- tr1::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
+ std::tr1::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
result->insert(CategoryNamePart("cran"));
return result;
}
-tr1::shared_ptr<const QualifiedPackageNameSet>
+std::tr1::shared_ptr<const QualifiedPackageNameSet>
CRANRepository::package_names(const CategoryNamePart & c) const
{
Context context("When fetching package names in category '" + stringify(c)
+ "' in " + stringify(name()) + ":");
Lock l(*_imp->big_nasty_mutex);
- tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
+ std::tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
if (! has_category_named(c))
return result;
need_ids();
std::transform(_imp->ids.begin(), _imp->ids.end(), result->inserter(),
- tr1::mem_fn(&std::pair<const QualifiedPackageName, tr1::shared_ptr<const cranrepository::CRANPackageID> >::first));
+ std::tr1::mem_fn(&std::pair<const QualifiedPackageName, std::tr1::shared_ptr<const cranrepository::CRANPackageID> >::first));
return result;
}
-tr1::shared_ptr<const PackageIDSequence>
+std::tr1::shared_ptr<const PackageIDSequence>
CRANRepository::package_ids(const QualifiedPackageName & n) const
{
Context context("When fetching versions of '" + stringify(n) + "' in "
+ stringify(name()) + ":");
Lock l(*_imp->big_nasty_mutex);
- tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
+ std::tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
if (! has_package_named(n))
return result;
@@ -217,7 +221,7 @@ CRANRepository::need_ids() const
for (DirIterator d(_imp->params.location), d_end ; d != d_end ; ++d)
if (is_file_with_extension(*d, ".DESCRIPTION", IsFileWithOptions()))
{
- tr1::shared_ptr<cranrepository::CRANPackageID> id(new cranrepository::CRANPackageID(_imp->params.environment,
+ std::tr1::shared_ptr<cranrepository::CRANPackageID> id(new cranrepository::CRANPackageID(_imp->params.environment,
shared_from_this(), *d));
if (! _imp->ids.insert(std::make_pair(id->name(), id)).second)
Log::get_instance()->message("cran.id.duplicate", ll_warning, lc_context)
@@ -227,7 +231,7 @@ CRANRepository::need_ids() const
for (PackageIDSequence::ConstIterator i(id->contains_key()->value()->begin()),
i_end(id->contains_key()->value()->end()) ; i != i_end ; ++i)
if (! _imp->ids.insert(std::make_pair((*i)->name(),
- tr1::static_pointer_cast<const cranrepository::CRANPackageID>(*i))).second)
+ std::tr1::static_pointer_cast<const cranrepository::CRANPackageID>(*i))).second)
Log::get_instance()->message("cran.id.duplicate", ll_warning, lc_context) << "Couldn't insert package '" << **i
<< "', which is contained in '" << *id << "', due to name collision";
}
@@ -248,17 +252,17 @@ CRANRepository::fetch_repo_name(const std::string & location)
#if 0
void
-CRANRepository::do_install(const tr1::shared_ptr<const PackageID> & id_uncasted, const InstallOptions & o) const
+CRANRepository::do_install(const std::tr1::shared_ptr<const PackageID> & id_uncasted, const InstallOptions & o) const
{
if (id_uncasted->repository().get() != this)
throw PackageInstallActionError("Couldn't install '" + stringify(*id_uncasted) + "' using repository '" +
stringify(name()) + "'");
- const tr1::shared_ptr<const CRANPackageID> id(tr1::static_pointer_cast<const CRANPackageID>(id_uncasted));
+ const std::tr1::shared_ptr<const CRANPackageID> id(std::tr1::static_pointer_cast<const CRANPackageID>(id_uncasted));
if (id->bundle_member_key())
return;
- tr1::shared_ptr<const FSEntrySequence> bashrc_files(_imp->params.environment->bashrc_files());
+ std::tr1::shared_ptr<const FSEntrySequence> bashrc_files(_imp->params.environment->bashrc_files());
Command cmd(Command(LIBEXECDIR "/paludis/cran.bash fetch")
.with_setenv("CATEGORY", "cran")
@@ -335,7 +339,7 @@ CRANRepository::do_install(const tr1::shared_ptr<const PackageID> & id_uncasted,
}
#endif
-tr1::shared_ptr<SetSpecTree::ConstItem>
+std::tr1::shared_ptr<SetSpecTree::ConstItem>
CRANRepository::package_set(const SetName & s) const
{
if ("base" == s.data())
@@ -344,19 +348,19 @@ CRANRepository::package_set(const SetName & s) const
* \todo Implement system as all package which are installed
* by dev-lang/R by default.
*/
- return tr1::shared_ptr<SetSpecTree::ConstItem>(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
- tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
+ return std::tr1::shared_ptr<SetSpecTree::ConstItem>(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
+ std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
}
else
- return tr1::shared_ptr<SetSpecTree::ConstItem>();
+ return std::tr1::shared_ptr<SetSpecTree::ConstItem>();
}
-tr1::shared_ptr<const SetNameSet>
+std::tr1::shared_ptr<const SetNameSet>
CRANRepository::sets_list() const
{
Context context("While generating the list of sets:");
- tr1::shared_ptr<SetNameSet> result(new SetNameSet);
+ std::tr1::shared_ptr<SetNameSet> result(new SetNameSet);
result->insert(SetName("base"));
return result;
}
@@ -392,10 +396,10 @@ CRANRepository::sync() const
);
}
-tr1::shared_ptr<Repository>
+std::tr1::shared_ptr<Repository>
CRANRepository::make_cran_repository(
Environment * const env,
- tr1::shared_ptr<const Map<std::string, std::string> > m)
+ std::tr1::shared_ptr<const Map<std::string, std::string> > m)
{
Context context("When making CRAN repository from repo_file '" +
(m->end() == m->find("repo_file") ? std::string("?") : m->find("repo_file")->second) + "':");
@@ -430,7 +434,7 @@ CRANRepository::make_cran_repository(
<< "Key 'buildroot' is deprecated, use 'builddir' instead";
}
- return tr1::shared_ptr<Repository>(new CRANRepository(CRANRepositoryParams::create()
+ return std::tr1::shared_ptr<Repository>(new CRANRepository(CRANRepositoryParams::create()
.environment(env)
.location(location)
.distdir(distdir)
@@ -521,15 +525,15 @@ CRANRepository::need_keys_added() const
{
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
CRANRepository::format_key() const
{
return _imp->format_key;
}
-const tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
CRANRepository::installed_root_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
}
diff --git a/paludis/repositories/cran/cran_repository.hh b/paludis/repositories/cran/cran_repository.hh
index b76eb9488..b87da0463 100644
--- a/paludis/repositories/cran/cran_repository.hh
+++ b/paludis/repositories/cran/cran_repository.hh
@@ -25,8 +25,8 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/map-fwd.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/environment-fwd.hh>
+#include <tr1/memory>
#include <string>
/** \file
@@ -52,7 +52,7 @@ namespace paludis
public RepositorySyncableInterface,
public RepositorySetsInterface,
private PrivateImplementationPattern<CRANRepository>,
- public tr1::enable_shared_from_this<CRANRepository>
+ public std::tr1::enable_shared_from_this<CRANRepository>
{
private:
PrivateImplementationPattern<CRANRepository>::ImpPtr & _imp;
@@ -78,9 +78,9 @@ namespace paludis
/**
* Virtual constructor.
*/
- static tr1::shared_ptr<Repository> make_cran_repository(
+ static std::tr1::shared_ptr<Repository> make_cran_repository(
Environment * const env,
- tr1::shared_ptr<const Map<std::string, std::string> > m);
+ std::tr1::shared_ptr<const Map<std::string, std::string> > m);
/**
* Destructor.
@@ -92,9 +92,9 @@ namespace paludis
/* RepositorySyncableInterface */
- virtual tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName &) const;
+ virtual std::tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName &) const;
- virtual tr1::shared_ptr<const SetNameSet> sets_list() const;
+ virtual std::tr1::shared_ptr<const SetNameSet> sets_list() const;
/* RepositorySyncableInterface */
@@ -102,11 +102,11 @@ namespace paludis
/* Repository */
- virtual tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool has_package_named(const QualifiedPackageName &) const
@@ -115,7 +115,7 @@ namespace paludis
virtual bool has_category_named(const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -123,8 +123,8 @@ namespace paludis
/* Keys */
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
};
/**
diff --git a/paludis/repositories/cran/cran_repository_TEST.cc b/paludis/repositories/cran/cran_repository_TEST.cc
index 6b0fb59c9..3d2b56772 100644
--- a/paludis/repositories/cran/cran_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_repository_TEST.cc
@@ -2,7 +2,7 @@
/*
* Copyright (c) 2006 Danny van Dyk
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -41,12 +41,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "cran");
keys->insert("library", "cran_repository_TEST_dir/library");
keys->insert("location", "cran_repository_TEST_dir/repo1");
keys->insert("builddir", "cran_repository_TEST_dir/tmp");
- tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
+ std::tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
&env, keys));
TEST_CHECK(repo->has_category_named(CategoryNamePart("cran")));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/testpackage1")));
@@ -61,12 +61,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "cran");
keys->insert("library", "cran_repository_TEST_dir/library");
keys->insert("location", "cran_repository_TEST_dir/repo2");
keys->insert("builddir", "cran_repository_TEST_dir/tmp");
- tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
+ std::tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
&env, keys));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/testbundle")));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/bundlepkg1")));
diff --git a/paludis/repositories/cran/keys.cc b/paludis/repositories/cran/keys.cc
index 6a5246529..af39e485f 100644
--- a/paludis/repositories/cran/keys.cc
+++ b/paludis/repositories/cran/keys.cc
@@ -26,13 +26,13 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/join.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/dep_spec.hh>
#include <paludis/stringify_formatter-impl.hh>
#include <paludis/formatter.hh>
#include <paludis/action.hh>
+#include <tr1/functional>
using namespace paludis;
using namespace paludis::cranrepository;
@@ -45,14 +45,14 @@ PackageIDSequenceKey::PackageIDSequenceKey(const Environment * const e,
{
}
-const tr1::shared_ptr<const PackageIDSequence>
+const std::tr1::shared_ptr<const PackageIDSequence>
PackageIDSequenceKey::value() const
{
return _v;
}
void
-PackageIDSequenceKey::push_back(const tr1::shared_ptr<const PackageID> & i)
+PackageIDSequenceKey::push_back(const std::tr1::shared_ptr<const PackageID> & i)
{
_v->push_back(i);
}
@@ -60,21 +60,21 @@ PackageIDSequenceKey::push_back(const tr1::shared_ptr<const PackageID> & i)
std::string
PackageIDSequenceKey::pretty_print_flat(const Formatter<PackageID> & f) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
return join(indirect_iterator(value()->begin()), indirect_iterator(value()->end()), " ",
- tr1::bind(static_cast<std::string (Formatter<PackageID>::*)(const PackageID &, const format::Plain &) const>(
+ std::tr1::bind(static_cast<std::string (Formatter<PackageID>::*)(const PackageID &, const format::Plain &) const>(
&Formatter<PackageID>::format),
- tr1::cref(f), _1, format::Plain()));
+ std::tr1::cref(f), _1, format::Plain()));
}
PackageIDKey::PackageIDKey(const std::string & r, const std::string & h,
const CRANPackageID * const v, const MetadataKeyType t) :
- MetadataValueKey<tr1::shared_ptr<const PackageID> >(r, h, t),
+ MetadataValueKey<std::tr1::shared_ptr<const PackageID> >(r, h, t),
_v(v)
{
}
-const tr1::shared_ptr<const PackageID>
+const std::tr1::shared_ptr<const PackageID>
PackageIDKey::value() const
{
return _v->shared_from_this();
@@ -105,11 +105,11 @@ namespace paludis
const std::string v;
mutable Mutex mutex;
- mutable tr1::shared_ptr<const DependencySpecTree::ConstItem> c;
- const tr1::shared_ptr<const DependencyLabelSequence> labels;
+ mutable std::tr1::shared_ptr<const DependencySpecTree::ConstItem> c;
+ const std::tr1::shared_ptr<const DependencyLabelSequence> labels;
Implementation(const Environment * const e, const std::string & vv,
- const tr1::shared_ptr<const DependencyLabelSequence> & s) :
+ const std::tr1::shared_ptr<const DependencyLabelSequence> & s) :
env(e),
v(vv),
labels(s)
@@ -119,7 +119,7 @@ namespace paludis
}
DepKey::DepKey(const Environment * const e, const std::string & r, const std::string & h, const std::string & v,
- const tr1::shared_ptr<const DependencyLabelSequence> & s, const MetadataKeyType t) :
+ const std::tr1::shared_ptr<const DependencyLabelSequence> & s, const MetadataKeyType t) :
MetadataSpecTreeKey<DependencySpecTree>(r, h, t),
PrivateImplementationPattern<DepKey>(new Implementation<DepKey>(e, v, s)),
_imp(PrivateImplementationPattern<DepKey>::_imp)
@@ -130,7 +130,7 @@ DepKey::~DepKey()
{
}
-const tr1::shared_ptr<const DependencySpecTree::ConstItem>
+const std::tr1::shared_ptr<const DependencySpecTree::ConstItem>
DepKey::value() const
{
Lock l(_imp->mutex);
@@ -160,7 +160,7 @@ DepKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) const
return stringify(p);
}
-const tr1::shared_ptr<const DependencyLabelSequence>
+const std::tr1::shared_ptr<const DependencyLabelSequence>
DepKey::initial_labels() const
{
return _imp->labels;
diff --git a/paludis/repositories/cran/keys.hh b/paludis/repositories/cran/keys.hh
index 61805289e..dfcfd3fb3 100644
--- a/paludis/repositories/cran/keys.hh
+++ b/paludis/repositories/cran/keys.hh
@@ -36,23 +36,23 @@ namespace paludis
{
private:
const Environment * const _env;
- const tr1::shared_ptr<PackageIDSequence> _v;
+ const std::tr1::shared_ptr<PackageIDSequence> _v;
public:
PackageIDSequenceKey(const Environment * const,
const std::string &, const std::string &, const MetadataKeyType);
- virtual const tr1::shared_ptr<const PackageIDSequence> value() const
+ virtual const std::tr1::shared_ptr<const PackageIDSequence> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- void push_back(const tr1::shared_ptr<const PackageID> &);
+ void push_back(const std::tr1::shared_ptr<const PackageID> &);
virtual std::string pretty_print_flat(const Formatter<PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PackageIDKey :
- public MetadataValueKey<tr1::shared_ptr<const PackageID> >
+ public MetadataValueKey<std::tr1::shared_ptr<const PackageID> >
{
private:
const CRANPackageID * const _v;
@@ -60,7 +60,7 @@ namespace paludis
public:
PackageIDKey(const std::string &, const std::string &, const CRANPackageID * const, const MetadataKeyType);
- virtual const tr1::shared_ptr<const PackageID> value() const
+ virtual const std::tr1::shared_ptr<const PackageID> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const Formatter<PackageID> &) const
@@ -77,11 +77,11 @@ namespace paludis
public:
DepKey(const Environment * const,
const std::string &, const std::string &, const std::string &,
- const tr1::shared_ptr<const DependencyLabelSequence> &, const MetadataKeyType);
+ const std::tr1::shared_ptr<const DependencyLabelSequence> &, const MetadataKeyType);
~DepKey();
- virtual const tr1::shared_ptr<const DependencySpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const DependencySpecTree::ItemFormatter &) const
@@ -90,7 +90,7 @@ namespace paludis
virtual std::string pretty_print_flat(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const tr1::shared_ptr<const DependencyLabelSequence> initial_labels() const
+ virtual const std::tr1::shared_ptr<const DependencyLabelSequence> initial_labels() const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/repositories/cran/package_dep_spec.cc b/paludis/repositories/cran/package_dep_spec.cc
index b193f0a34..bb0e03c8a 100644
--- a/paludis/repositories/cran/package_dep_spec.cc
+++ b/paludis/repositories/cran/package_dep_spec.cc
@@ -38,8 +38,8 @@ namespace
PackageDepSpecData
{
std::string unnormalised_package_name;
- tr1::shared_ptr<const QualifiedPackageName> package_v;
- tr1::shared_ptr<VersionRequirements> version_requirements_v;
+ std::tr1::shared_ptr<const QualifiedPackageName> package_v;
+ std::tr1::shared_ptr<VersionRequirements> version_requirements_v;
virtual std::string as_string() const
{
@@ -65,22 +65,22 @@ namespace
return result;
}
- virtual tr1::shared_ptr<const QualifiedPackageName> package_ptr() const
+ virtual std::tr1::shared_ptr<const QualifiedPackageName> package_ptr() const
{
return package_v;
}
- virtual tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const
+ virtual std::tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const
{
- return tr1::shared_ptr<const PackageNamePart>();
+ return std::tr1::shared_ptr<const PackageNamePart>();
}
- virtual tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const
+ virtual std::tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const
{
- return tr1::shared_ptr<const CategoryNamePart>();
+ return std::tr1::shared_ptr<const CategoryNamePart>();
}
- virtual tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const
+ virtual std::tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const
{
return version_requirements_v;
}
@@ -90,19 +90,19 @@ namespace
return vr_and;
}
- virtual tr1::shared_ptr<const SlotRequirement> slot_requirement_ptr() const
+ virtual std::tr1::shared_ptr<const SlotRequirement> slot_requirement_ptr() const
{
- return tr1::shared_ptr<const SlotRequirement>();
+ return std::tr1::shared_ptr<const SlotRequirement>();
}
- virtual tr1::shared_ptr<const RepositoryName> repository_ptr() const
+ virtual std::tr1::shared_ptr<const RepositoryName> repository_ptr() const
{
- return tr1::shared_ptr<const RepositoryName>();
+ return std::tr1::shared_ptr<const RepositoryName>();
}
- virtual tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const
+ virtual std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const
{
- return tr1::shared_ptr<const AdditionalPackageDepSpecRequirements>();
+ return std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements>();
}
CRANPackageDepSpecData & version_requirement(const VersionRequirement & v)
@@ -131,7 +131,7 @@ paludis::cranrepository::parse_cran_package_dep_spec(const std::string & ss)
{
Context context("When parsing CRAN package dep spec '" + ss + "':");
- tr1::shared_ptr<CRANPackageDepSpecData> data(new CRANPackageDepSpecData);
+ std::tr1::shared_ptr<CRANPackageDepSpecData> data(new CRANPackageDepSpecData);
std::string s(ss);
std::string::size_type p(s.find('('));
diff --git a/paludis/repositories/e/aa_visitor_TEST.cc b/paludis/repositories/e/aa_visitor_TEST.cc
index 6eb0e0645..c21b549cb 100644
--- a/paludis/repositories/e/aa_visitor_TEST.cc
+++ b/paludis/repositories/e/aa_visitor_TEST.cc
@@ -42,9 +42,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
AAVisitor p1;
parse_fetchable_uri("( a -> b c x? ( d e ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p1);
diff --git a/paludis/repositories/e/check_fetched_files_visitor.cc b/paludis/repositories/e/check_fetched_files_visitor.cc
index 3d7d10241..627daf024 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.cc
+++ b/paludis/repositories/e/check_fetched_files_visitor.cc
@@ -57,21 +57,21 @@ namespace paludis
struct Implementation<CheckFetchedFilesVisitor>
{
const Environment * const env;
- const tr1::shared_ptr<const PackageID> id;
+ const std::tr1::shared_ptr<const PackageID> id;
const FSEntry distdir;
const bool check_unneeded;
std::set<std::string> done;
- const tr1::shared_ptr<Sequence<FetchActionFailure> > failures;
+ const std::tr1::shared_ptr<Sequence<FetchActionFailure> > failures;
bool need_nofetch;
bool in_nofetch;
- const tr1::shared_ptr<Manifest2Reader> m2r;
+ const std::tr1::shared_ptr<Manifest2Reader> m2r;
const UseManifest use_manifest;
Implementation(
const Environment * const e,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const PackageID> & i,
const FSEntry & d,
const bool c,
const bool n,
@@ -93,7 +93,7 @@ namespace paludis
CheckFetchedFilesVisitor::CheckFetchedFilesVisitor(
const Environment * const e,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const PackageID> & i,
const FSEntry & d,
const bool c,
const bool n,
@@ -411,7 +411,7 @@ CheckFetchedFilesVisitor::visit_leaf(const FetchableURIDepSpec & u)
std::cout << std::endl;
}
-const tr1::shared_ptr<const Sequence<FetchActionFailure> >
+const std::tr1::shared_ptr<const Sequence<FetchActionFailure> >
CheckFetchedFilesVisitor::failures() const
{
return _imp->failures;
diff --git a/paludis/repositories/e/check_fetched_files_visitor.hh b/paludis/repositories/e/check_fetched_files_visitor.hh
index 7e1e3665b..e062891ef 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.hh
+++ b/paludis/repositories/e/check_fetched_files_visitor.hh
@@ -25,12 +25,12 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/visitor-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/dep_spec-fwd.hh>
#include <paludis/dep_tree.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/action-fwd.hh>
+#include <tr1/memory>
namespace paludis
{
@@ -46,7 +46,7 @@ namespace paludis
public:
CheckFetchedFilesVisitor(
const Environment * const,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const FSEntry & distdir,
const bool check_unneeded,
const bool fetch_restrict,
@@ -67,7 +67,7 @@ namespace paludis
void visit_leaf(const FetchableURIDepSpec &);
- const tr1::shared_ptr<const Sequence<FetchActionFailure> > failures() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const Sequence<FetchActionFailure> > failures() const PALUDIS_ATTRIBUTE((warn_unused_result));
bool need_nofetch() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
diff --git a/paludis/repositories/e/conditional_dep_spec.cc b/paludis/repositories/e/conditional_dep_spec.cc
index f5daa5ccd..e716d46c5 100644
--- a/paludis/repositories/e/conditional_dep_spec.cc
+++ b/paludis/repositories/e/conditional_dep_spec.cc
@@ -44,9 +44,9 @@ namespace
UseFlagName flag;
const Environment * const env;
- const tr1::shared_ptr<const PackageID> id;
+ const std::tr1::shared_ptr<const PackageID> id;
- EConditionalDepSpecData(const std::string & s, const Environment * const e, const tr1::shared_ptr<const PackageID> & i) :
+ EConditionalDepSpecData(const std::string & s, const Environment * const e, const std::tr1::shared_ptr<const PackageID> & i) :
inverse(false),
flag(UseFlagName("unset")),
env(e),
@@ -107,7 +107,7 @@ namespace
ConditionalDepSpec
paludis::erepository::parse_e_conditional_dep_spec(const std::string & s,
- const Environment * const env, const tr1::shared_ptr<const PackageID> & id, const EAPI &)
+ const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, const EAPI &)
{
return ConditionalDepSpec(make_shared_ptr(new EConditionalDepSpecData(s, env, id)));
}
diff --git a/paludis/repositories/e/conditional_dep_spec.hh b/paludis/repositories/e/conditional_dep_spec.hh
index 87e99c5f4..a5e567d3f 100644
--- a/paludis/repositories/e/conditional_dep_spec.hh
+++ b/paludis/repositories/e/conditional_dep_spec.hh
@@ -31,7 +31,7 @@ namespace paludis
namespace erepository
{
ConditionalDepSpec parse_e_conditional_dep_spec(const std::string &,
- const Environment * const, const tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
UseFlagName conditional_dep_spec_flag(const ConditionalDepSpec &) PALUDIS_VISIBLE;
bool conditional_dep_spec_is_inverse(const ConditionalDepSpec &) PALUDIS_VISIBLE;
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 2746191ef..47ead01b9 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -26,11 +26,11 @@
#include <paludis/util/exception.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/kc.hh>
+#include <tr1/memory>
#include <stack>
#include <set>
@@ -75,14 +75,14 @@ namespace
dps_had_label
};
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
struct ParsePackageDepSpec
{
const EAPI & _eapi;
- const tr1::shared_ptr<const PackageID> _id;
+ const std::tr1::shared_ptr<const PackageID> _id;
- ParsePackageDepSpec(const EAPI & e, const tr1::shared_ptr<const PackageID> & i) :
+ ParsePackageDepSpec(const EAPI & e, const std::tr1::shared_ptr<const PackageID> & i) :
_eapi(e),
_id(i)
{
@@ -90,15 +90,15 @@ namespace
template <typename H_>
void
- add(const std::string & s, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
+ add(const std::string & s, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
{
- p(tr1::shared_ptr<TreeLeaf<H_, PackageDepSpec> >(new TreeLeaf<H_, PackageDepSpec>(
- tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(parse_e_package_dep_spec(s, _eapi, _id))))));
+ p(std::tr1::shared_ptr<TreeLeaf<H_, PackageDepSpec> >(new TreeLeaf<H_, PackageDepSpec>(
+ std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(parse_e_package_dep_spec(s, _eapi, _id))))));
}
template <typename H_>
void
- add_arrow(const std::string & lhs, const std::string & rhs, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
+ add_arrow(const std::string & lhs, const std::string & rhs, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
{
throw DepStringParseError(lhs + " -> " + rhs, "Arrows not allowed in this context");
}
@@ -107,9 +107,9 @@ namespace
struct ParsePackageOrBlockDepSpec
{
const EAPI & _eapi;
- const tr1::shared_ptr<const PackageID> _id;
+ const std::tr1::shared_ptr<const PackageID> _id;
- ParsePackageOrBlockDepSpec(const EAPI & e, const tr1::shared_ptr<const PackageID> & i) :
+ ParsePackageOrBlockDepSpec(const EAPI & e, const std::tr1::shared_ptr<const PackageID> & i) :
_eapi(e),
_id(i)
{
@@ -117,22 +117,22 @@ namespace
template <typename H_>
void
- add(const std::string & s, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
+ add(const std::string & s, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
{
if (s.empty() || '!' != s.at(0))
- p(tr1::shared_ptr<TreeLeaf<H_, PackageDepSpec> >(new TreeLeaf<H_, PackageDepSpec>(
- tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
+ p(std::tr1::shared_ptr<TreeLeaf<H_, PackageDepSpec> >(new TreeLeaf<H_, PackageDepSpec>(
+ std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
parse_e_package_dep_spec(s, _eapi, _id))))));
else
- p(tr1::shared_ptr<TreeLeaf<H_, BlockDepSpec> >(new TreeLeaf<H_, BlockDepSpec>(
- tr1::shared_ptr<BlockDepSpec>(new BlockDepSpec(
- tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
+ p(std::tr1::shared_ptr<TreeLeaf<H_, BlockDepSpec> >(new TreeLeaf<H_, BlockDepSpec>(
+ std::tr1::shared_ptr<BlockDepSpec>(new BlockDepSpec(
+ std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
parse_e_package_dep_spec(s.substr(1), _eapi, _id))))))));
}
template <typename H_>
void
- add_arrow(const std::string & lhs, const std::string & rhs, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
+ add_arrow(const std::string & lhs, const std::string & rhs, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
{
throw DepStringParseError(lhs + " -> " + rhs, "Arrows not allowed in this context");
}
@@ -142,15 +142,15 @@ namespace
{
template <typename H_>
void
- add(const std::string & s, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
+ add(const std::string & s, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
{
- p(tr1::shared_ptr<TreeLeaf<H_, PlainTextDepSpec> >(new TreeLeaf<H_, PlainTextDepSpec>(
- tr1::shared_ptr<PlainTextDepSpec>(new PlainTextDepSpec(s)))));
+ p(std::tr1::shared_ptr<TreeLeaf<H_, PlainTextDepSpec> >(new TreeLeaf<H_, PlainTextDepSpec>(
+ std::tr1::shared_ptr<PlainTextDepSpec>(new PlainTextDepSpec(s)))));
}
template <typename H_>
void
- add_arrow(const std::string & lhs, const std::string & rhs, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
+ add_arrow(const std::string & lhs, const std::string & rhs, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
{
throw DepStringParseError(lhs + " -> " + rhs, "Arrows not allowed in this context");
}
@@ -160,15 +160,15 @@ namespace
{
template <typename H_>
void
- add(const std::string & s, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
+ add(const std::string & s, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
{
- p(tr1::shared_ptr<TreeLeaf<H_, LicenseDepSpec> >(new TreeLeaf<H_, LicenseDepSpec>(
- tr1::shared_ptr<LicenseDepSpec>(new LicenseDepSpec(s)))));
+ p(std::tr1::shared_ptr<TreeLeaf<H_, LicenseDepSpec> >(new TreeLeaf<H_, LicenseDepSpec>(
+ std::tr1::shared_ptr<LicenseDepSpec>(new LicenseDepSpec(s)))));
}
template <typename H_>
void
- add_arrow(const std::string & lhs, const std::string & rhs, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
+ add_arrow(const std::string & lhs, const std::string & rhs, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
{
throw DepStringParseError(lhs + " -> " + rhs, "Arrows not allowed in this context");
}
@@ -185,19 +185,19 @@ namespace
template <typename H_>
void
- add(const std::string & s, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
+ add(const std::string & s, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
{
- p(tr1::shared_ptr<TreeLeaf<H_, FetchableURIDepSpec> >(new TreeLeaf<H_, FetchableURIDepSpec>(
- tr1::shared_ptr<FetchableURIDepSpec>(new FetchableURIDepSpec(s)))));
+ p(std::tr1::shared_ptr<TreeLeaf<H_, FetchableURIDepSpec> >(new TreeLeaf<H_, FetchableURIDepSpec>(
+ std::tr1::shared_ptr<FetchableURIDepSpec>(new FetchableURIDepSpec(s)))));
}
template <typename H_>
void
- add_arrow(const std::string & lhs, const std::string & rhs, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
+ add_arrow(const std::string & lhs, const std::string & rhs, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
{
if (_supports_arrow)
- p(tr1::shared_ptr<TreeLeaf<H_, FetchableURIDepSpec> >(new TreeLeaf<H_, FetchableURIDepSpec>(
- tr1::shared_ptr<FetchableURIDepSpec>(new FetchableURIDepSpec(lhs + " -> " + rhs)))));
+ p(std::tr1::shared_ptr<TreeLeaf<H_, FetchableURIDepSpec> >(new TreeLeaf<H_, FetchableURIDepSpec>(
+ std::tr1::shared_ptr<FetchableURIDepSpec>(new FetchableURIDepSpec(lhs + " -> " + rhs)))));
else
throw DepStringParseError(lhs + " -> " + rhs, "Arrows not allowed in this EAPI");
}
@@ -207,15 +207,15 @@ namespace
{
template <typename H_>
void
- add(const std::string & s, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
+ add(const std::string & s, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p) const
{
- p(tr1::shared_ptr<TreeLeaf<H_, SimpleURIDepSpec> >(new TreeLeaf<H_, SimpleURIDepSpec>(
- tr1::shared_ptr<SimpleURIDepSpec>(new SimpleURIDepSpec(s)))));
+ p(std::tr1::shared_ptr<TreeLeaf<H_, SimpleURIDepSpec> >(new TreeLeaf<H_, SimpleURIDepSpec>(
+ std::tr1::shared_ptr<SimpleURIDepSpec>(new SimpleURIDepSpec(s)))));
}
template <typename H_>
void
- add_arrow(const std::string & lhs, const std::string & rhs, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
+ add_arrow(const std::string & lhs, const std::string & rhs, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> &) const
{
throw DepStringParseError(lhs + " -> " + rhs, "Arrows not allowed in this context");
}
@@ -225,15 +225,15 @@ namespace
struct HandleUse
{
static void handle(const std::string &, const std::string & i,
- const tr1::shared_ptr<const PackageID> & id, const Environment * const env,
- const EAPI & eapi, std::stack<std::pair<tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > & stack)
+ const std::tr1::shared_ptr<const PackageID> & id, const Environment * const env,
+ const EAPI & eapi, std::stack<std::pair<std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > & stack)
{
- tr1::shared_ptr<ConstTreeSequence<H_, ConditionalDepSpec> > a(
- new ConstTreeSequence<H_, ConditionalDepSpec>(tr1::shared_ptr<ConditionalDepSpec>(
+ std::tr1::shared_ptr<ConstTreeSequence<H_, ConditionalDepSpec> > a(
+ new ConstTreeSequence<H_, ConditionalDepSpec>(std::tr1::shared_ptr<ConditionalDepSpec>(
new ConditionalDepSpec(parse_e_conditional_dep_spec(i, env, id, eapi)))));
stack.top().first(a);
- stack.push(std::make_pair(tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)>(
- tr1::bind(&ConstTreeSequence<H_, ConditionalDepSpec>::add, a.get(), _1)), false));
+ stack.push(std::make_pair(std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)>(
+ std::tr1::bind(&ConstTreeSequence<H_, ConditionalDepSpec>::add, a.get(), _1)), false));
}
};
@@ -241,8 +241,8 @@ namespace
struct HandleUse<H_, false>
{
static void handle(const std::string & s, const std::string &,
- const tr1::shared_ptr<const PackageID> &, const Environment * const,
- const EAPI &, std::stack<std::pair<tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > &)
+ const std::tr1::shared_ptr<const PackageID> &, const Environment * const,
+ const EAPI &, std::stack<std::pair<std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > &)
{
throw DepStringParseError(s, "use? group is not allowed here");
}
@@ -251,21 +251,21 @@ namespace
template <typename H_, bool>
struct HandleAny
{
- static void handle(const std::string &, std::stack<std::pair<tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > &
+ static void handle(const std::string &, std::stack<std::pair<std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > &
stack)
{
- tr1::shared_ptr<ConstTreeSequence<H_, AnyDepSpec> > a(new ConstTreeSequence<H_, AnyDepSpec>(
- tr1::shared_ptr<AnyDepSpec>(new AnyDepSpec)));
+ std::tr1::shared_ptr<ConstTreeSequence<H_, AnyDepSpec> > a(new ConstTreeSequence<H_, AnyDepSpec>(
+ std::tr1::shared_ptr<AnyDepSpec>(new AnyDepSpec)));
stack.top().first(a);
- stack.push(std::make_pair(tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)>(
- tr1::bind(&ConstTreeSequence<H_, AnyDepSpec>::add, a.get(), _1)), true));
+ stack.push(std::make_pair(std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)>(
+ std::tr1::bind(&ConstTreeSequence<H_, AnyDepSpec>::add, a.get(), _1)), true));
}
};
template <typename H_>
struct HandleAny<H_, false>
{
- static void handle(const std::string & s, std::stack<std::pair<tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > &)
+ static void handle(const std::string & s, std::stack<std::pair<std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > &)
{
throw DepStringParseError(s, "|| is not allowed here");
}
@@ -274,7 +274,7 @@ namespace
template <typename H_, typename K_>
struct HandleLabel
{
- static void add(const std::string & s, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> &,
+ static void add(const std::string & s, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> &,
const EAPI &)
{
throw DepStringParseError(s, "label is not allowed here");
@@ -284,11 +284,11 @@ namespace
template <typename H_>
struct HandleLabel<H_, LabelsAreURI>
{
- static void add(const std::string & s, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p,
+ static void add(const std::string & s, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p,
const EAPI & e)
{
if (e[k::supported()])
- p(tr1::shared_ptr<TreeLeaf<H_, URILabelsDepSpec> >(
+ p(std::tr1::shared_ptr<TreeLeaf<H_, URILabelsDepSpec> >(
new TreeLeaf<H_, URILabelsDepSpec>(parse_uri_label(s, e))));
else
throw DepStringParseError(s, "URI labels not allowed in this EAPI");
@@ -298,11 +298,11 @@ namespace
template <typename H_>
struct HandleLabel<H_, LabelsAreDependency>
{
- static void add(const std::string & s, tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p,
+ static void add(const std::string & s, std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)> & p,
const EAPI & e)
{
if (e[k::supported()])
- p(tr1::shared_ptr<TreeLeaf<H_, DependencyLabelsDepSpec> >(
+ p(std::tr1::shared_ptr<TreeLeaf<H_, DependencyLabelsDepSpec> >(
new TreeLeaf<H_, DependencyLabelsDepSpec>(parse_dependency_label(s, e))));
else
throw DepStringParseError(s, "Dependency labels not allowed in this EAPI");
@@ -313,20 +313,20 @@ namespace
namespace
{
template <typename H_, typename I_, bool any_, bool use_, typename Label_>
- tr1::shared_ptr<typename H_::ConstItem>
+ std::tr1::shared_ptr<typename H_::ConstItem>
parse(const std::string & s, bool disallow_any_use, const I_ & p, const Environment * const env,
- const EAPI & e, const tr1::shared_ptr<const PackageID> & id)
+ const EAPI & e, const std::tr1::shared_ptr<const PackageID> & id)
{
Context context("When parsing dependency string '" + s + "':");
if (! id)
throw InternalError(PALUDIS_HERE, "! id");
- tr1::shared_ptr<ConstTreeSequence<H_, AllDepSpec> > result(
- new ConstTreeSequence<H_, AllDepSpec>(tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
- std::stack<std::pair<tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > stack;
- stack.push(std::make_pair(tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)>(
- tr1::bind(&ConstTreeSequence<H_, AllDepSpec>::add, result.get(), _1)), false));
+ std::tr1::shared_ptr<ConstTreeSequence<H_, AllDepSpec> > result(
+ new ConstTreeSequence<H_, AllDepSpec>(std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
+ std::stack<std::pair<std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)>, bool> > stack;
+ stack.push(std::make_pair(std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)>(
+ std::tr1::bind(&ConstTreeSequence<H_, AllDepSpec>::add, result.get(), _1)), false));
std::string arrow_lhs;
DepParserState state(dps_initial);
@@ -372,11 +372,11 @@ namespace
case dpl_open_paren:
{
- tr1::shared_ptr<ConstTreeSequence<H_, AllDepSpec> > a(new ConstTreeSequence<H_, AllDepSpec>(
- tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
+ std::tr1::shared_ptr<ConstTreeSequence<H_, AllDepSpec> > a(new ConstTreeSequence<H_, AllDepSpec>(
+ std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
stack.top().first(a);
- stack.push(std::make_pair(tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<H_> >)>(
- tr1::bind(&ConstTreeSequence<H_, AllDepSpec>::add, a.get(), _1)), false));
+ stack.push(std::make_pair(std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<H_> >)>(
+ std::tr1::bind(&ConstTreeSequence<H_, AllDepSpec>::add, a.get(), _1)), false));
state = dps_had_paren;
}
continue;
@@ -658,9 +658,9 @@ namespace
}
}
-tr1::shared_ptr<DependencySpecTree::ConstItem>
+std::tr1::shared_ptr<DependencySpecTree::ConstItem>
paludis::erepository::parse_depend(const std::string & s, const Environment * const env,
- const tr1::shared_ptr<const PackageID> & id, const EAPI & e)
+ const std::tr1::shared_ptr<const PackageID> & id, const EAPI & e)
{
Context c("When parsing dependency string '" + s + "' using EAPI '" + e[k::name()] + "':");
@@ -672,9 +672,9 @@ paludis::erepository::parse_depend(const std::string & s, const Environment * co
ParsePackageOrBlockDepSpec(e, id), env, e, id);
}
-tr1::shared_ptr<ProvideSpecTree::ConstItem>
+std::tr1::shared_ptr<ProvideSpecTree::ConstItem>
paludis::erepository::parse_provide(const std::string & s, const Environment * const env,
- const tr1::shared_ptr<const PackageID> & id, const EAPI & e)
+ const std::tr1::shared_ptr<const PackageID> & id, const EAPI & e)
{
Context c("When parsing provide string '" + s + "' using EAPI '" + e[k::name()] + "':");
@@ -682,12 +682,12 @@ paludis::erepository::parse_provide(const std::string & s, const Environment * c
throw DepStringParseError(s, "Don't know how to parse EAPI '" + e[k::name()] + "' provides");
return parse<ProvideSpecTree, ParsePackageDepSpec, false, true, void>(s, false,
- ParsePackageDepSpec(e, tr1::shared_ptr<const PackageID>()), env, e, id);
+ ParsePackageDepSpec(e, std::tr1::shared_ptr<const PackageID>()), env, e, id);
}
-tr1::shared_ptr<RestrictSpecTree::ConstItem>
+std::tr1::shared_ptr<RestrictSpecTree::ConstItem>
paludis::erepository::parse_restrict(const std::string & s, const Environment * const env,
- const tr1::shared_ptr<const PackageID> & id, const EAPI & e)
+ const std::tr1::shared_ptr<const PackageID> & id, const EAPI & e)
{
Context c("When parsing restrict string '" + s + "' using EAPI '" + e[k::name()] + "':");
@@ -698,9 +698,9 @@ paludis::erepository::parse_restrict(const std::string & s, const Environment *
ParseTextDepSpec(), env, e, id);
}
-tr1::shared_ptr<FetchableURISpecTree::ConstItem>
+std::tr1::shared_ptr<FetchableURISpecTree::ConstItem>
paludis::erepository::parse_fetchable_uri(const std::string & s, const Environment * const env,
- const tr1::shared_ptr<const PackageID> & id, const EAPI & e)
+ const std::tr1::shared_ptr<const PackageID> & id, const EAPI & e)
{
Context c("When parsing fetchable URI string '" + s + "' using EAPI '" + e[k::name()] + "':");
@@ -712,9 +712,9 @@ paludis::erepository::parse_fetchable_uri(const std::string & s, const Environme
env, e, id);
}
-tr1::shared_ptr<SimpleURISpecTree::ConstItem>
+std::tr1::shared_ptr<SimpleURISpecTree::ConstItem>
paludis::erepository::parse_simple_uri(const std::string & s, const Environment * const env,
- const tr1::shared_ptr<const PackageID> & id, const EAPI & e)
+ const std::tr1::shared_ptr<const PackageID> & id, const EAPI & e)
{
Context c("When parsing simple URI string '" + s + "' using EAPI '" + e[k::name()] + "':");
@@ -725,9 +725,9 @@ paludis::erepository::parse_simple_uri(const std::string & s, const Environment
ParseSimpleURIDepSpec(), env, e, id);
}
-tr1::shared_ptr<LicenseSpecTree::ConstItem>
+std::tr1::shared_ptr<LicenseSpecTree::ConstItem>
paludis::erepository::parse_license(const std::string & s, const Environment * const env,
- const tr1::shared_ptr<const PackageID> & id, const EAPI & e)
+ const std::tr1::shared_ptr<const PackageID> & id, const EAPI & e)
{
Context c("When parsing license string '" + s + "' using EAPI '" + e[k::name()] + "':");
@@ -738,7 +738,7 @@ paludis::erepository::parse_license(const std::string & s, const Environment * c
true, ParseLicenseDepSpec(), env, e, id);
}
-tr1::shared_ptr<URILabelsDepSpec>
+std::tr1::shared_ptr<URILabelsDepSpec>
paludis::erepository::parse_uri_label(const std::string & s, const EAPI & e)
{
Context context("When parsing label string '" + s + "' using EAPI '" + e[k::name()] + "':");
@@ -750,7 +750,7 @@ paludis::erepository::parse_uri_label(const std::string & s, const EAPI & e)
if (c.empty())
throw DepStringParseError(s, "Unknown label");
- tr1::shared_ptr<URILabelsDepSpec> l(new LabelsDepSpec<URILabelVisitorTypes>);
+ std::tr1::shared_ptr<URILabelsDepSpec> l(new LabelsDepSpec<URILabelVisitorTypes>);
if (c == "URIMirrorsThenListedLabel")
l->add_label(make_shared_ptr(new URIMirrorsThenListedLabel(s.substr(0, s.length() - 1))));
@@ -770,7 +770,7 @@ paludis::erepository::parse_uri_label(const std::string & s, const EAPI & e)
return l;
}
-tr1::shared_ptr<DependencyLabelsDepSpec>
+std::tr1::shared_ptr<DependencyLabelsDepSpec>
paludis::erepository::parse_dependency_label(const std::string & s, const EAPI & e)
{
Context context("When parsing label string '" + s + "' using EAPI '" + e[k::name()] + "':");
@@ -782,7 +782,7 @@ paludis::erepository::parse_dependency_label(const std::string & s, const EAPI &
std::string label(s.substr(0, s.length() - 1));
tokenise<delim_kind::AnyOfTag, delim_mode::DelimiterTag>(label, ",+", "", std::inserter(labels, labels.end()));
- tr1::shared_ptr<DependencyLabelsDepSpec> l(new DependencyLabelsDepSpec);
+ std::tr1::shared_ptr<DependencyLabelsDepSpec> l(new DependencyLabelsDepSpec);
for (std::set<std::string>::iterator it = labels.begin(), it_e = labels.end(); it != it_e; ++it)
{
diff --git a/paludis/repositories/e/dep_parser.hh b/paludis/repositories/e/dep_parser.hh
index 6c6baeaa5..fbdedba25 100644
--- a/paludis/repositories/e/dep_parser.hh
+++ b/paludis/repositories/e/dep_parser.hh
@@ -76,48 +76,48 @@ namespace paludis
/**
* Parse a dependency heirarchy.
*/
- tr1::shared_ptr<DependencySpecTree::ConstItem> parse_depend(const std::string & s,
- const Environment * const, const tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<DependencySpecTree::ConstItem> parse_depend(const std::string & s,
+ const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a dep spec label.
*/
- tr1::shared_ptr<DependencyLabelsDepSpec> parse_dependency_label(const std::string & s, const EAPI &) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<DependencyLabelsDepSpec> parse_dependency_label(const std::string & s, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a provide heirarchy.
*/
- tr1::shared_ptr<ProvideSpecTree::ConstItem> parse_provide(const std::string & s,
- const Environment * const, const tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<ProvideSpecTree::ConstItem> parse_provide(const std::string & s,
+ const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a restrict.
*/
- tr1::shared_ptr<RestrictSpecTree::ConstItem> parse_restrict(const std::string & s,
- const Environment * const, const tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<RestrictSpecTree::ConstItem> parse_restrict(const std::string & s,
+ const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a fetchable uri heirarchy.
*/
- tr1::shared_ptr<FetchableURISpecTree::ConstItem> parse_fetchable_uri(const std::string & s,
- const Environment * const, const tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<FetchableURISpecTree::ConstItem> parse_fetchable_uri(const std::string & s,
+ const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a simple uri heirarchy.
*/
- tr1::shared_ptr<SimpleURISpecTree::ConstItem> parse_simple_uri(const std::string & s,
- const Environment * const, const tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<SimpleURISpecTree::ConstItem> parse_simple_uri(const std::string & s,
+ const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a license heirarchy.
*/
- tr1::shared_ptr<LicenseSpecTree::ConstItem> parse_license(const std::string & s,
- const Environment * const, const tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<LicenseSpecTree::ConstItem> parse_license(const std::string & s,
+ const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a URI label.
*/
- tr1::shared_ptr<URILabelsDepSpec> parse_uri_label(const std::string & s, const EAPI &) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<URILabelsDepSpec> parse_uri_label(const std::string & s, const EAPI &) PALUDIS_VISIBLE;
}
}
diff --git a/paludis/repositories/e/dep_parser_TEST.cc b/paludis/repositories/e/dep_parser_TEST.cc
index b6c1fa1ff..50f4a088a 100644
--- a/paludis/repositories/e/dep_parser_TEST.cc
+++ b/paludis/repositories/e/dep_parser_TEST.cc
@@ -52,12 +52,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
StringifyFormatter ff;
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "");
@@ -75,12 +75,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
StringifyFormatter ff;
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend(" \n \t",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "");
@@ -98,12 +98,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
StringifyFormatter ff;
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("app-editors/vim",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "app-editors/vim");
@@ -122,21 +122,21 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d1(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d1(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend(">=app-editors/vim-6.4_alpha",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d1);
TEST_CHECK_EQUAL(stringify(d1), ">=app-editors/vim-6.4_alpha");
- DepSpecPrettyPrinter d2(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d2(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("=app-editors/vim-6.4_alpha-r1",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d2);
TEST_CHECK_EQUAL(stringify(d2), "=app-editors/vim-6.4_alpha-r1");
- DepSpecPrettyPrinter d3(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d3(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend(">=app-editors/vim-6.4_alpha:one",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d3);
TEST_CHECK_EQUAL(stringify(d3), ">=app-editors/vim-6.4_alpha:one");
@@ -155,11 +155,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("app-editors/vim app-misc/hilite \nsys-apps/findutils",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "app-editors/vim app-misc/hilite sys-apps/findutils");
@@ -174,11 +174,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("|| ( one/one two/two )",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "|| ( one/one two/two )");
@@ -193,11 +193,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("|| ( one/one foo? ( two/two ) )",
&env, id, *EAPIData::get_instance()->eapi_from_string("0"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "|| ( one/one foo? ( two/two ) )");
@@ -205,7 +205,7 @@ namespace test_cases
TEST_CHECK_THROWS(parse_depend("|| ( one/one foo? ( two/two ) )",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d), DepStringError);
- DepSpecPrettyPrinter e(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter e(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("|| ( one/one ( foo? ( two/two ) ) )",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(e);
TEST_CHECK_EQUAL(stringify(e), "|| ( one/one ( foo? ( two/two ) ) )");
@@ -224,11 +224,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend(" ( one/one two/two ) ",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "one/one two/two");
@@ -247,11 +247,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("foo? ( one/one )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "foo? ( one/one )");
}
@@ -269,11 +269,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("!foo? ( one/one )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "!foo? ( one/one )");
}
@@ -287,15 +287,15 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, true);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, true);
parse_fetchable_uri("a\n->\tb", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "a -> b\n");
- DepSpecPrettyPrinter e(0, tr1::shared_ptr<const PackageID>(), ff, 0, true);
+ DepSpecPrettyPrinter e(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, true);
parse_fetchable_uri("a-> b", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(e);
TEST_CHECK_EQUAL(stringify(e), "a->\nb\n");
@@ -316,11 +316,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
TEST_CHECK_THROWS(parse_depend("!foo? ( one/one",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d), DepStringError);
TEST_CHECK_THROWS(parse_depend("!foo? ( one/one ) )",
@@ -346,11 +346,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
TEST_CHECK_THROWS(parse_depend("||",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(d), DepStringError);
TEST_CHECK_THROWS(parse_depend("|| ",
@@ -400,11 +400,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("build: one/one",
&env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "build: one/one");
@@ -421,11 +421,11 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_fetchable_uri("http://foo/bar manual: two",
&env, id, *EAPIData::get_instance()->eapi_from_string("kdebuild-1"))->accept(d);
TEST_CHECK_EQUAL(stringify(d), "http://foo/bar manual: two");
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.cc b/paludis/repositories/e/dep_spec_pretty_printer.cc
index 34030c751..4bde9a301 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer.cc
@@ -47,7 +47,7 @@ namespace paludis
{
std::stringstream s;
const Environment * const env;
- const tr1::shared_ptr<const PackageID> id;
+ const std::tr1::shared_ptr<const PackageID> id;
GenericSpecTree::ItemFormatter formatter;
unsigned indent;
bool extra_label_indent;
@@ -57,7 +57,7 @@ namespace paludis
Implementation(
const Environment * const e,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const PackageID> & i,
const GenericSpecTree::ItemFormatter & f,
unsigned in,
bool b) :
@@ -76,7 +76,7 @@ namespace paludis
DepSpecPrettyPrinter::DepSpecPrettyPrinter(
const Environment * const e,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const GenericSpecTree::ItemFormatter & f,
unsigned i,
bool b) :
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.hh b/paludis/repositories/e/dep_spec_pretty_printer.hh
index 092294cdf..a75117d25 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/e/dep_spec_pretty_printer.hh
@@ -72,7 +72,7 @@ namespace paludis
*/
DepSpecPrettyPrinter(
const Environment * const env,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const GenericSpecTree::ItemFormatter & formatter,
unsigned initial_indent,
bool use_newlines);
diff --git a/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc b/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
index 1afbee3a7..607c3cc60 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
@@ -43,31 +43,31 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter p1(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter p1(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("foo/bar bar/baz", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p1);
TEST_CHECK_STRINGIFY_EQUAL(p1, "foo/bar bar/baz");
- DepSpecPrettyPrinter p2(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter p2(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("foo/bar moo? ( bar/baz )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p2);
TEST_CHECK_STRINGIFY_EQUAL(p2, "foo/bar moo? ( bar/baz )");
- DepSpecPrettyPrinter p3(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter p3(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_depend("|| ( a/b ( c/d e/f ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p3);
TEST_CHECK_STRINGIFY_EQUAL(p3, "|| ( a/b ( c/d e/f ) )");
- DepSpecPrettyPrinter p4(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter p4(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_license("( ( ( ) a ) b )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p4);
TEST_CHECK_STRINGIFY_EQUAL(p4, "a b");
- DepSpecPrettyPrinter p5(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter p5(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_fetchable_uri("( a -> b c x? ( d e ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p5);
TEST_CHECK_STRINGIFY_EQUAL(p5, "a -> b c x? ( d e )");
- DepSpecPrettyPrinter p6(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter p6(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
parse_fetchable_uri("a manual: b x? ( c mirrors-first: d manual: e ) f",
&env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->accept(p6);
TEST_CHECK_STRINGIFY_EQUAL(p6, "a manual: b x? ( c mirrors-first: d manual: e ) f");
@@ -82,28 +82,28 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter p1(0, tr1::shared_ptr<const PackageID>(), ff, 1, true);
+ DepSpecPrettyPrinter p1(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true);
parse_depend("foo/bar bar/baz", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p1);
TEST_CHECK_STRINGIFY_EQUAL(p1, " foo/bar\n bar/baz\n");
- DepSpecPrettyPrinter p2(0, tr1::shared_ptr<const PackageID>(), ff, 1, true);
+ DepSpecPrettyPrinter p2(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true);
parse_depend("foo/bar moo? ( bar/baz )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p2);
TEST_CHECK_STRINGIFY_EQUAL(p2, " foo/bar\n moo? (\n bar/baz\n )\n");
- DepSpecPrettyPrinter p3(0, tr1::shared_ptr<const PackageID>(), ff, 1, true);
+ DepSpecPrettyPrinter p3(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true);
parse_depend("|| ( a/b ( c/d e/f ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p3);
TEST_CHECK_STRINGIFY_EQUAL(p3, " || (\n a/b\n (\n c/d\n"
" e/f\n )\n )\n");
- DepSpecPrettyPrinter p4(0, tr1::shared_ptr<const PackageID>(), ff, 1, true);
+ DepSpecPrettyPrinter p4(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true);
parse_license("( ( ( ) a ) b )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->accept(p4);
TEST_CHECK_STRINGIFY_EQUAL(p4, " a\n b\n");
- DepSpecPrettyPrinter p5(0, tr1::shared_ptr<const PackageID>(), ff, 1, true);
+ DepSpecPrettyPrinter p5(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true);
parse_fetchable_uri("a manual: b x? ( c mirrors-first: d manual: e ) f",
&env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->accept(p5);
TEST_CHECK_STRINGIFY_EQUAL(p5, " a\n manual:\n b\n x? (\n c\n"
diff --git a/paludis/repositories/e/dependencies_rewriter.cc b/paludis/repositories/e/dependencies_rewriter.cc
index 56659dab3..23896fb59 100644
--- a/paludis/repositories/e/dependencies_rewriter.cc
+++ b/paludis/repositories/e/dependencies_rewriter.cc
@@ -29,7 +29,7 @@
using namespace paludis;
using namespace paludis::erepository;
-typedef std::list<tr1::shared_ptr<ActiveDependencyLabels> > LabelsStack;
+typedef std::list<std::tr1::shared_ptr<ActiveDependencyLabels> > LabelsStack;
namespace paludis
{
@@ -40,7 +40,7 @@ namespace paludis
std::string rdepend;
std::string pdepend;
- tr1::shared_ptr<DependencyLabelSequence> default_labels;
+ std::tr1::shared_ptr<DependencyLabelSequence> default_labels;
LabelsStack labels;
Implementation() :
@@ -114,7 +114,7 @@ DependenciesRewriter::visit_sequence(const AllDepSpec &,
DependencySpecTree::ConstSequenceIterator end)
{
_imp->labels.push_front(make_shared_ptr(new ActiveDependencyLabels(**_imp->labels.begin())));
- RunOnDestruction restore_labels(tr1::bind(tr1::mem_fn(&LabelsStack::pop_front), &_imp->labels));
+ RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &_imp->labels));
std::string d(_imp->depend), r(_imp->rdepend), p(_imp->pdepend);
_imp->depend.clear();
@@ -134,7 +134,7 @@ DependenciesRewriter::visit_sequence(const AnyDepSpec &,
DependencySpecTree::ConstSequenceIterator end)
{
_imp->labels.push_front(make_shared_ptr(new ActiveDependencyLabels(**_imp->labels.begin())));
- RunOnDestruction restore_labels(tr1::bind(tr1::mem_fn(&LabelsStack::pop_front), &_imp->labels));
+ RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &_imp->labels));
std::string d(_imp->depend), r(_imp->rdepend), p(_imp->pdepend);
_imp->depend.clear();
@@ -154,7 +154,7 @@ DependenciesRewriter::visit_sequence(const ConditionalDepSpec & spec,
DependencySpecTree::ConstSequenceIterator end)
{
_imp->labels.push_front(make_shared_ptr(new ActiveDependencyLabels(**_imp->labels.begin())));
- RunOnDestruction restore_labels(tr1::bind(tr1::mem_fn(&LabelsStack::pop_front), &_imp->labels));
+ RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &_imp->labels));
std::string d(_imp->depend), r(_imp->rdepend), p(_imp->pdepend);
_imp->depend.clear();
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index eb8bfc2dd..b8a8da62c 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -194,49 +194,49 @@ EInstalledRepository::describe_use_flag(const UseFlagName &, const PackageID &)
return "";
}
-tr1::shared_ptr<const UseFlagNameSet>
+std::tr1::shared_ptr<const UseFlagNameSet>
EInstalledRepository::use_expand_flags() const
{
- return tr1::shared_ptr<const UseFlagNameSet>(new UseFlagNameSet);
+ return std::tr1::shared_ptr<const UseFlagNameSet>(new UseFlagNameSet);
}
-tr1::shared_ptr<const UseFlagNameSet>
+std::tr1::shared_ptr<const UseFlagNameSet>
EInstalledRepository::use_expand_prefixes() const
{
- return tr1::shared_ptr<const UseFlagNameSet>(new UseFlagNameSet);
+ return std::tr1::shared_ptr<const UseFlagNameSet>(new UseFlagNameSet);
}
-tr1::shared_ptr<const UseFlagNameSet>
+std::tr1::shared_ptr<const UseFlagNameSet>
EInstalledRepository::use_expand_hidden_prefixes() const
{
- return tr1::shared_ptr<const UseFlagNameSet>(new UseFlagNameSet);
+ return std::tr1::shared_ptr<const UseFlagNameSet>(new UseFlagNameSet);
}
-tr1::shared_ptr<SetSpecTree::ConstItem>
+std::tr1::shared_ptr<SetSpecTree::ConstItem>
EInstalledRepository::package_set(const SetName & s) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
Context context("When fetching package set '" + stringify(s) + "' from '" +
stringify(name()) + "':");
if ("everything" == s.data())
{
- tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > result(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
- tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
- tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("everything"), stringify(name())));
+ std::tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > result(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
+ std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
+ std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("everything"), stringify(name())));
- tr1::shared_ptr<const CategoryNamePartSet> cats(category_names());
+ std::tr1::shared_ptr<const CategoryNamePartSet> cats(category_names());
for (CategoryNamePartSet::ConstIterator i(cats->begin()), i_end(cats->end()) ;
i != i_end ; ++i)
{
- tr1::shared_ptr<const QualifiedPackageNameSet> pkgs(package_names(*i));
+ std::tr1::shared_ptr<const QualifiedPackageNameSet> pkgs(package_names(*i));
for (QualifiedPackageNameSet::ConstIterator e(pkgs->begin()), e_end(pkgs->end()) ;
e != e_end ; ++e)
{
- tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(make_package_dep_spec().package(*e)));
+ std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(make_package_dep_spec().package(*e)));
spec->set_tag(tag);
- result->add(tr1::shared_ptr<TreeLeaf<SetSpecTree, PackageDepSpec> >(new TreeLeaf<SetSpecTree, PackageDepSpec>(spec)));
+ result->add(std::tr1::shared_ptr<TreeLeaf<SetSpecTree, PackageDepSpec> >(new TreeLeaf<SetSpecTree, PackageDepSpec>(spec)));
}
}
@@ -246,49 +246,49 @@ EInstalledRepository::package_set(const SetName & s) const
{
if (_imp->params.deprecated_world.exists())
{
- tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("world"), stringify(name())));
+ std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("world"), stringify(name())));
SetFile world(SetFileParams::create()
.file_name(_imp->params.deprecated_world)
.type(sft_simple)
- .parser(tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
.tag(tag)
.set_operator_mode(sfsmo_natural)
.environment(_imp->params.environment));
return world.contents();
}
- return tr1::shared_ptr<SetSpecTree::ConstItem>(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
- tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
+ return std::tr1::shared_ptr<SetSpecTree::ConstItem>(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
+ std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
}
else
- return tr1::shared_ptr<SetSpecTree::ConstItem>();
+ return std::tr1::shared_ptr<SetSpecTree::ConstItem>();
}
-tr1::shared_ptr<const SetNameSet>
+std::tr1::shared_ptr<const SetNameSet>
EInstalledRepository::sets_list() const
{
Context context("While generating the list of sets:");
- tr1::shared_ptr<SetNameSet> result(new SetNameSet);
+ std::tr1::shared_ptr<SetNameSet> result(new SetNameSet);
result->insert(SetName("everything"));
if (_imp->params.deprecated_world.exists())
result->insert(SetName("world"));
return result;
}
-tr1::shared_ptr<const CategoryNamePartSet>
+std::tr1::shared_ptr<const CategoryNamePartSet>
EInstalledRepository::unimportant_category_names() const
{
- tr1::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
+ std::tr1::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
result->insert(CategoryNamePart("virtual"));
return result;
}
-tr1::shared_ptr<const UseFlagNameSet>
+std::tr1::shared_ptr<const UseFlagNameSet>
EInstalledRepository::arch_flags() const
{
- return tr1::shared_ptr<const UseFlagNameSet>(new UseFlagNameSet);
+ return std::tr1::shared_ptr<const UseFlagNameSet>(new UseFlagNameSet);
}
char
@@ -296,13 +296,13 @@ EInstalledRepository::use_expand_separator(const PackageID & id) const
{
if (this != id.repository().get())
return '\0';
- const tr1::shared_ptr<const EAPI> & eapi(static_cast<const ERepositoryID &>(id).eapi());
+ const std::tr1::shared_ptr<const EAPI> & eapi(static_cast<const ERepositoryID &>(id).eapi());
return (*eapi)[k::supported()] ? (*(*eapi)[k::supported()])[k::ebuild_options()].use_expand_separator : '\0';
}
std::string
EInstalledRepository::get_environment_variable(
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & var) const
{
Context context("When fetching environment variable '" + var + "' for '" +
@@ -339,7 +339,7 @@ EInstalledRepository::get_environment_variable(
}
void
-EInstalledRepository::perform_config(const tr1::shared_ptr<const ERepositoryID> & id) const
+EInstalledRepository::perform_config(const std::tr1::shared_ptr<const ERepositoryID> & id) const
{
Context context("When configuring '" + stringify(*id) + "':");
@@ -349,10 +349,10 @@ EInstalledRepository::perform_config(const tr1::shared_ptr<const ERepositoryID>
FSEntry ver_dir(id->fs_location_key()->value());
- tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
eclassdirs->push_back(ver_dir);
- tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
+ std::tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
EAPIPhases phases((*(*id->eapi())[k::supported()])[k::ebuild_phases()].ebuild_config);
for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
@@ -382,7 +382,7 @@ EInstalledRepository::perform_config(const tr1::shared_ptr<const ERepositoryID>
}
void
-EInstalledRepository::perform_info(const tr1::shared_ptr<const ERepositoryID> & id) const
+EInstalledRepository::perform_info(const std::tr1::shared_ptr<const ERepositoryID> & id) const
{
Context context("When infoing '" + stringify(*id) + "':");
@@ -392,10 +392,10 @@ EInstalledRepository::perform_info(const tr1::shared_ptr<const ERepositoryID> &
FSEntry ver_dir(id->fs_location_key()->value());
- tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
eclassdirs->push_back(ver_dir);
- tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
+ std::tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
EAPIPhases phases((*(*id->eapi())[k::supported()])[k::ebuild_phases()].ebuild_info);
@@ -412,7 +412,7 @@ EInstalledRepository::perform_info(const tr1::shared_ptr<const ERepositoryID> &
RepositoryName rn(id->source_origin_key()->value());
if (_imp->params.environment->package_database()->has_repository_named(rn))
{
- const tr1::shared_ptr<const Repository> r(_imp->params.environment->package_database()->fetch_repository(rn));
+ const std::tr1::shared_ptr<const Repository> r(_imp->params.environment->package_database()->fetch_repository(rn));
if ((*r)[k::e_interface()])
{
i = (*r)[k::e_interface()]->info_variables_file((*r)[k::e_interface()]->params().location / "profiles");
diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh
index 342bffb9c..319ef36d2 100644
--- a/paludis/repositories/e/e_installed_repository.hh
+++ b/paludis/repositories/e/e_installed_repository.hh
@@ -58,16 +58,16 @@ namespace paludis
virtual bool query_use_force(const UseFlagName &, const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const UseFlagNameSet> arch_flags() const
+ virtual std::tr1::shared_ptr<const UseFlagNameSet> arch_flags() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const UseFlagNameSet> use_expand_flags() const
+ virtual std::tr1::shared_ptr<const UseFlagNameSet> use_expand_flags() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const UseFlagNameSet> use_expand_hidden_prefixes() const
+ virtual std::tr1::shared_ptr<const UseFlagNameSet> use_expand_hidden_prefixes() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const UseFlagNameSet> use_expand_prefixes() const
+ virtual std::tr1::shared_ptr<const UseFlagNameSet> use_expand_prefixes() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual char use_expand_separator(const PackageID &) const
@@ -79,16 +79,16 @@ namespace paludis
/* RepositorySetsInterface */
- virtual tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName & id) const
+ virtual std::tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName & id) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const SetNameSet> sets_list() const
+ virtual std::tr1::shared_ptr<const SetNameSet> sets_list() const
PALUDIS_ATTRIBUTE((warn_unused_result));
/* RepositoryEnvironmentVariableInterface */
virtual std::string get_environment_variable(
- const tr1::shared_ptr<const PackageID> & for_package,
+ const std::tr1::shared_ptr<const PackageID> & for_package,
const std::string & var) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -110,19 +110,19 @@ namespace paludis
/* Repository */
- virtual tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const;
///\name For use by EInstalledRepositoryID
///\{
- virtual void perform_uninstall(const tr1::shared_ptr<const erepository::ERepositoryID> & id,
+ virtual void perform_uninstall(const std::tr1::shared_ptr<const erepository::ERepositoryID> & id,
const UninstallActionOptions & o, bool reinstalling) const = 0;
- virtual void perform_config(const tr1::shared_ptr<const erepository::ERepositoryID> & id) const;
+ virtual void perform_config(const std::tr1::shared_ptr<const erepository::ERepositoryID> & id) const;
- virtual void perform_info(const tr1::shared_ptr<const erepository::ERepositoryID> & id) const;
+ virtual void perform_info(const std::tr1::shared_ptr<const erepository::ERepositoryID> & id) const;
///\}
};
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 189a3d6b7..5fd8aac17 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -69,48 +69,48 @@ namespace paludis
const QualifiedPackageName name;
const VersionSpec version;
const Environment * const environment;
- const tr1::shared_ptr<const Repository> repository;
+ const std::tr1::shared_ptr<const Repository> repository;
const FSEntry dir;
mutable bool has_keys;
- tr1::shared_ptr<const SlotName> slot;
- tr1::shared_ptr<const EAPI> eapi;
-
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location;
- tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use;
- tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited;
- tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse;
- tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license;
- tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide;
- tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies;
- tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies;
- tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies;
- tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrictions;
- tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri;
- tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage;
- tr1::shared_ptr<const MetadataValueKey<std::string> > short_description;
- tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > > contents;
- tr1::shared_ptr<const MetadataTimeKey> installed_time;
- tr1::shared_ptr<const MetadataValueKey<std::string> > source_origin;
- tr1::shared_ptr<const MetadataValueKey<std::string> > binary_origin;
-
- tr1::shared_ptr<const MetadataValueKey<std::string> > asflags;
- tr1::shared_ptr<const MetadataValueKey<std::string> > cbuild;
- tr1::shared_ptr<const MetadataValueKey<std::string> > cflags;
- tr1::shared_ptr<const MetadataValueKey<std::string> > chost;
- tr1::shared_ptr<const MetadataValueKey<std::string> > ctarget;
- tr1::shared_ptr<const MetadataValueKey<std::string> > cxxflags;
- tr1::shared_ptr<const MetadataValueKey<std::string> > ldflags;
- tr1::shared_ptr<const MetadataValueKey<std::string> > pkgmanager;
- tr1::shared_ptr<const MetadataValueKey<std::string> > vdb_format;
-
- tr1::shared_ptr<DependencyLabelSequence> build_dependencies_labels;
- tr1::shared_ptr<DependencyLabelSequence> run_dependencies_labels;
- tr1::shared_ptr<DependencyLabelSequence> post_dependencies_labels;
+ std::tr1::shared_ptr<const SlotName> slot;
+ std::tr1::shared_ptr<const EAPI> eapi;
+
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location;
+ std::tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use;
+ std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited;
+ std::tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse;
+ std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license;
+ std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide;
+ std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies;
+ std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies;
+ std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies;
+ std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrictions;
+ std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri;
+ std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > short_description;
+ std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > > contents;
+ std::tr1::shared_ptr<const MetadataTimeKey> installed_time;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > source_origin;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > binary_origin;
+
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > asflags;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > cbuild;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > cflags;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > chost;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > ctarget;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > cxxflags;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > ldflags;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > pkgmanager;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > vdb_format;
+
+ std::tr1::shared_ptr<DependencyLabelSequence> build_dependencies_labels;
+ std::tr1::shared_ptr<DependencyLabelSequence> run_dependencies_labels;
+ std::tr1::shared_ptr<DependencyLabelSequence> post_dependencies_labels;
Implementation(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
- const tr1::shared_ptr<const Repository> r, const FSEntry & f) :
+ const std::tr1::shared_ptr<const Repository> r, const FSEntry & f) :
name(q),
version(v),
environment(e),
@@ -130,7 +130,7 @@ namespace paludis
EInstalledRepositoryID::EInstalledRepositoryID(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
- const tr1::shared_ptr<const Repository> & r,
+ const std::tr1::shared_ptr<const Repository> & r,
const FSEntry & f) :
PrivateImplementationPattern<EInstalledRepositoryID>(new Implementation<EInstalledRepositoryID>(q, v, e, r, f)),
_imp(PrivateImplementationPattern<EInstalledRepositoryID>::_imp)
@@ -447,13 +447,13 @@ EInstalledRepositoryID::slot() const
return *_imp->slot;
}
-const tr1::shared_ptr<const Repository>
+const std::tr1::shared_ptr<const Repository>
EInstalledRepositoryID::repository() const
{
return _imp->repository;
}
-const tr1::shared_ptr<const EAPI>
+const std::tr1::shared_ptr<const EAPI>
EInstalledRepositoryID::eapi() const
{
Lock l(_imp->mutex);
@@ -477,155 +477,155 @@ EInstalledRepositoryID::eapi() const
return _imp->eapi;
}
-const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >
+const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
EInstalledRepositoryID::virtual_for_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
}
-const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
EInstalledRepositoryID::keywords_key() const
{
- return tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
+ return std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
EInstalledRepositoryID::eclass_keywords_key() const
{
- return tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
+ return std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> >
EInstalledRepositoryID::use_key() const
{
need_keys_added();
return _imp->use;
}
-const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
EInstalledRepositoryID::iuse_key() const
{
need_keys_added();
return _imp->iuse;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
EInstalledRepositoryID::license_key() const
{
need_keys_added();
return _imp->license;
}
-const tr1::shared_ptr<const MetadataValueKey<bool> >
+const std::tr1::shared_ptr<const MetadataValueKey<bool> >
EInstalledRepositoryID::transient_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<bool> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<bool> >();
}
-const tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::inherited_key() const
{
need_keys_added();
return _imp->inherited;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
EInstalledRepositoryID::provide_key() const
{
need_keys_added();
return _imp->provide;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::build_dependencies_key() const
{
need_keys_added();
return _imp->build_dependencies;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::run_dependencies_key() const
{
need_keys_added();
return _imp->run_dependencies;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::post_dependencies_key() const
{
need_keys_added();
return _imp->post_dependencies;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::suggested_dependencies_key() const
{
- return tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> >
EInstalledRepositoryID::restrict_key() const
{
need_keys_added();
return _imp->restrictions;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
EInstalledRepositoryID::fetches_key() const
{
need_keys_added();
return _imp->src_uri;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
EInstalledRepositoryID::homepage_key() const
{
need_keys_added();
return _imp->homepage;
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
EInstalledRepositoryID::short_description_key() const
{
need_keys_added();
return _imp->short_description;
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
EInstalledRepositoryID::long_description_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<std::string> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
}
-const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > >
+const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
EInstalledRepositoryID::contents_key() const
{
need_keys_added();
return _imp->contents;
}
-const tr1::shared_ptr<const MetadataTimeKey>
+const std::tr1::shared_ptr<const MetadataTimeKey>
EInstalledRepositoryID::installed_time_key() const
{
need_keys_added();
return _imp->installed_time;
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
EInstalledRepositoryID::source_origin_key() const
{
need_keys_added();
return _imp->source_origin;
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
EInstalledRepositoryID::binary_origin_key() const
{
need_keys_added();
return _imp->binary_origin;
}
-const tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
EInstalledRepositoryID::fs_location_key() const
{
// Avoid loading whole metadata
@@ -716,16 +716,16 @@ namespace
struct PerformAction :
ConstVisitor<ActionVisitorTypes>
{
- const tr1::shared_ptr<const erepository::ERepositoryID> id;
+ const std::tr1::shared_ptr<const erepository::ERepositoryID> id;
- PerformAction(const tr1::shared_ptr<const erepository::ERepositoryID> i) :
+ PerformAction(const std::tr1::shared_ptr<const erepository::ERepositoryID> i) :
id(i)
{
}
void visit(const UninstallAction & a)
{
- tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_uninstall(id,
+ std::tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_uninstall(id,
a.options, false);
}
@@ -735,12 +735,12 @@ namespace
void visit(const ConfigAction &)
{
- tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_config(id);
+ std::tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_config(id);
}
void visit(const InfoAction &)
{
- tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_info(id);
+ std::tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_info(id);
}
void visit(const InstallAction & a) PALUDIS_ATTRIBUTE((noreturn));
@@ -777,16 +777,16 @@ EInstalledRepositoryID::perform_action(Action & a) const
a.accept(b);
}
-const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
EInstalledRepositoryID::contains_key() const
{
- return tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
+ return std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
-const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >
+const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
EInstalledRepositoryID::contained_in_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
}
diff --git a/paludis/repositories/e/e_installed_repository_id.hh b/paludis/repositories/e/e_installed_repository_id.hh
index db4851139..f3b5ff761 100644
--- a/paludis/repositories/e/e_installed_repository_id.hh
+++ b/paludis/repositories/e/e_installed_repository_id.hh
@@ -32,7 +32,7 @@ namespace paludis
{
class EInstalledRepositoryID :
public ERepositoryID,
- public tr1::enable_shared_from_this<EInstalledRepositoryID>,
+ public std::tr1::enable_shared_from_this<EInstalledRepositoryID>,
private PrivateImplementationPattern<EInstalledRepositoryID>
{
private:
@@ -44,7 +44,7 @@ namespace paludis
EInstalledRepositoryID(const QualifiedPackageName &, const VersionSpec &,
const Environment * const,
- const tr1::shared_ptr<const Repository> &,
+ const std::tr1::shared_ptr<const Repository> &,
const FSEntry & file);
public:
@@ -55,36 +55,36 @@ namespace paludis
virtual const QualifiedPackageName name() const;
virtual const VersionSpec version() const;
virtual const SlotName slot() const;
- virtual const tr1::shared_ptr<const Repository> repository() const;
- virtual const tr1::shared_ptr<const EAPI> eapi() const;
-
- virtual const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > > virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > eclass_keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > > contents_key() const;
- virtual const tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > source_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > binary_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > > contained_in_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
-
- virtual const tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
-
- virtual const tr1::shared_ptr<const MetadataValueKey<bool> > transient_key() const;
+ virtual const std::tr1::shared_ptr<const Repository> repository() const;
+ virtual const std::tr1::shared_ptr<const EAPI> eapi() const;
+
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > virtual_for_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > eclass_keywords_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > > contents_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > source_origin_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > binary_origin_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > contained_in_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
+
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
+
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<bool> > transient_key() const;
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const;
@@ -98,7 +98,7 @@ namespace paludis
virtual std::string fs_location_raw_name() const = 0;
virtual std::string fs_location_human_name() const = 0;
virtual std::string contents_filename() const = 0;
- virtual tr1::shared_ptr<MetadataValueKey<tr1::shared_ptr<const Contents> > > make_contents_key() const = 0;
+ virtual std::tr1::shared_ptr<MetadataValueKey<std::tr1::shared_ptr<const Contents> > > make_contents_key() const = 0;
};
}
}
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index aa5812366..2bb03bfba 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -32,7 +32,6 @@
#include <paludis/util/log.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/set.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/join.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/create_iterator-impl.hh>
@@ -43,6 +42,7 @@
#include <paludis/stringify_formatter-impl.hh>
#include <paludis/dep_spec_flattener.hh>
+#include <tr1/functional>
#include <list>
#include <vector>
#include <fstream>
@@ -51,9 +51,9 @@
using namespace paludis;
using namespace paludis::erepository;
-EMutableRepositoryMaskInfoKey::EMutableRepositoryMaskInfoKey(const tr1::shared_ptr<const ERepositoryID> &,
- const std::string & r, const std::string & h, tr1::shared_ptr<const RepositoryMaskInfo> v, const MetadataKeyType t) :
- MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > (r, h, t),
+EMutableRepositoryMaskInfoKey::EMutableRepositoryMaskInfoKey(const std::tr1::shared_ptr<const ERepositoryID> &,
+ const std::string & r, const std::string & h, std::tr1::shared_ptr<const RepositoryMaskInfo> v, const MetadataKeyType t) :
+ MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > (r, h, t),
_value(v)
{
}
@@ -62,14 +62,14 @@ EMutableRepositoryMaskInfoKey::~EMutableRepositoryMaskInfoKey()
{
}
-const tr1::shared_ptr<const RepositoryMaskInfo>
+const std::tr1::shared_ptr<const RepositoryMaskInfo>
EMutableRepositoryMaskInfoKey::value() const
{
return _value;
}
void
-EMutableRepositoryMaskInfoKey::set_value(tr1::shared_ptr<const RepositoryMaskInfo> v)
+EMutableRepositoryMaskInfoKey::set_value(std::tr1::shared_ptr<const RepositoryMaskInfo> v)
{
_value = v;
}
@@ -80,17 +80,17 @@ namespace paludis
struct Implementation<EDependenciesKey>
{
const Environment * const env;
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<const DependencySpecTree::ConstItem> value;
- mutable tr1::function<void () throw ()> value_used;
- const tr1::shared_ptr<const DependencyLabelSequence> labels;
+ mutable std::tr1::shared_ptr<const DependencySpecTree::ConstItem> value;
+ mutable std::tr1::function<void () throw ()> value_used;
+ const std::tr1::shared_ptr<const DependencyLabelSequence> labels;
Implementation(
const Environment * const e,
- const tr1::shared_ptr<const ERepositoryID> & i, const std::string & v,
- const tr1::shared_ptr<const DependencyLabelSequence> & s) :
+ const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ const std::tr1::shared_ptr<const DependencyLabelSequence> & s) :
env(e),
id(i),
string_value(v),
@@ -102,9 +102,9 @@ namespace paludis
EDependenciesKey::EDependenciesKey(
const Environment * const e,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v,
- const tr1::shared_ptr<const DependencyLabelSequence> & l, const MetadataKeyType t) :
+ const std::tr1::shared_ptr<const DependencyLabelSequence> & l, const MetadataKeyType t) :
MetadataSpecTreeKey<DependencySpecTree>(r, h, t),
PrivateImplementationPattern<EDependenciesKey>(new Implementation<EDependenciesKey>(e, id, v, l)),
_imp(PrivateImplementationPattern<EDependenciesKey>::_imp)
@@ -115,7 +115,7 @@ EDependenciesKey::~EDependenciesKey()
{
}
-const tr1::shared_ptr<const DependencySpecTree::ConstItem>
+const std::tr1::shared_ptr<const DependencySpecTree::ConstItem>
EDependenciesKey::value() const
{
Lock l(_imp->value_mutex);
@@ -124,7 +124,7 @@ EDependenciesKey::value() const
if (_imp->value_used)
{
_imp->value_used();
- _imp->value_used = tr1::function<void () throw ()>();
+ _imp->value_used = std::tr1::function<void () throw ()>();
}
return _imp->value;
}
@@ -134,7 +134,7 @@ EDependenciesKey::value() const
return _imp->value;
}
-const tr1::shared_ptr<const DependencyLabelSequence>
+const std::tr1::shared_ptr<const DependencyLabelSequence>
EDependenciesKey::initial_labels() const
{
return _imp->labels;
@@ -164,14 +164,14 @@ namespace paludis
struct Implementation<ELicenseKey>
{
const Environment * const env;
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<const LicenseSpecTree::ConstItem> value;
- mutable tr1::function<void () throw ()> value_used;
+ mutable std::tr1::shared_ptr<const LicenseSpecTree::ConstItem> value;
+ mutable std::tr1::function<void () throw ()> value_used;
Implementation(const Environment * const e,
- const tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
+ const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
env(e),
id(i),
string_value(v)
@@ -182,7 +182,7 @@ namespace paludis
ELicenseKey::ELicenseKey(
const Environment * const e,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
MetadataSpecTreeKey<LicenseSpecTree>(r, h, t),
PrivateImplementationPattern<ELicenseKey>(new Implementation<ELicenseKey>(e, id, v)),
@@ -194,7 +194,7 @@ ELicenseKey::~ELicenseKey()
{
}
-const tr1::shared_ptr<const LicenseSpecTree::ConstItem>
+const std::tr1::shared_ptr<const LicenseSpecTree::ConstItem>
ELicenseKey::value() const
{
Lock l(_imp->value_mutex);
@@ -203,7 +203,7 @@ ELicenseKey::value() const
if (_imp->value_used)
{
_imp->value_used();
- _imp->value_used = tr1::function<void () throw ()>();
+ _imp->value_used = std::tr1::function<void () throw ()>();
}
return _imp->value;
}
@@ -237,13 +237,13 @@ namespace paludis
struct Implementation<EFetchableURIKey>
{
const Environment * const env;
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<const FetchableURISpecTree::ConstItem> value;
- mutable tr1::shared_ptr<const URILabel> initial_label;
+ mutable std::tr1::shared_ptr<const FetchableURISpecTree::ConstItem> value;
+ mutable std::tr1::shared_ptr<const URILabel> initial_label;
- Implementation(const Environment * const e, const tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
+ Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
env(e),
id(i),
string_value(v)
@@ -253,7 +253,7 @@ namespace paludis
}
EFetchableURIKey::EFetchableURIKey(const Environment * const e,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
MetadataSpecTreeKey<FetchableURISpecTree>(r, h, t),
PrivateImplementationPattern<EFetchableURIKey>(new Implementation<EFetchableURIKey>(e, id, v)),
@@ -265,7 +265,7 @@ EFetchableURIKey::~EFetchableURIKey()
{
}
-const tr1::shared_ptr<const FetchableURISpecTree::ConstItem>
+const std::tr1::shared_ptr<const FetchableURISpecTree::ConstItem>
EFetchableURIKey::value() const
{
Lock l(_imp->value_mutex);
@@ -296,7 +296,7 @@ EFetchableURIKey::pretty_print_flat(const FetchableURISpecTree::ItemFormatter &
return stringify(p);
}
-const tr1::shared_ptr<const URILabel>
+const std::tr1::shared_ptr<const URILabel>
EFetchableURIKey::initial_label() const
{
Lock l(_imp->value_mutex);
@@ -338,12 +338,12 @@ namespace paludis
struct Implementation<ESimpleURIKey>
{
const Environment * const env;
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<const SimpleURISpecTree::ConstItem> value;
+ mutable std::tr1::shared_ptr<const SimpleURISpecTree::ConstItem> value;
- Implementation(const Environment * const e, const tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
+ Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
env(e),
id(i),
string_value(v)
@@ -353,7 +353,7 @@ namespace paludis
}
ESimpleURIKey::ESimpleURIKey(const Environment * const e,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
MetadataSpecTreeKey<SimpleURISpecTree>(r, h, t),
PrivateImplementationPattern<ESimpleURIKey>(new Implementation<ESimpleURIKey>(e, id, v)),
@@ -365,7 +365,7 @@ ESimpleURIKey::~ESimpleURIKey()
{
}
-const tr1::shared_ptr<const SimpleURISpecTree::ConstItem>
+const std::tr1::shared_ptr<const SimpleURISpecTree::ConstItem>
ESimpleURIKey::value() const
{
Lock l(_imp->value_mutex);
@@ -402,12 +402,12 @@ namespace paludis
struct Implementation<ERestrictKey>
{
const Environment * const env;
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<const RestrictSpecTree::ConstItem> value;
+ mutable std::tr1::shared_ptr<const RestrictSpecTree::ConstItem> value;
- Implementation(const Environment * const e, const tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
+ Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
env(e),
id(i),
string_value(v)
@@ -417,7 +417,7 @@ namespace paludis
}
ERestrictKey::ERestrictKey(const Environment * const e,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
MetadataSpecTreeKey<RestrictSpecTree>(r, h, t),
PrivateImplementationPattern<ERestrictKey>(new Implementation<ERestrictKey>(e, id, v)),
@@ -429,7 +429,7 @@ ERestrictKey::~ERestrictKey()
{
}
-const tr1::shared_ptr<const RestrictSpecTree::ConstItem>
+const std::tr1::shared_ptr<const RestrictSpecTree::ConstItem>
ERestrictKey::value() const
{
Lock l(_imp->value_mutex);
@@ -466,12 +466,12 @@ namespace paludis
struct Implementation<EProvideKey>
{
const Environment * const env;
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<const ProvideSpecTree::ConstItem> value;
+ mutable std::tr1::shared_ptr<const ProvideSpecTree::ConstItem> value;
- Implementation(const Environment * const e, const tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
+ Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
env(e),
id(i),
string_value(v)
@@ -480,7 +480,7 @@ namespace paludis
};
}
-EProvideKey::EProvideKey(const Environment * const e, const tr1::shared_ptr<const ERepositoryID> & id,
+EProvideKey::EProvideKey(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
MetadataSpecTreeKey<ProvideSpecTree>(r, h, t),
PrivateImplementationPattern<EProvideKey>(new Implementation<EProvideKey>(e, id, v)),
@@ -492,7 +492,7 @@ EProvideKey::~EProvideKey()
{
}
-const tr1::shared_ptr<const ProvideSpecTree::ConstItem>
+const std::tr1::shared_ptr<const ProvideSpecTree::ConstItem>
EProvideKey::value() const
{
Lock l(_imp->value_mutex);
@@ -528,14 +528,14 @@ namespace paludis
template <>
struct Implementation<EIUseKey>
{
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const Environment * const env;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<IUseFlagSet> value;
- mutable tr1::function<void () throw ()> value_used;
+ mutable std::tr1::shared_ptr<IUseFlagSet> value;
+ mutable std::tr1::function<void () throw ()> value_used;
- Implementation(const tr1::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v) :
+ Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v) :
id(i),
env(e),
string_value(v)
@@ -546,7 +546,7 @@ namespace paludis
EIUseKey::EIUseKey(
const Environment * const e,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
MetadataCollectionKey<IUseFlagSet>(r, h, t),
PrivateImplementationPattern<EIUseKey>(new Implementation<EIUseKey>(id, e, v)),
@@ -558,7 +558,7 @@ EIUseKey::~EIUseKey()
{
}
-const tr1::shared_ptr<const IUseFlagSet>
+const std::tr1::shared_ptr<const IUseFlagSet>
EIUseKey::value() const
{
Lock l(_imp->value_mutex);
@@ -567,7 +567,7 @@ EIUseKey::value() const
if (_imp->value_used)
{
_imp->value_used();
- _imp->value_used = tr1::function<void () throw ()>();
+ _imp->value_used = std::tr1::function<void () throw ()>();
}
return _imp->value;
}
@@ -577,7 +577,7 @@ EIUseKey::value() const
std::list<std::string> tokens;
tokenise_whitespace(_imp->string_value, std::back_inserter(tokens));
- tr1::shared_ptr<const UseFlagNameSet> prefixes;
+ std::tr1::shared_ptr<const UseFlagNameSet> prefixes;
if ((*_imp->id->repository())[k::use_interface()])
prefixes = (*_imp->id->repository())[k::use_interface()]->use_expand_prefixes();
else
@@ -646,7 +646,7 @@ EIUseKey::pretty_print_flat(const Formatter<IUseFlag> & f) const
std::string
EIUseKey::pretty_print_flat_with_comparison(
const Environment * const env,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const Formatter<IUseFlag> & f) const
{
std::string result;
@@ -691,9 +691,9 @@ EIUseKey::pretty_print_flat_with_comparison(
l = f.decorate(*i, l, format::Added());
else
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
IUseFlagSet::ConstIterator p(std::find_if(id->iuse_key()->value()->begin(), id->iuse_key()->value()->end(),
- tr1::bind(std::equal_to<UseFlagName>(), i->flag, tr1::bind<const UseFlagName>(&IUseFlag::flag, _1))));
+ std::tr1::bind(std::equal_to<UseFlagName>(), i->flag, std::tr1::bind<const UseFlagName>(&IUseFlag::flag, _1))));
if (p == id->iuse_key()->value()->end())
l = f.decorate(*i, l, format::Added());
@@ -738,9 +738,9 @@ EIUseKey::pretty_print_flat_with_comparison(
l = f.decorate(j->second, l, format::Added());
else
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
IUseFlagSet::ConstIterator p(std::find_if(id->iuse_key()->value()->begin(), id->iuse_key()->value()->end(),
- tr1::bind(std::equal_to<UseFlagName>(), j->second.flag, tr1::bind<const UseFlagName>(&IUseFlag::flag, _1))));
+ std::tr1::bind(std::equal_to<UseFlagName>(), j->second.flag, std::tr1::bind<const UseFlagName>(&IUseFlag::flag, _1))));
if (p == id->iuse_key()->value()->end())
l = f.decorate(j->second, l, format::Added());
@@ -759,14 +759,14 @@ namespace paludis
template <>
struct Implementation<EKeywordsKey>
{
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const Environment * const env;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<KeywordNameSet> value;
- mutable tr1::function<void () throw ()> value_used;
+ mutable std::tr1::shared_ptr<KeywordNameSet> value;
+ mutable std::tr1::function<void () throw ()> value_used;
- Implementation(const tr1::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v) :
+ Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v) :
id(i),
env(e),
string_value(v)
@@ -775,7 +775,7 @@ namespace paludis
};
}
-EKeywordsKey::EKeywordsKey(const Environment * const e, const tr1::shared_ptr<const ERepositoryID> & id,
+EKeywordsKey::EKeywordsKey(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
MetadataCollectionKey<KeywordNameSet>(r, h, t),
PrivateImplementationPattern<EKeywordsKey>(new Implementation<EKeywordsKey>(id, e, v)),
@@ -787,7 +787,7 @@ EKeywordsKey::~EKeywordsKey()
{
}
-const tr1::shared_ptr<const KeywordNameSet>
+const std::tr1::shared_ptr<const KeywordNameSet>
EKeywordsKey::value() const
{
Lock l(_imp->value_mutex);
@@ -796,7 +796,7 @@ EKeywordsKey::value() const
if (_imp->value_used)
{
_imp->value_used();
- _imp->value_used = tr1::function<void () throw ()>();
+ _imp->value_used = std::tr1::function<void () throw ()>();
}
return _imp->value;
}
@@ -817,7 +817,7 @@ EKeywordsKey::pretty_print_flat(const Formatter<KeywordName> & f) const
if (! result.empty())
result.append(" ");
- tr1::shared_ptr<KeywordNameSet> k(new KeywordNameSet);
+ std::tr1::shared_ptr<KeywordNameSet> k(new KeywordNameSet);
k->insert(*i);
if (_imp->env->accept_keywords(k, *_imp->id))
result.append(f.format(*i, format::Accepted()));
@@ -833,13 +833,13 @@ namespace paludis
template <>
struct Implementation<EUseKey>
{
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const Environment * const env;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<UseFlagNameSet> value;
+ mutable std::tr1::shared_ptr<UseFlagNameSet> value;
- Implementation(const tr1::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v) :
+ Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v) :
id(i),
env(e),
string_value(v)
@@ -848,7 +848,7 @@ namespace paludis
};
}
-EUseKey::EUseKey(const Environment * const e, const tr1::shared_ptr<const ERepositoryID> & id,
+EUseKey::EUseKey(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
MetadataCollectionKey<UseFlagNameSet>(r, h, t),
PrivateImplementationPattern<EUseKey>(new Implementation<EUseKey>(id, e, v)),
@@ -860,7 +860,7 @@ EUseKey::~EUseKey()
{
}
-const tr1::shared_ptr<const UseFlagNameSet>
+const std::tr1::shared_ptr<const UseFlagNameSet>
EUseKey::value() const
{
Lock l(_imp->value_mutex);
@@ -920,12 +920,12 @@ namespace paludis
template <>
struct Implementation<EInheritedKey>
{
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<Set<std::string> > value;
+ mutable std::tr1::shared_ptr<Set<std::string> > value;
- Implementation(const tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
+ Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v) :
id(i),
string_value(v)
{
@@ -933,7 +933,7 @@ namespace paludis
};
}
-EInheritedKey::EInheritedKey(const tr1::shared_ptr<const ERepositoryID> & id,
+EInheritedKey::EInheritedKey(const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
MetadataCollectionKey<Set<std::string> >(r, h, t),
PrivateImplementationPattern<EInheritedKey>(new Implementation<EInheritedKey>(id, v)),
@@ -945,7 +945,7 @@ EInheritedKey::~EInheritedKey()
{
}
-const tr1::shared_ptr<const Set<std::string> >
+const std::tr1::shared_ptr<const Set<std::string> >
EInheritedKey::value() const
{
Lock l(_imp->value_mutex);
@@ -970,12 +970,12 @@ namespace paludis
template <>
struct Implementation<EContentsKey>
{
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const FSEntry filename;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<Contents> value;
+ mutable std::tr1::shared_ptr<Contents> value;
- Implementation(const tr1::shared_ptr<const ERepositoryID> & i, const FSEntry & v) :
+ Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const FSEntry & v) :
id(i),
filename(v)
{
@@ -983,9 +983,9 @@ namespace paludis
};
}
-EContentsKey::EContentsKey(const tr1::shared_ptr<const ERepositoryID> & id,
+EContentsKey::EContentsKey(const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const FSEntry & v, const MetadataKeyType t) :
- MetadataValueKey<tr1::shared_ptr<const Contents> > (r, h, t),
+ MetadataValueKey<std::tr1::shared_ptr<const Contents> > (r, h, t),
PrivateImplementationPattern<EContentsKey>(new Implementation<EContentsKey>(id, v)),
_imp(PrivateImplementationPattern<EContentsKey>::_imp)
{
@@ -995,7 +995,7 @@ EContentsKey::~EContentsKey()
{
}
-const tr1::shared_ptr<const Contents>
+const std::tr1::shared_ptr<const Contents>
EContentsKey::value() const
{
Lock l(_imp->value_mutex);
@@ -1034,17 +1034,17 @@ EContentsKey::value() const
}
if ("obj" == tokens.at(0))
- _imp->value->add(tr1::shared_ptr<ContentsEntry>(new ContentsFileEntry(tokens.at(1))));
+ _imp->value->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsFileEntry(tokens.at(1))));
else if ("dir" == tokens.at(0))
- _imp->value->add(tr1::shared_ptr<ContentsEntry>(new ContentsDirEntry(tokens.at(1))));
+ _imp->value->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsDirEntry(tokens.at(1))));
else if ("misc" == tokens.at(0))
- _imp->value->add(tr1::shared_ptr<ContentsEntry>(new ContentsMiscEntry(tokens.at(1))));
+ _imp->value->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsMiscEntry(tokens.at(1))));
else if ("fif" == tokens.at(0))
- _imp->value->add(tr1::shared_ptr<ContentsEntry>(new ContentsFifoEntry(tokens.at(1))));
+ _imp->value->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsFifoEntry(tokens.at(1))));
else if ("dev" == tokens.at(0))
- _imp->value->add(tr1::shared_ptr<ContentsEntry>(new ContentsDevEntry(tokens.at(1))));
+ _imp->value->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsDevEntry(tokens.at(1))));
else if ("sym" == tokens.at(0))
- _imp->value->add(tr1::shared_ptr<ContentsEntry>(new ContentsSymEntry(tokens.at(1), tokens.at(2))));
+ _imp->value->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsSymEntry(tokens.at(1), tokens.at(2))));
}
return _imp->value;
@@ -1055,12 +1055,12 @@ namespace paludis
template <>
struct Implementation<EMTimeKey>
{
- const tr1::shared_ptr<const ERepositoryID> id;
+ const std::tr1::shared_ptr<const ERepositoryID> id;
const FSEntry filename;
mutable Mutex value_mutex;
- mutable tr1::shared_ptr<time_t> value;
+ mutable std::tr1::shared_ptr<time_t> value;
- Implementation(const tr1::shared_ptr<const ERepositoryID> & i, const FSEntry & v) :
+ Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const FSEntry & v) :
id(i),
filename(v)
{
@@ -1068,7 +1068,7 @@ namespace paludis
};
}
-EMTimeKey::EMTimeKey(const tr1::shared_ptr<const ERepositoryID> & id,
+EMTimeKey::EMTimeKey(const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const FSEntry & v, const MetadataKeyType t) :
MetadataTimeKey(r, h, t),
PrivateImplementationPattern<EMTimeKey>(new Implementation<EMTimeKey>(id, v)),
diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh
index da547a4f1..167fcfa6b 100644
--- a/paludis/repositories/e/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
@@ -31,20 +31,20 @@ namespace paludis
class ERepositoryID;
class EMutableRepositoryMaskInfoKey :
- public MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> >
+ public MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> >
{
private:
- tr1::shared_ptr<const RepositoryMaskInfo> _value;
+ std::tr1::shared_ptr<const RepositoryMaskInfo> _value;
public:
- EMutableRepositoryMaskInfoKey(const tr1::shared_ptr<const ERepositoryID> &,
- const std::string &, const std::string &, tr1::shared_ptr<const RepositoryMaskInfo>, const MetadataKeyType);
+ EMutableRepositoryMaskInfoKey(const std::tr1::shared_ptr<const ERepositoryID> &,
+ const std::string &, const std::string &, std::tr1::shared_ptr<const RepositoryMaskInfo>, const MetadataKeyType);
~EMutableRepositoryMaskInfoKey();
- virtual const tr1::shared_ptr<const RepositoryMaskInfo> value() const
+ virtual const std::tr1::shared_ptr<const RepositoryMaskInfo> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- void set_value(tr1::shared_ptr<const RepositoryMaskInfo>);
+ void set_value(std::tr1::shared_ptr<const RepositoryMaskInfo>);
};
class EDependenciesKey :
@@ -57,13 +57,13 @@ namespace paludis
public:
EDependenciesKey(
const Environment * const,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &,
- const tr1::shared_ptr<const DependencyLabelSequence> &,
+ const std::tr1::shared_ptr<const DependencyLabelSequence> &,
const MetadataKeyType);
~EDependenciesKey();
- virtual const tr1::shared_ptr<const DependencySpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const DependencySpecTree::ItemFormatter &) const
@@ -72,7 +72,7 @@ namespace paludis
virtual std::string pretty_print_flat(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const tr1::shared_ptr<const DependencyLabelSequence> initial_labels() const
+ virtual const std::tr1::shared_ptr<const DependencyLabelSequence> initial_labels() const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -85,11 +85,11 @@ namespace paludis
public:
EFetchableURIKey(const Environment * const,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EFetchableURIKey();
- virtual const tr1::shared_ptr<const FetchableURISpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const FetchableURISpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const FetchableURISpecTree::ItemFormatter &) const
@@ -98,7 +98,7 @@ namespace paludis
virtual std::string pretty_print_flat(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const tr1::shared_ptr<const URILabel> initial_label() const
+ virtual const std::tr1::shared_ptr<const URILabel> initial_label() const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -111,11 +111,11 @@ namespace paludis
public:
ESimpleURIKey(const Environment * const,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~ESimpleURIKey();
- virtual const tr1::shared_ptr<const SimpleURISpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const SimpleURISpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const SimpleURISpecTree::ItemFormatter &) const
@@ -134,11 +134,11 @@ namespace paludis
public:
ERestrictKey(const Environment * const,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~ERestrictKey();
- virtual const tr1::shared_ptr<const RestrictSpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const RestrictSpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const RestrictSpecTree::ItemFormatter &) const
@@ -157,11 +157,11 @@ namespace paludis
public:
EProvideKey(const Environment * const,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EProvideKey();
- virtual const tr1::shared_ptr<const ProvideSpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const ProvideSpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const ProvideSpecTree::ItemFormatter &) const
@@ -181,11 +181,11 @@ namespace paludis
public:
ELicenseKey(
const Environment * const,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~ELicenseKey();
- virtual const tr1::shared_ptr<const LicenseSpecTree::ConstItem> value() const
+ virtual const std::tr1::shared_ptr<const LicenseSpecTree::ConstItem> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const LicenseSpecTree::ItemFormatter &) const
@@ -205,11 +205,11 @@ namespace paludis
public:
EIUseKey(
const Environment * const,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EIUseKey();
- const tr1::shared_ptr<const IUseFlagSet> value() const
+ const std::tr1::shared_ptr<const IUseFlagSet> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print_flat(const Formatter<IUseFlag> &) const
@@ -217,7 +217,7 @@ namespace paludis
virtual std::string pretty_print_flat_with_comparison(
const Environment * const,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const Formatter<IUseFlag> &
) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -233,11 +233,11 @@ namespace paludis
public:
EKeywordsKey(
const Environment * const,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EKeywordsKey();
- const tr1::shared_ptr<const KeywordNameSet> value() const
+ const std::tr1::shared_ptr<const KeywordNameSet> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print_flat(const Formatter<KeywordName> &) const
@@ -254,11 +254,11 @@ namespace paludis
public:
EUseKey(
const Environment * const,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EUseKey();
- const tr1::shared_ptr<const UseFlagNameSet> value() const
+ const std::tr1::shared_ptr<const UseFlagNameSet> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print_flat(const Formatter<UseFlagName> &) const
@@ -273,11 +273,11 @@ namespace paludis
PrivateImplementationPattern<EInheritedKey>::ImpPtr & _imp;
public:
- EInheritedKey(const tr1::shared_ptr<const ERepositoryID> &,
+ EInheritedKey(const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EInheritedKey();
- const tr1::shared_ptr<const Set<std::string> > value() const
+ const std::tr1::shared_ptr<const Set<std::string> > value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print_flat(const Formatter<std::string> &) const
@@ -285,7 +285,7 @@ namespace paludis
};
class EContentsKey :
- public MetadataValueKey<tr1::shared_ptr<const Contents> >,
+ public MetadataValueKey<std::tr1::shared_ptr<const Contents> >,
private PrivateImplementationPattern<EContentsKey>
{
private:
@@ -293,11 +293,11 @@ namespace paludis
public:
EContentsKey(
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const FSEntry &, const MetadataKeyType);
~EContentsKey();
- const tr1::shared_ptr<const Contents> value() const
+ const std::tr1::shared_ptr<const Contents> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -309,7 +309,7 @@ namespace paludis
PrivateImplementationPattern<EMTimeKey>::ImpPtr & _imp;
public:
- EMTimeKey(const tr1::shared_ptr<const ERepositoryID> &,
+ EMTimeKey(const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const FSEntry &, const MetadataKeyType);
~EMTimeKey();
diff --git a/paludis/repositories/e/e_mask.cc b/paludis/repositories/e/e_mask.cc
index 7412ddacf..cebad426f 100644
--- a/paludis/repositories/e/e_mask.cc
+++ b/paludis/repositories/e/e_mask.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -31,9 +31,9 @@ namespace paludis
{
const char key;
const std::string description;
- const tr1::shared_ptr<const MetadataKey> unaccepted_key;
+ const std::tr1::shared_ptr<const MetadataKey> unaccepted_key;
- Implementation(const char k, const std::string & d, const tr1::shared_ptr<const MetadataKey> & u) :
+ Implementation(const char k, const std::string & d, const std::tr1::shared_ptr<const MetadataKey> & u) :
key(k),
description(d),
unaccepted_key(u)
@@ -42,7 +42,7 @@ namespace paludis
};
}
-EUnacceptedMask::EUnacceptedMask(const char k, const std::string & d, const tr1::shared_ptr<const MetadataKey> & u) :
+EUnacceptedMask::EUnacceptedMask(const char k, const std::string & d, const std::tr1::shared_ptr<const MetadataKey> & u) :
PrivateImplementationPattern<EUnacceptedMask>(new Implementation<EUnacceptedMask>(k, d, u))
{
}
@@ -63,7 +63,7 @@ EUnacceptedMask::description() const
return _imp->description;
}
-const tr1::shared_ptr<const MetadataKey>
+const std::tr1::shared_ptr<const MetadataKey>
EUnacceptedMask::unaccepted_key() const
{
return _imp->unaccepted_key;
@@ -123,9 +123,9 @@ namespace paludis
{
const char key;
const std::string description;
- const tr1::shared_ptr<const MetadataKey> mask_key;
+ const std::tr1::shared_ptr<const MetadataKey> mask_key;
- Implementation(const char k, const std::string & d, const tr1::shared_ptr<const MetadataKey> & m) :
+ Implementation(const char k, const std::string & d, const std::tr1::shared_ptr<const MetadataKey> & m) :
key(k),
description(d),
mask_key(m)
@@ -134,7 +134,7 @@ namespace paludis
};
}
-ERepositoryMask::ERepositoryMask(const char k, const std::string & d, const tr1::shared_ptr<const MetadataKey> & m) :
+ERepositoryMask::ERepositoryMask(const char k, const std::string & d, const std::tr1::shared_ptr<const MetadataKey> & m) :
PrivateImplementationPattern<ERepositoryMask>(new Implementation<ERepositoryMask>(k, d, m))
{
}
@@ -155,7 +155,7 @@ ERepositoryMask::description() const
return _imp->description;
}
-const tr1::shared_ptr<const MetadataKey>
+const std::tr1::shared_ptr<const MetadataKey>
ERepositoryMask::mask_key() const
{
return _imp->mask_key;
diff --git a/paludis/repositories/e/e_mask.hh b/paludis/repositories/e/e_mask.hh
index 5d34d62bf..dcce2cdba 100644
--- a/paludis/repositories/e/e_mask.hh
+++ b/paludis/repositories/e/e_mask.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -32,12 +32,12 @@ namespace paludis
private PrivateImplementationPattern<EUnacceptedMask>
{
public:
- EUnacceptedMask(const char, const std::string &, const tr1::shared_ptr<const MetadataKey> &);
+ EUnacceptedMask(const char, const std::string &, const std::tr1::shared_ptr<const MetadataKey> &);
~EUnacceptedMask();
char key() const;
const std::string description() const;
- const tr1::shared_ptr<const MetadataKey> unaccepted_key() const;
+ const std::tr1::shared_ptr<const MetadataKey> unaccepted_key() const;
};
class EUnsupportedMask :
@@ -58,12 +58,12 @@ namespace paludis
private PrivateImplementationPattern<ERepositoryMask>
{
public:
- ERepositoryMask(const char, const std::string &, const tr1::shared_ptr<const MetadataKey> &);
+ ERepositoryMask(const char, const std::string &, const std::tr1::shared_ptr<const MetadataKey> &);
~ERepositoryMask();
virtual char key() const;
const std::string description() const;
- const tr1::shared_ptr<const MetadataKey> mask_key() const;
+ const std::tr1::shared_ptr<const MetadataKey> mask_key() const;
};
}
}
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index df647a40d..bc5d8a7b1 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -45,7 +45,6 @@
#include <paludis/dep_spec.hh>
#include <paludis/literal_metadata_key.hh>
#include <paludis/environment.hh>
-#include <paludis/hashed_containers.hh>
#include <paludis/hook.hh>
#include <paludis/match_package.hh>
#include <paludis/query.hh>
@@ -69,7 +68,6 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
#include <paludis/util/system.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
@@ -77,7 +75,10 @@
#include <paludis/util/rmd160.hh>
#include <paludis/util/sha1.hh>
#include <paludis/util/sha256.hh>
+#include <paludis/util/hashes.hh>
+#include <tr1/functional>
+#include <tr1/unordered_map>
#include <map>
#include <set>
#include <functional>
@@ -102,10 +103,11 @@
using namespace paludis;
-typedef MakeHashedMap<QualifiedPackageName,
- std::list<std::pair<tr1::shared_ptr<const PackageDepSpec>, tr1::shared_ptr<const RepositoryMaskInfo> > > >::Type RepositoryMaskMap;
-typedef MakeHashedMultiMap<std::string, std::string>::Type MirrorMap;
-typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> >::Type VirtualsMap;
+typedef std::tr1::unordered_map<QualifiedPackageName,
+ std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, std::tr1::shared_ptr<const RepositoryMaskInfo> > >,
+ Hash<QualifiedPackageName> > RepositoryMaskMap;
+typedef std::tr1::unordered_multimap<std::string, std::string, Hash<std::string> > MirrorMap;
+typedef std::tr1::unordered_map<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec>, Hash<QualifiedPackageName> > VirtualsMap;
typedef std::list<RepositoryEInterface::ProfilesDescLine> ProfilesDesc;
namespace
@@ -142,22 +144,22 @@ namespace
for (std::set<std::string>::const_iterator i(info_pkgs.begin()),
i_end(info_pkgs.end()) ; i != i_end ; ++i)
{
- tr1::shared_ptr<MetadataKey> key;
- tr1::shared_ptr<const PackageIDSequence> q(
+ std::tr1::shared_ptr<MetadataKey> key;
+ std::tr1::shared_ptr<const PackageIDSequence> q(
_env->package_database()->query(
query::Matches(erepository::parse_e_package_dep_spec(*i,
*erepository::EAPIData::get_instance()->eapi_from_string(_p),
- tr1::shared_ptr<const PackageID>())) &
+ std::tr1::shared_ptr<const PackageID>())) &
query::InstalledAtRoot(_env->root()),
qo_order_by_version));
if (q->empty())
key.reset(new LiteralMetadataValueKey<std::string>(*i, *i, mkt_normal, "(none)"));
else
{
- using namespace tr1::placeholders;
- tr1::shared_ptr<Set<std::string> > s(new Set<std::string>);
+ using namespace std::tr1::placeholders;
+ std::tr1::shared_ptr<Set<std::string> > s(new Set<std::string>);
std::transform(indirect_iterator(q->begin()), indirect_iterator(q->end()), s->inserter(),
- tr1::bind(tr1::mem_fn(&PackageID::canonical_form), _1, idcf_version));
+ std::tr1::bind(std::tr1::mem_fn(&PackageID::canonical_form), _1, idcf_version));
key.reset(new LiteralMetadataStringSetKey(*i, *i, mkt_normal, s));
}
@@ -206,16 +208,16 @@ namespace paludis
ERepository * const repo;
const ERepositoryParams params;
- const tr1::shared_ptr<Mutexes> mutexes;
+ const std::tr1::shared_ptr<Mutexes> mutexes;
- tr1::shared_ptr<RepositoryNameCache> names_cache;
+ std::tr1::shared_ptr<RepositoryNameCache> names_cache;
mutable RepositoryMaskMap repo_mask;
mutable bool has_repo_mask;
const std::map<QualifiedPackageName, QualifiedPackageName> provide_map;
- mutable tr1::shared_ptr<UseFlagNameSet> arch_flags;
+ mutable std::tr1::shared_ptr<UseFlagNameSet> arch_flags;
mutable bool has_mirrors;
mutable MirrorMap mirrors;
@@ -223,52 +225,52 @@ namespace paludis
mutable bool has_profiles_desc;
mutable ProfilesDesc profiles_desc;
- mutable std::list<tr1::shared_ptr<UseDesc> > use_desc;
+ mutable std::list<std::tr1::shared_ptr<UseDesc> > use_desc;
- mutable tr1::shared_ptr<ERepositoryProfile> profile_ptr;
+ mutable std::tr1::shared_ptr<ERepositoryProfile> profile_ptr;
- mutable tr1::shared_ptr<ERepositoryNews> news_ptr;
+ mutable std::tr1::shared_ptr<ERepositoryNews> news_ptr;
- mutable tr1::shared_ptr<ERepositorySets> sets_ptr;
- mutable tr1::shared_ptr<erepository::ERepositoryEntries> entries_ptr;
- mutable tr1::shared_ptr<erepository::Layout> layout;
+ mutable std::tr1::shared_ptr<ERepositorySets> sets_ptr;
+ mutable std::tr1::shared_ptr<erepository::ERepositoryEntries> entries_ptr;
+ mutable std::tr1::shared_ptr<erepository::Layout> layout;
- Implementation(ERepository * const, const ERepositoryParams &, tr1::shared_ptr<Mutexes> = make_shared_ptr(new Mutexes));
+ Implementation(ERepository * const, const ERepositoryParams &, std::tr1::shared_ptr<Mutexes> = make_shared_ptr(new Mutexes));
~Implementation();
void need_profiles() const;
void need_profiles_desc() const;
- tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > layout_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
- tr1::shared_ptr<const MetadataCollectionKey<FSEntrySequence> > profiles_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > cache_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > write_cache_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > append_repository_name_to_write_cache_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > ignore_deprecated_profiles;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > names_cache_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > distdir_key;
- tr1::shared_ptr<const MetadataCollectionKey<FSEntrySequence> > eclassdirs_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > securitydir_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > setsdir_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > newsdir_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > sync_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > sync_options_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > builddir_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > master_repository_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > eapi_when_unknown_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > eapi_when_unspecified_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > profile_eapi_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > use_manifest_key;
- tr1::shared_ptr<const MetadataSectionKey> info_pkgs_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > binary_destination_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > binary_src_uri_prefix_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > binary_keywords;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > layout_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
+ std::tr1::shared_ptr<const MetadataCollectionKey<FSEntrySequence> > profiles_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > cache_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > write_cache_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > append_repository_name_to_write_cache_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > ignore_deprecated_profiles;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > names_cache_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > distdir_key;
+ std::tr1::shared_ptr<const MetadataCollectionKey<FSEntrySequence> > eclassdirs_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > securitydir_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > setsdir_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > newsdir_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_options_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > builddir_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > master_repository_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > eapi_when_unknown_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > eapi_when_unspecified_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > profile_eapi_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > use_manifest_key;
+ std::tr1::shared_ptr<const MetadataSectionKey> info_pkgs_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > binary_destination_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > binary_src_uri_prefix_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > binary_keywords;
};
Implementation<ERepository>::Implementation(ERepository * const r,
- const ERepositoryParams & p, tr1::shared_ptr<Mutexes> m) :
+ const ERepositoryParams & p, std::tr1::shared_ptr<Mutexes> m) :
repo(r),
params(p),
mutexes(m),
@@ -282,7 +284,7 @@ namespace paludis
layout(erepository::LayoutMaker::get_instance()->find_maker(
params.layout)(r, params.location, entries_ptr, params.master_repository ?
make_shared_ptr(new FSEntry(params.master_repository->params().location)) :
- tr1::shared_ptr<FSEntry>())),
+ std::tr1::shared_ptr<FSEntry>())),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format",
mkt_significant, params.entry_format)),
layout_key(new LiteralMetadataValueKey<std::string> ("layout", "layout",
@@ -320,9 +322,9 @@ namespace paludis
builddir_key(new LiteralMetadataValueKey<FSEntry> (
"builddir", "builddir", mkt_normal, params.builddir)),
master_repository_key(params.master_repository ?
- tr1::shared_ptr<MetadataValueKey<std::string> >(new LiteralMetadataValueKey<std::string> (
+ std::tr1::shared_ptr<MetadataValueKey<std::string> >(new LiteralMetadataValueKey<std::string> (
"master_repository", "master_repository", mkt_normal, stringify(params.master_repository->name()))) :
- tr1::shared_ptr<MetadataValueKey<std::string> >()),
+ std::tr1::shared_ptr<MetadataValueKey<std::string> >()),
eapi_when_unknown_key(new LiteralMetadataValueKey<std::string> (
"eapi_when_unknown", "eapi_when_unknown", mkt_normal, params.eapi_when_unknown)),
eapi_when_unspecified_key(new LiteralMetadataValueKey<std::string> (
@@ -332,9 +334,9 @@ namespace paludis
use_manifest_key(new LiteralMetadataValueKey<std::string> (
"use_manifest", "use_manifest", mkt_normal, stringify(params.use_manifest))),
info_pkgs_key((layout->info_packages_file(params.location / "profiles")).exists() ?
- tr1::shared_ptr<MetadataSectionKey>(new PkgInfoSectionKey(
+ std::tr1::shared_ptr<MetadataSectionKey>(new PkgInfoSectionKey(
params.environment, layout->info_packages_file(params.location / "profiles"), params.profile_eapi)) :
- tr1::shared_ptr<MetadataSectionKey>()),
+ std::tr1::shared_ptr<MetadataSectionKey>()),
binary_destination_key(new LiteralMetadataValueKey<std::string> (
"binary_destination", "binary_destination", mkt_normal, stringify(params.binary_destination))),
binary_src_uri_prefix_key(new LiteralMetadataValueKey<std::string> (
@@ -376,7 +378,7 @@ namespace paludis
Context context("When loading profiles.desc:");
bool found_one(false);
- tr1::shared_ptr<const FSEntrySequence> profiles_desc_files(layout->profiles_desc_files());
+ std::tr1::shared_ptr<const FSEntrySequence> profiles_desc_files(layout->profiles_desc_files());
for (FSEntrySequence::ConstIterator p(profiles_desc_files->begin()), p_end(profiles_desc_files->end()) ;
p != p_end ; ++p)
{
@@ -401,7 +403,7 @@ namespace paludis
(k::arch(), tokens.at(0))
(k::path(), *profiles.begin())
(k::status(), tokens.at(2))
- (k::profile(), tr1::shared_ptr<ERepositoryProfile>(new ERepositoryProfile(
+ (k::profile(), std::tr1::shared_ptr<ERepositoryProfile>(new ERepositoryProfile(
params.environment, repo, repo->name(), profiles,
(*(*erepository::EAPIData::get_instance()->eapi_from_string(
params.eapi_when_unknown))[k::supported()])[k::ebuild_environment_variables()][k::env_arch()]))));
@@ -540,25 +542,25 @@ ERepository::has_package_named(const QualifiedPackageName & q) const
return _imp->layout->has_package_named(q);
}
-tr1::shared_ptr<const CategoryNamePartSet>
+std::tr1::shared_ptr<const CategoryNamePartSet>
ERepository::category_names() const
{
return _imp->layout->category_names();
}
-tr1::shared_ptr<const QualifiedPackageNameSet>
+std::tr1::shared_ptr<const QualifiedPackageNameSet>
ERepository::package_names(const CategoryNamePart & c) const
{
return _imp->layout->package_names(c);
}
-tr1::shared_ptr<const PackageIDSequence>
+std::tr1::shared_ptr<const PackageIDSequence>
ERepository::package_ids(const QualifiedPackageName & n) const
{
return _imp->layout->package_ids(n);
}
-tr1::shared_ptr<const RepositoryMaskInfo>
+std::tr1::shared_ptr<const RepositoryMaskInfo>
ERepository::repository_masked(const PackageID & id) const
{
Lock l(_imp->mutexes->repo_mask_mutex);
@@ -567,12 +569,12 @@ ERepository::repository_masked(const PackageID & id) const
{
Context context("When querying repository mask for '" + stringify(id) + "':");
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
- tr1::shared_ptr<const FSEntrySequence> repository_mask_files(_imp->layout->repository_mask_files());
+ std::tr1::shared_ptr<const FSEntrySequence> repository_mask_files(_imp->layout->repository_mask_files());
erepository::ProfileFile<erepository::MaskFile> repository_mask_file;
std::for_each(repository_mask_files->begin(), repository_mask_files->end(),
- tr1::bind(&erepository::ProfileFile<erepository::MaskFile>::add_file, tr1::ref(repository_mask_file), _1));
+ std::tr1::bind(&erepository::ProfileFile<erepository::MaskFile>::add_file, std::tr1::ref(repository_mask_file), _1));
for (erepository::ProfileFile<erepository::MaskFile>::ConstIterator
line(repository_mask_file.begin()), line_end(repository_mask_file.end()) ;
@@ -580,10 +582,10 @@ ERepository::repository_masked(const PackageID & id) const
{
try
{
- tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(erepository::parse_e_package_dep_spec(
+ std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(erepository::parse_e_package_dep_spec(
line->first,
*erepository::EAPIData::get_instance()->eapi_from_string(_imp->params.profile_eapi),
- tr1::shared_ptr<const PackageID>())));
+ std::tr1::shared_ptr<const PackageID>())));
if (a->package_ptr())
_imp->repo_mask[*a->package_ptr()].push_back(std::make_pair(a, line->second));
else
@@ -608,14 +610,14 @@ ERepository::repository_masked(const PackageID & id) const
RepositoryMaskMap::iterator r(_imp->repo_mask.find(id.name()));
if (_imp->repo_mask.end() == r)
- return tr1::shared_ptr<const RepositoryMaskInfo>();
+ return std::tr1::shared_ptr<const RepositoryMaskInfo>();
else
- for (std::list<std::pair<tr1::shared_ptr<const PackageDepSpec>, tr1::shared_ptr<const RepositoryMaskInfo> > >::const_iterator
+ for (std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, std::tr1::shared_ptr<const RepositoryMaskInfo> > >::const_iterator
k(r->second.begin()), k_end(r->second.end()) ; k != k_end ; ++k)
if (match_package(*_imp->params.environment, *k->first, id))
return k->second;
- return tr1::shared_ptr<const RepositoryMaskInfo>();
+ return std::tr1::shared_ptr<const RepositoryMaskInfo>();
}
UseFlagState
@@ -662,7 +664,7 @@ ERepository::query_use(const UseFlagName & f, const PackageID & e) const
break;
bool is_expand(false);
- const tr1::shared_ptr<const UseFlagNameSet> prefixes(use_expand_prefixes());
+ const std::tr1::shared_ptr<const UseFlagNameSet> prefixes(use_expand_prefixes());
for (UseFlagNameSet::ConstIterator p(prefixes->begin()), p_end(prefixes->end()) ;
p != p_end && ! is_expand ; ++p)
if (0 == stringify(*p).compare(0, stringify(*p).length(), stringify(f), 0, stringify(*p).length()))
@@ -734,7 +736,7 @@ ERepository::query_use_force(const UseFlagName & u, const PackageID & e) const
}
}
-tr1::shared_ptr<const UseFlagNameSet>
+std::tr1::shared_ptr<const UseFlagNameSet>
ERepository::arch_flags() const
{
Lock l(_imp->mutexes->arch_flags_mutex);
@@ -744,7 +746,7 @@ ERepository::arch_flags() const
_imp->arch_flags.reset(new UseFlagNameSet);
bool found_one(false);
- tr1::shared_ptr<const FSEntrySequence> arch_list_files(_imp->layout->arch_list_files());
+ std::tr1::shared_ptr<const FSEntrySequence> arch_list_files(_imp->layout->arch_list_files());
for (FSEntrySequence::ConstIterator p(arch_list_files->begin()), p_end(arch_list_files->end()) ;
p != p_end ; ++p)
{
@@ -775,7 +777,7 @@ ERepository::need_mirrors() const
if (! _imp->has_mirrors)
{
bool found_one(false);
- tr1::shared_ptr<const FSEntrySequence> mirror_files(_imp->layout->mirror_files());
+ std::tr1::shared_ptr<const FSEntrySequence> mirror_files(_imp->layout->mirror_files());
for (FSEntrySequence::ConstIterator p(mirror_files->begin()), p_end(mirror_files->end()) ;
p != p_end ; ++p)
{
@@ -813,7 +815,7 @@ ERepository::need_mirrors() const
}
}
-tr1::shared_ptr<SetSpecTree::ConstItem>
+std::tr1::shared_ptr<SetSpecTree::ConstItem>
ERepository::package_set(const SetName & s) const
{
if (s.data() == "system")
@@ -825,7 +827,7 @@ ERepository::package_set(const SetName & s) const
return _imp->sets_ptr->package_set(s);
}
-tr1::shared_ptr<const SetNameSet>
+std::tr1::shared_ptr<const SetNameSet>
ERepository::sets_list() const
{
return _imp->sets_ptr->sets_list();
@@ -905,20 +907,20 @@ ERepository::update_news() const
_imp->news_ptr->update_news();
}
-const tr1::shared_ptr<const erepository::Layout>
+const std::tr1::shared_ptr<const erepository::Layout>
ERepository::layout() const
{
return _imp->layout;
}
-const tr1::shared_ptr<const ERepositoryProfile>
+const std::tr1::shared_ptr<const ERepositoryProfile>
ERepository::profile() const
{
_imp->need_profiles();
return _imp->profile_ptr;
}
-const tr1::shared_ptr<const erepository::ERepositoryEntries>
+const std::tr1::shared_ptr<const erepository::ERepositoryEntries>
ERepository::entries() const
{
return _imp->entries_ptr;
@@ -926,7 +928,7 @@ ERepository::entries() const
std::string
ERepository::get_environment_variable(
- const tr1::shared_ptr<const PackageID> & for_package,
+ const std::tr1::shared_ptr<const PackageID> & for_package,
const std::string & var) const
{
Context context("When fetching environment variable '" + var + "' from repository '"
@@ -934,7 +936,7 @@ ERepository::get_environment_variable(
_imp->need_profiles();
- return _imp->entries_ptr->get_environment_variable(tr1::static_pointer_cast<const erepository::ERepositoryID>(for_package),
+ return _imp->entries_ptr->get_environment_variable(std::tr1::static_pointer_cast<const erepository::ERepositoryID>(for_package),
var, _imp->profile_ptr);
}
@@ -960,7 +962,7 @@ ERepository::end_mirrors(const std::string & s) const
return MirrorsConstIterator(_imp->mirrors.equal_range(s).second);
}
-tr1::shared_ptr<const ERepository::VirtualsSequence>
+std::tr1::shared_ptr<const ERepository::VirtualsSequence>
ERepository::virtual_packages() const
{
Context context("When loading virtual packages for repository '" +
@@ -968,7 +970,7 @@ ERepository::virtual_packages() const
_imp->need_profiles();
- tr1::shared_ptr<VirtualsSequence> result(new VirtualsSequence);
+ std::tr1::shared_ptr<VirtualsSequence> result(new VirtualsSequence);
for (ERepositoryProfile::VirtualsConstIterator i(_imp->profile_ptr->begin_virtuals()),
i_end(_imp->profile_ptr->end_virtuals()) ; i != i_end ; ++i)
@@ -979,14 +981,14 @@ ERepository::virtual_packages() const
return result;
}
-tr1::shared_ptr<const UseFlagNameSet>
+std::tr1::shared_ptr<const UseFlagNameSet>
ERepository::use_expand_flags() const
{
_imp->need_profiles();
std::string expand_sep(stringify((*(*erepository::EAPIData::get_instance()->eapi_from_string(
(_imp->params.profile_eapi)))[k::supported()])[k::ebuild_options()].use_expand_separator));
- tr1::shared_ptr<UseFlagNameSet> result(new UseFlagNameSet);
+ std::tr1::shared_ptr<UseFlagNameSet> result(new UseFlagNameSet);
for (ERepositoryProfile::UseExpandConstIterator i(_imp->profile_ptr->begin_use_expand()),
i_end(_imp->profile_ptr->end_use_expand()) ; i != i_end ; ++i)
{
@@ -1005,12 +1007,12 @@ ERepository::use_expand_flags() const
return result;
}
-tr1::shared_ptr<const UseFlagNameSet>
+std::tr1::shared_ptr<const UseFlagNameSet>
ERepository::use_expand_prefixes() const
{
_imp->need_profiles();
- tr1::shared_ptr<UseFlagNameSet> result(new UseFlagNameSet);
+ std::tr1::shared_ptr<UseFlagNameSet> result(new UseFlagNameSet);
for (ERepositoryProfile::UseExpandConstIterator i(_imp->profile_ptr->begin_use_expand()),
i_end(_imp->profile_ptr->end_use_expand()) ; i != i_end ; ++i)
{
@@ -1022,12 +1024,12 @@ ERepository::use_expand_prefixes() const
return result;
}
-tr1::shared_ptr<const UseFlagNameSet>
+std::tr1::shared_ptr<const UseFlagNameSet>
ERepository::use_expand_hidden_prefixes() const
{
_imp->need_profiles();
- tr1::shared_ptr<UseFlagNameSet> result(new UseFlagNameSet);
+ std::tr1::shared_ptr<UseFlagNameSet> result(new UseFlagNameSet);
for (ERepositoryProfile::UseExpandConstIterator i(_imp->profile_ptr->begin_use_expand_hidden()),
i_end(_imp->profile_ptr->end_use_expand_hidden()) ; i != i_end ; ++i)
{
@@ -1044,7 +1046,7 @@ ERepository::use_expand_separator(const PackageID & id) const
{
if (this != id.repository().get())
return '\0';
- const tr1::shared_ptr<const erepository::EAPI> & eapi(static_cast<const erepository::ERepositoryID &>(id).eapi());
+ const std::tr1::shared_ptr<const erepository::EAPI> & eapi(static_cast<const erepository::ERepositoryID &>(id).eapi());
return (*eapi)[k::supported()] ? (*(*eapi)[k::supported()])[k::ebuild_options()].use_expand_separator : '\0';
}
@@ -1054,13 +1056,13 @@ ERepository::regenerate_cache() const
_imp->names_cache->regenerate_cache();
}
-tr1::shared_ptr<const CategoryNamePartSet>
+std::tr1::shared_ptr<const CategoryNamePartSet>
ERepository::category_names_containing_package(const PackageNamePart & p) const
{
if (! _imp->names_cache->usable())
return Repository::category_names_containing_package(p);
- tr1::shared_ptr<const CategoryNamePartSet> result(
+ std::tr1::shared_ptr<const CategoryNamePartSet> result(
_imp->names_cache->category_names_containing_package(p));
return result ? result : Repository::category_names_containing_package(p);
@@ -1141,14 +1143,14 @@ ERepository::describe_use_flag(const UseFlagName & f,
{
std::string expand_sep(stringify((*(*erepository::EAPIData::get_instance()->eapi_from_string(
_imp->params.profile_eapi))[k::supported()])[k::ebuild_options()].use_expand_separator));
- tr1::shared_ptr<const FSEntrySequence> use_desc_dirs(_imp->layout->use_desc_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> use_desc_dirs(_imp->layout->use_desc_dirs());
for (FSEntrySequence::ConstIterator p(use_desc_dirs->begin()), p_end(use_desc_dirs->end()) ;
p != p_end ; ++p)
- _imp->use_desc.push_back(tr1::shared_ptr<UseDesc>(new UseDesc(*p, expand_sep)));
+ _imp->use_desc.push_back(std::tr1::shared_ptr<UseDesc>(new UseDesc(*p, expand_sep)));
}
std::string result;
- for (std::list<tr1::shared_ptr<UseDesc> >::const_iterator i(_imp->use_desc.begin()),
+ for (std::list<std::tr1::shared_ptr<UseDesc> >::const_iterator i(_imp->use_desc.begin()),
i_end(_imp->use_desc.end()) ; i != i_end ; ++i)
{
std::string new_result((*i)->describe(f, e));
@@ -1206,10 +1208,10 @@ ERepository::perform_hook(const Hook & hook) const
return HookResult(0, "");
}
-tr1::shared_ptr<const CategoryNamePartSet>
+std::tr1::shared_ptr<const CategoryNamePartSet>
ERepository::unimportant_category_names() const
{
- tr1::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
+ std::tr1::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
result->insert(CategoryNamePart("virtual"));
return result;
}
@@ -1223,7 +1225,7 @@ namespace
void * handle;
void (* qa_checks_handle)(
const Environment * const,
- const tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepository> &,
const QACheckProperties & ignore_if,
const QACheckProperties & ignore_unless,
const QAMessageLevel minimum_level,
@@ -1275,7 +1277,7 @@ ERepository::check_qa(
if (0 == libqahandle.qa_checks_handle)
libqahandle.qa_checks_handle = STUPID_CAST(void (*)(
const Environment * const,
- const tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepository> &,
const QACheckProperties &,
const QACheckProperties &,
const QAMessageLevel,
@@ -1365,7 +1367,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
if (! manifest)
throw ERepositoryConfigurationError("Couldn't open Manifest for writing.");
- tr1::shared_ptr<Map<FSEntry, std::string> > files = _imp->layout->manifest_files(qpn);
+ std::tr1::shared_ptr<Map<FSEntry, std::string> > files = _imp->layout->manifest_files(qpn);
for (Map<FSEntry, std::string>::ConstIterator f(files->begin()) ;
f != files->end() ; ++f)
@@ -1381,8 +1383,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
std::ifstream file_stream(stringify(file).c_str());
if (! file_stream)
- throw ERepositoryConfigurationError("Couldn't read "
- + stringify(file));
+ throw ERepositoryConfigurationError("Couldn't read " + stringify(file));
RMD160 rmd160sum(file_stream);
manifest << file_type << " " << filename << " "
@@ -1399,7 +1400,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
manifest << " SHA256 " << sha256sum.hexsum() << std::endl;
}
- tr1::shared_ptr<const PackageIDSequence> versions;
+ std::tr1::shared_ptr<const PackageIDSequence> versions;
versions = package_ids(qpn);
std::set<std::string> done_files;
@@ -1408,7 +1409,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
v_end(versions->end()) ;
v != v_end ; ++v)
{
- tr1::shared_ptr<const PackageID> id = (*v);
+ std::tr1::shared_ptr<const PackageID> id = (*v);
if (! id->fetches_key())
continue;
paludis::erepository::AAVisitor aa;
@@ -1472,15 +1473,15 @@ ERepository::need_keys_added() const
{
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
ERepository::format_key() const
{
return _imp->format_key;
}
-const tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
ERepository::installed_root_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
}
diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh
index 1e1e36c97..d96716e50 100644
--- a/paludis/repositories/e/e_repository.hh
+++ b/paludis/repositories/e/e_repository.hh
@@ -25,10 +25,10 @@
#include <paludis/mask-fwd.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/repositories/e/e_repository_params.hh>
#include <paludis/repositories/e/e_repository_profile.hh>
#include <paludis/repositories/e/layout.hh>
+#include <tr1/memory>
#include <string>
/** \file
@@ -62,7 +62,7 @@ namespace paludis
public RepositoryHookInterface,
public RepositoryQAInterface,
public RepositoryManifestInterface,
- public tr1::enable_shared_from_this<ERepository>,
+ public std::tr1::enable_shared_from_this<ERepository>,
private PrivateImplementationPattern<ERepository>
{
private:
@@ -99,7 +99,7 @@ namespace paludis
/* RepositoryVirtualsInterface */
- virtual tr1::shared_ptr<const VirtualsSequence> virtual_packages() const
+ virtual std::tr1::shared_ptr<const VirtualsSequence> virtual_packages() const
PALUDIS_ATTRIBUTE((warn_unused_result));
/* RepositoryDestinationInterface */
@@ -128,9 +128,9 @@ namespace paludis
/* RepositorySetsInterface */
- virtual tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName & id) const;
+ virtual std::tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName & id) const;
- virtual tr1::shared_ptr<const SetNameSet> sets_list() const;
+ virtual std::tr1::shared_ptr<const SetNameSet> sets_list() const;
/* RepositorySyncableInterface */
@@ -147,16 +147,16 @@ namespace paludis
virtual bool query_use_force(const UseFlagName &, const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const UseFlagNameSet> arch_flags() const
+ virtual std::tr1::shared_ptr<const UseFlagNameSet> arch_flags() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const UseFlagNameSet> use_expand_flags() const
+ virtual std::tr1::shared_ptr<const UseFlagNameSet> use_expand_flags() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const UseFlagNameSet> use_expand_hidden_prefixes() const
+ virtual std::tr1::shared_ptr<const UseFlagNameSet> use_expand_hidden_prefixes() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const UseFlagNameSet> use_expand_prefixes() const
+ virtual std::tr1::shared_ptr<const UseFlagNameSet> use_expand_prefixes() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual char use_expand_separator(const PackageID &) const
@@ -169,24 +169,24 @@ namespace paludis
/* RepositoryEnvironmentVariableInterface */
virtual std::string get_environment_variable(
- const tr1::shared_ptr<const PackageID> & for_package,
+ const std::tr1::shared_ptr<const PackageID> & for_package,
const std::string & var) const
PALUDIS_ATTRIBUTE((warn_unused_result));
/* Repository */
- virtual tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const CategoryNamePartSet> category_names_containing_package(
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names_containing_package(
const PackageNamePart &) const;
virtual bool has_package_named(const QualifiedPackageName &) const
@@ -226,25 +226,25 @@ namespace paludis
HookResult perform_hook(const Hook &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
/**
* Update GLEP 42 news files.
*/
void update_news() const;
- const tr1::shared_ptr<const erepository::Layout> layout() const;
- const tr1::shared_ptr<const erepository::ERepositoryEntries> entries() const;
- const tr1::shared_ptr<const ERepositoryProfile> profile() const;
+ const std::tr1::shared_ptr<const erepository::Layout> layout() const;
+ const std::tr1::shared_ptr<const erepository::ERepositoryEntries> entries() const;
+ const std::tr1::shared_ptr<const ERepositoryProfile> profile() const;
- tr1::shared_ptr<const RepositoryMaskInfo> repository_masked(const PackageID &) const;
+ std::tr1::shared_ptr<const RepositoryMaskInfo> repository_masked(const PackageID &) const;
void regenerate_cache() const;
/* Keys */
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
};
}
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 04fa5075e..89c6c526a 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -30,7 +30,6 @@
#include <paludis/util/system.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/visitor_cast.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/map.hh>
#include <paludis/util/set.hh>
#include <paludis/util/kc.hh>
@@ -42,7 +41,7 @@
#include <paludis/user_dep_spec.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-
+#include <tr1/functional>
#include <set>
#include <fstream>
#include <string>
@@ -69,13 +68,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo1");
keys->insert("profiles", "e_repository_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "test-repo-1");
}
@@ -93,13 +92,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo2");
keys->insert("profiles", "e_repository_TEST_dir/repo2/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "x-repo2");
}
@@ -117,13 +116,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo3");
keys->insert("profiles", "e_repository_TEST_dir/repo3/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "x-repo3");
}
@@ -141,13 +140,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo1");
keys->insert("profiles", "e_repository_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -174,20 +173,20 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo1");
keys->insert("profiles", "e_repository_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- tr1::shared_ptr<const CategoryNamePartSet> c(repo->category_names());
+ std::tr1::shared_ptr<const CategoryNamePartSet> c(repo->category_names());
TEST_CHECK(c->end() != c->find(CategoryNamePart("cat-one")));
TEST_CHECK(c->end() != c->find(CategoryNamePart("cat-two")));
TEST_CHECK(c->end() != c->find(CategoryNamePart("cat-three")));
@@ -209,13 +208,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo4");
keys->insert("profiles", "e_repository_TEST_dir/repo4/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -250,13 +249,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo4");
keys->insert("profiles", "e_repository_TEST_dir/repo4/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
repo->package_names(CategoryNamePart("cat-one"));
@@ -295,16 +294,16 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo4");
keys->insert("profiles", "e_repository_TEST_dir/repo4/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
- tr1::shared_ptr<const QualifiedPackageNameSet> names;
+ std::tr1::shared_ptr<const QualifiedPackageNameSet> names;
for (int pass = 1 ; pass <= 2 ; ++pass)
{
@@ -349,16 +348,16 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo5");
keys->insert("profiles", "e_repository_TEST_dir/repo5/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
- tr1::shared_ptr<const QualifiedPackageNameSet> names;
+ std::tr1::shared_ptr<const QualifiedPackageNameSet> names;
for (int pass = 1 ; pass <= 2 ; ++pass)
{
@@ -378,37 +377,37 @@ namespace test_cases
void run()
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo4");
keys->insert("profiles", "e_repository_TEST_dir/repo4/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- tr1::shared_ptr<const PackageIDSequence> versions;
+ std::tr1::shared_ptr<const PackageIDSequence> versions;
versions = repo->package_ids(QualifiedPackageName("cat-one/pkg-one"));
TEST_CHECK(! versions->empty());
TEST_CHECK_EQUAL(2, std::distance(versions->begin(), versions->end()));
TEST_CHECK(indirect_iterator(versions->end()) != std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- tr1::bind(std::equal_to<VersionSpec>(), tr1::bind(tr1::mem_fn(&PackageID::version), _1), VersionSpec("1"))));
+ std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("1"))));
TEST_CHECK(indirect_iterator(versions->end()) != std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- tr1::bind(std::equal_to<VersionSpec>(), tr1::bind(tr1::mem_fn(&PackageID::version), _1), VersionSpec("1.1-r1"))));
+ std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("1.1-r1"))));
TEST_CHECK(indirect_iterator(versions->end()) == std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- tr1::bind(std::equal_to<VersionSpec>(), tr1::bind(tr1::mem_fn(&PackageID::version), _1), VersionSpec("2"))));
+ std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("2"))));
versions = repo->package_ids(QualifiedPackageName("cat-one/pkg-neither"));
TEST_CHECK(versions->empty());
@@ -427,37 +426,37 @@ namespace test_cases
void run()
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo8");
keys->insert("profiles", "e_repository_TEST_dir/repo8/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- tr1::shared_ptr<const PackageIDSequence> versions;
+ std::tr1::shared_ptr<const PackageIDSequence> versions;
versions = repo->package_ids(QualifiedPackageName("cat-one/pkg-one"));
TEST_CHECK(! versions->empty());
TEST_CHECK_EQUAL(2, std::distance(versions->begin(), versions->end()));
TEST_CHECK(indirect_iterator(versions->end()) != std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- tr1::bind(std::equal_to<VersionSpec>(), tr1::bind(tr1::mem_fn(&PackageID::version), _1), VersionSpec("1"))));
+ std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("1"))));
TEST_CHECK(indirect_iterator(versions->end()) != std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- tr1::bind(std::equal_to<VersionSpec>(), tr1::bind(tr1::mem_fn(&PackageID::version), _1), VersionSpec("1.1-r1"))));
+ std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("1.1-r1"))));
TEST_CHECK(indirect_iterator(versions->end()) == std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- tr1::bind(std::equal_to<VersionSpec>(), tr1::bind(tr1::mem_fn(&PackageID::version), _1), VersionSpec("2"))));
+ std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("2"))));
versions = repo->package_ids(QualifiedPackageName("cat-one/pkg-neither"));
TEST_CHECK(versions->empty());
@@ -478,19 +477,19 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo6");
keys->insert("profiles", "e_repository_TEST_dir/repo6/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->begin());
@@ -521,21 +520,21 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("write_cache", "e_repository_TEST_dir/repo7/metadata/cache");
keys->insert("location", "e_repository_TEST_dir/repo7");
keys->insert("profiles", "e_repository_TEST_dir/repo7/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 3 ; ++pass)
{
TestMessageSuffix pass_suffix("pass=" + stringify(pass), true);
- tr1::shared_ptr<const PackageID> id1(*env.package_database()->query(query::Matches(
+ std::tr1::shared_ptr<const PackageID> id1(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->begin());
@@ -543,27 +542,27 @@ namespace test_cases
TEST_CHECK(id1->short_description_key());
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Description");
StringifyFormatter ff;
- erepository::DepSpecPrettyPrinter pd(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pd(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
TEST_CHECK(id1->build_dependencies_key());
id1->build_dependencies_key()->value()->accept(pd);
TEST_CHECK_STRINGIFY_EQUAL(pd, "foo/bar");
- erepository::DepSpecPrettyPrinter pr(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pr(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
TEST_CHECK(id1->run_dependencies_key());
id1->run_dependencies_key()->value()->accept(pr);
TEST_CHECK_STRINGIFY_EQUAL(pr, "foo/bar");
- tr1::shared_ptr<const PackageID> id2(*env.package_database()->query(query::Matches(
+ std::tr1::shared_ptr<const PackageID> id2(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-2",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->begin());
TEST_CHECK(id2->end_metadata() != id2->find_metadata("EAPI"));
TEST_CHECK(id2->short_description_key());
TEST_CHECK_EQUAL(id2->short_description_key()->value(), "dquote \" squote ' backslash \\ dollar $");
- erepository::DepSpecPrettyPrinter pd2(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pd2(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
TEST_CHECK(id2->build_dependencies_key());
id2->build_dependencies_key()->value()->accept(pd2);
TEST_CHECK_STRINGIFY_EQUAL(pd2, "foo/bar bar/baz");
- erepository::DepSpecPrettyPrinter pr2(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pr2(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
TEST_CHECK(id2->run_dependencies_key());
id2->run_dependencies_key()->value()->accept(pr2);
TEST_CHECK_STRINGIFY_EQUAL(pr2, "foo/bar");
@@ -589,21 +588,21 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("write_cache", "e_repository_TEST_dir/repo7/metadata/cache");
keys->insert("location", "e_repository_TEST_dir/repo7");
keys->insert("profiles", "e_repository_TEST_dir/repo7/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 3 ; ++pass)
{
TestMessageSuffix pass_suffix("pass=" + stringify(pass), true);
- tr1::shared_ptr<const PackageID> id1(*env.package_database()->query(query::Matches(
+ std::tr1::shared_ptr<const PackageID> id1(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/stale-pkg-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->begin());
@@ -616,7 +615,7 @@ namespace test_cases
{
TestMessageSuffix pass_suffix("pass=" + stringify(pass), true);
- tr1::shared_ptr<const PackageID> id1(*env.package_database()->query(query::Matches(
+ std::tr1::shared_ptr<const PackageID> id1(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/stale-pkg-2",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->begin());
@@ -650,25 +649,25 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo7");
keys->insert("profiles", "e_repository_TEST_dir/repo7/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository( &env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository( &env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- tr1::shared_ptr<const PackageID> id1(*env.package_database()->query(query::Matches(
+ std::tr1::shared_ptr<const PackageID> id1(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-two-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
- TEST_CHECK_EQUAL((*tr1::static_pointer_cast<const erepository::ERepositoryID>(id1)->eapi())[k::name()], "UNKNOWN");
+ TEST_CHECK_EQUAL((*std::tr1::static_pointer_cast<const erepository::ERepositoryID>(id1)->eapi())[k::name()], "UNKNOWN");
TEST_CHECK(! id1->short_description_key());
}
}
@@ -686,26 +685,26 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo9");
keys->insert("profiles", "e_repository_TEST_dir/repo9/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- tr1::shared_ptr<const PackageID> p1(*env.package_database()->query(query::Matches(PackageDepSpec(
+ std::tr1::shared_ptr<const PackageID> p1(*env.package_database()->query(query::Matches(PackageDepSpec(
parse_user_package_dep_spec("=cat-one/pkg-one-1", UserPackageDepSpecOptions()))),
qo_require_exactly_one)->begin());
- tr1::shared_ptr<const PackageID> p2(*env.package_database()->query(query::Matches(PackageDepSpec(
+ std::tr1::shared_ptr<const PackageID> p2(*env.package_database()->query(query::Matches(PackageDepSpec(
parse_user_package_dep_spec("=cat-two/pkg-two-1", UserPackageDepSpecOptions()))),
qo_require_exactly_one)->begin());
- tr1::shared_ptr<const PackageID> p4(*env.package_database()->query(query::Matches(PackageDepSpec(
+ std::tr1::shared_ptr<const PackageID> p4(*env.package_database()->query(query::Matches(PackageDepSpec(
parse_user_package_dep_spec("=cat-one/pkg-one-2", UserPackageDepSpecOptions()))),
qo_require_exactly_one)->begin());
@@ -739,22 +738,22 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys18(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys18(
new Map<std::string, std::string>);
keys18->insert("format", "ebuild");
keys18->insert("names_cache", "/var/empty");
keys18->insert("location", "e_repository_TEST_dir/repo18");
keys18->insert("profiles", "e_repository_TEST_dir/repo18/profiles/profile");
- tr1::shared_ptr<ERepository> repo18(make_ebuild_repository(&env, keys18));
+ std::tr1::shared_ptr<ERepository> repo18(make_ebuild_repository(&env, keys18));
env.package_database()->add_repository(1, repo18);
- tr1::shared_ptr<Map<std::string, std::string> > keys19(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys19(
new Map<std::string, std::string>);
keys19->insert("format", "ebuild");
keys19->insert("names_cache", "/var/empty");
keys19->insert("location", "e_repository_TEST_dir/repo19");
keys19->insert("master_repository", "test-repo-18");
- tr1::shared_ptr<ERepository> repo19(make_ebuild_repository(&env, keys19));
+ std::tr1::shared_ptr<ERepository> repo19(make_ebuild_repository(&env, keys19));
env.package_database()->add_repository(1, repo19);
TEST_CHECK((*env.package_database()->query(query::Matches(PackageDepSpec(parse_user_package_dep_spec("=category/package-1::test-repo-18",
@@ -789,13 +788,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo10");
keys->insert("profiles", "e_repository_TEST_dir/repo10/profiles/profile/subprofile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -827,13 +826,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo10");
keys->insert("profiles", "e_repository_TEST_dir/repo10/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
TEST_CHECK((*env.package_database()->query(query::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat/was_masked-0",
@@ -862,19 +861,19 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo15");
keys->insert("profiles", "e_repository_TEST_dir/repo15/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
bool has_one(false), has_two(false), has_three(false);
int count(0);
- tr1::shared_ptr<const RepositoryVirtualsInterface::VirtualsSequence> seq(repo->virtual_packages());
+ std::tr1::shared_ptr<const RepositoryVirtualsInterface::VirtualsSequence> seq(repo->virtual_packages());
for (RepositoryVirtualsInterface::VirtualsSequence::ConstIterator it(seq->begin()),
it_end(seq->end()); it_end != it; ++it, ++count)
if ("virtual/one" == stringify((*it)[k::virtual_name()]))
@@ -937,13 +936,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo11");
keys->insert("profiles", "e_repository_TEST_dir/repo11/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
repo->make_manifest(QualifiedPackageName("category/package"));
@@ -982,7 +981,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "exheres");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo12");
@@ -992,7 +991,7 @@ namespace test_cases
keys->insert("eapi_when_unspecified", "exheres-0");
keys->insert("profile_eapi", "exheres-0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "distdir"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
FetchAction action(FetchActionOptions::named_create()
@@ -1002,7 +1001,7 @@ namespace test_cases
{
TestMessageSuffix suffix("no files", true);
- const tr1::shared_ptr<const PackageID> no_files_id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> no_files_id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(no_files_id);
@@ -1013,7 +1012,7 @@ namespace test_cases
{
TestMessageSuffix suffix("fetched files", true);
- const tr1::shared_ptr<const PackageID> fetched_files_id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> fetched_files_id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(fetched_files_id);
@@ -1025,7 +1024,7 @@ namespace test_cases
{
TestMessageSuffix suffix("fetchable files", true);
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "fetchable-1.txt").is_regular_file());
- const tr1::shared_ptr<const PackageID> fetchable_files_id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> fetchable_files_id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(fetchable_files_id);
@@ -1036,7 +1035,7 @@ namespace test_cases
{
TestMessageSuffix suffix("arrow files", true);
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "arrowed.txt").is_regular_file());
- const tr1::shared_ptr<const PackageID> arrow_files_id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> arrow_files_id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/arrow-files",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(arrow_files_id);
@@ -1046,7 +1045,7 @@ namespace test_cases
{
TestMessageSuffix suffix("unfetchable files", true);
- const tr1::shared_ptr<const PackageID> unfetchable_files_id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> unfetchable_files_id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unfetchable-files",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(unfetchable_files_id);
@@ -1054,7 +1053,7 @@ namespace test_cases
}
{
- const tr1::shared_ptr<const PackageID> no_files_restricted_id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> no_files_restricted_id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files-restricted",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(no_files_restricted_id);
@@ -1062,7 +1061,7 @@ namespace test_cases
}
{
- const tr1::shared_ptr<const PackageID> fetched_files_restricted_id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> fetched_files_restricted_id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files-restricted",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(fetched_files_restricted_id);
@@ -1070,7 +1069,7 @@ namespace test_cases
}
{
- const tr1::shared_ptr<const PackageID> fetchable_files_restricted_id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> fetchable_files_restricted_id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files-restricted",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(fetchable_files_restricted_id);
@@ -1087,13 +1086,13 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo11");
keys->insert("profiles", "e_repository_TEST_dir/repo11/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
env.package_database()->add_repository(1, repo);
@@ -1102,7 +1101,7 @@ namespace test_cases
(k::safe_resume(), true)
);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
UserPackageDepSpecOptions()))), qo_order_by_version)->last());
TEST_CHECK(id);
@@ -1130,7 +1129,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo13");
@@ -1141,19 +1140,19 @@ namespace test_cases
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
+ std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
installed_repo->add_version("cat", "pretend-installed", "0")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
installed_repo->add_version("cat", "pretend-installed", "1")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
env.package_database()->add_repository(2, installed_repo);
- tr1::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
iv_keys->insert("root", "/");
env.package_database()->add_repository(-2, RepositoryMaker::get_instance()->find_maker("installed_virtuals")(&env, iv_keys));
env.package_database()->add_repository(-2, RepositoryMaker::get_instance()->find_maker("virtuals")(&env,
- tr1::shared_ptr<Map<std::string, std::string> >()));
+ std::tr1::shared_ptr<Map<std::string, std::string> >()));
InstallAction action(InstallActionOptions::named_create()
(k::debug_build(), iado_none)
@@ -1163,7 +1162,7 @@ namespace test_cases
);
{
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=virtual/virtual-pretend-installed-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1171,7 +1170,7 @@ namespace test_cases
{
TestMessageSuffix suffix("in-ebuild die", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1180,7 +1179,7 @@ namespace test_cases
{
TestMessageSuffix suffix("in-subshell die", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1189,7 +1188,7 @@ namespace test_cases
{
TestMessageSuffix suffix("success", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1198,7 +1197,7 @@ namespace test_cases
{
TestMessageSuffix suffix("unpack die", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1207,7 +1206,7 @@ namespace test_cases
{
TestMessageSuffix suffix("emake fail", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1216,7 +1215,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf source 0", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1226,7 +1225,7 @@ namespace test_cases
{
TestMessageSuffix suffix("best version", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1235,7 +1234,7 @@ namespace test_cases
{
TestMessageSuffix suffix("has version", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1244,7 +1243,7 @@ namespace test_cases
{
TestMessageSuffix suffix("match", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1253,7 +1252,7 @@ namespace test_cases
{
TestMessageSuffix suffix("vars", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/vars-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1280,7 +1279,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo13");
@@ -1291,10 +1290,10 @@ namespace test_cases
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
+ std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
env.package_database()->add_repository(2, installed_repo);
InstallAction action(InstallActionOptions::named_create()
@@ -1306,7 +1305,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf source 1", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1316,7 +1315,7 @@ namespace test_cases
{
TestMessageSuffix suffix("dosym success 1", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-success-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1344,7 +1343,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo13");
@@ -1355,10 +1354,10 @@ namespace test_cases
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
+ std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
env.package_database()->add_repository(2, installed_repo);
InstallAction action(InstallActionOptions::named_create()
@@ -1370,7 +1369,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf source kdebuild-1", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-kdebuild-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1380,7 +1379,7 @@ namespace test_cases
{
TestMessageSuffix suffix("banned functions kdebuild-1", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/banned-functions-kdebuild-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1390,7 +1389,7 @@ namespace test_cases
{
TestMessageSuffix suffix("banned vars kdebuild-1", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/banned-vars-kdebuild-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1399,7 +1398,7 @@ namespace test_cases
{
TestMessageSuffix suffix("dosym success kdebuild-1", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-success-kdebuild-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1409,7 +1408,7 @@ namespace test_cases
{
TestMessageSuffix suffix("dosym fail kdebuild-1", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-fail-kdebuild-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1437,7 +1436,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo13");
@@ -1448,17 +1447,17 @@ namespace test_cases
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
+ std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
env.package_database()->add_repository(2, installed_repo);
InfoAction action;
{
TestMessageSuffix suffix("info success kdebuild-1", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/info-success-kdebuild-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1468,7 +1467,7 @@ namespace test_cases
{
TestMessageSuffix suffix("info fail kdebuild-1", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/info-fail-kdebuild-1",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1496,7 +1495,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo14");
@@ -1507,19 +1506,19 @@ namespace test_cases
keys->insert("profile_eapi", "exheres-0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
+ std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
installed_repo->add_version("cat", "pretend-installed", "0")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
installed_repo->add_version("cat", "pretend-installed", "1")->provide_key()->set_from_string("virtual/virtual-pretend-installed");
env.package_database()->add_repository(2, installed_repo);
- tr1::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
iv_keys->insert("root", "/");
env.package_database()->add_repository(-2, RepositoryMaker::get_instance()->find_maker("installed_virtuals")(&env, iv_keys));
env.package_database()->add_repository(-2, RepositoryMaker::get_instance()->find_maker("virtuals")(&env,
- tr1::shared_ptr<Map<std::string, std::string> >()));
+ std::tr1::shared_ptr<Map<std::string, std::string> >()));
InstallAction action(InstallActionOptions::named_create()
(k::debug_build(), iado_none)
@@ -1530,7 +1529,7 @@ namespace test_cases
{
TestMessageSuffix suffix("in-ebuild die", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1539,7 +1538,7 @@ namespace test_cases
{
TestMessageSuffix suffix("in-subshell die", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1548,7 +1547,7 @@ namespace test_cases
{
TestMessageSuffix suffix("success", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1557,7 +1556,7 @@ namespace test_cases
{
TestMessageSuffix suffix("unpack die", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1566,7 +1565,7 @@ namespace test_cases
{
TestMessageSuffix suffix("emake fail", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1575,7 +1574,7 @@ namespace test_cases
{
TestMessageSuffix suffix("best version", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1584,7 +1583,7 @@ namespace test_cases
{
TestMessageSuffix suffix("has version", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1593,7 +1592,7 @@ namespace test_cases
{
TestMessageSuffix suffix("match", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1602,7 +1601,7 @@ namespace test_cases
{
TestMessageSuffix suffix("ever", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/ever-1.3",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1613,7 +1612,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf phase", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-phase-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1622,7 +1621,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf vars", true);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-vars-0",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
TEST_CHECK(id);
@@ -1639,34 +1638,34 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_TEST_dir/repo17");
keys->insert("profiles", "e_repository_TEST_dir/repo17/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
env.package_database()->add_repository(1, repo);
- const tr1::shared_ptr<const PackageID> id(*env.package_database()->
+ const std::tr1::shared_ptr<const PackageID> id(*env.package_database()->
query(query::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
UserPackageDepSpecOptions()))), qo_require_exactly_one)->last());
StringifyFormatter ff;
- erepository::DepSpecPrettyPrinter pd(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pd(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
TEST_CHECK(id->build_dependencies_key());
id->build_dependencies_key()->value()->accept(pd);
TEST_CHECK_STRINGIFY_EQUAL(pd, "cat/pkg1 build: cat/pkg2 build,run: cat/pkg3 suggested: cat/pkg4 post:");
- erepository::DepSpecPrettyPrinter pr(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pr(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
TEST_CHECK(id->run_dependencies_key());
id->run_dependencies_key()->value()->accept(pr);
TEST_CHECK_STRINGIFY_EQUAL(pr, "cat/pkg1 build: build,run: cat/pkg3 suggested: cat/pkg4 post:");
- erepository::DepSpecPrettyPrinter pp(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pp(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
TEST_CHECK(id->post_dependencies_key());
id->post_dependencies_key()->value()->accept(pp);
TEST_CHECK_STRINGIFY_EQUAL(pp, "build: build,run: suggested: post: cat/pkg5");
diff --git a/paludis/repositories/e/e_repository_entries.cc b/paludis/repositories/e/e_repository_entries.cc
index 376e8198f..6b3152cc0 100644
--- a/paludis/repositories/e/e_repository_entries.cc
+++ b/paludis/repositories/e/e_repository_entries.cc
@@ -26,7 +26,7 @@ using namespace paludis;
using namespace paludis::erepository;
template class VirtualConstructor<std::string,
- tr1::shared_ptr<ERepositoryEntries> (*) (const Environment * const, ERepository * const,
+ std::tr1::shared_ptr<ERepositoryEntries> (*) (const Environment * const, ERepository * const,
const ERepositoryParams &),
virtual_constructor_not_found::ThrowException<NoSuchERepositoryEntriesType> >;
diff --git a/paludis/repositories/e/e_repository_entries.hh b/paludis/repositories/e/e_repository_entries.hh
index 5e130e4ea..330d344cc 100644
--- a/paludis/repositories/e/e_repository_entries.hh
+++ b/paludis/repositories/e/e_repository_entries.hh
@@ -28,10 +28,10 @@
#include <paludis/environment-fwd.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/virtual_constructor.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/repositories/e/e_repository_profile.hh>
#include <paludis/repositories/e/e_repository_params.hh>
#include <paludis/repositories/e/e_repository_id.hh>
+#include <tr1/memory>
#include <string>
/** \file
@@ -71,44 +71,44 @@ namespace paludis
/**
* Create an ERepositoryID.
*/
- virtual const tr1::shared_ptr<const ERepositoryID> make_id(const QualifiedPackageName &, const FSEntry &) const
+ virtual const std::tr1::shared_ptr<const ERepositoryID> make_id(const QualifiedPackageName &, const FSEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
* Fetch an environment variable.
*/
- virtual std::string get_environment_variable(const tr1::shared_ptr<const ERepositoryID> &, const std::string & var,
- tr1::shared_ptr<const ERepositoryProfile>) const = 0;
+ virtual std::string get_environment_variable(const std::tr1::shared_ptr<const ERepositoryID> &, const std::string & var,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const = 0;
/**
* Handle an install.
*/
- virtual void install(const tr1::shared_ptr<const ERepositoryID> &, const InstallActionOptions &,
- tr1::shared_ptr<const ERepositoryProfile>) const = 0;
+ virtual void install(const std::tr1::shared_ptr<const ERepositoryID> &, const InstallActionOptions &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const = 0;
/**
* Handle a fetch.
*/
- virtual void fetch(const tr1::shared_ptr<const ERepositoryID> &, const FetchActionOptions &,
- tr1::shared_ptr<const ERepositoryProfile>) const = 0;
+ virtual void fetch(const std::tr1::shared_ptr<const ERepositoryID> &, const FetchActionOptions &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const = 0;
/**
* Handle a pretend fetch.
*/
- virtual void pretend_fetch(const tr1::shared_ptr<const ERepositoryID> &, PretendFetchAction &,
- tr1::shared_ptr<const ERepositoryProfile>) const = 0;
+ virtual void pretend_fetch(const std::tr1::shared_ptr<const ERepositoryID> &, PretendFetchAction &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const = 0;
/**
* Handle a pretend.
*/
- virtual bool pretend(const tr1::shared_ptr<const ERepositoryID> &,
- tr1::shared_ptr<const ERepositoryProfile>) const = 0;
+ virtual bool pretend(const std::tr1::shared_ptr<const ERepositoryID> &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const = 0;
/**
* Handle an info.
*/
- virtual void info(const tr1::shared_ptr<const ERepositoryID> &,
- tr1::shared_ptr<const ERepositoryProfile>) const = 0;
+ virtual void info(const std::tr1::shared_ptr<const ERepositoryID> &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const = 0;
/**
* Handle a merge.
@@ -151,7 +151,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE ERepositoryEntriesMaker :
public VirtualConstructor<std::string,
- tr1::shared_ptr<ERepositoryEntries> (*) (const Environment * const, ERepository * const,
+ std::tr1::shared_ptr<ERepositoryEntries> (*) (const Environment * const, ERepository * const,
const ERepositoryParams &),
virtual_constructor_not_found::ThrowException<NoSuchERepositoryEntriesType> >,
public InstantiationPolicy<ERepositoryEntriesMaker, instantiation_method::SingletonTag>
diff --git a/paludis/repositories/e/e_repository_id.cc b/paludis/repositories/e/e_repository_id.cc
index b97c3c081..cc4f9cb90 100644
--- a/paludis/repositories/e/e_repository_id.cc
+++ b/paludis/repositories/e/e_repository_id.cc
@@ -26,10 +26,10 @@
using namespace paludis;
using namespace paludis::erepository;
-tr1::shared_ptr<const Set<std::string> >
+std::tr1::shared_ptr<const Set<std::string> >
ERepositoryID::breaks_portage() const
{
- tr1::shared_ptr<Set<std::string> > why(new Set<std::string>);
+ std::tr1::shared_ptr<Set<std::string> > why(new Set<std::string>);
if (version().has_try_part() || version().has_scm_part() || version().has_local_revision())
why->insert("version");
if ((! (*eapi())[k::supported()]) || (*((*eapi())[k::supported()]))[k::breaks_portage()])
diff --git a/paludis/repositories/e/e_repository_id.hh b/paludis/repositories/e/e_repository_id.hh
index 18f353ca6..94358b405 100644
--- a/paludis/repositories/e/e_repository_id.hh
+++ b/paludis/repositories/e/e_repository_id.hh
@@ -31,14 +31,14 @@ namespace paludis
public PackageID
{
public:
- virtual const tr1::shared_ptr<const EAPI> eapi() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const = 0;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const = 0;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const = 0;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use_key() const = 0;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > eclass_keywords_key() const = 0;
+ virtual const std::tr1::shared_ptr<const EAPI> eapi() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const = 0;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const = 0;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const = 0;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use_key() const = 0;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > eclass_keywords_key() const = 0;
- virtual tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual std::tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
}
diff --git a/paludis/repositories/e/e_repository_mask_file.cc b/paludis/repositories/e/e_repository_mask_file.cc
index 3593177ab..57875d909 100644
--- a/paludis/repositories/e/e_repository_mask_file.cc
+++ b/paludis/repositories/e/e_repository_mask_file.cc
@@ -34,14 +34,14 @@ using namespace paludis;
using namespace paludis::erepository;
template class WrappedForwardIterator<MaskFile::ConstIteratorTag,
- const std::pair<const std::string, tr1::shared_ptr<const RepositoryMaskInfo> > >;
+ const std::pair<const std::string, std::tr1::shared_ptr<const RepositoryMaskInfo> > >;
namespace paludis
{
template <>
struct Implementation<MaskFile>
{
- std::list<std::pair<const std::string, tr1::shared_ptr<const RepositoryMaskInfo> > > lines;
+ std::list<std::pair<const std::string, std::tr1::shared_ptr<const RepositoryMaskInfo> > > lines;
};
}
@@ -53,7 +53,7 @@ MaskFile::MaskFile(const FSEntry & f, const LineConfigFileOptions & opts) :
myopts += lcfo_no_skip_blank_lines;
LineConfigFile file(f, myopts);
- tr1::shared_ptr<Sequence<std::string> > comment(new Sequence<std::string>);
+ std::tr1::shared_ptr<Sequence<std::string> > comment(new Sequence<std::string>);
bool comment_used(false);
for (LineConfigFile::ConstIterator it(file.begin()), it_end(file.end()); it_end != it; ++it)
{
@@ -68,7 +68,7 @@ MaskFile::MaskFile(const FSEntry & f, const LineConfigFileOptions & opts) :
{
if (comment_used)
{
- tr1::shared_ptr<Sequence<std::string> > cpy(new Sequence<std::string>);
+ std::tr1::shared_ptr<Sequence<std::string> > cpy(new Sequence<std::string>);
std::copy(comment->begin(), comment->end(), cpy->back_inserter());
comment = cpy;
comment_used = false;
@@ -77,7 +77,7 @@ MaskFile::MaskFile(const FSEntry & f, const LineConfigFileOptions & opts) :
continue;
}
- _imp->lines.push_back(std::make_pair(*it, tr1::shared_ptr<RepositoryMaskInfo>(new RepositoryMaskInfo(f, comment))));
+ _imp->lines.push_back(std::make_pair(*it, std::tr1::shared_ptr<RepositoryMaskInfo>(new RepositoryMaskInfo(f, comment))));
comment_used = true;
}
}
diff --git a/paludis/repositories/e/e_repository_mask_file.hh b/paludis/repositories/e/e_repository_mask_file.hh
index f680c6a3b..4d8f9a2c7 100644
--- a/paludis/repositories/e/e_repository_mask_file.hh
+++ b/paludis/repositories/e/e_repository_mask_file.hh
@@ -54,7 +54,7 @@ namespace paludis
struct ConstIteratorTag;
typedef WrappedForwardIterator<ConstIteratorTag,
- const std::pair<const std::string, tr1::shared_ptr<const RepositoryMaskInfo> > > ConstIterator;
+ const std::pair<const std::string, std::tr1::shared_ptr<const RepositoryMaskInfo> > > ConstIterator;
ConstIterator begin() const;
ConstIterator end() const;
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index adbecd6a8..195607092 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -140,7 +140,7 @@ ERepositoryNews::update_news() const
query::Matches(PackageDepSpec(erepository::parse_e_package_dep_spec(*i,
*erepository::EAPIData::get_instance()->eapi_from_string(
_imp->e_repository->params().profile_eapi),
- tr1::shared_ptr<const PackageID>()))) &
+ std::tr1::shared_ptr<const PackageID>()))) &
query::SupportsAction<InstalledAction>(),
qo_whatever)->empty())
local_show = true;
@@ -160,7 +160,7 @@ ERepositoryNews::update_news() const
if (news.begin_display_if_profile() != news.end_display_if_profile())
{
bool local_show(false);
- tr1::shared_ptr<const FSEntrySequence> c(_imp->params.profiles);
+ std::tr1::shared_ptr<const FSEntrySequence> c(_imp->params.profiles);
for (FSEntrySequence::ConstIterator p(c->begin()), p_end(c->end()) ; p != p_end ; ++p)
{
std::string profile(strip_leading_string(strip_trailing_string(
diff --git a/paludis/repositories/e/e_repository_params.sr b/paludis/repositories/e/e_repository_params.sr
index 8a7785fd9..1bc7a51bb 100644
--- a/paludis/repositories/e/e_repository_params.sr
+++ b/paludis/repositories/e/e_repository_params.sr
@@ -9,20 +9,20 @@ make_class_ERepositoryParams()
key layout std::string
key environment "Environment *"
key location FSEntry
- key profiles "tr1::shared_ptr<const FSEntrySequence>"
+ key profiles "std::tr1::shared_ptr<const FSEntrySequence>"
key cache FSEntry
key write_cache FSEntry
key append_repository_name_to_write_cache bool
key names_cache FSEntry
key distdir FSEntry
- key eclassdirs "tr1::shared_ptr<const FSEntrySequence>"
+ key eclassdirs "std::tr1::shared_ptr<const FSEntrySequence>"
key setsdir FSEntry
key securitydir FSEntry
key newsdir FSEntry
key sync std::string
key sync_options std::string
key builddir FSEntry
- key master_repository "tr1::shared_ptr<const ERepository>"
+ key master_repository "std::tr1::shared_ptr<const ERepository>"
key write_bin_uri_prefix std::string
key eapi_when_unknown std::string
key eapi_when_unspecified std::string
diff --git a/paludis/repositories/e/e_repository_profile.cc b/paludis/repositories/e/e_repository_profile.cc
index 9b2ef2704..fa9044c66 100644
--- a/paludis/repositories/e/e_repository_profile.cc
+++ b/paludis/repositories/e/e_repository_profile.cc
@@ -39,14 +39,16 @@
#include <paludis/util/create_iterator-impl.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/kc.hh>
+#include <paludis/util/hashes.hh>
#include <paludis/dep_tag.hh>
#include <paludis/environment.hh>
#include <paludis/match_package.hh>
-#include <paludis/hashed_containers.hh>
#include <paludis/distribution.hh>
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
+#include <tr1/unordered_map>
+#include <tr1/unordered_set>
#include <list>
#include <algorithm>
#include <set>
@@ -59,18 +61,19 @@ using namespace paludis;
template class WrappedForwardIterator<ERepositoryProfile::UseExpandConstIteratorTag, const UseFlagName>;
template class WrappedForwardIterator<ERepositoryProfile::VirtualsConstIteratorTag,
- const std::pair<const QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > >;
+ const std::pair<const QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >;
namespace
{
- typedef MakeHashedSet<UseFlagName>::Type UseFlagSet;
- typedef MakeHashedMap<std::string, std::string>::Type EnvironmentVariablesMap;
- typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> >::Type VirtualsMap;
- typedef MakeHashedMap<QualifiedPackageName,
- std::list<std::pair<tr1::shared_ptr<const PackageDepSpec>, tr1::shared_ptr<const RepositoryMaskInfo> > > >::Type PackageMaskMap;
+ typedef std::tr1::unordered_set<UseFlagName, Hash<UseFlagName> > UseFlagSet;
+ typedef std::tr1::unordered_map<std::string, std::string, Hash<std::string> > EnvironmentVariablesMap;
+ typedef std::tr1::unordered_map<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec>, Hash<QualifiedPackageName> > VirtualsMap;
+ typedef std::tr1::unordered_map<QualifiedPackageName,
+ std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, std::tr1::shared_ptr<const RepositoryMaskInfo> > >,
+ Hash<QualifiedPackageName> > PackageMaskMap;
- typedef MakeHashedMap<UseFlagName, bool>::Type FlagStatusMap;
- typedef std::list<std::pair<tr1::shared_ptr<const PackageDepSpec>, FlagStatusMap> > PackageFlagStatusMapList;
+ typedef std::tr1::unordered_map<UseFlagName, bool, Hash<UseFlagName> > FlagStatusMap;
+ typedef std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, FlagStatusMap> > PackageFlagStatusMapList;
struct StackedValues
{
@@ -141,8 +144,8 @@ namespace paludis
///\name System package set
///\{
- tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > system_packages;
- tr1::shared_ptr<GeneralSetDepTag> system_tag;
+ std::tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > system_packages;
+ std::tr1::shared_ptr<GeneralSetDepTag> system_tag;
///\}
@@ -179,7 +182,7 @@ namespace paludis
env(e),
repository(p),
system_packages(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
- tr1::shared_ptr<AllDepSpec>(new AllDepSpec))),
+ std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec))),
system_tag(new GeneralSetDepTag(SetName("system"), stringify(name)))
{
Context context("When loading profiles '" + join(dirs.begin(), dirs.end(), "' '") + "' for repository '" + stringify(name) + "':");
@@ -419,7 +422,7 @@ Implementation<ERepositoryProfile>::load_special_make_defaults_vars()
bool
Implementation<ERepositoryProfile>::is_incremental(const std::string & s) const
{
- tr1::shared_ptr<const erepository::EAPI> e(erepository::EAPIData::get_instance()->eapi_from_string(repository->params().profile_eapi));
+ std::tr1::shared_ptr<const erepository::EAPI> e(erepository::EAPIData::get_instance()->eapi_from_string(repository->params().profile_eapi));
try
{
@@ -465,12 +468,12 @@ Implementation<ERepositoryProfile>::make_vars_from_file_vars()
continue;
Context context_spec("When parsing '" + *i + "':");
- tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
+ std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
erepository::parse_e_package_dep_spec(i->substr(1), *erepository::EAPIData::get_instance()->eapi_from_string(
- repository->params().profile_eapi), tr1::shared_ptr<const PackageID>())));
+ repository->params().profile_eapi), std::tr1::shared_ptr<const PackageID>())));
spec->set_tag(system_tag);
- system_packages->add(tr1::shared_ptr<SetSpecTree::ConstItem>(new TreeLeaf<SetSpecTree, PackageDepSpec>(spec)));
+ system_packages->add(std::tr1::shared_ptr<SetSpecTree::ConstItem>(new TreeLeaf<SetSpecTree, PackageDepSpec>(spec)));
}
}
catch (const InternalError &)
@@ -497,9 +500,9 @@ Implementation<ERepositoryProfile>::make_vars_from_file_vars()
QualifiedPackageName v(tokens[0]);
virtuals.erase(v);
- virtuals.insert(std::make_pair(v, tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
+ virtuals.insert(std::make_pair(v, std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
erepository::parse_e_package_dep_spec(tokens[1], *erepository::EAPIData::get_instance()->eapi_from_string(
- repository->params().profile_eapi), tr1::shared_ptr<const PackageID>())))));
+ repository->params().profile_eapi), std::tr1::shared_ptr<const PackageID>())))));
}
}
catch (const InternalError &)
@@ -520,9 +523,9 @@ Implementation<ERepositoryProfile>::make_vars_from_file_vars()
try
{
- tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(
+ std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(
erepository::parse_e_package_dep_spec(line->first, *erepository::EAPIData::get_instance()->eapi_from_string(
- repository->params().profile_eapi), tr1::shared_ptr<const PackageID>())));
+ repository->params().profile_eapi), std::tr1::shared_ptr<const PackageID>())));
if (a->package_ptr())
package_mask[*a->package_ptr()].push_back(std::make_pair(a, line->second));
@@ -602,9 +605,9 @@ Implementation<ERepositoryProfile>::load_spec_use_file(const FSEntry & file, Pac
try
{
- tr1::shared_ptr<const PackageDepSpec> spec(new PackageDepSpec(
+ std::tr1::shared_ptr<const PackageDepSpec> spec(new PackageDepSpec(
erepository::parse_e_package_dep_spec(*tokens.begin(), *erepository::EAPIData::get_instance()->eapi_from_string(
- repository->params().profile_eapi), tr1::shared_ptr<const PackageID>())));
+ repository->params().profile_eapi), std::tr1::shared_ptr<const PackageID>())));
PackageFlagStatusMapList::iterator n(m.insert(m.end(), std::make_pair(spec, FlagStatusMap())));
for (std::list<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
@@ -812,7 +815,7 @@ ERepositoryProfile::environment_variable(const std::string & s) const
return i->second;
}
-tr1::shared_ptr<SetSpecTree::ConstItem>
+std::tr1::shared_ptr<SetSpecTree::ConstItem>
ERepositoryProfile::system_packages() const
{
return _imp->system_packages;
@@ -860,20 +863,20 @@ ERepositoryProfile::end_virtuals() const
return VirtualsConstIterator(_imp->virtuals.end());
}
-tr1::shared_ptr<const RepositoryMaskInfo>
+std::tr1::shared_ptr<const RepositoryMaskInfo>
ERepositoryProfile::profile_masked(const PackageID & id) const
{
PackageMaskMap::const_iterator rr(_imp->package_mask.find(id.name()));
if (_imp->package_mask.end() == rr)
- return tr1::shared_ptr<const RepositoryMaskInfo>();
+ return std::tr1::shared_ptr<const RepositoryMaskInfo>();
else
{
- for (std::list<std::pair<tr1::shared_ptr<const PackageDepSpec>, tr1::shared_ptr<const RepositoryMaskInfo> > >::const_iterator k(rr->second.begin()),
+ for (std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, std::tr1::shared_ptr<const RepositoryMaskInfo> > >::const_iterator k(rr->second.begin()),
k_end(rr->second.end()) ; k != k_end ; ++k)
if (match_package(*_imp->env, *k->first, id))
return k->second;
}
- return tr1::shared_ptr<const RepositoryMaskInfo>();
+ return std::tr1::shared_ptr<const RepositoryMaskInfo>();
}
diff --git a/paludis/repositories/e/e_repository_profile.hh b/paludis/repositories/e/e_repository_profile.hh
index 1f6a5e53f..b68912875 100644
--- a/paludis/repositories/e/e_repository_profile.hh
+++ b/paludis/repositories/e/e_repository_profile.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -104,14 +104,14 @@ namespace paludis
///\name Masks
///\{
- tr1::shared_ptr<const RepositoryMaskInfo> profile_masked(const PackageID &) const;
+ std::tr1::shared_ptr<const RepositoryMaskInfo> profile_masked(const PackageID &) const;
///\}
///\name System package set
///\{
- tr1::shared_ptr<SetSpecTree::ConstItem> system_packages() const;
+ std::tr1::shared_ptr<SetSpecTree::ConstItem> system_packages() const;
///\}
@@ -120,7 +120,7 @@ namespace paludis
struct VirtualsConstIteratorTag;
typedef WrappedForwardIterator<VirtualsConstIteratorTag,
- const std::pair<const QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > > VirtualsConstIterator;
+ const std::pair<const QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > > VirtualsConstIterator;
VirtualsConstIterator begin_virtuals() const;
VirtualsConstIterator end_virtuals() const;
diff --git a/paludis/repositories/e/e_repository_profile_file.cc b/paludis/repositories/e/e_repository_profile_file.cc
index 1b0e5b608..88b95f56e 100644
--- a/paludis/repositories/e/e_repository_profile_file.cc
+++ b/paludis/repositories/e/e_repository_profile_file.cc
@@ -19,7 +19,6 @@
#include "e_repository_profile_file.hh"
#include "e_repository_mask_file.hh"
-#include <paludis/util/tr1_type_traits.hh>
#include <paludis/util/log.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/config_file.hh>
@@ -30,6 +29,7 @@
#include <list>
#include <set>
#include <algorithm>
+#include <tr1/type_traits>
using namespace paludis;
using namespace paludis::erepository;
@@ -80,7 +80,7 @@ namespace paludis
template <typename F_>
struct Implementation<ProfileFile<F_> >
{
- typedef std::list<typename tr1::remove_const<typename tr1::remove_reference<
+ typedef std::list<typename std::tr1::remove_const<typename std::tr1::remove_reference<
typename F_::ConstIterator::value_type>::type>::type> Lines;
Lines lines;
@@ -100,7 +100,7 @@ ProfileFile<F_>::add_file(const FSEntry & f)
F_ file(f, LineConfigFileOptions());
for (typename F_::ConstIterator line(file.begin()), line_end(file.end()) ; line != line_end ; ++line)
{
- const std::string & key(FileEntryTraits<typename tr1::remove_const<typename tr1::remove_reference<
+ const std::string & key(FileEntryTraits<typename std::tr1::remove_const<typename std::tr1::remove_reference<
typename F_::ConstIterator::value_type>::type>::type>::extract_key(*line));
if (0 == key.compare(0, 1, "-", 0, 1))
{
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index 0b0610402..93738369d 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -43,9 +43,8 @@
#include <paludis/util/tokeniser.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/make_shared_ptr.hh>
-
+#include <tr1/functional>
#include <algorithm>
#include <list>
#include <map>
@@ -89,10 +88,10 @@ ERepositorySets::~ERepositorySets()
{
}
-tr1::shared_ptr<SetSpecTree::ConstItem>
+std::tr1::shared_ptr<SetSpecTree::ConstItem>
ERepositorySets::package_set(const SetName & ss) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
if ("system" == ss.data())
throw InternalError(PALUDIS_HERE, "system set should've been handled by ERepository");
@@ -105,7 +104,7 @@ ERepositorySets::package_set(const SetName & ss) const
if ((_imp->params.setsdir / (stringify(s.first) + ".conf")).exists())
{
- tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(ss, stringify(_imp->e_repository->name())));
+ std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(ss, stringify(_imp->e_repository->name())));
FSEntry ff(_imp->params.setsdir / (stringify(s.first) + ".conf"));
Context context("When loading package set '" + stringify(s.first) + "' from '" + stringify(ff) + "':");
@@ -114,36 +113,36 @@ ERepositorySets::package_set(const SetName & ss) const
.file_name(ff)
.environment(_imp->environment)
.type(sft_paludis_conf)
- .parser(tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
.set_operator_mode(s.second)
.tag(tag));
return f.contents();
}
else
- return tr1::shared_ptr<SetSpecTree::ConstItem>();
+ return std::tr1::shared_ptr<SetSpecTree::ConstItem>();
}
-tr1::shared_ptr<const SetNameSet>
+std::tr1::shared_ptr<const SetNameSet>
ERepositorySets::sets_list() const
{
Context context("While generating the list of sets:");
- tr1::shared_ptr<SetNameSet> result(new SetNameSet);
+ std::tr1::shared_ptr<SetNameSet> result(new SetNameSet);
result->insert(SetName("insecurity"));
result->insert(SetName("security"));
result->insert(SetName("system"));
try
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
std::list<FSEntry> repo_sets;
std::remove_copy_if(
DirIterator(_imp->params.setsdir),
DirIterator(),
std::back_inserter(repo_sets),
- tr1::bind(std::logical_not<bool>(), tr1::bind(is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ std::tr1::bind(std::logical_not<bool>(), std::tr1::bind(is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::list<FSEntry>::const_iterator f(repo_sets.begin()),
f_end(repo_sets.end());
@@ -227,17 +226,17 @@ namespace
}
}
-tr1::shared_ptr<SetSpecTree::ConstItem>
+std::tr1::shared_ptr<SetSpecTree::ConstItem>
ERepositorySets::security_set(bool insecurity) const
{
Context context("When building security or insecurity package set:");
- tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > security_packages(
- new ConstTreeSequence<SetSpecTree, AllDepSpec>(tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
+ std::tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > security_packages(
+ new ConstTreeSequence<SetSpecTree, AllDepSpec>(std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
if (!_imp->params.securitydir.is_directory_or_symlink_to_directory())
return security_packages;
- std::map<std::string, tr1::shared_ptr<GLSADepTag> > glsa_tags;
+ std::map<std::string, std::tr1::shared_ptr<GLSADepTag> > glsa_tags;
for (DirIterator f(_imp->params.securitydir), f_end ; f != f_end; ++f)
{
@@ -248,14 +247,14 @@ ERepositorySets::security_set(bool insecurity) const
try
{
- tr1::shared_ptr<const GLSA> glsa(GLSA::create_from_xml_file(stringify(*f)));
+ std::tr1::shared_ptr<const GLSA> glsa(GLSA::create_from_xml_file(stringify(*f)));
Context local_local_context("When handling GLSA '" + glsa->id() + "' from '" +
stringify(*f) + "':");
for (GLSA::PackagesConstIterator glsa_pkg(glsa->begin_packages()),
glsa_pkg_end(glsa->end_packages()) ; glsa_pkg != glsa_pkg_end ; ++glsa_pkg)
{
- tr1::shared_ptr<const PackageIDSequence> candidates;
+ std::tr1::shared_ptr<const PackageIDSequence> candidates;
if (insecurity)
candidates = _imp->environment->package_database()->query(query::Package(glsa_pkg->name()), qo_order_by_version);
else
@@ -271,18 +270,18 @@ ERepositorySets::security_set(bool insecurity) const
continue;
if (glsa_tags.end() == glsa_tags.find(glsa->id()))
- glsa_tags.insert(std::make_pair(glsa->id(), tr1::shared_ptr<GLSADepTag>(
+ glsa_tags.insert(std::make_pair(glsa->id(), std::tr1::shared_ptr<GLSADepTag>(
new GLSADepTag(glsa->id(), glsa->title(), *f))));
if (insecurity)
{
- tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
+ std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
make_package_dep_spec()
.package((*c)->name())
.version_requirement(VersionRequirement(vo_equal, (*c)->version()))
.repository((*c)->repository()->name())));
spec->set_tag(glsa_tags.find(glsa->id())->second);
- security_packages->add(tr1::shared_ptr<TreeLeaf<SetSpecTree, PackageDepSpec> >(
+ security_packages->add(std::tr1::shared_ptr<TreeLeaf<SetSpecTree, PackageDepSpec> >(
new TreeLeaf<SetSpecTree, PackageDepSpec>(spec)));
}
else
@@ -293,7 +292,7 @@ ERepositorySets::security_set(bool insecurity) const
/* we need to find the best not vulnerable installable package that isn't masked
* that's in the same slot as our vulnerable installed package. */
bool ok(false);
- tr1::shared_ptr<const PackageIDSequence> available(
+ std::tr1::shared_ptr<const PackageIDSequence> available(
_imp->environment->package_database()->query(
query::Matches(make_package_dep_spec()
.package(glsa_pkg->name())
@@ -311,12 +310,12 @@ ERepositorySets::security_set(bool insecurity) const
continue;
}
- tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(make_package_dep_spec()
+ std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(make_package_dep_spec()
.package((*r)->name())
.version_requirement(VersionRequirement(vo_equal, (*r)->version()))
.repository((*r)->repository()->name())));
spec->set_tag(glsa_tags.find(glsa->id())->second);
- security_packages->add(tr1::shared_ptr<SetSpecTree::ConstItem>(
+ security_packages->add(std::tr1::shared_ptr<SetSpecTree::ConstItem>(
new TreeLeaf<SetSpecTree, PackageDepSpec>(spec)));
ok = true;
break;
diff --git a/paludis/repositories/e/e_repository_sets.hh b/paludis/repositories/e/e_repository_sets.hh
index c8244fe6d..07210f709 100644
--- a/paludis/repositories/e/e_repository_sets.hh
+++ b/paludis/repositories/e/e_repository_sets.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008 Ciaran McCreesh
* Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -58,17 +58,17 @@ namespace paludis
/**
* Fetch a package set other than system.
*/
- tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName & s) const;
+ std::tr1::shared_ptr<SetSpecTree::ConstItem> package_set(const SetName & s) const;
/**
* Fetch the security or insecurity set.
*/
- tr1::shared_ptr<SetSpecTree::ConstItem> security_set(bool insecure) const;
+ std::tr1::shared_ptr<SetSpecTree::ConstItem> security_set(bool insecure) const;
/**
* Give a list of all the sets in this repo.
*/
- tr1::shared_ptr<const SetNameSet> sets_list() const;
+ std::tr1::shared_ptr<const SetNameSet> sets_list() const;
};
}
diff --git a/paludis/repositories/e/e_repository_sets_TEST.cc b/paludis/repositories/e/e_repository_sets_TEST.cc
index 8eac4978d..c07a7e6f5 100644
--- a/paludis/repositories/e/e_repository_sets_TEST.cc
+++ b/paludis/repositories/e/e_repository_sets_TEST.cc
@@ -52,16 +52,16 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_sets_TEST_dir/repo1");
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
- tr1::shared_ptr<const SetNameSet> sets_list((*repo)[k::sets_interface()]->sets_list());
+ std::tr1::shared_ptr<const SetNameSet> sets_list((*repo)[k::sets_interface()]->sets_list());
TEST_CHECK_EQUAL(sets_list->size(), 4U);
TEST_CHECK(sets_list->end() != sets_list->find(SetName("system")));
TEST_CHECK(sets_list->end() != sets_list->find(SetName("security")));
@@ -81,22 +81,22 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_sets_TEST_dir/repo1");
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
- tr1::shared_ptr<FakeInstalledRepository> installed(
+ std::tr1::shared_ptr<FakeInstalledRepository> installed(
new FakeInstalledRepository(&env, RepositoryName("installed")));
installed->add_version("cat-two", "bar", "1.5");
env.package_database()->add_repository(0, installed);
- tr1::shared_ptr<SetSpecTree::ConstItem> set1((*repo)[k::sets_interface()]->package_set(SetName("set1")));
+ std::tr1::shared_ptr<SetSpecTree::ConstItem> set1((*repo)[k::sets_interface()]->package_set(SetName("set1")));
StringifyFormatter ff;
- erepository::DepSpecPrettyPrinter pretty(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pretty(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
set1->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "cat-one/foo >=cat-two/bar-2");
}
@@ -119,19 +119,19 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_sets_TEST_dir/repo1");
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<SetSpecTree::ConstItem> insecurity((*repo)[k::sets_interface()]->package_set(SetName("insecurity")));
+ std::tr1::shared_ptr<SetSpecTree::ConstItem> insecurity((*repo)[k::sets_interface()]->package_set(SetName("insecurity")));
StringifyFormatter ff;
- erepository::DepSpecPrettyPrinter pretty(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pretty(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
insecurity->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "=cat-one/foo-1::test-repo-1 =cat-two/bar-1.5::test-repo-1 "
"=cat-two/bar-1.5.1::test-repo-1 =cat-three/baz-1.0::test-repo-1 "
@@ -155,25 +155,25 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "e_repository_sets_TEST_dir/repo1");
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakeInstalledRepository> installed(
+ std::tr1::shared_ptr<FakeInstalledRepository> installed(
new FakeInstalledRepository(&env, RepositoryName("installed")));
installed->add_version("cat-one", "foo", "2.1");
installed->add_version("cat-two", "bar", "1.5");
installed->add_version("cat-three", "baz", "1.0");
env.package_database()->add_repository(0, installed);
- tr1::shared_ptr<const SetSpecTree::ConstItem> security((*repo)[k::sets_interface()]->package_set(SetName("security")));
+ std::tr1::shared_ptr<const SetSpecTree::ConstItem> security((*repo)[k::sets_interface()]->package_set(SetName("security")));
StringifyFormatter ff;
- erepository::DepSpecPrettyPrinter pretty(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ erepository::DepSpecPrettyPrinter pretty(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
security->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "=cat-two/bar-2.0::test-repo-1 =cat-three/baz-1.3::test-repo-1");
}
diff --git a/paludis/repositories/e/e_stripper.hh b/paludis/repositories/e/e_stripper.hh
index 14f97ba56..a8c947037 100644
--- a/paludis/repositories/e/e_stripper.hh
+++ b/paludis/repositories/e/e_stripper.hh
@@ -27,7 +27,7 @@ namespace paludis
namespace erepository
{
typedef kc::KeyedClass<
- kc::Field<k::package_id, tr1::shared_ptr<const PackageID> >,
+ kc::Field<k::package_id, std::tr1::shared_ptr<const PackageID> >,
kc::Field<k::image_dir, FSEntry>,
kc::Field<k::debug_dir, FSEntry>,
kc::Field<k::debug_build, InstallActionDebugOption>
diff --git a/paludis/repositories/e/eapi-fwd.hh b/paludis/repositories/e/eapi-fwd.hh
index 57cced39b..a10825460 100644
--- a/paludis/repositories/e/eapi-fwd.hh
+++ b/paludis/repositories/e/eapi-fwd.hh
@@ -22,10 +22,10 @@
#include <paludis/util/kc-fwd.hh>
#include <paludis/util/keys.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/repositories/e/dep_parser-fwd.hh>
#include <paludis/merger-fwd.hh>
#include <paludis/name-fwd.hh>
+#include <tr1/memory>
namespace paludis
{
@@ -100,7 +100,7 @@ namespace paludis
typedef kc::KeyedClass<
kc::Field<k::name, std::string>,
kc::Field<k::exported_name, std::string>,
- kc::Field<k::supported, tr1::shared_ptr<const SupportedEAPI> >
+ kc::Field<k::supported, std::tr1::shared_ptr<const SupportedEAPI> >
> EAPI;
}
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index d001e1b0e..84fa22ba5 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -20,7 +20,6 @@
#include <paludis/repositories/e/eapi.hh>
#include <paludis/name.hh>
#include <paludis/dep_spec.hh>
-#include <paludis/hashed_containers.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/system.hh>
@@ -36,7 +35,8 @@
#include <paludis/util/config_file.hh>
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/kc.hh>
-
+#include <paludis/util/hashes.hh>
+#include <tr1/unordered_map>
#include <map>
#include <vector>
#include <list>
@@ -53,7 +53,7 @@ namespace paludis
template<>
struct Implementation<EAPIData>
{
- MakeHashedMap<std::string, tr1::shared_ptr<const EAPI> >::Type values;
+ std::tr1::unordered_map<std::string, std::tr1::shared_ptr<const EAPI>, Hash<std::string> > values;
Implementation()
{
@@ -67,7 +67,7 @@ namespace paludis
Context cc("When loading EAPI file '" + stringify(*d) + "':");
- tr1::shared_ptr<Map<std::string, std::string> > predefined(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > predefined(new Map<std::string, std::string>);
predefined->insert("PALUDIS_EAPIS_DIR", stringify(d->dirname()));
KeyValueConfigFile k(*d, KeyValueConfigFileOptions(), predefined);
@@ -111,7 +111,7 @@ namespace paludis
merger_options += destringify<MergerOption>(*t);
}
- tr1::shared_ptr<EAPI> eapi(new EAPI(
+ std::tr1::shared_ptr<EAPI> eapi(new EAPI(
strip_trailing_string(d->basename(), ".conf"),
k.get("exported_name"),
make_shared_ptr(new SupportedEAPI(
@@ -268,7 +268,7 @@ namespace paludis
values.insert(std::make_pair(strip_trailing_string(d->basename(), ".conf"), eapi));
}
- MakeHashedMap<std::string, tr1::shared_ptr<const EAPI> >::Type::const_iterator i(values.find("0"));
+ std::tr1::unordered_map<std::string, std::tr1::shared_ptr<const EAPI>, Hash<std::string> >::const_iterator i(values.find("0"));
if (i == values.end())
throw EAPIConfigurationError("No EAPI configuration found for EAPI 0");
else
@@ -291,20 +291,20 @@ EAPIData::~EAPIData()
{
}
-tr1::shared_ptr<const EAPI>
+std::tr1::shared_ptr<const EAPI>
EAPIData::eapi_from_string(const std::string & s) const
{
- MakeHashedMap<std::string, tr1::shared_ptr<const EAPI> >::Type::const_iterator i(_imp->values.find(s));
+ std::tr1::unordered_map<std::string, std::tr1::shared_ptr<const EAPI>, Hash<std::string> >::const_iterator i(_imp->values.find(s));
if (i != _imp->values.end())
return i->second;
- return make_shared_ptr(new EAPI(s, s, tr1::shared_ptr<SupportedEAPI>()));
+ return make_shared_ptr(new EAPI(s, s, std::tr1::shared_ptr<SupportedEAPI>()));
}
-tr1::shared_ptr<const EAPI>
+std::tr1::shared_ptr<const EAPI>
EAPIData::unknown_eapi() const
{
- return make_shared_ptr(new EAPI("UNKNOWN", "UNKNOWN", tr1::shared_ptr<SupportedEAPI>()));
+ return make_shared_ptr(new EAPI("UNKNOWN", "UNKNOWN", std::tr1::shared_ptr<SupportedEAPI>()));
}
namespace paludis
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 740752775..36852050d 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -26,11 +26,11 @@
#include <paludis/util/sr.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/util/options.hh>
#include <paludis/name.hh>
#include <paludis/dep_spec-fwd.hh>
#include <paludis/merger-fwd.hh>
+#include <tr1/memory>
namespace paludis
{
@@ -85,12 +85,12 @@ namespace paludis
/**
* Make an EAPI.
*/
- tr1::shared_ptr<const EAPI> eapi_from_string(const std::string &) const;
+ std::tr1::shared_ptr<const EAPI> eapi_from_string(const std::string &) const;
/**
* Make the unknown EAPI.
*/
- tr1::shared_ptr<const EAPI> unknown_eapi() const;
+ std::tr1::shared_ptr<const EAPI> unknown_eapi() const;
};
}
}
diff --git a/paludis/repositories/e/eapi.sr b/paludis/repositories/e/eapi.sr
index 5e13c7d52..475d487b1 100644
--- a/paludis/repositories/e/eapi.sr
+++ b/paludis/repositories/e/eapi.sr
@@ -153,9 +153,9 @@ make_class_EAPIEbuildOptions()
key ignore_pivot_env_variables std::string
key ignore_pivot_env_functions std::string
- key restrict_fetch "tr1::shared_ptr<Set<std::string> >"
- key restrict_mirror "tr1::shared_ptr<Set<std::string> >"
- key restrict_primaryuri "tr1::shared_ptr<Set<std::string> >"
+ key restrict_fetch "std::tr1::shared_ptr<Set<std::string> >"
+ key restrict_mirror "std::tr1::shared_ptr<Set<std::string> >"
+ key restrict_primaryuri "std::tr1::shared_ptr<Set<std::string> >"
doxygen_comment << "END"
/**
diff --git a/paludis/repositories/e/eapi_phase.cc b/paludis/repositories/e/eapi_phase.cc
index 32a40d8bc..dfdbfb49f 100644
--- a/paludis/repositories/e/eapi_phase.cc
+++ b/paludis/repositories/e/eapi_phase.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -47,7 +47,7 @@ namespace paludis
template <>
struct Implementation<EAPIPhases>
{
- std::list<tr1::shared_ptr<const EAPIPhase> > phases;
+ std::list<std::tr1::shared_ptr<const EAPIPhase> > phases;
};
}
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 56672baf5..b1729a5f0 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -36,7 +36,6 @@
#include <paludis/util/tokeniser.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/destringify.hh>
#include <paludis/util/indirect_iterator-impl.hh>
@@ -57,7 +56,7 @@
#include <sys/time.h>
#include <unistd.h>
#include <time.h>
-
+#include <tr1/functional>
#include <list>
#include "config.h"
@@ -104,13 +103,13 @@ EbuildCommand::operator() ()
if (params[k::userpriv()])
cmd.with_uid_gid(params[k::environment()]->reduced_uid(), params[k::environment()]->reduced_gid());
- using namespace tr1::placeholders;
- cmd.with_pipe_command_handler(tr1::bind(&pipe_command_handler, params[k::environment()], params[k::package_id()], _1));
+ using namespace std::tr1::placeholders;
+ cmd.with_pipe_command_handler(std::tr1::bind(&pipe_command_handler, params[k::environment()], params[k::package_id()], _1));
- tr1::shared_ptr<const FSEntrySequence> syncers_dirs(params[k::environment()]->syncers_dirs());
- tr1::shared_ptr<const FSEntrySequence> bashrc_files(params[k::environment()]->bashrc_files());
- tr1::shared_ptr<const FSEntrySequence> fetchers_dirs(params[k::environment()]->fetchers_dirs());
- tr1::shared_ptr<const FSEntrySequence> hook_dirs(params[k::environment()]->hook_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> syncers_dirs(params[k::environment()]->syncers_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> bashrc_files(params[k::environment()]->bashrc_files());
+ std::tr1::shared_ptr<const FSEntrySequence> fetchers_dirs(params[k::environment()]->fetchers_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> hook_dirs(params[k::environment()]->hook_dirs());
cmd = extend_command(cmd
.with_setenv("P", stringify(params[k::package_id()]->name().package) + "-" +
@@ -341,7 +340,7 @@ EbuildMetadataCommand::do_run_command(const Command & cmd)
namespace
{
- std::string get(const tr1::shared_ptr<const Map<std::string, std::string> > & k, const std::string & s)
+ std::string get(const std::tr1::shared_ptr<const Map<std::string, std::string> > & k, const std::string & s)
{
Map<std::string, std::string>::ConstIterator i(k->find(s));
if (k->end() == i)
@@ -351,7 +350,7 @@ namespace
}
void
-EbuildMetadataCommand::load(const tr1::shared_ptr<const EbuildID> & id)
+EbuildMetadataCommand::load(const std::tr1::shared_ptr<const EbuildID> & id)
{
Context context("When loading generated metadata for '" + stringify(*params[k::package_id()]) + "':");
@@ -699,17 +698,17 @@ WriteVDBEntryCommand::WriteVDBEntryCommand(const WriteVDBEntryParams & p) :
void
WriteVDBEntryCommand::operator() ()
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
std::string ebuild_cmd(getenv_with_default("PALUDIS_EBUILD_DIR", LIBEXECDIR "/paludis") +
"/write_vdb_entry.bash '" +
stringify(params[k::output_directory()]) + "' '" +
stringify(params[k::environment_file()]) + "'");
- tr1::shared_ptr<const FSEntrySequence> syncers_dirs(params[k::environment()]->syncers_dirs());
- tr1::shared_ptr<const FSEntrySequence> bashrc_files(params[k::environment()]->bashrc_files());
- tr1::shared_ptr<const FSEntrySequence> fetchers_dirs(params[k::environment()]->fetchers_dirs());
- tr1::shared_ptr<const FSEntrySequence> hook_dirs(params[k::environment()]->hook_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> syncers_dirs(params[k::environment()]->syncers_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> bashrc_files(params[k::environment()]->bashrc_files());
+ std::tr1::shared_ptr<const FSEntrySequence> fetchers_dirs(params[k::environment()]->fetchers_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> hook_dirs(params[k::environment()]->hook_dirs());
Command cmd(Command(ebuild_cmd)
.with_setenv("PKGMANAGER", PALUDIS_PACKAGE "-" + stringify(PALUDIS_VERSION_MAJOR) + "." +
@@ -736,7 +735,7 @@ WriteVDBEntryCommand::operator() ()
(*(*params[k::package_id()]->eapi())[k::supported()])[k::ebuild_options()].ignore_pivot_env_functions)
.with_setenv("PALUDIS_IGNORE_PIVOT_ENV_VARIABLES",
(*(*params[k::package_id()]->eapi())[k::supported()])[k::ebuild_options()].ignore_pivot_env_variables)
- .with_pipe_command_handler(tr1::bind(&pipe_command_handler, params[k::environment()], params[k::package_id()], _1))
+ .with_pipe_command_handler(std::tr1::bind(&pipe_command_handler, params[k::environment()], params[k::package_id()], _1))
);
if (0 != (run_command(cmd)))
@@ -892,7 +891,7 @@ WriteBinaryEbuildCommand::WriteBinaryEbuildCommand(const WriteBinaryEbuildComman
void
WriteBinaryEbuildCommand::operator() ()
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
if (! (*EAPIData::get_instance()->eapi_from_string("pbin-1+" + (*params[k::package_id()]->eapi())[k::exported_name()]))[k::supported()])
throw InstallActionError("Don't know how to write binary ebuilds using EAPI 'pbin-1+" +
@@ -909,10 +908,10 @@ WriteBinaryEbuildCommand::operator() ()
stringify(params[k::environment_file()]) + "' '" +
stringify(params[k::image()]) + "'");
- tr1::shared_ptr<const FSEntrySequence> syncers_dirs(params[k::environment()]->syncers_dirs());
- tr1::shared_ptr<const FSEntrySequence> bashrc_files(params[k::environment()]->bashrc_files());
- tr1::shared_ptr<const FSEntrySequence> fetchers_dirs(params[k::environment()]->fetchers_dirs());
- tr1::shared_ptr<const FSEntrySequence> hook_dirs(params[k::environment()]->hook_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> syncers_dirs(params[k::environment()]->syncers_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> bashrc_files(params[k::environment()]->bashrc_files());
+ std::tr1::shared_ptr<const FSEntrySequence> fetchers_dirs(params[k::environment()]->fetchers_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> hook_dirs(params[k::environment()]->hook_dirs());
Command cmd(Command(ebuild_cmd)
.with_setenv("PKGMANAGER", PALUDIS_PACKAGE "-" + stringify(PALUDIS_VERSION_MAJOR) + "." +
@@ -944,7 +943,7 @@ WriteBinaryEbuildCommand::operator() ()
+ (*params[k::package_id()]->eapi())[k::exported_name()]))[k::supported()])[k::ebuild_metadata_variables()].metadata_keywords)
.with_setenv("PALUDIS_BINARY_DISTDIR_VARIABLE", (*(*EAPIData::get_instance()->eapi_from_string("pbin-1+"
+ (*params[k::package_id()]->eapi())[k::exported_name()]))[k::supported()])[k::ebuild_environment_variables()][k::env_distdir()])
- .with_pipe_command_handler(tr1::bind(&pipe_command_handler, params[k::environment()], params[k::package_id()], _1))
+ .with_pipe_command_handler(std::tr1::bind(&pipe_command_handler, params[k::environment()], params[k::package_id()], _1))
);
if (0 != (run_command(cmd)))
diff --git a/paludis/repositories/e/ebuild.hh b/paludis/repositories/e/ebuild.hh
index 52a71c8bb..711639a9e 100644
--- a/paludis/repositories/e/ebuild.hh
+++ b/paludis/repositories/e/ebuild.hh
@@ -57,12 +57,12 @@ namespace paludis
*/
typedef kc::KeyedClass<
kc::Field<k::environment, const Environment *>,
- kc::Field<k::package_id, tr1::shared_ptr<const erepository::ERepositoryID> >,
+ kc::Field<k::package_id, std::tr1::shared_ptr<const erepository::ERepositoryID> >,
kc::Field<k::ebuild_dir, FSEntry>,
kc::Field<k::ebuild_file, FSEntry>,
kc::Field<k::files_dir, FSEntry>,
- kc::Field<k::eclassdirs, tr1::shared_ptr<const FSEntrySequence> >,
- kc::Field<k::exlibsdirs, tr1::shared_ptr<const FSEntrySequence> >,
+ kc::Field<k::eclassdirs, std::tr1::shared_ptr<const FSEntrySequence> >,
+ kc::Field<k::exlibsdirs, std::tr1::shared_ptr<const FSEntrySequence> >,
kc::Field<k::portdir, FSEntry>,
kc::Field<k::distdir, FSEntry>,
kc::Field<k::builddir, FSEntry>,
@@ -84,8 +84,8 @@ namespace paludis
kc::Field<k::use, std::string>,
kc::Field<k::use_expand, std::string>,
kc::Field<k::root, std::string>,
- kc::Field<k::profiles, tr1::shared_ptr<const FSEntrySequence> >,
- kc::Field<k::expand_vars, tr1::shared_ptr<const Map<std::string, std::string> > >
+ kc::Field<k::profiles, std::tr1::shared_ptr<const FSEntrySequence> >,
+ kc::Field<k::expand_vars, std::tr1::shared_ptr<const Map<std::string, std::string> > >
> EbuildNoFetchCommandParams;
/**
@@ -101,8 +101,8 @@ namespace paludis
kc::Field<k::use, std::string>,
kc::Field<k::use_expand, std::string>,
kc::Field<k::root, std::string>,
- kc::Field<k::profiles, tr1::shared_ptr<const FSEntrySequence> >,
- kc::Field<k::expand_vars, tr1::shared_ptr<const Map<std::string, std::string> > >,
+ kc::Field<k::profiles, std::tr1::shared_ptr<const FSEntrySequence> >,
+ kc::Field<k::expand_vars, std::tr1::shared_ptr<const Map<std::string, std::string> > >,
kc::Field<k::disable_cfgpro, bool>,
kc::Field<k::slot, SlotName>,
kc::Field<k::config_protect, std::string>,
@@ -121,8 +121,8 @@ namespace paludis
kc::Field<k::use, std::string>,
kc::Field<k::use_expand, std::string>,
kc::Field<k::root, std::string>,
- kc::Field<k::profiles, tr1::shared_ptr<const FSEntrySequence> >,
- kc::Field<k::expand_vars, tr1::shared_ptr<const Map<std::string, std::string> > >
+ kc::Field<k::profiles, std::tr1::shared_ptr<const FSEntrySequence> >,
+ kc::Field<k::expand_vars, std::tr1::shared_ptr<const Map<std::string, std::string> > >
> EbuildPretendCommandParams;
/**
@@ -163,8 +163,8 @@ namespace paludis
kc::Field<k::use, std::string>,
kc::Field<k::use_expand, std::string>,
kc::Field<k::root, std::string>,
- kc::Field<k::profiles, tr1::shared_ptr<const FSEntrySequence> >,
- kc::Field<k::expand_vars, tr1::shared_ptr<const Map<std::string, std::string> > >,
+ kc::Field<k::profiles, std::tr1::shared_ptr<const FSEntrySequence> >,
+ kc::Field<k::expand_vars, std::tr1::shared_ptr<const Map<std::string, std::string> > >,
kc::Field<k::load_environment, const FSEntry *>,
kc::Field<k::info_vars, FSEntry>,
kc::Field<k::use_ebuild_file, bool>
@@ -179,7 +179,7 @@ namespace paludis
*/
typedef kc::KeyedClass<
kc::Field<k::environment, const Environment *>,
- kc::Field<k::package_id, tr1::shared_ptr<const erepository::ERepositoryID> >,
+ kc::Field<k::package_id, std::tr1::shared_ptr<const erepository::ERepositoryID> >,
kc::Field<k::output_directory, FSEntry>,
kc::Field<k::environment_file, FSEntry>
> WriteVDBEntryParams;
@@ -194,7 +194,7 @@ namespace paludis
typedef kc::KeyedClass<
kc::Field<k::environment, const Environment *>,
kc::Field<k::destination_repository, const ERepository *>,
- kc::Field<k::package_id, tr1::shared_ptr<const erepository::ERepositoryID> >,
+ kc::Field<k::package_id, std::tr1::shared_ptr<const erepository::ERepositoryID> >,
kc::Field<k::binary_ebuild_location, FSEntry>,
kc::Field<k::binary_distdir, FSEntry>,
kc::Field<k::environment_file, FSEntry>,
@@ -568,7 +568,7 @@ namespace paludis
public EbuildCommand
{
private:
- tr1::shared_ptr<Map<std::string, std::string> > keys;
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys;
public:
EbuildMetadataCommand(const EbuildCommandParams &);
@@ -583,7 +583,7 @@ namespace paludis
Command extend_command(const Command &);
- void load(const tr1::shared_ptr<const EbuildID> &);
+ void load(const std::tr1::shared_ptr<const EbuildID> &);
};
}
}
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 79f62a313..678f3c534 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -48,12 +48,11 @@
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/visitor-impl.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/kc.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/instantiation_policy-impl.hh>
-
+#include <tr1/functional>
#include <fstream>
#include <list>
#include <set>
@@ -116,7 +115,7 @@ namespace paludis
ERepository * const e_repository;
const ERepositoryParams params;
- tr1::shared_ptr<EclassMtimes> eclass_mtimes;
+ std::tr1::shared_ptr<EclassMtimes> eclass_mtimes;
time_t master_mtime;
Implementation(const Environment * const e, ERepository * const p,
@@ -144,12 +143,12 @@ EbuildEntries::~EbuildEntries()
{
}
-const tr1::shared_ptr<const ERepositoryID>
+const std::tr1::shared_ptr<const ERepositoryID>
EbuildEntries::make_id(const QualifiedPackageName & q, const FSEntry & f) const
{
Context context("When creating ID for '" + stringify(q) + "' from '" + stringify(f) + "':");
- tr1::shared_ptr<EbuildID> result(new EbuildID(q, extract_package_file_version(q, f), _imp->params.environment,
+ std::tr1::shared_ptr<EbuildID> result(new EbuildID(q, extract_package_file_version(q, f), _imp->params.environment,
_imp->e_repository->shared_from_this(), f, _guess_eapi(q, f),
_imp->master_mtime, _imp->eclass_mtimes));
return result;
@@ -166,10 +165,10 @@ namespace
std::list<const URILabelsDepSpec *> _labels;
const Environment * const env;
- const tr1::shared_ptr<const PackageID> id;
+ const std::tr1::shared_ptr<const PackageID> id;
public:
- AFinder(const Environment * const e, const tr1::shared_ptr<const PackageID> & i) :
+ AFinder(const Environment * const e, const std::tr1::shared_ptr<const PackageID> & i) :
env(e),
id(i)
{
@@ -226,7 +225,7 @@ namespace
{
std::string make_use(const Environment * const env,
const ERepositoryID & id,
- tr1::shared_ptr<const ERepositoryProfile> profile)
+ std::tr1::shared_ptr<const ERepositoryProfile> profile)
{
std::string use;
@@ -243,14 +242,14 @@ namespace
return use;
}
- tr1::shared_ptr<Map<std::string, std::string> >
+ std::tr1::shared_ptr<Map<std::string, std::string> >
make_expand(const Environment * const env,
const ERepositoryID & e,
- tr1::shared_ptr<const ERepositoryProfile> profile,
+ std::tr1::shared_ptr<const ERepositoryProfile> profile,
std::string & use,
const std::string & expand_sep)
{
- tr1::shared_ptr<Map<std::string, std::string> > expand_vars(
+ std::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(
new Map<std::string, std::string>);
for (ERepositoryProfile::UseExpandConstIterator x(profile->begin_use_expand()),
@@ -267,7 +266,7 @@ namespace
create_inserter<UseFlagName>(std::inserter(possible_values, possible_values.end())));
/* possible values from environment */
- tr1::shared_ptr<const UseFlagNameSet> possible_values_from_env(
+ std::tr1::shared_ptr<const UseFlagNameSet> possible_values_from_env(
env->known_use_expand_names(*x, e));
for (UseFlagNameSet::ConstIterator i(possible_values_from_env->begin()),
i_end(possible_values_from_env->end()) ; i != i_end ; ++i)
@@ -329,10 +328,10 @@ namespace
}
void
-EbuildEntries::fetch(const tr1::shared_ptr<const ERepositoryID> & id,
- const FetchActionOptions & o, tr1::shared_ptr<const ERepositoryProfile> p) const
+EbuildEntries::fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ const FetchActionOptions & o, std::tr1::shared_ptr<const ERepositoryProfile> p) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
Context context("When fetching '" + stringify(*id) + "':");
@@ -427,10 +426,10 @@ EbuildEntries::fetch(const tr1::shared_ptr<const ERepositoryID> & id,
check_userpriv(FSEntry(_imp->params.builddir), _imp->environment));
std::string use(make_use(_imp->params.environment, *id, p));
std::string expand_sep(stringify((*(*id->eapi())[k::supported()])[k::ebuild_options()].use_expand_separator));
- tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
+ std::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment, *id, p, use, expand_sep));
- tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
+ std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
EAPIPhases phases((*(*id->eapi())[k::supported()])[k::ebuild_phases()].ebuild_nofetch);
for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
@@ -473,10 +472,10 @@ EbuildEntries::fetch(const tr1::shared_ptr<const ERepositoryID> & id,
}
void
-EbuildEntries::pretend_fetch(const tr1::shared_ptr<const ERepositoryID> & id,
- PretendFetchAction & a, tr1::shared_ptr<const ERepositoryProfile>) const
+EbuildEntries::pretend_fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ PretendFetchAction & a, std::tr1::shared_ptr<const ERepositoryProfile>) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
Context context("When pretending to fetch ID '" + stringify(*id) + "':");
@@ -490,10 +489,10 @@ EbuildEntries::pretend_fetch(const tr1::shared_ptr<const ERepositoryID> & id,
}
void
-EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
- const InstallActionOptions & o, tr1::shared_ptr<const ERepositoryProfile> p) const
+EbuildEntries::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ const InstallActionOptions & o, std::tr1::shared_ptr<const ERepositoryProfile> p) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
Context context("When installing '" + stringify(*id) + "':");
@@ -505,19 +504,19 @@ EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
test_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "test"));
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "test"));
strip_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "strip")) ||
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "strip")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "nostrip"));
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nostrip"));
}
std::string archives, all_archives;
@@ -576,10 +575,10 @@ EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
/* add expand to use (iuse isn't reliable for use_expand things), and make the expand
* environment variables */
std::string expand_sep(stringify((*(*id->eapi())[k::supported()])[k::ebuild_options()].use_expand_separator));
- tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
+ std::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment, *id, p, use, expand_sep));
- tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
+ std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
bool userpriv_ok((! userpriv_restrict) && (_imp->environment->reduced_gid() != getgid()) &&
check_userpriv(FSEntry(_imp->params.distdir), _imp->environment) &&
@@ -704,10 +703,10 @@ EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
}
void
-EbuildEntries::info(const tr1::shared_ptr<const ERepositoryID> & id,
- tr1::shared_ptr<const ERepositoryProfile> p) const
+EbuildEntries::info(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ std::tr1::shared_ptr<const ERepositoryProfile> p) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
Context context("When infoing '" + stringify(*id) + "':");
@@ -719,9 +718,9 @@ EbuildEntries::info(const tr1::shared_ptr<const ERepositoryID> & id,
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
}
bool userpriv_ok((! userpriv_restrict) && (_imp->environment->reduced_gid() != getgid()) &&
check_userpriv(FSEntry(_imp->params.builddir), _imp->environment));
@@ -732,10 +731,10 @@ EbuildEntries::info(const tr1::shared_ptr<const ERepositoryID> & id,
/* add expand to use (iuse isn't reliable for use_expand things), and make the expand
* environment variables */
std::string expand_sep(stringify((*(*id->eapi())[k::supported()])[k::ebuild_options()].use_expand_separator));
- tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
+ std::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment, *id, p, use, expand_sep));
- tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
+ std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
EAPIPhases phases((*(*id->eapi())[k::supported()])[k::ebuild_phases()].ebuild_info);
for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
@@ -785,8 +784,8 @@ EbuildEntries::info(const tr1::shared_ptr<const ERepositoryID> & id,
}
std::string
-EbuildEntries::get_environment_variable(const tr1::shared_ptr<const ERepositoryID> & id,
- const std::string & var, tr1::shared_ptr<const ERepositoryProfile>) const
+EbuildEntries::get_environment_variable(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ const std::string & var, std::tr1::shared_ptr<const ERepositoryProfile>) const
{
EAPIPhases phases((*(*id->eapi())[k::supported()])[k::ebuild_phases()].ebuild_variable);
@@ -797,7 +796,7 @@ EbuildEntries::get_environment_variable(const tr1::shared_ptr<const ERepositoryI
bool userpriv_restrict;
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
DepSpecFlattener<RestrictSpecTree, PlainTextDepSpec> restricts(_imp->params.environment);
if (id->restrict_key())
@@ -805,14 +804,14 @@ EbuildEntries::get_environment_variable(const tr1::shared_ptr<const ERepositoryI
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
}
bool userpriv_ok((! userpriv_restrict) && (_imp->environment->reduced_gid() != getgid()) &&
check_userpriv(FSEntry(_imp->params.builddir), _imp->environment));
- tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
+ std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
EbuildVariableCommand cmd(EbuildCommandParams::named_create()
(k::environment(), _imp->params.environment)
@@ -838,11 +837,11 @@ EbuildEntries::get_environment_variable(const tr1::shared_ptr<const ERepositoryI
return cmd.result();
}
-tr1::shared_ptr<ERepositoryEntries>
+std::tr1::shared_ptr<ERepositoryEntries>
EbuildEntries::make_ebuild_entries(
const Environment * const e, ERepository * const r, const ERepositoryParams & p)
{
- return tr1::shared_ptr<ERepositoryEntries>(new EbuildEntries(e, r, p));
+ return std::tr1::shared_ptr<ERepositoryEntries>(new EbuildEntries(e, r, p));
}
void
@@ -856,7 +855,7 @@ EbuildEntries::merge(const MergeParams & m)
FSEntry binary_ebuild_location(_imp->e_repository->layout()->binary_ebuild_location(
m[k::package_id()]->name(), m[k::package_id()]->version(),
- "pbin-1+" + (*tr1::static_pointer_cast<const ERepositoryID>(m[k::package_id()])->eapi())[k::name()]));
+ "pbin-1+" + (*std::tr1::static_pointer_cast<const ERepositoryID>(m[k::package_id()])->eapi())[k::name()]));
binary_ebuild_location.dirname().dirname().mkdir();
binary_ebuild_location.dirname().mkdir();
@@ -864,14 +863,14 @@ EbuildEntries::merge(const MergeParams & m)
WriteBinaryEbuildCommand write_binary_ebuild_command(
WriteBinaryEbuildCommandParams::named_create()
(k::environment(), _imp->params.environment)
- (k::package_id(), tr1::static_pointer_cast<const ERepositoryID>(m[k::package_id()]))
+ (k::package_id(), std::tr1::static_pointer_cast<const ERepositoryID>(m[k::package_id()]))
(k::binary_ebuild_location(), binary_ebuild_location)
(k::binary_distdir(), _imp->params.binary_distdir)
(k::environment_file(), m[k::environment_file()])
(k::image(), m[k::image_dir()])
(k::destination_repository(), _imp->e_repository)
(k::builddir(), _imp->params.builddir)
- (k::merger_options(), (*(*tr1::static_pointer_cast<const ERepositoryID>(m[k::package_id()])->eapi())[k::supported()])
+ (k::merger_options(), (*(*std::tr1::static_pointer_cast<const ERepositoryID>(m[k::package_id()])->eapi())[k::supported()])
[k::merger_options()])
);
@@ -905,10 +904,10 @@ EbuildEntries::extract_package_file_version(const QualifiedPackageName & n, cons
}
bool
-EbuildEntries::pretend(const tr1::shared_ptr<const ERepositoryID> & id,
- tr1::shared_ptr<const ERepositoryProfile> p) const
+EbuildEntries::pretend(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ std::tr1::shared_ptr<const ERepositoryProfile> p) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
Context context("When running pretend for '" + stringify(*id) + "':");
@@ -925,19 +924,19 @@ EbuildEntries::pretend(const tr1::shared_ptr<const ERepositoryID> & id,
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
+ std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
}
bool userpriv_ok((! userpriv_restrict) && (_imp->environment->reduced_gid() != getgid()) &&
check_userpriv(FSEntry(_imp->params.builddir), _imp->environment));
std::string use(make_use(_imp->params.environment, *id, p));
std::string expand_sep(stringify((*(*id->eapi())[k::supported()])[k::ebuild_options()].use_expand_separator));
- tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
+ std::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment, *id, p, use, expand_sep));
- tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
+ std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
EAPIPhases phases((*(*id->eapi())[k::supported()])[k::ebuild_phases()].ebuild_pretend);
for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
diff --git a/paludis/repositories/e/ebuild_entries.hh b/paludis/repositories/e/ebuild_entries.hh
index d97af8111..41cf4b879 100644
--- a/paludis/repositories/e/ebuild_entries.hh
+++ b/paludis/repositories/e/ebuild_entries.hh
@@ -53,7 +53,7 @@ namespace paludis
/**
* Create an EbuildEntries instance.
*/
- static tr1::shared_ptr<ERepositoryEntries> make_ebuild_entries(const Environment * const,
+ static std::tr1::shared_ptr<ERepositoryEntries> make_ebuild_entries(const Environment * const,
ERepository * const, const ERepositoryParams &);
///\name Basic operations
@@ -75,26 +75,26 @@ namespace paludis
virtual VersionSpec extract_package_file_version(const QualifiedPackageName &, const FSEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const tr1::shared_ptr<const ERepositoryID> make_id(const QualifiedPackageName &, const FSEntry &) const
+ virtual const std::tr1::shared_ptr<const ERepositoryID> make_id(const QualifiedPackageName &, const FSEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string get_environment_variable(const tr1::shared_ptr<const ERepositoryID> &, const std::string & var,
- tr1::shared_ptr<const ERepositoryProfile>) const;
+ virtual std::string get_environment_variable(const std::tr1::shared_ptr<const ERepositoryID> &, const std::string & var,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const;
- virtual void fetch(const tr1::shared_ptr<const ERepositoryID> &, const FetchActionOptions &,
- tr1::shared_ptr<const ERepositoryProfile>) const;
+ virtual void fetch(const std::tr1::shared_ptr<const ERepositoryID> &, const FetchActionOptions &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const;
- virtual void pretend_fetch(const tr1::shared_ptr<const ERepositoryID> &, PretendFetchAction &,
- tr1::shared_ptr<const ERepositoryProfile>) const;
+ virtual void pretend_fetch(const std::tr1::shared_ptr<const ERepositoryID> &, PretendFetchAction &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const;
- virtual void install(const tr1::shared_ptr<const ERepositoryID> &, const InstallActionOptions &,
- tr1::shared_ptr<const ERepositoryProfile>) const;
+ virtual void install(const std::tr1::shared_ptr<const ERepositoryID> &, const InstallActionOptions &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const;
- virtual bool pretend(const tr1::shared_ptr<const ERepositoryID> &,
- tr1::shared_ptr<const ERepositoryProfile>) const;
+ virtual bool pretend(const std::tr1::shared_ptr<const ERepositoryID> &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const;
- virtual void info(const tr1::shared_ptr<const ERepositoryID> &,
- tr1::shared_ptr<const ERepositoryProfile>) const;
+ virtual void info(const std::tr1::shared_ptr<const ERepositoryID> &,
+ std::tr1::shared_ptr<const ERepositoryProfile>) const;
virtual std::string get_package_file_manifest_key(const FSEntry &, const QualifiedPackageName &) const;
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index 44fb06065..9ce7ba7d0 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
@@ -28,7 +28,7 @@
#include <paludis/repositories/e/dependencies_rewriter.hh>
#include <paludis/stringify_formatter.hh>
#include <paludis/repositories/e/eapi.hh>
-#include <paludis/util/tr1_functional.hh>
+#include <tr1/functional>
#include <fstream>
#include <set>
#include <list>
@@ -42,7 +42,7 @@ using namespace paludis;
using namespace paludis::erepository;
EbuildFlatMetadataCache::EbuildFlatMetadataCache(const Environment * const v, const FSEntry & f,
- const FSEntry & e, time_t t, tr1::shared_ptr<const EclassMtimes> m, bool s) :
+ const FSEntry & e, time_t t, std::tr1::shared_ptr<const EclassMtimes> m, bool s) :
_env(v),
_filename(f),
_ebuild(e),
@@ -53,9 +53,9 @@ EbuildFlatMetadataCache::EbuildFlatMetadataCache(const Environment * const v, co
}
bool
-EbuildFlatMetadataCache::load(const tr1::shared_ptr<const EbuildID> & id)
+EbuildFlatMetadataCache::load(const std::tr1::shared_ptr<const EbuildID> & id)
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
Context context("When loading version metadata from '" + stringify(_filename) + "':");
@@ -87,8 +87,8 @@ EbuildFlatMetadataCache::load(const tr1::shared_ptr<const EbuildID> & id)
if (ok && ! tokens.empty())
ok = tokens.end() == std::find_if(tokens.begin(), tokens.end(),
- tr1::bind(std::greater<time_t>(), tr1::bind(
- tr1::mem_fn(&EclassMtimes::mtime), _eclass_mtimes.get(), _1), cache_time));
+ std::tr1::bind(std::greater<time_t>(), std::tr1::bind(
+ std::tr1::mem_fn(&EclassMtimes::mtime), _eclass_mtimes.get(), _1), cache_time));
}
if (ok)
@@ -209,14 +209,14 @@ namespace
std::string flatten(const T_ & d)
{
StringifyFormatter ff;
- DepSpecPrettyPrinter p(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter p(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
d->accept(p);
return stringify(p);
}
}
void
-EbuildFlatMetadataCache::save(const tr1::shared_ptr<const EbuildID> & id)
+EbuildFlatMetadataCache::save(const std::tr1::shared_ptr<const EbuildID> & id)
{
Context context("When saving version metadata to '" + stringify(_filename) + "':");
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.hh b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
index 089af56ce..85ebf9f2c 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.hh
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
@@ -45,7 +45,7 @@ namespace paludis
const FSEntry & _filename;
const FSEntry & _ebuild;
time_t _master_mtime;
- tr1::shared_ptr<const EclassMtimes> _eclass_mtimes;
+ std::tr1::shared_ptr<const EclassMtimes> _eclass_mtimes;
bool _silent;
public:
@@ -53,15 +53,15 @@ namespace paludis
///\{
EbuildFlatMetadataCache(const Environment * const, const FSEntry & filename, const FSEntry & ebuild,
- time_t master_mtime, tr1::shared_ptr<const EclassMtimes> eclass_mtimes, bool silent);
+ time_t master_mtime, std::tr1::shared_ptr<const EclassMtimes> eclass_mtimes, bool silent);
///\}
///\name Cache operations
///\{
- bool load(const tr1::shared_ptr<const EbuildID> &);
- void save(const tr1::shared_ptr<const EbuildID> &);
+ bool load(const std::tr1::shared_ptr<const EbuildID> &);
+ void save(const std::tr1::shared_ptr<const EbuildID> &);
///\}
};
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index a74ce3ead..d93cb0e95 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -61,42 +61,42 @@ namespace paludis
const QualifiedPackageName name;
const VersionSpec version;
const Environment * const environment;
- const tr1::shared_ptr<const ERepository> repository;
+ const std::tr1::shared_ptr<const ERepository> repository;
const FSEntry ebuild;
- tr1::shared_ptr<const SlotName> slot;
- mutable tr1::shared_ptr<const EAPI> eapi;
+ std::tr1::shared_ptr<const SlotName> slot;
+ mutable std::tr1::shared_ptr<const EAPI> eapi;
const std::string guessed_eapi;
const time_t master_mtime;
- const tr1::shared_ptr<const EclassMtimes> eclass_mtimes;
+ const std::tr1::shared_ptr<const EclassMtimes> eclass_mtimes;
mutable bool has_keys;
mutable bool has_masks;
- mutable tr1::shared_ptr<const LiteralMetadataValueKey<FSEntry> > fs_location;
- mutable tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > short_description;
- mutable tr1::shared_ptr<const EDependenciesKey> build_dependencies;
- mutable tr1::shared_ptr<const EDependenciesKey> run_dependencies;
- mutable tr1::shared_ptr<const EDependenciesKey> post_dependencies;
- mutable tr1::shared_ptr<const EProvideKey> provide;
- mutable tr1::shared_ptr<const ERestrictKey> restrictions;
- mutable tr1::shared_ptr<const EFetchableURIKey> src_uri;
- mutable tr1::shared_ptr<const ESimpleURIKey> homepage;
- mutable tr1::shared_ptr<const ELicenseKey> license;
- mutable tr1::shared_ptr<const EKeywordsKey> keywords;
- mutable tr1::shared_ptr<const EKeywordsKey> eclass_keywords;
- mutable tr1::shared_ptr<const EIUseKey> iuse;
- mutable tr1::shared_ptr<const EInheritedKey> inherited;
- mutable tr1::shared_ptr<const EUseKey> use;
- mutable tr1::shared_ptr<EMutableRepositoryMaskInfoKey> repository_mask;
- mutable tr1::shared_ptr<EMutableRepositoryMaskInfoKey> profile_mask;
-
- tr1::shared_ptr<DependencyLabelSequence> build_dependencies_labels;
- tr1::shared_ptr<DependencyLabelSequence> run_dependencies_labels;
- tr1::shared_ptr<DependencyLabelSequence> post_dependencies_labels;
+ mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<FSEntry> > fs_location;
+ mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > short_description;
+ mutable std::tr1::shared_ptr<const EDependenciesKey> build_dependencies;
+ mutable std::tr1::shared_ptr<const EDependenciesKey> run_dependencies;
+ mutable std::tr1::shared_ptr<const EDependenciesKey> post_dependencies;
+ mutable std::tr1::shared_ptr<const EProvideKey> provide;
+ mutable std::tr1::shared_ptr<const ERestrictKey> restrictions;
+ mutable std::tr1::shared_ptr<const EFetchableURIKey> src_uri;
+ mutable std::tr1::shared_ptr<const ESimpleURIKey> homepage;
+ mutable std::tr1::shared_ptr<const ELicenseKey> license;
+ mutable std::tr1::shared_ptr<const EKeywordsKey> keywords;
+ mutable std::tr1::shared_ptr<const EKeywordsKey> eclass_keywords;
+ mutable std::tr1::shared_ptr<const EIUseKey> iuse;
+ mutable std::tr1::shared_ptr<const EInheritedKey> inherited;
+ mutable std::tr1::shared_ptr<const EUseKey> use;
+ mutable std::tr1::shared_ptr<EMutableRepositoryMaskInfoKey> repository_mask;
+ mutable std::tr1::shared_ptr<EMutableRepositoryMaskInfoKey> profile_mask;
+
+ std::tr1::shared_ptr<DependencyLabelSequence> build_dependencies_labels;
+ std::tr1::shared_ptr<DependencyLabelSequence> run_dependencies_labels;
+ std::tr1::shared_ptr<DependencyLabelSequence> post_dependencies_labels;
Implementation(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
- const tr1::shared_ptr<const ERepository> r, const FSEntry & f, const std::string & g,
- const time_t t, const tr1::shared_ptr<const EclassMtimes> & m) :
+ const std::tr1::shared_ptr<const ERepository> r, const FSEntry & f, const std::string & g,
+ const time_t t, const std::tr1::shared_ptr<const EclassMtimes> & m) :
name(q),
version(v),
environment(e),
@@ -120,11 +120,11 @@ namespace paludis
EbuildID::EbuildID(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
- const tr1::shared_ptr<const ERepository> & r,
+ const std::tr1::shared_ptr<const ERepository> & r,
const FSEntry & f,
const std::string & g,
const time_t t,
- const tr1::shared_ptr<const EclassMtimes> & m) :
+ const std::tr1::shared_ptr<const EclassMtimes> & m) :
PrivateImplementationPattern<EbuildID>(new Implementation<EbuildID>(q, v, e, r, f, g, t, m)),
_imp(PrivateImplementationPattern<EbuildID>::_imp)
{
@@ -257,10 +257,10 @@ EbuildID::need_keys_added() const
add_metadata_key(make_shared_ptr(new LiteralMetadataValueKey<std::string>("EAPI", "EAPI", mkt_internal, (*_imp->eapi)[k::name()])));
_imp->repository_mask = make_shared_ptr(new EMutableRepositoryMaskInfoKey(shared_from_this(), "repository_mask", "Repository masked",
- tr1::static_pointer_cast<const ERepository>(repository())->repository_masked(*this), mkt_internal));
+ std::tr1::static_pointer_cast<const ERepository>(repository())->repository_masked(*this), mkt_internal));
add_metadata_key(_imp->repository_mask);
_imp->profile_mask = make_shared_ptr(new EMutableRepositoryMaskInfoKey(shared_from_this(), "profile_mask", "Profile masked",
- tr1::static_pointer_cast<const ERepository>(repository())->profile()->profile_masked(*this), mkt_internal));
+ std::tr1::static_pointer_cast<const ERepository>(repository())->profile()->profile_masked(*this), mkt_internal));
add_metadata_key(_imp->profile_mask);
}
@@ -365,13 +365,13 @@ EbuildID::need_masks_added() const
add_mask(make_shared_ptr(new ERepositoryMask('P', "profile", _imp->profile_mask)));
/* user */
- tr1::shared_ptr<const Mask> user_mask(_imp->environment->mask_for_user(*this));
+ std::tr1::shared_ptr<const Mask> user_mask(_imp->environment->mask_for_user(*this));
if (user_mask)
add_mask(user_mask);
}
/* break portage */
- tr1::shared_ptr<const Mask> breaks_mask(_imp->environment->mask_for_breakage(*this));
+ std::tr1::shared_ptr<const Mask> breaks_mask(_imp->environment->mask_for_breakage(*this));
if (breaks_mask)
add_mask(breaks_mask);
}
@@ -386,8 +386,8 @@ EbuildID::invalidate_masks() const
_imp->has_masks = false;
PackageID::invalidate_masks();
- _imp->repository_mask->set_value(tr1::static_pointer_cast<const ERepository>(repository())->repository_masked(*this));
- _imp->profile_mask->set_value(tr1::static_pointer_cast<const ERepository>(repository())->profile()->profile_masked(*this));
+ _imp->repository_mask->set_value(std::tr1::static_pointer_cast<const ERepository>(repository())->repository_masked(*this));
+ _imp->profile_mask->set_value(std::tr1::static_pointer_cast<const ERepository>(repository())->profile()->profile_masked(*this));
}
const std::string
@@ -445,13 +445,13 @@ EbuildID::slot() const
return *_imp->slot;
}
-const tr1::shared_ptr<const Repository>
+const std::tr1::shared_ptr<const Repository>
EbuildID::repository() const
{
return _imp->repository;
}
-const tr1::shared_ptr<const EAPI>
+const std::tr1::shared_ptr<const EAPI>
EbuildID::eapi() const
{
if (_imp->eapi)
@@ -465,152 +465,152 @@ EbuildID::eapi() const
return _imp->eapi;
}
-const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >
+const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
EbuildID::virtual_for_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
}
-const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
EbuildID::keywords_key() const
{
need_keys_added();
return _imp->keywords;
}
-const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
EbuildID::eclass_keywords_key() const
{
need_keys_added();
return _imp->eclass_keywords;
}
-const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> >
EbuildID::iuse_key() const
{
need_keys_added();
return _imp->iuse;
}
-const tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> >
EbuildID::use_key() const
{
need_keys_added();
return _imp->use;
}
-const tr1::shared_ptr<const MetadataValueKey<bool> >
+const std::tr1::shared_ptr<const MetadataValueKey<bool> >
EbuildID::transient_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<bool> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<bool> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
EbuildID::license_key() const
{
need_keys_added();
return _imp->license;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
EbuildID::provide_key() const
{
need_keys_added();
return _imp->provide;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EbuildID::build_dependencies_key() const
{
need_keys_added();
return _imp->build_dependencies;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EbuildID::run_dependencies_key() const
{
need_keys_added();
return _imp->run_dependencies;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EbuildID::post_dependencies_key() const
{
need_keys_added();
return _imp->post_dependencies;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EbuildID::suggested_dependencies_key() const
{
- return tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> >
EbuildID::restrict_key() const
{
need_keys_added();
return _imp->restrictions;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
EbuildID::fetches_key() const
{
need_keys_added();
return _imp->src_uri;
}
-const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
+const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
EbuildID::homepage_key() const
{
need_keys_added();
return _imp->homepage;
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
EbuildID::short_description_key() const
{
need_keys_added();
return _imp->short_description;
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
EbuildID::long_description_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<std::string> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
}
-const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > >
+const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
EbuildID::contents_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >();
}
-const tr1::shared_ptr<const MetadataTimeKey>
+const std::tr1::shared_ptr<const MetadataTimeKey>
EbuildID::installed_time_key() const
{
- return tr1::shared_ptr<const MetadataTimeKey>();
+ return std::tr1::shared_ptr<const MetadataTimeKey>();
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
EbuildID::source_origin_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<std::string> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
EbuildID::binary_origin_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<std::string> >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
}
-const tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EbuildID::inherited_key() const
{
return _imp->inherited;
}
-const tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
EbuildID::fs_location_key() const
{
// Avoid loading whole metadata
@@ -651,7 +651,7 @@ EbuildID::set_slot(const SlotName & s) const
_imp->slot.reset(new SlotName(s));
}
-tr1::shared_ptr<const ERepository>
+std::tr1::shared_ptr<const ERepository>
EbuildID::e_repository() const
{
return _imp->repository;
@@ -837,49 +837,49 @@ namespace
struct PerformAction :
Visitor<ActionVisitorTypes>
{
- const tr1::shared_ptr<const PackageID> id;
+ const std::tr1::shared_ptr<const PackageID> id;
- PerformAction(const tr1::shared_ptr<const PackageID> i) :
+ PerformAction(const std::tr1::shared_ptr<const PackageID> i) :
id(i)
{
}
void visit(InstallAction & a)
{
- tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->install(
- tr1::static_pointer_cast<const ERepositoryID>(id),
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->install(
+ std::tr1::static_pointer_cast<const ERepositoryID>(id),
a.options,
- tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
}
void visit(FetchAction & a)
{
- tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->fetch(
- tr1::static_pointer_cast<const ERepositoryID>(id),
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->fetch(
+ std::tr1::static_pointer_cast<const ERepositoryID>(id),
a.options,
- tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
}
void visit(PretendFetchAction & a)
{
- tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->pretend_fetch(
- tr1::static_pointer_cast<const ERepositoryID>(id),
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->pretend_fetch(
+ std::tr1::static_pointer_cast<const ERepositoryID>(id),
a,
- tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
}
void visit(PretendAction &)
{
- tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->pretend(
- tr1::static_pointer_cast<const ERepositoryID>(id),
- tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->pretend(
+ std::tr1::static_pointer_cast<const ERepositoryID>(id),
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
}
void visit(InfoAction &)
{
- tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->info(
- tr1::static_pointer_cast<const ERepositoryID>(id),
- tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->entries()->info(
+ std::tr1::static_pointer_cast<const ERepositoryID>(id),
+ std::tr1::static_pointer_cast<const ERepository>(id->repository())->profile());
}
void visit(InstalledAction & a) PALUDIS_ATTRIBUTE((noreturn));
@@ -913,15 +913,15 @@ EbuildID::perform_action(Action & a) const
a.accept(b);
}
-const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
+const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
EbuildID::contains_key() const
{
- return tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
+ return std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
-const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >
+const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
EbuildID::contained_in_key() const
{
- return tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > >();
+ return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
}
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index b7a1663b4..e87e3d856 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -35,7 +35,7 @@ namespace paludis
{
class EbuildID :
public ERepositoryID,
- public tr1::enable_shared_from_this<EbuildID>,
+ public std::tr1::enable_shared_from_this<EbuildID>,
private PrivateImplementationPattern<EbuildID>
{
private:
@@ -48,11 +48,11 @@ namespace paludis
public:
EbuildID(const QualifiedPackageName &, const VersionSpec &,
const Environment * const e,
- const tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepository> &,
const FSEntry & file,
const std::string & guessed_eapi,
const time_t master_mtime,
- const tr1::shared_ptr<const EclassMtimes> & eclass_mtimes);
+ const std::tr1::shared_ptr<const EclassMtimes> & eclass_mtimes);
~EbuildID();
@@ -61,35 +61,35 @@ namespace paludis
virtual const QualifiedPackageName name() const;
virtual const VersionSpec version() const;
virtual const SlotName slot() const;
- virtual const tr1::shared_ptr<const Repository> repository() const;
-
- virtual const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > > virtual_for_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > eclass_keywords_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const Contents> > > contents_key() const;
- virtual const tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > source_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > binary_origin_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<tr1::shared_ptr<const PackageID> > > contained_in_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
-
- const tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const;
- const tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
- virtual const tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const;
- virtual const tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use_key() const;
-
- virtual const tr1::shared_ptr<const MetadataValueKey<bool> > transient_key() const;
+ virtual const std::tr1::shared_ptr<const Repository> repository() const;
+
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > virtual_for_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > eclass_keywords_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<IUseFlagSet> > iuse_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > > contents_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > source_origin_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > binary_origin_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > contained_in_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
+
+ const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const;
+ const std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<RestrictSpecTree> > restrict_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameSet> > use_key() const;
+
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<bool> > transient_key() const;
virtual bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -97,7 +97,7 @@ namespace paludis
virtual std::size_t extra_hash_value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const ERepository> e_repository() const;
+ virtual std::tr1::shared_ptr<const ERepository> e_repository() const;
void set_eapi(const std::string &) const;
void set_slot(const SlotName &) const;
@@ -120,7 +120,7 @@ namespace paludis
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const;
- virtual const tr1::shared_ptr<const EAPI> eapi() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual const std::tr1::shared_ptr<const EAPI> eapi() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void invalidate_masks() const;
};
diff --git a/paludis/repositories/e/eclass_mtimes.cc b/paludis/repositories/e/eclass_mtimes.cc
index 40303c247..428dc0b02 100644
--- a/paludis/repositories/e/eclass_mtimes.cc
+++ b/paludis/repositories/e/eclass_mtimes.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -18,12 +18,13 @@
*/
#include "eclass_mtimes.hh"
-#include <paludis/hashed_containers.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
+#include <paludis/util/hashes.hh>
+#include <tr1/unordered_map>
using namespace paludis;
@@ -32,18 +33,18 @@ namespace paludis
template<>
struct Implementation<EclassMtimes>
{
- tr1::shared_ptr<const FSEntrySequence> eclass_dirs;
+ std::tr1::shared_ptr<const FSEntrySequence> eclass_dirs;
mutable Mutex mutex;
- mutable MakeHashedMap<std::string, time_t>::Type eclass_mtimes;
+ mutable std::tr1::unordered_map<std::string, time_t, Hash<std::string> > eclass_mtimes;
- Implementation(tr1::shared_ptr<const FSEntrySequence> d) :
+ Implementation(std::tr1::shared_ptr<const FSEntrySequence> d) :
eclass_dirs(d)
{
}
};
}
-EclassMtimes::EclassMtimes(tr1::shared_ptr<const FSEntrySequence> d) :
+EclassMtimes::EclassMtimes(std::tr1::shared_ptr<const FSEntrySequence> d) :
PrivateImplementationPattern<EclassMtimes>(new Implementation<EclassMtimes>(d))
{
}
@@ -57,7 +58,7 @@ EclassMtimes::mtime(const std::string & e) const
{
Lock l(_imp->mutex);
- MakeHashedMap<std::string, time_t>::Type::const_iterator i(_imp->eclass_mtimes.find(e));
+ std::tr1::unordered_map<std::string, time_t, Hash<std::string> >::const_iterator i(_imp->eclass_mtimes.find(e));
if (i != _imp->eclass_mtimes.end())
return i->second;
diff --git a/paludis/repositories/e/eclass_mtimes.hh b/paludis/repositories/e/eclass_mtimes.hh
index 28f5b1e67..891f29ea0 100644
--- a/paludis/repositories/e/eclass_mtimes.hh
+++ b/paludis/repositories/e/eclass_mtimes.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -22,7 +22,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/tr1_memory.hh>
+#include <tr1/memory>
namespace paludis
{
@@ -40,7 +40,7 @@ namespace paludis
///\name Basic operations
///\{
- EclassMtimes(tr1::shared_ptr<const FSEntrySequence>);
+ EclassMtimes(std::tr1::shared_ptr<const FSEntrySequence>);
~EclassMtimes();
///\}
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 0b120c5aa..2523e4647 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -22,14 +22,12 @@
#include <paludis/repositories/e/e_repository_exceptions.hh>
#include <paludis/repositories/e/e_repository.hh>
#include <paludis/util/config_file.hh>
-#include <paludis/hashed_containers.hh>
#include <paludis/package_id.hh>
#include <paludis/package_database.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/util/map.hh>
@@ -41,8 +39,9 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
-
-#include <paludis/util/tr1_functional.hh>
+#include <paludis/util/hashes.hh>
+#include <tr1/functional>
+#include <tr1/unordered_map>
#include <functional>
#include <algorithm>
#include <list>
@@ -50,9 +49,9 @@
using namespace paludis;
using namespace paludis::erepository;
-typedef MakeHashedMap<CategoryNamePart, bool>::Type CategoryMap;
-typedef MakeHashedMap<QualifiedPackageName, bool>::Type PackagesMap;
-typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<PackageIDSequence> >::Type IDMap;
+typedef std::tr1::unordered_map<CategoryNamePart, bool, Hash<CategoryNamePart> > CategoryMap;
+typedef std::tr1::unordered_map<QualifiedPackageName, bool, Hash<QualifiedPackageName> > PackagesMap;
+typedef std::tr1::unordered_map<QualifiedPackageName, std::tr1::shared_ptr<PackageIDSequence>, Hash<QualifiedPackageName> > IDMap;
namespace paludis
{
@@ -69,17 +68,17 @@ namespace paludis
mutable PackagesMap package_names;
mutable IDMap ids;
- mutable tr1::shared_ptr<CategoryNamePartSet> category_names_collection;
- tr1::shared_ptr<const ERepositoryEntries> entries;
+ mutable std::tr1::shared_ptr<CategoryNamePartSet> category_names_collection;
+ std::tr1::shared_ptr<const ERepositoryEntries> entries;
- tr1::shared_ptr<FSEntrySequence> arch_list_files;
- tr1::shared_ptr<FSEntrySequence> repository_mask_files;
- tr1::shared_ptr<FSEntrySequence> profiles_desc_files;
- tr1::shared_ptr<FSEntrySequence> mirror_files;
- tr1::shared_ptr<FSEntrySequence> use_desc_dirs;
+ std::tr1::shared_ptr<FSEntrySequence> arch_list_files;
+ std::tr1::shared_ptr<FSEntrySequence> repository_mask_files;
+ std::tr1::shared_ptr<FSEntrySequence> profiles_desc_files;
+ std::tr1::shared_ptr<FSEntrySequence> mirror_files;
+ std::tr1::shared_ptr<FSEntrySequence> use_desc_dirs;
Implementation(const ERepository * const n, const FSEntry & t,
- tr1::shared_ptr<const ERepositoryEntries> e) :
+ std::tr1::shared_ptr<const ERepositoryEntries> e) :
repository(n),
tree_root(t),
has_category_names(false),
@@ -95,8 +94,8 @@ namespace paludis
}
ExheresLayout::ExheresLayout(const ERepository * const r, const FSEntry & tree_root,
- tr1::shared_ptr<const ERepositoryEntries> e,
- tr1::shared_ptr<const FSEntry> f) :
+ std::tr1::shared_ptr<const ERepositoryEntries> e,
+ std::tr1::shared_ptr<const FSEntry> f) :
Layout(f),
PrivateImplementationPattern<ExheresLayout>(new Implementation<ExheresLayout>(r, tree_root, e))
{
@@ -183,7 +182,7 @@ ExheresLayout::need_package_ids(const QualifiedPackageName & n) const
{
Lock l(_imp->big_nasty_mutex);
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
if (_imp->package_names[n])
return;
@@ -191,7 +190,7 @@ ExheresLayout::need_package_ids(const QualifiedPackageName & n) const
Context context("When loading versions for '" + stringify(n) + "' in "
+ stringify(_imp->repository->name()) + ":");
- tr1::shared_ptr<PackageIDSequence> v(new PackageIDSequence);
+ std::tr1::shared_ptr<PackageIDSequence> v(new PackageIDSequence);
FSEntry path(_imp->tree_root / "packages" / stringify(n.category) / stringify(n.package));
@@ -202,9 +201,9 @@ ExheresLayout::need_package_ids(const QualifiedPackageName & n) const
try
{
- tr1::shared_ptr<const PackageID> id(_imp->entries->make_id(n, *e));
+ std::tr1::shared_ptr<const PackageID> id(_imp->entries->make_id(n, *e));
if (indirect_iterator(v->end()) != std::find_if(indirect_iterator(v->begin()), indirect_iterator(v->end()),
- tr1::bind(std::equal_to<VersionSpec>(), id->version(), tr1::bind(tr1::mem_fn(&PackageID::version), _1))))
+ std::tr1::bind(std::equal_to<VersionSpec>(), id->version(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1))))
Log::get_instance()->message("e.exheres_layout.id.duplicate", ll_warning, lc_context)
<< "Ignoring entry '" << *e << "' for '" << n << "' in repository '" << _imp->repository->name()
<< "' because another equivalent version already exists";
@@ -288,10 +287,10 @@ ExheresLayout::need_category_names_collection() const
_imp->category_names_collection.reset(new CategoryNamePartSet);
std::transform(_imp->category_names.begin(), _imp->category_names.end(),
_imp->category_names_collection->inserter(),
- tr1::mem_fn(&std::pair<const CategoryNamePart, bool>::first));
+ std::tr1::mem_fn(&std::pair<const CategoryNamePart, bool>::first));
}
-tr1::shared_ptr<const CategoryNamePartSet>
+std::tr1::shared_ptr<const CategoryNamePartSet>
ExheresLayout::category_names() const
{
Lock l(_imp->big_nasty_mutex);
@@ -302,12 +301,12 @@ ExheresLayout::category_names() const
return _imp->category_names_collection;
}
-tr1::shared_ptr<const QualifiedPackageNameSet>
+std::tr1::shared_ptr<const QualifiedPackageNameSet>
ExheresLayout::package_names(const CategoryNamePart & c) const
{
Lock l(_imp->big_nasty_mutex);
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
/* this isn't particularly fast because it isn't called very often. avoid
* changing the data structures used to make this faster at the expense of
@@ -319,7 +318,7 @@ ExheresLayout::package_names(const CategoryNamePart & c) const
need_category_names();
if (_imp->category_names.end() == _imp->category_names.find(c))
- return tr1::shared_ptr<QualifiedPackageNameSet>(new QualifiedPackageNameSet);
+ return std::tr1::shared_ptr<QualifiedPackageNameSet>(new QualifiedPackageNameSet);
if ((_imp->tree_root / "packages" / stringify(c)).is_directory_or_symlink_to_directory())
for (DirIterator d(_imp->tree_root / "packages" / stringify(c)), d_end ; d != d_end ; ++d)
@@ -330,7 +329,7 @@ ExheresLayout::package_names(const CategoryNamePart & c) const
continue;
if (DirIterator() == std::find_if(DirIterator(*d), DirIterator(),
- tr1::bind(&ERepositoryEntries::is_package_file, _imp->entries.get(),
+ std::tr1::bind(&ERepositoryEntries::is_package_file, _imp->entries.get(),
c + PackageNamePart(d->basename()), _1)))
continue;
@@ -346,7 +345,7 @@ ExheresLayout::package_names(const CategoryNamePart & c) const
_imp->category_names[c] = true;
- tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
+ std::tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
for (PackagesMap::const_iterator p(_imp->package_names.begin()), p_end(_imp->package_names.end()) ;
p != p_end ; ++p)
@@ -356,7 +355,7 @@ ExheresLayout::package_names(const CategoryNamePart & c) const
return result;
}
-tr1::shared_ptr<const PackageIDSequence>
+std::tr1::shared_ptr<const PackageIDSequence>
ExheresLayout::package_ids(const QualifiedPackageName & n) const
{
Lock l(_imp->big_nasty_mutex);
@@ -369,7 +368,7 @@ ExheresLayout::package_ids(const QualifiedPackageName & n) const
return _imp->ids.find(n)->second;
}
else
- return tr1::shared_ptr<PackageIDSequence>(new PackageIDSequence);
+ return std::tr1::shared_ptr<PackageIDSequence>(new PackageIDSequence);
}
FSEntry
@@ -396,31 +395,31 @@ ExheresLayout::category_directory(const CategoryNamePart & cat) const
return _imp->tree_root / "packages" / stringify(cat);
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::arch_list_files() const
{
return _imp->arch_list_files;
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::repository_mask_files() const
{
return _imp->repository_mask_files;
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::profiles_desc_files() const
{
return _imp->profiles_desc_files;
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::mirror_files() const
{
return _imp->mirror_files;
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::use_desc_dirs() const
{
return _imp->use_desc_dirs;
@@ -435,31 +434,31 @@ ExheresLayout::profiles_base_dir() const
return _imp->tree_root / "profiles";
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::exlibsdirs(const QualifiedPackageName & q) const
{
- tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
- tr1::shared_ptr<const FSEntrySequence> global(exlibsdirs_global());
+ std::tr1::shared_ptr<const FSEntrySequence> global(exlibsdirs_global());
std::copy(global->begin(), global->end(), result->back_inserter());
- tr1::shared_ptr<const FSEntrySequence> category(exlibsdirs_category(q.category));
+ std::tr1::shared_ptr<const FSEntrySequence> category(exlibsdirs_category(q.category));
std::copy(category->begin(), category->end(), result->back_inserter());
- tr1::shared_ptr<const FSEntrySequence> package(exlibsdirs_package(q));
+ std::tr1::shared_ptr<const FSEntrySequence> package(exlibsdirs_package(q));
std::copy(package->begin(), package->end(), result->back_inserter());
return result;
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::exlibsdirs_global() const
{
- tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
if (_imp->repository->params().master_repository)
{
- tr1::shared_ptr<const FSEntrySequence> master(_imp->repository->params().master_repository->layout()->exlibsdirs_global());
+ std::tr1::shared_ptr<const FSEntrySequence> master(_imp->repository->params().master_repository->layout()->exlibsdirs_global());
std::copy(master->begin(), master->end(), result->back_inserter());
}
result->push_back(_imp->tree_root / "exlibs");
@@ -467,14 +466,14 @@ ExheresLayout::exlibsdirs_global() const
return result;
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::exlibsdirs_category(const CategoryNamePart & c) const
{
- tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
if (_imp->repository->params().master_repository)
{
- tr1::shared_ptr<const FSEntrySequence> master(_imp->repository->params().master_repository->layout()->exlibsdirs_category(c));
+ std::tr1::shared_ptr<const FSEntrySequence> master(_imp->repository->params().master_repository->layout()->exlibsdirs_category(c));
std::copy(master->begin(), master->end(), result->back_inserter());
}
result->push_back(category_directory(c) / "exlibs");
@@ -482,14 +481,14 @@ ExheresLayout::exlibsdirs_category(const CategoryNamePart & c) const
return result;
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::exlibsdirs_package(const QualifiedPackageName & q) const
{
- tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
if (_imp->repository->params().master_repository)
{
- tr1::shared_ptr<const FSEntrySequence> master(_imp->repository->params().master_repository->layout()->exlibsdirs_package(q));
+ std::tr1::shared_ptr<const FSEntrySequence> master(_imp->repository->params().master_repository->layout()->exlibsdirs_package(q));
std::copy(master->begin(), master->end(), result->back_inserter());
}
result->push_back(package_directory(q));
@@ -497,14 +496,14 @@ ExheresLayout::exlibsdirs_package(const QualifiedPackageName & q) const
return result;
}
-tr1::shared_ptr<const FSEntrySequence>
+std::tr1::shared_ptr<const FSEntrySequence>
ExheresLayout::licenses_dirs() const
{
- tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
if (_imp->repository->params().master_repository)
{
- tr1::shared_ptr<const FSEntrySequence> master(_imp->repository->params().master_repository->layout()->licenses_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> master(_imp->repository->params().master_repository->layout()->licenses_dirs());
std::copy(master->begin(), master->end(), result->back_inserter());
}
result->push_back(_imp->tree_root / "licenses");
@@ -515,7 +514,7 @@ ExheresLayout::licenses_dirs() const
namespace
{
void aux_files_helper(const FSEntry & d,
- tr1::shared_ptr<Map<FSEntry, std::string> > & m,
+ std::tr1::shared_ptr<Map<FSEntry, std::string> > & m,
const QualifiedPackageName & qpn)
{
if (! d.exists())
@@ -545,10 +544,10 @@ namespace
}
}
-tr1::shared_ptr<Map<FSEntry, std::string> >
+std::tr1::shared_ptr<Map<FSEntry, std::string> >
ExheresLayout::manifest_files(const QualifiedPackageName & qpn) const
{
- tr1::shared_ptr<Map<FSEntry, std::string> > result(new Map<FSEntry, std::string>);
+ std::tr1::shared_ptr<Map<FSEntry, std::string> > result(new Map<FSEntry, std::string>);
FSEntry package_dir = _imp->repository->layout()->package_directory(qpn);
std::list<FSEntry> package_files((DirIterator(package_dir)),
diff --git a/paludis/repositories/e/exheres_layout.hh b/paludis/repositories/e/exheres_layout.hh
index 6f91c256d..6cda1408e 100644
--- a/paludis/repositories/e/exheres_layout.hh
+++ b/paludis/repositories/e/exheres_layout.hh
@@ -49,8 +49,8 @@ namespace paludis
///\{
ExheresLayout(const ERepository * const, const FSEntry &,
- tr1::shared_ptr<const ERepositoryEntries>,
- tr1::shared_ptr<const FSEntry>);
+ std::tr1::shared_ptr<const ERepositoryEntries>,
+ std::tr1::shared_ptr<const FSEntry>);
virtual ~ExheresLayout();
@@ -65,14 +65,14 @@ namespace paludis
virtual FSEntry categories_file() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -92,39 +92,39 @@ namespace paludis
const std::string & eapi) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const FSEntrySequence> arch_list_files() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> arch_list_files() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const FSEntrySequence> repository_mask_files() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> repository_mask_files() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const FSEntrySequence> profiles_desc_files() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> profiles_desc_files() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const FSEntrySequence> mirror_files() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> mirror_files() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const FSEntrySequence> use_desc_dirs() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> use_desc_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual FSEntry profiles_base_dir() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const FSEntrySequence> exlibsdirs(const QualifiedPackageName &) const;
+ virtual std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(const QualifiedPackageName &) const;
- virtual tr1::shared_ptr<const FSEntrySequence> exlibsdirs_global() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs_global() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const FSEntrySequence> exlibsdirs_category(const CategoryNamePart &) const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs_category(const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const FSEntrySequence> exlibsdirs_package(const QualifiedPackageName &) const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs_package(const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const FSEntrySequence> licenses_dirs() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> licenses_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<Map<FSEntry, std::string> > manifest_files(const QualifiedPackageName &) const
+ virtual std::tr1::shared_ptr<Map<FSEntry, std::string> > manifest_files(const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void invalidate_masks();
diff --git a/paludis/repositories/e/exndbam_id.cc b/paludis/repositories/e/exndbam_id.cc
index b78ba5c32..fd6636e00 100644
--- a/paludis/repositories/e/exndbam_id.cc
+++ b/paludis/repositories/e/exndbam_id.cc
@@ -19,12 +19,12 @@
#include <paludis/repositories/e/exndbam_id.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/contents.hh>
#include <paludis/ndbam.hh>
+#include <tr1/functional>
using namespace paludis;
using namespace paludis::erepository;
@@ -47,34 +47,34 @@ namespace
}
class ExndbamContentsKey :
- public MetadataValueKey<tr1::shared_ptr<const Contents> >
+ public MetadataValueKey<std::tr1::shared_ptr<const Contents> >
{
private:
const PackageID * const _id;
const NDBAM * const _db;
mutable Mutex _mutex;
- mutable tr1::shared_ptr<Contents> _v;
+ mutable std::tr1::shared_ptr<Contents> _v;
public:
ExndbamContentsKey(const PackageID * const i, const NDBAM * const d) :
- MetadataValueKey<tr1::shared_ptr<const Contents> > ("contents", "Contents", mkt_internal),
+ MetadataValueKey<std::tr1::shared_ptr<const Contents> > ("contents", "Contents", mkt_internal),
_id(i),
_db(d)
{
}
- const tr1::shared_ptr<const Contents> value() const
+ const std::tr1::shared_ptr<const Contents> value() const
{
Lock l(_mutex);
if (_v)
return _v;
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
_v.reset(new Contents);
_db->parse_contents(*_id,
- tr1::bind(&create_file, tr1::ref(*_v), _1),
- tr1::bind(&create_dir, tr1::ref(*_v), _1),
- tr1::bind(&create_sym, tr1::ref(*_v), _1, _2)
+ std::tr1::bind(&create_file, std::tr1::ref(*_v), _1),
+ std::tr1::bind(&create_dir, std::tr1::ref(*_v), _1),
+ std::tr1::bind(&create_sym, std::tr1::ref(*_v), _1, _2)
);
return _v;
}
@@ -83,7 +83,7 @@ namespace
ExndbamID::ExndbamID(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
- const tr1::shared_ptr<const Repository> & r,
+ const std::tr1::shared_ptr<const Repository> & r,
const FSEntry & f, const NDBAM * const n) :
EInstalledRepositoryID(q, v, e, r, f),
_ndbam(n)
@@ -108,7 +108,7 @@ ExndbamID::contents_filename() const
return "contents";
}
-tr1::shared_ptr<MetadataValueKey<tr1::shared_ptr<const Contents> > >
+std::tr1::shared_ptr<MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
ExndbamID::make_contents_key() const
{
return make_shared_ptr(new ExndbamContentsKey(this, _ndbam));
diff --git a/paludis/repositories/e/exndbam_id.hh b/paludis/repositories/e/exndbam_id.hh
index b0521c5c1..cb40bd74a 100644
--- a/paludis/repositories/e/exndbam_id.hh
+++ b/paludis/repositories/e/exndbam_id.hh
@@ -36,14 +36,14 @@ namespace paludis
public:
ExndbamID(const QualifiedPackageName &, const VersionSpec &,
const Environment * const,
- const tr1::shared_ptr<const Repository> &,
+ const std::tr1::shared_ptr<const Repository> &,
const FSEntry & file,
const NDBAM * const);
virtual std::string fs_location_raw_name() const;
virtual std::string fs_location_human_name() const;
virtual std::string contents_filename() const;
- virtual tr1::shared_ptr<MetadataValueKey<tr1::shared_ptr<const Contents> > > make_contents_key() const;
+ virtual std::tr1::shared_ptr<MetadataValueKey<std::tr1::shared_ptr<const Contents> > > make_contents_key() const;
};
}
}
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index fe1898ea7..94e3b221d 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -66,10 +66,10 @@ namespace paludis
ExndbamRepositoryParams params;
mutable NDBAM ndbam;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
- tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
- tr1::shared_ptr<const MetadataValueKey<FSEntry> > builddir_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
+ std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key;
+ std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > builddir_key;
Implementation(const ExndbamRepositoryParams & p) :
params(p),
@@ -129,10 +129,10 @@ ExndbamRepository::_add_metadata_keys() const
}
-tr1::shared_ptr<Repository>
+std::tr1::shared_ptr<Repository>
ExndbamRepository::make_exndbam_repository(
Environment * const env,
- tr1::shared_ptr<const Map<std::string, std::string> > m)
+ std::tr1::shared_ptr<const Map<std::string, std::string> > m)
{
std::string repo_file(m->end() == m->find("repo_file") ? std::string("?") : m->find("repo_file")->second);
Context context("When making Exndbam repository from repo_file '" + repo_file + "':");
@@ -169,7 +169,7 @@ ExndbamRepository::make_exndbam_repository(
"read but not updated. If you have recently upgraded from <paludis-0.26.0_alpha13, consult "
"the FAQ Upgrades section.";
- return tr1::shared_ptr<Repository>(new ExndbamRepository(
+ return std::tr1::shared_ptr<Repository>(new ExndbamRepository(
RepositoryName(name),
ExndbamRepositoryParams::create()
.environment(env)
@@ -191,11 +191,11 @@ ExndbamRepository::invalidate_masks()
{
}
-tr1::shared_ptr<const PackageIDSequence>
+std::tr1::shared_ptr<const PackageIDSequence>
ExndbamRepository::package_ids(const QualifiedPackageName & q) const
{
- tr1::shared_ptr<NDBAMEntrySequence> entries(_imp->ndbam.entries(q));
- tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
+ std::tr1::shared_ptr<NDBAMEntrySequence> entries(_imp->ndbam.entries(q));
+ std::tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
for (IndirectIterator<NDBAMEntrySequence::ConstIterator> e(entries->begin()), e_end(entries->end()) ;
e != e_end ; ++e)
@@ -210,19 +210,19 @@ ExndbamRepository::package_ids(const QualifiedPackageName & q) const
return result;
}
-tr1::shared_ptr<const QualifiedPackageNameSet>
+std::tr1::shared_ptr<const QualifiedPackageNameSet>
ExndbamRepository::package_names(const CategoryNamePart & c) const
{
return _imp->ndbam.package_names(c);
}
-tr1::shared_ptr<const CategoryNamePartSet>
+std::tr1::shared_ptr<const CategoryNamePartSet>
ExndbamRepository::category_names() const
{
return _imp->ndbam.category_names();
}
-tr1::shared_ptr<const CategoryNamePartSet>
+std::tr1::shared_ptr<const CategoryNamePartSet>
ExndbamRepository::category_names_containing_package(
const PackageNamePart & p) const
{
@@ -247,13 +247,13 @@ ExndbamRepositoryConfigurationError::ExndbamRepositoryConfigurationError(
{
}
-const tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
ExndbamRepository::format_key() const
{
return _imp->format_key;
}
-const tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
ExndbamRepository::installed_root_key() const
{
return _imp->root_key;
@@ -273,9 +273,9 @@ ExndbamRepository::merge(const MergeParams & m)
if (! is_suitable_destination_for(*m[k::package_id()]))
throw InstallActionError("Not a suitable destination for '" + stringify(*m[k::package_id()]) + "'");
- tr1::shared_ptr<const PackageID> if_overwritten_id, if_same_name_id;
+ std::tr1::shared_ptr<const PackageID> if_overwritten_id, if_same_name_id;
{
- tr1::shared_ptr<const PackageIDSequence> ids(package_ids(m[k::package_id()]->name()));
+ std::tr1::shared_ptr<const PackageIDSequence> ids(package_ids(m[k::package_id()]->name()));
for (PackageIDSequence::ConstIterator v(ids->begin()), v_end(ids->end()) ;
v != v_end ; ++v)
{
@@ -311,7 +311,7 @@ ExndbamRepository::merge(const MergeParams & m)
WriteVDBEntryCommand write_vdb_entry_command(
WriteVDBEntryParams::named_create()
(k::environment(), _imp->params.environment)
- (k::package_id(), tr1::static_pointer_cast<const ERepositoryID>(m[k::package_id()]))
+ (k::package_id(), std::tr1::static_pointer_cast<const ERepositoryID>(m[k::package_id()]))
(k::output_directory(), target_ver_dir)
(k::environment_file(), m[k::environment_file()]));
@@ -355,7 +355,7 @@ ExndbamRepository::merge(const MergeParams & m)
if (if_overwritten_id)
{
UninstallActionOptions uninstall_options(false);
- perform_uninstall(tr1::static_pointer_cast<const ERepositoryID>(if_overwritten_id), uninstall_options, true);
+ perform_uninstall(std::tr1::static_pointer_cast<const ERepositoryID>(if_overwritten_id), uninstall_options, true);
}
VDBPostMergeCommand post_merge_command(
@@ -366,7 +366,7 @@ ExndbamRepository::merge(const MergeParams & m)
}
void
-ExndbamRepository::perform_uninstall(const tr1::shared_ptr<const ERepositoryID> & id,
+ExndbamRepository::perform_uninstall(const std::tr1::shared_ptr<const ERepositoryID> & id,
const UninstallActionOptions & o, bool replace) const
{
Context context("When uninstalling '" + stringify(*id) + (replace ? "' for a reinstall:" : "':"));
@@ -374,7 +374,7 @@ ExndbamRepository::perform_uninstall(const tr1::shared_ptr<const ERepositoryID>
bool last(! replace);
if (last)
{
- tr1::shared_ptr<const PackageIDSequence> ids(package_ids(id->name()));
+ std::tr1::shared_ptr<const PackageIDSequence> ids(package_ids(id->name()));
for (PackageIDSequence::ConstIterator v(ids->begin()), v_end(ids->end()) ;
v != v_end ; ++v)
if (**v != *id)
@@ -389,9 +389,9 @@ ExndbamRepository::perform_uninstall(const tr1::shared_ptr<const ERepositoryID>
"' because root ('" + stringify(_imp->params.root) + "') is not a directory");
FSEntry ver_dir(id->fs_location_key()->value());
- tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
+ std::tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
- tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
eclassdirs->push_back(ver_dir);
EAPIPhases phases((*(*id->eapi())[k::supported()])[k::ebuild_phases()].ebuild_uninstall);
diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh
index 1330b40be..e07de721e 100644
--- a/paludis/repositories/e/exndbam_repository.hh
+++ b/paludis/repositories/e/exndbam_repository.hh
@@ -23,9 +23,9 @@
#include <paludis/repositories/e/e_installed_repository.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/util/map.hh>
#include <paludis/repository.hh>
+#include <tr1/memory>
namespace paludis
{
@@ -38,7 +38,7 @@ namespace paludis
class PALUDIS_VISIBLE ExndbamRepository :
public erepository::EInstalledRepository,
- public tr1::enable_shared_from_this<ExndbamRepository>,
+ public std::tr1::enable_shared_from_this<ExndbamRepository>,
public PrivateImplementationPattern<ExndbamRepository>
{
private:
@@ -57,9 +57,9 @@ namespace paludis
/**
* Virtual constructor.
*/
- static tr1::shared_ptr<Repository> make_exndbam_repository(
+ static std::tr1::shared_ptr<Repository> make_exndbam_repository(
Environment * const env,
- tr1::shared_ptr<const Map<std::string, std::string> > m);
+ std::tr1::shared_ptr<const Map<std::string, std::string> > m);
/**
* Destructor.
@@ -78,18 +78,18 @@ namespace paludis
/* Repository */
- virtual tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const CategoryNamePartSet> category_names_containing_package(
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names_containing_package(
const PackageNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -101,13 +101,13 @@ namespace paludis
/* Keys */
- virtual const tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
///\name For use by ExndbamID
///\{
- void perform_uninstall(const tr1::shared_ptr<const erepository::ERepositoryID> & id,
+ void perform_uninstall(const std::tr1::shared_ptr<const erepository::ERepositoryID> & id,
const UninstallActionOptions & o, bool reinstalling) const;
///\}
diff --git a/paludis/repositories/e/exndbam_repository_TEST.cc b/paludis/repositories/e/exndbam_repository_TEST.cc
index ab72803ed..c8091a8f5 100644
--- a/paludis/repositories/e/exndbam_repository_TEST.cc
+++ b/paludis/repositories/e/exndbam_repository_TEST.cc
@@ -38,10 +38,10 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "exndbam");
keys->insert("location", "exndbam_repository_TEST_dir/repo1");
- tr1::shared_ptr<Repository> repo(ExndbamRepository::make_exndbam_repository(&env, keys));
+ std::tr1::shared_ptr<Repository> repo(ExndbamRepository::make_exndbam_repository(&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "installed");
}
} test_exndbam_repository_repo_name;
diff --git a/paludis/repositories/e/fetch_visitor.cc b/paludis/repositories/e/fetch_visitor.cc
index f3ea9c06b..d639dd769 100644
--- a/paludis/repositories/e/fetch_visitor.cc
+++ b/paludis/repositories/e/fetch_visitor.cc
@@ -48,26 +48,26 @@ namespace paludis
struct Implementation<FetchVisitor>
{
const Environment * const env;
- const tr1::shared_ptr<const PackageID> id;
+ const std::tr1::shared_ptr<const PackageID> id;
const EAPI & eapi;
const FSEntry distdir;
const bool fetch_unneeded;
const bool userpriv;
const std::string mirrors_name;
- tr1::shared_ptr<const URILabel> default_label;
+ std::tr1::shared_ptr<const URILabel> default_label;
const bool safe_resume;
std::list<const URILabel *> labels;
Implementation(
const Environment * const e,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const PackageID> & i,
const EAPI & p,
const FSEntry & d,
const bool f,
const bool u,
const std::string & m,
- const tr1::shared_ptr<const URILabel> & n,
+ const std::tr1::shared_ptr<const URILabel> & n,
const bool sr) :
env(e),
id(i),
@@ -86,13 +86,13 @@ namespace paludis
FetchVisitor::FetchVisitor(
const Environment * const e,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const PackageID> & i,
const EAPI & p,
const FSEntry & d,
const bool f,
const bool u,
const std::string & m,
- const tr1::shared_ptr<const URILabel> & n,
+ const std::tr1::shared_ptr<const URILabel> & n,
const bool sr) :
PrivateImplementationPattern<FetchVisitor>(new Implementation<FetchVisitor>(e, i, p, d, f, u, m, n, sr))
{
@@ -181,7 +181,7 @@ FetchVisitor::visit_leaf(const FetchableURIDepSpec & u)
continue;
}
- const tr1::shared_ptr<const FSEntrySequence> fetch_dirs(_imp->env->fetchers_dirs());
+ const std::tr1::shared_ptr<const FSEntrySequence> fetch_dirs(_imp->env->fetchers_dirs());
bool found(false);
for (FSEntrySequence::ConstIterator d(fetch_dirs->begin()), d_end(fetch_dirs->end()) ;
d != d_end ; ++d)
@@ -194,10 +194,10 @@ FetchVisitor::visit_leaf(const FetchableURIDepSpec & u)
if (_imp->userpriv)
cmd.with_uid_gid(_imp->env->reduced_uid(), _imp->env->reduced_gid());
- tr1::shared_ptr<const FSEntrySequence> syncers_dirs(_imp->env->syncers_dirs());
- tr1::shared_ptr<const FSEntrySequence> bashrc_files(_imp->env->bashrc_files());
- tr1::shared_ptr<const FSEntrySequence> fetchers_dirs(_imp->env->fetchers_dirs());
- tr1::shared_ptr<const FSEntrySequence> hook_dirs(_imp->env->hook_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> syncers_dirs(_imp->env->syncers_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> bashrc_files(_imp->env->bashrc_files());
+ std::tr1::shared_ptr<const FSEntrySequence> fetchers_dirs(_imp->env->fetchers_dirs());
+ std::tr1::shared_ptr<const FSEntrySequence> hook_dirs(_imp->env->hook_dirs());
cmd
.with_setenv("P", stringify(_imp->id->name().package) + "-" +
diff --git a/paludis/repositories/e/fetch_visitor.hh b/paludis/repositories/e/fetch_visitor.hh
index c25e08a24..b7914637f 100644
--- a/paludis/repositories/e/fetch_visitor.hh
+++ b/paludis/repositories/e/fetch_visitor.hh
@@ -25,11 +25,11 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/visitor-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/dep_spec.hh>
#include <paludis/dep_tree.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/environment-fwd.hh>
+#include <tr1/memory>
namespace paludis
{
@@ -42,13 +42,13 @@ namespace paludis
public:
FetchVisitor(
const Environment * const,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const EAPI & eapi,
const FSEntry & distdir,
const bool fetch_unneeded,
const bool userpriv,
const std::string & mirrors_name,
- const tr1::shared_ptr<const URILabel> & initial_label,
+ const std::tr1::shared_ptr<const URILabel> & initial_label,
const bool safe_resume);
~FetchVisitor();
diff --git a/paludis/repositories/e/fetch_visitor_TEST.cc b/paludis/repositories/e/fetch_visitor_TEST.cc
index 4aab93318..4274c86b9 100644
--- a/paludis/repositories/e/fetch_visitor_TEST.cc
+++ b/paludis/repositories/e/fetch_visitor_TEST.cc
@@ -47,14 +47,14 @@ namespace test_cases
void run()
{
TestEnvironment env;
- const tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
TEST_CHECK(FSEntry("fetch_visitor_TEST_dir/in/input1").exists());
TEST_CHECK(! FSEntry("fetch_visitor_TEST_dir/out/input1").exists());
- const tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string("exheres-0"));
+ const std::tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string("exheres-0"));
FetchVisitor v(&env, *env.package_database()->query(query::Matches(parse_user_package_dep_spec("=cat/pkg-1", UserPackageDepSpecOptions())),
qo_require_exactly_one)->begin(),
*eapi, FSEntry("fetch_visitor_TEST_dir/out"),
diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc
index 90c03cdc7..81f4994ab 100644
--- a/paludis/repositories/e/fix_locked_dependencies.cc
+++ b/paludis/repositories/e/fix_locked_dependencies.cc
@@ -21,7 +21,6 @@
#include <paludis/repositories/e/package_dep_spec.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/visitor_cast.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/make_shared_ptr.hh>
@@ -31,6 +30,7 @@
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <paludis/package_id.hh>
+#include <tr1/functional>
#include <algorithm>
#include <list>
@@ -39,9 +39,9 @@ using namespace paludis::erepository;
namespace
{
- void cannot_add(const tr1::shared_ptr<const DependencySpecTree::ConstItem> &) PALUDIS_ATTRIBUTE((noreturn));
+ void cannot_add(const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> &) PALUDIS_ATTRIBUTE((noreturn));
- void cannot_add(const tr1::shared_ptr<const DependencySpecTree::ConstItem> &)
+ void cannot_add(const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> &)
{
throw InternalError(PALUDIS_HERE, "Got weird tree");
}
@@ -50,16 +50,16 @@ namespace
ConstVisitor<DependencySpecTree>
{
std::list<std::pair<
- tr1::shared_ptr<DependencySpecTree::ConstItem>,
- tr1::function<void (const tr1::shared_ptr<DependencySpecTree::ConstItem> &)> > > stack;
+ std::tr1::shared_ptr<DependencySpecTree::ConstItem>,
+ std::tr1::function<void (const std::tr1::shared_ptr<DependencySpecTree::ConstItem> &)> > > stack;
- tr1::shared_ptr<const DependencySpecTree::ConstItem> result;
+ std::tr1::shared_ptr<const DependencySpecTree::ConstItem> result;
const Environment * const env;
const EAPI & eapi;
- const tr1::shared_ptr<const PackageID> id;
+ const std::tr1::shared_ptr<const PackageID> id;
- Fixer(const Environment * const e, const EAPI & a, const tr1::shared_ptr<const PackageID> & i) :
+ Fixer(const Environment * const e, const EAPI & a, const std::tr1::shared_ptr<const PackageID> & i) :
env(e),
eapi(a),
id(i)
@@ -70,17 +70,17 @@ namespace
DependencySpecTree::ConstSequenceIterator cur,
DependencySpecTree::ConstSequenceIterator end)
{
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > c(
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > c(
new ConstTreeSequence<DependencySpecTree, AllDepSpec>(
- tr1::static_pointer_cast<AllDepSpec>(s.clone())));
+ std::tr1::static_pointer_cast<AllDepSpec>(s.clone())));
if (! stack.empty())
stack.begin()->second(c);
else
result = c;
- using namespace tr1::placeholders;
- stack.push_front(std::make_pair(c, tr1::bind(&ConstTreeSequence<DependencySpecTree, AllDepSpec>::add, c.get(), _1)));
+ using namespace std::tr1::placeholders;
+ stack.push_front(std::make_pair(c, std::tr1::bind(&ConstTreeSequence<DependencySpecTree, AllDepSpec>::add, c.get(), _1)));
std::for_each(cur, end, accept_visitor(*this));
stack.pop_front();
}
@@ -89,17 +89,17 @@ namespace
DependencySpecTree::ConstSequenceIterator cur,
DependencySpecTree::ConstSequenceIterator end)
{
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AnyDepSpec> > c(
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AnyDepSpec> > c(
new ConstTreeSequence<DependencySpecTree, AnyDepSpec>(
- tr1::static_pointer_cast<AnyDepSpec>(s.clone())));
+ std::tr1::static_pointer_cast<AnyDepSpec>(s.clone())));
if (! stack.empty())
stack.begin()->second(c);
else
result = c;
- using namespace tr1::placeholders;
- stack.push_front(std::make_pair(c, tr1::bind(&ConstTreeSequence<DependencySpecTree, AnyDepSpec>::add, c.get(), _1)));
+ using namespace std::tr1::placeholders;
+ stack.push_front(std::make_pair(c, std::tr1::bind(&ConstTreeSequence<DependencySpecTree, AnyDepSpec>::add, c.get(), _1)));
std::for_each(cur, end, accept_visitor(*this));
stack.pop_front();
}
@@ -108,24 +108,24 @@ namespace
DependencySpecTree::ConstSequenceIterator cur,
DependencySpecTree::ConstSequenceIterator end)
{
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, ConditionalDepSpec> > c(
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, ConditionalDepSpec> > c(
new ConstTreeSequence<DependencySpecTree, ConditionalDepSpec>(
- tr1::static_pointer_cast<ConditionalDepSpec>(s.clone())));
+ std::tr1::static_pointer_cast<ConditionalDepSpec>(s.clone())));
if (! stack.empty())
stack.begin()->second(c);
else
result = c;
- using namespace tr1::placeholders;
- stack.push_front(std::make_pair(c, tr1::bind(&ConstTreeSequence<DependencySpecTree, ConditionalDepSpec>::add, c.get(), _1)));
+ using namespace std::tr1::placeholders;
+ stack.push_front(std::make_pair(c, std::tr1::bind(&ConstTreeSequence<DependencySpecTree, ConditionalDepSpec>::add, c.get(), _1)));
std::for_each(cur, end, accept_visitor(*this));
stack.pop_front();
}
void visit_leaf(const PackageDepSpec & s)
{
- tr1::shared_ptr<TreeLeaf<DependencySpecTree, PackageDepSpec> > c;
+ std::tr1::shared_ptr<TreeLeaf<DependencySpecTree, PackageDepSpec> > c;
do
{
@@ -136,7 +136,7 @@ namespace
if (! r)
break;
- tr1::shared_ptr<const PackageIDSequence> matches(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> matches(env->package_database()->query(
query::Matches(s) & query::InstalledAtRoot(FSEntry("/")), qo_order_by_version));
if (matches->empty())
break;
@@ -144,12 +144,12 @@ namespace
PackageDepSpec new_s(partial_parse_e_package_dep_spec(stringify(s), eapi, id).slot_requirement(
make_shared_ptr(new ESlotExactRequirement((*matches->last())->slot(), true))));
- c.reset(new TreeLeaf<DependencySpecTree, PackageDepSpec>(tr1::static_pointer_cast<PackageDepSpec>(
+ c.reset(new TreeLeaf<DependencySpecTree, PackageDepSpec>(std::tr1::static_pointer_cast<PackageDepSpec>(
PackageDepSpec(new_s).clone())));
} while (false);
if (! c)
- c.reset(new TreeLeaf<DependencySpecTree, PackageDepSpec>(tr1::static_pointer_cast<PackageDepSpec>(s.clone())));
+ c.reset(new TreeLeaf<DependencySpecTree, PackageDepSpec>(std::tr1::static_pointer_cast<PackageDepSpec>(s.clone())));
if (stack.empty())
{
@@ -162,8 +162,8 @@ namespace
void visit_leaf(const NamedSetDepSpec & s)
{
- tr1::shared_ptr<TreeLeaf<DependencySpecTree, NamedSetDepSpec> > c(
- new TreeLeaf<DependencySpecTree, NamedSetDepSpec>(tr1::static_pointer_cast<NamedSetDepSpec>(s.clone())));
+ std::tr1::shared_ptr<TreeLeaf<DependencySpecTree, NamedSetDepSpec> > c(
+ new TreeLeaf<DependencySpecTree, NamedSetDepSpec>(std::tr1::static_pointer_cast<NamedSetDepSpec>(s.clone())));
if (stack.empty())
{
@@ -176,8 +176,8 @@ namespace
void visit_leaf(const BlockDepSpec & s)
{
- tr1::shared_ptr<TreeLeaf<DependencySpecTree, BlockDepSpec> > c(
- new TreeLeaf<DependencySpecTree, BlockDepSpec>(tr1::static_pointer_cast<BlockDepSpec>(s.clone())));
+ std::tr1::shared_ptr<TreeLeaf<DependencySpecTree, BlockDepSpec> > c(
+ new TreeLeaf<DependencySpecTree, BlockDepSpec>(std::tr1::static_pointer_cast<BlockDepSpec>(s.clone())));
if (stack.empty())
{
@@ -190,8 +190,8 @@ namespace
void visit_leaf(const DependencyLabelsDepSpec & s)
{
- tr1::shared_ptr<TreeLeaf<DependencySpecTree, DependencyLabelsDepSpec> > c(
- new TreeLeaf<DependencySpecTree, DependencyLabelsDepSpec>(tr1::static_pointer_cast<DependencyLabelsDepSpec>(s.clone())));
+ std::tr1::shared_ptr<TreeLeaf<DependencySpecTree, DependencyLabelsDepSpec> > c(
+ new TreeLeaf<DependencySpecTree, DependencyLabelsDepSpec>(std::tr1::static_pointer_cast<DependencyLabelsDepSpec>(s.clone())));
if (stack.empty())
{
@@ -204,11 +204,11 @@ namespace
};
}
-const tr1::shared_ptr<const DependencySpecTree::ConstItem>
+const std::tr1::shared_ptr<const DependencySpecTree::ConstItem>
paludis::erepository::fix_locked_dependencies(
const Environment * const env,
- const EAPI & e, const tr1::shared_ptr<const PackageID> & id,
- const tr1::shared_ptr<const DependencySpecTree::ConstItem> & b)
+ const EAPI & e, const std::tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> & b)
{
Fixer f(env, e, id);
b->accept(f);
diff --git a/paludis/repositories/e/fix_locked_dependencies.hh b/paludis/repositories/e/fix_locked_dependencies.hh
index f41e14770..6ccbd4e92 100644
--- a/paludis/repositories/e/fix_locked_dependencies.hh
+++ b/paludis/repositories/e/fix_locked_dependencies.hh
@@ -22,19 +22,19 @@
#include <paludis/repositories/e/eapi-fwd.hh>
#include <paludis/util/attributes.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/dep_tree.hh>
+#include <tr1/memory>
namespace paludis
{
namespace erepository
{
- const tr1::shared_ptr<const DependencySpecTree::ConstItem> fix_locked_dependencies(
+ const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> fix_locked_dependencies(
const Environment * const env,
- const EAPI &, const tr1::shared_ptr<const PackageID> &,
- const tr1::shared_ptr<const DependencySpecTree::ConstItem> &) PALUDIS_VISIBLE;
+ const EAPI &, const std::tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const DependencySpecTree::ConstItem> &) PALUDIS_VISIBLE;
}
}
diff --git a/paludis/repositories/e/fix_locked_dependencies_TEST.cc b/paludis/repositories/e/fix_locked_dependencies_TEST.cc
index 255ecc32c..fe3eedc2c 100644
--- a/paludis/repositories/e/fix_locked_dependencies_TEST.cc
+++ b/paludis/repositories/e/fix_locked_dependencies_TEST.cc
@@ -44,36 +44,36 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
+ std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(&env, RepositoryName("installed")));
env.package_database()->add_repository(2, installed_repo);
installed_repo->add_version("cat", "installed", "1")->set_slot(SlotName("monkey"));
- tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string("paludis-1"));
+ std::tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string("paludis-1"));
- tr1::shared_ptr<DependencySpecTree::ConstItem> bb(parse_depend(
+ std::tr1::shared_ptr<DependencySpecTree::ConstItem> bb(parse_depend(
"|| ( foo/bar ( bar/baz oink/squeak ) ) blah/blah", &env, id, *eapi)),
aa(fix_locked_dependencies(&env, *eapi, id, bb));
StringifyFormatter ff;
DepSpecPrettyPrinter
- a(0, tr1::shared_ptr<const PackageID>(), ff, 0, false),
- b(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ a(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false),
+ b(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
aa->accept(a);
bb->accept(b);
TEST_CHECK_STRINGIFY_EQUAL(a, b);
- tr1::shared_ptr<DependencySpecTree::ConstItem> cc(parse_depend(
+ std::tr1::shared_ptr<DependencySpecTree::ConstItem> cc(parse_depend(
"foo/bar:= cat/installed:= >=cat/installed-1.2:= <=cat/installed-1.2:=", &env, id, *eapi)),
dd(fix_locked_dependencies(&env, *eapi, id, cc));
DepSpecPrettyPrinter
- c(0, tr1::shared_ptr<const PackageID>(), ff, 0, false),
- d(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ c(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false),
+ d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
cc->accept(c);
dd->accept(d);
diff --git a/paludis/repositories/e/glsa.cc b/paludis/repositories/e/glsa.cc
index 48dc251cc..9085b662b 100644
--- a/paludis/repositories/e/glsa.cc
+++ b/paludis/repositories/e/glsa.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -63,7 +63,7 @@ namespace paludis
{
std::string id;
std::string title;
- std::list<tr1::shared_ptr<const GLSAPackage> > packages;
+ std::list<std::tr1::shared_ptr<const GLSAPackage> > packages;
};
}
@@ -158,7 +158,7 @@ GLSA::end_packages() const
}
void
-GLSA::add_package(tr1::shared_ptr<const GLSAPackage> p)
+GLSA::add_package(std::tr1::shared_ptr<const GLSAPackage> p)
{
_imp->packages.push_back(p);
}
@@ -195,7 +195,7 @@ namespace
{
Mutex mutex;
void * handle;
- tr1::shared_ptr<GLSA> (* create_glsa_from_xml_file_handle)(const std::string &);
+ std::tr1::shared_ptr<GLSA> (* create_glsa_from_xml_file_handle)(const std::string &);
LibXMLHandle() :
handle(0),
@@ -214,7 +214,7 @@ namespace
#endif
-tr1::shared_ptr<GLSA>
+std::tr1::shared_ptr<GLSA>
GLSA::create_from_xml_file(const std::string & filename)
{
#if ENABLE_GLSA
@@ -232,7 +232,7 @@ GLSA::create_from_xml_file(const std::string & filename)
+ stringify(dlerror()) + "' when dlopen(libpaludiserepositoryxmlthings.so)");
if (0 == libxmlhandle.create_glsa_from_xml_file_handle)
- libxmlhandle.create_glsa_from_xml_file_handle = STUPID_CAST(tr1::shared_ptr<GLSA> (*)(const std::string &),
+ libxmlhandle.create_glsa_from_xml_file_handle = STUPID_CAST(std::tr1::shared_ptr<GLSA> (*)(const std::string &),
dlsym(libxmlhandle.handle, "create_glsa_from_xml_file"));
if (0 == libxmlhandle.create_glsa_from_xml_file_handle)
throw NotAvailableError("Cannot create GLSA from XML file '" + filename + "' due to error '"
diff --git a/paludis/repositories/e/glsa.hh b/paludis/repositories/e/glsa.hh
index ba4789ad1..644aeb525 100644
--- a/paludis/repositories/e/glsa.hh
+++ b/paludis/repositories/e/glsa.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -22,11 +22,10 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/sr.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
-
+#include <tr1/memory>
#include <string>
namespace paludis
@@ -136,7 +135,7 @@ namespace paludis
/**
* Create a GLSA from an XML file.
*/
- static tr1::shared_ptr<GLSA> create_from_xml_file(const std::string & filename);
+ static std::tr1::shared_ptr<GLSA> create_from_xml_file(const std::string & filename);
///\name Iterate over our packages.
///\{
@@ -151,7 +150,7 @@ namespace paludis
/**
* Add a package.
*/
- void add_package(tr1::shared_ptr<const GLSAPackage>);
+ void add_package(std::tr1::shared_ptr<const GLSAPackage>);
/**
* Set our ID.
diff --git a/paludis/repositories/e/layout.cc b/paludis/repositories/e/layout.cc
index a8ed096ce..95de508e7 100644
--- a/paludis/repositories/e/layout.cc
+++ b/paludis/repositories/e/layout.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008 Ciaran McCreesh
* Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -30,16 +30,16 @@ using namespace paludis;
using namespace paludis::erepository;
template class VirtualConstructor<std::string,
- tr1::shared_ptr<Layout> (*) (const ERepository * const, const FSEntry &,
- tr1::shared_ptr<const ERepositoryEntries>,
- tr1::shared_ptr<const FSEntry>),
+ std::tr1::shared_ptr<Layout> (*) (const ERepository * const, const FSEntry &,
+ std::tr1::shared_ptr<const ERepositoryEntries>,
+ std::tr1::shared_ptr<const FSEntry>),
virtual_constructor_not_found::ThrowException<NoSuchLayoutType> >;
template class InstantiationPolicy<LayoutMaker, instantiation_method::SingletonTag>;
template class Map<FSEntry, std::string>;
-Layout::Layout(tr1::shared_ptr<const FSEntry> l) :
+Layout::Layout(std::tr1::shared_ptr<const FSEntry> l) :
_master_repository_location(l)
{
}
@@ -48,7 +48,7 @@ Layout::~Layout()
{
}
-tr1::shared_ptr<const FSEntry>
+std::tr1::shared_ptr<const FSEntry>
Layout::master_repository_location() const
{
return _master_repository_location;
@@ -63,12 +63,12 @@ Layout::sync_filter_file() const
namespace
{
template <typename T_>
- tr1::shared_ptr<Layout>
+ std::tr1::shared_ptr<Layout>
make_layout(const ERepository * const n, const FSEntry & b,
- tr1::shared_ptr<const ERepositoryEntries> e,
- tr1::shared_ptr<const FSEntry> f)
+ std::tr1::shared_ptr<const ERepositoryEntries> e,
+ std::tr1::shared_ptr<const FSEntry> f)
{
- return tr1::shared_ptr<Layout>(new T_(n, b, e, f));
+ return std::tr1::shared_ptr<Layout>(new T_(n, b, e, f));
}
}
diff --git a/paludis/repositories/e/layout.hh b/paludis/repositories/e/layout.hh
index 1f1d95703..93b46dbe7 100644
--- a/paludis/repositories/e/layout.hh
+++ b/paludis/repositories/e/layout.hh
@@ -28,8 +28,8 @@
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/virtual_constructor.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/util/map-fwd.hh>
+#include <tr1/memory>
namespace paludis
{
@@ -48,13 +48,13 @@ namespace paludis
class PALUDIS_VISIBLE Layout
{
private:
- tr1::shared_ptr<const FSEntry> _master_repository_location;
+ std::tr1::shared_ptr<const FSEntry> _master_repository_location;
protected:
///\name Basic operations
///\{
- Layout(tr1::shared_ptr<const FSEntry> master_repository_location);
+ Layout(std::tr1::shared_ptr<const FSEntry> master_repository_location);
///\}
@@ -69,7 +69,7 @@ namespace paludis
///\name Configuration information
///\{
- tr1::shared_ptr<const FSEntry> master_repository_location() const;
+ std::tr1::shared_ptr<const FSEntry> master_repository_location() const;
///\}
@@ -85,14 +85,14 @@ namespace paludis
virtual FSEntry categories_file() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
@@ -112,40 +112,40 @@ namespace paludis
const std::string & eapi) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> arch_list_files() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> arch_list_files() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> repository_mask_files() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> repository_mask_files() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> profiles_desc_files() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> profiles_desc_files() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> mirror_files() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> mirror_files() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> use_desc_dirs() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> use_desc_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
virtual FSEntry profiles_base_dir() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> exlibsdirs(const QualifiedPackageName &) const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> exlibsdirs_global() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs_global() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> exlibsdirs_category(const CategoryNamePart &) const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs_category(const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> exlibsdirs_package(const QualifiedPackageName &) const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs_package(const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<const FSEntrySequence> licenses_dirs() const
+ virtual std::tr1::shared_ptr<const FSEntrySequence> licenses_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual tr1::shared_ptr<Map<FSEntry, std::string> > manifest_files(const QualifiedPackageName &) const
+ virtual std::tr1::shared_ptr<Map<FSEntry, std::string> > manifest_files(const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
virtual FSEntry sync_filter_file() const;
@@ -179,9 +179,9 @@ namespace paludis
*/
class PALUDIS_VISIBLE LayoutMaker :
public VirtualConstructor<std::string,
- tr1::shared_ptr<Layout> (*) (const ERepository * const, const FSEntry &,
- tr1::shared_ptr<const ERepositoryEntries>,
- tr1::shared_ptr<const FSEntry>),
+ std::tr1::shared_ptr<Layout> (*) (const ERepository * const, const FSEntry &,
+ std::tr1::shared_ptr<const ERepositoryEntries>,
+ std::tr1::shared_ptr<const FSEntry>),
virtual_constructor_not_found::ThrowException<NoSuchLayoutType> >,
public InstantiationPolicy<LayoutMaker, instantiation_method::SingletonTag>
{
diff --git a/paludis/repositories/e/make_ebuild_repository.cc b/paludis/repositories/e/make_ebuild_repository.cc
index 97229f98a..ba26d67e1 100644
--- a/paludis/repositories/e/make_ebuild_repository.cc
+++ b/paludis/repositories/e/make_ebuild_repository.cc
@@ -36,10 +36,10 @@
using namespace paludis;
-tr1::shared_ptr<ERepository>
+std::tr1::shared_ptr<ERepository>
paludis::make_ebuild_repository(
Environment * const env,
- tr1::shared_ptr<const Map<std::string, std::string> > m)
+ std::tr1::shared_ptr<const Map<std::string, std::string> > m)
{
std::string repo_file(m->end() == m->find("repo_file") ? std::string("?") :
m->find("repo_file")->second);
@@ -50,13 +50,13 @@ paludis::make_ebuild_repository(
if (m->end() == m->find("location") || ((location = m->find("location")->second)).empty())
throw ERepositoryConfigurationError("Key 'location' not specified or empty");
- tr1::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
+ std::tr1::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf",
KeyValueConfigFileOptions())
: 0);
- tr1::shared_ptr<const RepositoryName> master_repository_name;
- tr1::shared_ptr<const ERepository> master_repository;
+ std::tr1::shared_ptr<const RepositoryName> master_repository_name;
+ std::tr1::shared_ptr<const ERepository> master_repository;
if (m->end() != m->find("master_repository") && ! m->find("master_repository")->second.empty())
{
Context context_local("When finding configuration information for master_repository '"
@@ -64,7 +64,7 @@ paludis::make_ebuild_repository(
master_repository_name.reset(new RepositoryName(m->find("master_repository")->second));
- tr1::shared_ptr<const Repository> master_repository_uncasted(
+ std::tr1::shared_ptr<const Repository> master_repository_uncasted(
env->package_database()->fetch_repository(*master_repository_name));
std::string format("unknown");
@@ -74,7 +74,7 @@ paludis::make_ebuild_repository(
throw ERepositoryConfigurationError("Master repository format is '" +
stringify(format) + "', not 'ebuild'");
- master_repository = tr1::static_pointer_cast<const ERepository>(master_repository_uncasted);
+ master_repository = std::tr1::static_pointer_cast<const ERepository>(master_repository_uncasted);
if (master_repository->params().master_repository)
throw ERepositoryConfigurationError("Requested master repository has a master_repository of '" +
@@ -82,7 +82,7 @@ paludis::make_ebuild_repository(
"be used as a master repository");
}
- tr1::shared_ptr<FSEntrySequence> profiles(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> profiles(new FSEntrySequence);
if (m->end() != m->find("profiles"))
tokenise_whitespace(m->find("profiles")->second,
create_inserter<FSEntry>(std::back_inserter(*profiles)));
@@ -96,7 +96,7 @@ paludis::make_ebuild_repository(
throw ERepositoryConfigurationError("No profiles have been specified");
}
- tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
+ std::tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
if (m->end() != m->find("eclassdirs"))
tokenise_whitespace(m->find("eclassdirs")->second,
@@ -273,7 +273,7 @@ paludis::make_ebuild_repository(
throw ERepositoryConfigurationError("binary_destination = true, but binary_keywords is unset or empty");
}
- return tr1::shared_ptr<ERepository>(new ERepository(ERepositoryParams::create()
+ return std::tr1::shared_ptr<ERepository>(new ERepository(ERepositoryParams::create()
.entry_format("ebuild")
.layout(layout)
.environment(env)
@@ -304,10 +304,10 @@ paludis::make_ebuild_repository(
.builddir(builddir)));
}
-tr1::shared_ptr<Repository>
+std::tr1::shared_ptr<Repository>
paludis::make_ebuild_repository_wrapped(
Environment * const env,
- tr1::shared_ptr<const Map<std::string, std::string> > m)
+ std::tr1::shared_ptr<const Map<std::string, std::string> > m)
{
return make_ebuild_repository(env, m);
}
diff --git a/paludis/repositories/e/make_ebuild_repository.hh b/paludis/repositories/e/make_ebuild_repository.hh
index 1c0e01083..9d0f6eb62 100644
--- a/paludis/repositories/e/make_ebuild_repository.hh
+++ b/paludis/repositories/e/make_ebuild_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -31,10 +31,10 @@ namespace paludis
* \see ERepository
* \ingroup grperepository
*/
- tr1::shared_ptr<ERepository>
+ std::tr1::shared_ptr<ERepository>
make_ebuild_repository(
Environment * const,
- tr1::shared_ptr<const Map<std::string, std::string> >) PALUDIS_VISIBLE;
+ std::tr1::shared_ptr<const Map<std::string, std::string> >) PALUDIS_VISIBLE;
/**
* Create an ebuild format repository (wrapper for our virtual constructor).
@@ -42,10 +42,10 @@ namespace paludis
* \see ERepository
* \ingroup grperepository
*/
- tr1::shared_ptr<Repository>
+ std::tr1::shared_ptr<Repository>
make_ebuild_repository_wrapped(
Environment * const env,
- tr1::shared_ptr<const Map<std::string, std::string> > m);
+ std::tr1::shared_ptr<const Map<std::string, std::string> > m);
}
#endif
diff --git a/paludis/repositories/e/package_dep_spec.cc b/paludis/repositories/e/package_dep_spec.cc
index 8703caa78..61f9b74c5 100644
--- a/paludis/repositories/e/package_dep_spec.cc
+++ b/paludis/repositories/e/package_dep_spec.cc
@@ -29,13 +29,14 @@
#include <paludis/version_operator.hh>
#include <paludis/version_spec.hh>
#include <paludis/version_requirements.hh>
+#include <tr1/memory>
using namespace paludis;
using namespace paludis::erepository;
PartiallyMadePackageDepSpec
paludis::erepository::partial_parse_e_package_dep_spec(
- const std::string & ss, const EAPI & eapi, const tr1::shared_ptr<const PackageID> & id)
+ const std::string & ss, const EAPI & eapi, const std::tr1::shared_ptr<const PackageID> & id)
{
Context context("When parsing package dep spec '" + ss + "' with eapi '" + stringify(eapi[k::name()]) + "':");
@@ -141,7 +142,7 @@ paludis::erepository::partial_parse_e_package_dep_spec(
{
std::string raw_flag("[" + flag + "]");
- tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req;
+ std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirement> req;
if ('=' == flag.at(flag.length() - 1))
{
if (! id)
@@ -393,7 +394,7 @@ paludis::erepository::partial_parse_e_package_dep_spec(
}
PackageDepSpec
-paludis::erepository::parse_e_package_dep_spec(const std::string & ss, const EAPI & eapi, const tr1::shared_ptr<const PackageID> & id)
+paludis::erepository::parse_e_package_dep_spec(const std::string & ss, const EAPI & eapi, const std::tr1::shared_ptr<const PackageID> & id)
{
return partial_parse_e_package_dep_spec(ss, eapi, id);
}
diff --git a/paludis/repositories/e/package_dep_spec.hh b/paludis/repositories/e/package_dep_spec.hh
index 02f9159fb..1f1964129 100644
--- a/paludis/repositories/e/package_dep_spec.hh
+++ b/paludis/repositories/e/package_dep_spec.hh
@@ -31,10 +31,10 @@ namespace paludis
namespace erepository
{
PackageDepSpec parse_e_package_dep_spec(const std::string &, const EAPI & eapi,
- const tr1::shared_ptr<const PackageID> & id) PALUDIS_VISIBLE;
+ const std::tr1::shared_ptr<const PackageID> & id) PALUDIS_VISIBLE;
PartiallyMadePackageDepSpec partial_parse_e_package_dep_spec(const std::string &, const EAPI & eapi,
- const tr1::shared_ptr<const PackageID> & id) PALUDIS_VISIBLE;
+ const std::tr1::shared_ptr<const PackageID> & id) PALUDIS_VISIBLE;
class ESlotExactRequirement :
public SlotExactRequirement
diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc
index 3c4b7fa4b..fe78f0da0 100644
--- a/paludis/repositories/e/pipe_command_handler.cc
+++ b/paludis/repositories/e/pipe_command_handler.cc
@@ -53,7 +53,7 @@ namespace
std::string
paludis::erepository::pipe_command_handler(const Environment * const environment,
- const tr1::shared_ptr<const PackageID> & package_id, const std::string & s)
+ const std::tr1::shared_ptr<const PackageID> & package_id, const std::string & s)
{
Context context("In ebuild pipe command handler for '" + s + "':");
@@ -100,12 +100,12 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
}
else
{
- tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(tokens[1]));
+ std::tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(tokens[1]));
if (! (*eapi)[k::supported()])
return "EBEST_VERSION EAPI " + tokens[1] + " unsupported";
PackageDepSpec spec(erepository::parse_e_package_dep_spec(tokens[2], *eapi, package_id));
- tr1::shared_ptr<const PackageIDSequence> entries(environment->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> entries(environment->package_database()->query(
query::Matches(spec) & query::InstalledAtRoot(environment->root()), qo_order_by_version));
if ((*(*eapi)[k::supported()])[k::pipe_commands()][k::rewrite_virtuals()] && (! entries->empty()) &&
(*entries->last())->virtual_for_key())
@@ -114,7 +114,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
"' resolves to '" << **entries->last() << "', which is a virtual for '"
<< *(*entries->last())->virtual_for_key()->value() << "'. This will break with "
"new style virtuals.";
- tr1::shared_ptr<PackageIDSequence> new_entries(new PackageIDSequence);
+ std::tr1::shared_ptr<PackageIDSequence> new_entries(new PackageIDSequence);
new_entries->push_back((*entries->last())->virtual_for_key()->value());
entries = new_entries;
}
@@ -139,12 +139,12 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
}
else
{
- tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(tokens[1]));
+ std::tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(tokens[1]));
if (! (*eapi)[k::supported()])
return "EHAS_VERSION EAPI " + tokens[1] + " unsupported";
PackageDepSpec spec(erepository::parse_e_package_dep_spec(tokens[2], *eapi, package_id));
- tr1::shared_ptr<const PackageIDSequence> entries(environment->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> entries(environment->package_database()->query(
query::Matches(spec) & query::InstalledAtRoot(environment->root()), qo_order_by_version));
if (entries->empty())
return "O1;";
@@ -161,16 +161,16 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
}
else
{
- tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(tokens[1]));
+ std::tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(tokens[1]));
if (! (*eapi)[k::supported()])
return "EMATCH EAPI " + tokens[1] + " unsupported";
PackageDepSpec spec(erepository::parse_e_package_dep_spec(tokens[2], *eapi, package_id));
- tr1::shared_ptr<const PackageIDSequence> entries(environment->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> entries(environment->package_database()->query(
query::Matches(spec) & query::InstalledAtRoot(environment->root()), qo_order_by_version));
if ((*(*eapi)[k::supported()])[k::pipe_commands()][k::rewrite_virtuals()] && (! entries->empty()))
{
- tr1::shared_ptr<PackageIDSequence> new_entries(new PackageIDSequence);
+ std::tr1::shared_ptr<PackageIDSequence> new_entries(new PackageIDSequence);
for (PackageIDSequence::ConstIterator i(entries->begin()), i_end(entries->end()) ;
i != i_end ; ++i)
{
@@ -210,7 +210,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
{
if (! environment->package_database()->has_repository_named(RepositoryName("installed")))
return "Eno installed repository available";
- tr1::shared_ptr<const Repository> repo(environment->package_database()->fetch_repository(RepositoryName("installed")));
+ std::tr1::shared_ptr<const Repository> repo(environment->package_database()->fetch_repository(RepositoryName("installed")));
Repository::MetadataConstIterator key(repo->find_metadata("location"));
if (repo->end_metadata() == key)
return "Einstalled repository has no location key";
@@ -227,7 +227,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
return "Ebad REWRITE_VAR command";
}
- tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(tokens[1]));
+ std::tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(tokens[1]));
if (! (*eapi)[k::supported()])
return "EREWRITE_VAR EAPI " + tokens[1] + " unsupported";
@@ -238,12 +238,12 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
(var == (*(*eapi)[k::supported()])[k::ebuild_metadata_variables()].metadata_pdepend) ||
(var == (*(*eapi)[k::supported()])[k::ebuild_metadata_variables()].metadata_dependencies))
{
- tr1::shared_ptr<const DependencySpecTree::ConstItem> before(parse_depend(join(tokens.begin() + 4, tokens.end(), " "),
+ std::tr1::shared_ptr<const DependencySpecTree::ConstItem> before(parse_depend(join(tokens.begin() + 4, tokens.end(), " "),
environment, package_id, *eapi));
- tr1::shared_ptr<const DependencySpecTree::ConstItem> after(fix_locked_dependencies(
+ std::tr1::shared_ptr<const DependencySpecTree::ConstItem> after(fix_locked_dependencies(
environment, *eapi, package_id, before));
StringifyFormatter ff;
- DepSpecPrettyPrinter p(0, tr1::shared_ptr<const PackageID>(), ff, 0, false);
+ DepSpecPrettyPrinter p(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false);
after->accept(p);
return "O0;" + stringify(p);
}
diff --git a/paludis/repositories/e/pipe_command_handler.hh b/paludis/repositories/e/pipe_command_handler.hh
index 223bba489..446b43520 100644
--- a/paludis/repositories/e/pipe_command_handler.hh
+++ b/paludis/repositories/e/pipe_command_handler.hh
@@ -22,7 +22,7 @@
#include <paludis/environment-fwd.hh>
#include <paludis/package_id-fwd.hh>
-#include <paludis/util/tr1_functional.hh>
+#include <tr1/functional>
#include <string>
namespace paludis
@@ -30,7 +30,7 @@ namespace paludis
namespace erepository
{
std::string pipe_command_handler(const Environment * const,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string & s);
}
}
diff --git a/paludis/repositories/e/pretend_fetch_visitor.cc b/paludis/repositories/e/pretend_fetch_visitor.cc
index 37340baa0..19a4fa343 100644
--- a/paludis/repositories/e/pretend_fetch_visitor.cc
+++ b/paludis/repositories/e/pretend_fetch_visitor.cc
@@ -43,11 +43,11 @@ namespace paludis
struct Implementation<PretendFetchVisitor>
{
const Environment * const env;
- const tr1::shared_ptr<const PackageID> id;
+ const std::tr1::shared_ptr<const PackageID> id;
const EAPI & eapi;
const FSEntry distdir;
const bool fetch_unneeded;
- tr1::shared_ptr<const URILabel> default_label;
+ std::tr1::shared_ptr<const URILabel> default_label;
PretendFetchAction & action;
std::set<std::string> already_done;
@@ -56,11 +56,11 @@ namespace paludis
Implementation(
const Environment * const e,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const PackageID> & i,
const EAPI & p,
const FSEntry & d,
const bool f,
- const tr1::shared_ptr<const URILabel> & n,
+ const std::tr1::shared_ptr<const URILabel> & n,
PretendFetchAction & a) :
env(e),
id(i),
@@ -78,11 +78,11 @@ namespace paludis
PretendFetchVisitor::PretendFetchVisitor(
const Environment * const e,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const PackageID> & i,
const EAPI & p,
const FSEntry & d,
const bool f,
- const tr1::shared_ptr<const URILabel> & n,
+ const std::tr1::shared_ptr<const URILabel> & n,
PretendFetchAction & a) :
PrivateImplementationPattern<PretendFetchVisitor>(new Implementation<PretendFetchVisitor>(e, i, p, d, f, n, a))
{
diff --git a/paludis/repositories/e/pretend_fetch_visitor.hh b/paludis/repositories/e/pretend_fetch_visitor.hh
index 227667a85..3b770e0a2 100644
--- a/paludis/repositories/e/pretend_fetch_visitor.hh
+++ b/paludis/repositories/e/pretend_fetch_visitor.hh
@@ -39,11 +39,11 @@ namespace paludis
public:
PretendFetchVisitor(
const Environment * const,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const EAPI & eapi,
const FSEntry & distdir,
const bool fetch_unneeded,
- const tr1::shared_ptr<const URILabel> & initial_label,
+ const std::tr1::shared_ptr<const URILabel> & initial_label,
PretendFetchAction & action);
~PretendFetchVisitor();
diff --git a/paludis/repositories/e/qa/categories.cc b/paludis/repositories/e/qa/categories.cc
index 86c40d01a..915e57366 100644
--- a/paludis/repositories/e/qa/categories.cc
+++ b/paludis/repositories/e/qa/categories.cc
@@ -34,7 +34,7 @@ using namespace paludis;
bool
paludis::erepository::categories_check(
QAReporter & reporter,
- const tr1::shared_ptr<const ERepository> & repo,
+ const std::tr1::shared_ptr<const ERepository> & repo,
const std::string & name)
{
Context context("When performing check '" + name + "':");
diff --git a/paludis/repositories/e/qa/categories.hh b/paludis/repositories/e/qa/categories.hh
index 24cf81a22..1bcc161d1 100644
--- a/paludis/repositories/e/qa/categories.hh
+++ b/paludis/repositories/e/qa/categories.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -28,7 +28,7 @@ namespace paludis
{
bool categories_check(
QAReporter &,
- const tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepository> &,
const std::string &
);
}
diff --git a/paludis/repositories/e/qa/default_functions.cc b/paludis/repositories/e/qa/default_functions.cc
index c8cbbebc1..5089d621f 100644
--- a/paludis/repositories/e/qa/default_functions.cc
+++ b/paludis/repositories/e/qa/default_functions.cc
@@ -39,7 +39,7 @@ bool
paludis::erepository::default_functions_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & content,
const std::string & name)
{
diff --git a/paludis/repositories/e/qa/default_functions.hh b/paludis/repositories/e/qa/default_functions.hh
index 182ee4937..757564658 100644
--- a/paludis/repositories/e/qa/default_functions.hh
+++ b/paludis/repositories/e/qa/default_functions.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -34,7 +34,7 @@ namespace paludis
bool default_functions_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &,
const std::string &) PALUDIS_VISIBLE;
}
diff --git a/paludis/repositories/e/qa/default_functions_TEST.cc b/paludis/repositories/e/qa/default_functions_TEST.cc
index bae58aadf..f7357b3c3 100644
--- a/paludis/repositories/e/qa/default_functions_TEST.cc
+++ b/paludis/repositories/e/qa/default_functions_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -66,9 +66,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("cat/other");
TestReporter r;
@@ -84,9 +84,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("cat/other");
TestReporter r;
@@ -102,9 +102,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("cat/other");
TestReporter r;
diff --git a/paludis/repositories/e/qa/deprecated_functions.cc b/paludis/repositories/e/qa/deprecated_functions.cc
index 5e124c8b6..28e01195f 100644
--- a/paludis/repositories/e/qa/deprecated_functions.cc
+++ b/paludis/repositories/e/qa/deprecated_functions.cc
@@ -69,7 +69,7 @@ namespace
};
QAMessage
- with_id(QAMessage m, const tr1::shared_ptr<const PackageID> & id)
+ with_id(QAMessage m, const std::tr1::shared_ptr<const PackageID> & id)
{
return id ? m.with_associated_id(id) : m;
}
@@ -79,7 +79,7 @@ bool
paludis::erepository::deprecated_functions_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & content,
const std::string & name)
{
diff --git a/paludis/repositories/e/qa/deprecated_functions.hh b/paludis/repositories/e/qa/deprecated_functions.hh
index a986619c2..0d6b6fa80 100644
--- a/paludis/repositories/e/qa/deprecated_functions.hh
+++ b/paludis/repositories/e/qa/deprecated_functions.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -34,7 +34,7 @@ namespace paludis
bool deprecated_functions_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &,
const std::string &);
}
diff --git a/paludis/repositories/e/qa/eapi_supported.cc b/paludis/repositories/e/qa/eapi_supported.cc
index 66a960a01..690ea498c 100644
--- a/paludis/repositories/e/qa/eapi_supported.cc
+++ b/paludis/repositories/e/qa/eapi_supported.cc
@@ -29,7 +29,7 @@ bool
paludis::erepository::eapi_supported_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & name)
{
Context context("When performing check '" + name + "' using eapi_supported_check on ID '" + stringify(*id) + "':");
diff --git a/paludis/repositories/e/qa/eapi_supported.hh b/paludis/repositories/e/qa/eapi_supported.hh
index 51fe7a702..4e101d3b9 100644
--- a/paludis/repositories/e/qa/eapi_supported.hh
+++ b/paludis/repositories/e/qa/eapi_supported.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -31,7 +31,7 @@ namespace paludis
bool eapi_supported_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &);
}
}
diff --git a/paludis/repositories/e/qa/ebuild_count.cc b/paludis/repositories/e/qa/ebuild_count.cc
index 512854458..3be96ffc6 100644
--- a/paludis/repositories/e/qa/ebuild_count.cc
+++ b/paludis/repositories/e/qa/ebuild_count.cc
@@ -30,7 +30,7 @@ bool
paludis::erepository::ebuild_count_check(
QAReporter & reporter,
const FSEntry & dir,
- const tr1::shared_ptr<const Repository> & repo,
+ const std::tr1::shared_ptr<const Repository> & repo,
const QualifiedPackageName & q,
const std::string & name
)
@@ -39,7 +39,7 @@ paludis::erepository::ebuild_count_check(
Log::get_instance()->message("e.qa.ebuild_count_check", ll_debug, lc_context) << "ebuild_count_check '"
<< dir << "', " << name << "'";
- tr1::shared_ptr<const PackageIDSequence> ids(repo->package_ids(q));
+ std::tr1::shared_ptr<const PackageIDSequence> ids(repo->package_ids(q));
PackageIDSequence::ConstIterator::difference_type count(std::distance(ids->begin(), ids->end()));
if (count > 10)
diff --git a/paludis/repositories/e/qa/ebuild_count.hh b/paludis/repositories/e/qa/ebuild_count.hh
index 3d62c22f5..f38dd9ed5 100644
--- a/paludis/repositories/e/qa/ebuild_count.hh
+++ b/paludis/repositories/e/qa/ebuild_count.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -31,7 +31,7 @@ namespace paludis
ebuild_count_check(
QAReporter &,
const FSEntry &,
- const tr1::shared_ptr<const Repository> &,
+ const std::tr1::shared_ptr<const Repository> &,
const QualifiedPackageName &,
const std::string &
);
diff --git a/paludis/repositories/e/qa/extractors.cc b/paludis/repositories/e/qa/extractors.cc
index 8ad0eb554..258da9992 100644
--- a/paludis/repositories/e/qa/extractors.cc
+++ b/paludis/repositories/e/qa/extractors.cc
@@ -31,8 +31,8 @@
#include <paludis/util/options.hh>
#include <paludis/util/log.hh>
#include <paludis/util/instantiation_policy-impl.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/repositories/e/conditional_dep_spec.hh>
+#include <tr1/functional>
#include <algorithm>
#include <map>
#include <set>
@@ -45,7 +45,7 @@ namespace
struct ExtractorsRequirements :
InstantiationPolicy<ExtractorsRequirements, instantiation_method::SingletonTag>
{
- tr1::shared_ptr<const KeyValueConfigFile> file;
+ std::tr1::shared_ptr<const KeyValueConfigFile> file;
ExtractorsRequirements(const FSEntry & f = FSEntry(getenv_with_default("PALUDIS_QA_DATA_DIR",
stringify(FSEntry(DATADIR) / "paludis" / "qa"))) / "extractors.conf")
@@ -253,7 +253,7 @@ bool
paludis::erepository::extractors_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & name)
{
Context context("When performing check '" + name + "' on ID '" + stringify(*id) + "':");
diff --git a/paludis/repositories/e/qa/extractors.hh b/paludis/repositories/e/qa/extractors.hh
index 14d577958..a27ee23f7 100644
--- a/paludis/repositories/e/qa/extractors.hh
+++ b/paludis/repositories/e/qa/extractors.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -32,7 +32,7 @@ namespace paludis
bool extractors_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &) PALUDIS_VISIBLE;
}
}
diff --git a/paludis/repositories/e/qa/extractors_TEST.cc b/paludis/repositories/e/qa/extractors_TEST.cc
index bd1622b68..adcd91b7e 100644
--- a/paludis/repositories/e/qa/extractors_TEST.cc
+++ b/paludis/repositories/e/qa/extractors_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -64,9 +64,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("app-arch/unzip");
id->fetches_key()->set_from_string("foo.zip");
@@ -83,9 +83,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("app-misc/foo");
id->fetches_key()->set_from_string("foo.tar.bz2");
@@ -102,9 +102,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("oink? ( app-arch/unzip ) !oink? ( bar? ( app-arch/unzip ) foo? ( app-arch/unzip ) )");
id->fetches_key()->set_from_string("foo? ( foo.zip ) bar? ( baz? ( moo.zip ) )");
@@ -122,9 +122,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("app-arch/blah");
id->fetches_key()->set_from_string("foo.zip");
@@ -141,9 +141,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("foo? ( baz? ( app-arch/unzip ) !baz? ( app-arch/unzip ) ) ");
id->fetches_key()->set_from_string("oink? ( a.zip ) !oink? ( bar? ( a.zip ) )");
diff --git a/paludis/repositories/e/qa/fetches_key.cc b/paludis/repositories/e/qa/fetches_key.cc
index 461be737a..a3779dd8c 100644
--- a/paludis/repositories/e/qa/fetches_key.cc
+++ b/paludis/repositories/e/qa/fetches_key.cc
@@ -79,14 +79,14 @@ namespace
{
QAReporter & reporter;
bool fetch_restrict;
- tr1::shared_ptr<const PackageID> id;
- tr1::shared_ptr<const MetadataKey> key;
+ std::tr1::shared_ptr<const PackageID> id;
+ std::tr1::shared_ptr<const MetadataKey> key;
FSEntry entry;
std::string name;
Checker(QAReporter & rr, bool f,
- const tr1::shared_ptr<const PackageID> & i,
- const tr1::shared_ptr<const MetadataKey> & k,
+ const std::tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const MetadataKey> & k,
const FSEntry & fs, const std::string & n) :
reporter(rr),
fetch_restrict(f),
@@ -187,7 +187,7 @@ bool
paludis::erepository::fetches_key_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & name)
{
Context context("When performing check '" + name + "' using fetches_key_check on ID '" + stringify(*id) + "':");
diff --git a/paludis/repositories/e/qa/fetches_key.hh b/paludis/repositories/e/qa/fetches_key.hh
index aa3c83a3e..f98514028 100644
--- a/paludis/repositories/e/qa/fetches_key.hh
+++ b/paludis/repositories/e/qa/fetches_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -31,7 +31,7 @@ namespace paludis
bool fetches_key_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &);
}
}
diff --git a/paludis/repositories/e/qa/function_keyword.cc b/paludis/repositories/e/qa/function_keyword.cc
index d3cee3123..4e2e6ec98 100644
--- a/paludis/repositories/e/qa/function_keyword.cc
+++ b/paludis/repositories/e/qa/function_keyword.cc
@@ -29,7 +29,7 @@ using namespace paludis;
namespace
{
QAMessage
- with_id(QAMessage m, const tr1::shared_ptr<const PackageID> & id)
+ with_id(QAMessage m, const std::tr1::shared_ptr<const PackageID> & id)
{
return id ? m.with_associated_id(id) : m;
}
@@ -39,7 +39,7 @@ bool
paludis::erepository::function_keyword_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & content,
const std::string & name)
{
diff --git a/paludis/repositories/e/qa/function_keyword.hh b/paludis/repositories/e/qa/function_keyword.hh
index df51e8c54..f4cc52b4f 100644
--- a/paludis/repositories/e/qa/function_keyword.hh
+++ b/paludis/repositories/e/qa/function_keyword.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -34,7 +34,7 @@ namespace paludis
bool function_keyword_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &,
const std::string &) PALUDIS_VISIBLE;
}
diff --git a/paludis/repositories/e/qa/function_keyword_TEST.cc b/paludis/repositories/e/qa/function_keyword_TEST.cc
index 9f7f397ac..0660d558c 100644
--- a/paludis/repositories/e/qa/function_keyword_TEST.cc
+++ b/paludis/repositories/e/qa/function_keyword_TEST.cc
@@ -63,9 +63,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("cat/other");
TestReporter r1;
diff --git a/paludis/repositories/e/qa/header.cc b/paludis/repositories/e/qa/header.cc
index 70fdc3d74..a37710fcc 100644
--- a/paludis/repositories/e/qa/header.cc
+++ b/paludis/repositories/e/qa/header.cc
@@ -30,7 +30,7 @@ using namespace paludis;
namespace
{
QAMessage
- with_id(QAMessage m, const tr1::shared_ptr<const PackageID> & id)
+ with_id(QAMessage m, const std::tr1::shared_ptr<const PackageID> & id)
{
return id ? m.with_associated_id(id) : m;
}
@@ -40,7 +40,7 @@ bool
paludis::erepository::header_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & content,
const std::string & name)
{
diff --git a/paludis/repositories/e/qa/header.hh b/paludis/repositories/e/qa/header.hh
index c530a9a93..8d33b9deb 100644
--- a/paludis/repositories/e/qa/header.hh
+++ b/paludis/repositories/e/qa/header.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -34,7 +34,7 @@ namespace paludis
bool header_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &,
const std::string &) PALUDIS_VISIBLE;
}
diff --git a/paludis/repositories/e/qa/homepage_key.cc b/paludis/repositories/e/qa/homepage_key.cc
index a1753d3cc..018a932f3 100644
--- a/paludis/repositories/e/qa/homepage_key.cc
+++ b/paludis/repositories/e/qa/homepage_key.cc
@@ -41,18 +41,18 @@ namespace
using ConstVisitor<SimpleURISpecTree>::VisitConstSequence<HomepageChecker, ConditionalDepSpec>::visit_sequence;
using ConstVisitor<SimpleURISpecTree>::VisitConstSequence<HomepageChecker, AllDepSpec>::visit_sequence;
- const tr1::shared_ptr<const MetadataKey> & key;
+ const std::tr1::shared_ptr<const MetadataKey> & key;
const FSEntry entry;
QAReporter & reporter;
- const tr1::shared_ptr<const PackageID> id;
+ const std::tr1::shared_ptr<const PackageID> id;
const std::string name;
bool found_one;
HomepageChecker(
- const tr1::shared_ptr<const MetadataKey> & k,
+ const std::tr1::shared_ptr<const MetadataKey> & k,
const FSEntry & f,
QAReporter & r,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const PackageID> & i,
const std::string & n) :
key(k),
entry(f),
@@ -90,7 +90,7 @@ bool
paludis::erepository::homepage_key_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & name)
{
Context context("When performing check '" + name + "' using homepage_key_check on ID '" + stringify(*id) + "':");
diff --git a/paludis/repositories/e/qa/homepage_key.hh b/paludis/repositories/e/qa/homepage_key.hh
index 7804e9655..92c6f02a4 100644
--- a/paludis/repositories/e/qa/homepage_key.hh
+++ b/paludis/repositories/e/qa/homepage_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -31,7 +31,7 @@ namespace paludis
bool homepage_key_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &) PALUDIS_VISIBLE;
}
}
diff --git a/paludis/repositories/e/qa/homepage_key_TEST.cc b/paludis/repositories/e/qa/homepage_key_TEST.cc
index 55b22a450..9fd186553 100644
--- a/paludis/repositories/e/qa/homepage_key_TEST.cc
+++ b/paludis/repositories/e/qa/homepage_key_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
* Copyright (c) 2008 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -65,9 +65,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->homepage_key()->set_from_string("http://paludis.pioto.org/");
TestReporter r;
@@ -83,9 +83,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->homepage_key()->set_from_string("ptth://paludis.pioto.org/");
TestReporter r;
@@ -102,9 +102,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->homepage_key()->set_from_string("( )");
TestReporter r;
diff --git a/paludis/repositories/e/qa/inherited_key.cc b/paludis/repositories/e/qa/inherited_key.cc
index 1f0657b6d..83a529a84 100644
--- a/paludis/repositories/e/qa/inherited_key.cc
+++ b/paludis/repositories/e/qa/inherited_key.cc
@@ -71,7 +71,7 @@ bool
paludis::erepository::inherited_key_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & name)
{
Context context("When performing check '" + name + "' using inherited_key_check on ID '" + stringify(*id) + "':");
diff --git a/paludis/repositories/e/qa/inherited_key.hh b/paludis/repositories/e/qa/inherited_key.hh
index 14b135b45..cffceaf76 100644
--- a/paludis/repositories/e/qa/inherited_key.hh
+++ b/paludis/repositories/e/qa/inherited_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -31,7 +31,7 @@ namespace paludis
bool inherited_key_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &);
}
}
diff --git a/paludis/repositories/e/qa/iuse_key.cc b/paludis/repositories/e/qa/iuse_key.cc
index ca15537c1..4074bb8d8 100644
--- a/paludis/repositories/e/qa/iuse_key.cc
+++ b/paludis/repositories/e/qa/iuse_key.cc
@@ -71,8 +71,8 @@ bool
paludis::erepository::iuse_key_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const Repository> & repo,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const Repository> & repo,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & name)
{
Context context("When performing check '" + name + "' using iuse_key_check on ID '" + stringify(*id) + "':");
diff --git a/paludis/repositories/e/qa/iuse_key.hh b/paludis/repositories/e/qa/iuse_key.hh
index 82bc652c1..61381fa5e 100644
--- a/paludis/repositories/e/qa/iuse_key.hh
+++ b/paludis/repositories/e/qa/iuse_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -34,8 +34,8 @@ namespace paludis
iuse_key_check(
const FSEntry &,
QAReporter & reporter,
- const tr1::shared_ptr<const Repository> &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const Repository> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &);
}
}
diff --git a/paludis/repositories/e/qa/keywords_key.cc b/paludis/repositories/e/qa/keywords_key.cc
index cb4afce71..5fac5b986 100644
--- a/paludis/repositories/e/qa/keywords_key.cc
+++ b/paludis/repositories/e/qa/keywords_key.cc
@@ -36,7 +36,7 @@ bool
paludis::erepository::keywords_key_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & name)
{
Context context("When performing check '" + name + "' using keywords_key_check on ID '" + stringify(*id) + "':");
diff --git a/paludis/repositories/e/qa/keywords_key.hh b/paludis/repositories/e/qa/keywords_key.hh
index 610d39b3d..b90c57c78 100644
--- a/paludis/repositories/e/qa/keywords_key.hh
+++ b/paludis/repositories/e/qa/keywords_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -33,7 +33,7 @@ namespace paludis
keywords_key_check(
const FSEntry &,
QAReporter & reporter,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &);
}
}
diff --git a/paludis/repositories/e/qa/kv_variables.cc b/paludis/repositories/e/qa/kv_variables.cc
index fb2b29834..8860cdb93 100644
--- a/paludis/repositories/e/qa/kv_variables.cc
+++ b/paludis/repositories/e/qa/kv_variables.cc
@@ -31,7 +31,7 @@ bool
paludis::erepository::kv_variables_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & content,
const std::string & name)
{
diff --git a/paludis/repositories/e/qa/kv_variables.hh b/paludis/repositories/e/qa/kv_variables.hh
index b053bd3e5..36f8182c5 100644
--- a/paludis/repositories/e/qa/kv_variables.hh
+++ b/paludis/repositories/e/qa/kv_variables.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -34,7 +34,7 @@ namespace paludis
bool kv_variables_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &,
const std::string &) PALUDIS_VISIBLE;
}
diff --git a/paludis/repositories/e/qa/kv_variables_TEST.cc b/paludis/repositories/e/qa/kv_variables_TEST.cc
index 4b32be74b..ac818cb4a 100644
--- a/paludis/repositories/e/qa/kv_variables_TEST.cc
+++ b/paludis/repositories/e/qa/kv_variables_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -66,9 +66,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("cat/other");
TestReporter r;
@@ -84,9 +84,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::tr1::shared_ptr<FakePackageID> id(repo->add_version("cat", "pkg", "1"));
id->build_dependencies_key()->set_from_string("cat/other");
TestReporter r;
diff --git a/paludis/repositories/e/qa/license_key.cc b/paludis/repositories/e/qa/license_key.cc
index b72833be4..30f9b02c5 100644
--- a/paludis/repositories/e/qa/license_key.cc
+++ b/paludis/repositories/e/qa/license_key.cc
@@ -43,12 +43,12 @@ namespace
{
const FSEntry & entry;
QAReporter & reporter;
- tr1::shared_ptr<const ERepositoryID> id;
- tr1::shared_ptr<const FSEntrySequence> dirs;
+ std::tr1::shared_ptr<const ERepositoryID> id;
+ std::tr1::shared_ptr<const FSEntrySequence> dirs;
std::string name;
- Checker(const FSEntry & e, QAReporter & r, const tr1::shared_ptr<const ERepositoryID> & p,
- const tr1::shared_ptr<const FSEntrySequence> d, const std::string & n) :
+ Checker(const FSEntry & e, QAReporter & r, const std::tr1::shared_ptr<const ERepositoryID> & p,
+ const std::tr1::shared_ptr<const FSEntrySequence> d, const std::string & n) :
entry(e),
reporter(r),
id(p),
@@ -80,8 +80,8 @@ bool
paludis::erepository::license_key_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const ERepository> & repo,
- const tr1::shared_ptr<const ERepositoryID> & id,
+ const std::tr1::shared_ptr<const ERepository> & repo,
+ const std::tr1::shared_ptr<const ERepositoryID> & id,
const std::string & name)
{
Context context("When performing check '" + name + "' using license_key_check on ID '" + stringify(*id) + "':");
diff --git a/paludis/repositories/e/qa/license_key.hh b/paludis/repositories/e/qa/license_key.hh
index a405bc288..e783796a5 100644
--- a/paludis/repositories/e/qa/license_key.hh
+++ b/paludis/repositories/e/qa/license_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -34,8 +34,8 @@ namespace paludis
license_key_check(
const FSEntry &,
QAReporter & reporter,
- const tr1::shared_ptr<const ERepository> &,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &);
}
}
diff --git a/paludis/repositories/e/qa/manifest.cc b/paludis/repositories/e/qa/manifest.cc
index 96e46bbf6..2bf7be3a8 100644
--- a/paludis/repositories/e/qa/manifest.cc
+++ b/paludis/repositories/e/qa/manifest.cc
@@ -55,14 +55,14 @@ namespace
ConstVisitor<FetchableURISpecTree>::VisitConstSequence<DistfilesCollector, AllDepSpec>,
ConstVisitor<FetchableURISpecTree>::VisitConstSequence<DistfilesCollector, ConditionalDepSpec>
{
- tr1::shared_ptr<const PackageID> id;
- std::map<std::string, tr1::shared_ptr<PackageIDSet> > & distfiles;
+ std::tr1::shared_ptr<const PackageID> id;
+ std::map<std::string, std::tr1::shared_ptr<PackageIDSet> > & distfiles;
using ConstVisitor<FetchableURISpecTree>::VisitConstSequence<DistfilesCollector, AllDepSpec>::visit_sequence;
using ConstVisitor<FetchableURISpecTree>::VisitConstSequence<DistfilesCollector, ConditionalDepSpec>::visit_sequence;
- DistfilesCollector(const tr1::shared_ptr<const PackageID> & i,
- std::map<std::string, tr1::shared_ptr<PackageIDSet> > & d) :
+ DistfilesCollector(const std::tr1::shared_ptr<const PackageID> & i,
+ std::map<std::string, std::tr1::shared_ptr<PackageIDSet> > & d) :
id(i),
distfiles(d)
{
@@ -74,11 +74,11 @@ namespace
void visit_leaf(const FetchableURIDepSpec & u)
{
- std::map<std::string, tr1::shared_ptr<PackageIDSet> >::iterator it(
+ std::map<std::string, std::tr1::shared_ptr<PackageIDSet> >::iterator it(
distfiles.find(u.filename()));
if (distfiles.end() == it)
{
- tr1::shared_ptr<PackageIDSet> set(new PackageIDSet);
+ std::tr1::shared_ptr<PackageIDSet> set(new PackageIDSet);
it = distfiles.insert(std::make_pair(u.filename(), set)).first;
}
it->second->insert(id);
@@ -92,16 +92,16 @@ namespace
std::string name;
FSEntry manifest;
- tr1::shared_ptr<Map<FSEntry, std::string> > files;
- tr1::shared_ptr<const PackageIDSequence> packages;
+ std::tr1::shared_ptr<Map<FSEntry, std::string> > files;
+ std::tr1::shared_ptr<const PackageIDSequence> packages;
std::set<FSEntry> accounted_files;
- std::map<std::string, tr1::shared_ptr<PackageIDSet> > distfiles;
+ std::map<std::string, std::tr1::shared_ptr<PackageIDSet> > distfiles;
std::set<std::string> accounted_distfiles;
Manifest2Checker(QAReporter & r, const FSEntry & d, const std::string & n,
- const FSEntry & m, const tr1::shared_ptr<Map<FSEntry, std::string> > & f,
- const tr1::shared_ptr<const PackageIDSequence> & p) :
+ const FSEntry & m, const std::tr1::shared_ptr<Map<FSEntry, std::string> > & f,
+ const std::tr1::shared_ptr<const PackageIDSequence> & p) :
reporter(r),
dir(d),
name(n),
@@ -203,7 +203,7 @@ namespace
for (std::set<std::string>::const_iterator dist_it(stray_distfiles.begin()),
dist_it_end(stray_distfiles.end()); dist_it_end != dist_it; ++dist_it)
{
- tr1::shared_ptr<const PackageIDSet> set(distfiles.find(*dist_it)->second);
+ std::tr1::shared_ptr<const PackageIDSet> set(distfiles.find(*dist_it)->second);
for (PackageIDSet::ConstIterator pkg_it(set->begin()),
pkg_it_end(set->end()); pkg_it_end != pkg_it; ++pkg_it)
reporter.message(QAMessage((*pkg_it)->fs_location_key()->value(), qaml_normal, name, "DIST file '" + *dist_it + "' is not listed in the Manifest")
@@ -218,12 +218,12 @@ bool
paludis::erepository::manifest_check(
QAReporter & reporter,
const FSEntry & dir,
- const tr1::shared_ptr<const ERepository> & repo,
+ const std::tr1::shared_ptr<const ERepository> & repo,
const QualifiedPackageName & qpn,
const std::string & name
)
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
Context context("When performing check '" + name + "' using manifest_check on directory '" + stringify(dir) + "':");
Log::get_instance()->message("e.qa.manifest_check", ll_debug, lc_context) << "manifest_check '"
@@ -239,7 +239,7 @@ paludis::erepository::manifest_check(
return true;
}
- tr1::shared_ptr<const PackageIDSequence> ids(repo->package_ids(qpn));
+ std::tr1::shared_ptr<const PackageIDSequence> ids(repo->package_ids(qpn));
Manifest2Checker checker(reporter, dir, name, manifest, repo->layout()->manifest_files(qpn), ids);
for (PackageIDSequence::ConstIterator it(ids->begin()),
it_end(ids->end()); it_end != it; ++it)
@@ -252,7 +252,7 @@ paludis::erepository::manifest_check(
}
Manifest2Reader reader(manifest);
- std::for_each(reader.begin(), reader.end(), tr1::bind(&Manifest2Checker::check_file, tr1::ref(checker), _1));
+ std::for_each(reader.begin(), reader.end(), std::tr1::bind(&Manifest2Checker::check_file, std::tr1::ref(checker), _1));
checker.check_unmanifested();
bool is_signed(false);
diff --git a/paludis/repositories/e/qa/manifest.hh b/paludis/repositories/e/qa/manifest.hh
index f71d6232b..d4a6d3e6b 100644
--- a/paludis/repositories/e/qa/manifest.hh
+++ b/paludis/repositories/e/qa/manifest.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -29,7 +29,7 @@ namespace paludis
bool manifest_check(
QAReporter &,
const FSEntry & dir,
- const tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepository> &,
const QualifiedPackageName &,
const std::string & s
) PALUDIS_VISIBLE;
diff --git a/paludis/repositories/e/qa/manifest_TEST.cc b/paludis/repositories/e/qa/manifest_TEST.cc
index 7252b54c4..e5b751136 100644
--- a/paludis/repositories/e/qa/manifest_TEST.cc
+++ b/paludis/repositories/e/qa/manifest_TEST.cc
@@ -74,12 +74,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "manifest_TEST_dir/repo1");
keys->insert("profiles", stringify(FSEntry::cwd() / "manifest_TEST_dir/repo1/profiles/test"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
QualifiedPackageName qpn("cat/not-signed");
@@ -99,12 +99,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "manifest_TEST_dir/repo1");
keys->insert("profiles", stringify(FSEntry::cwd() / "manifest_TEST_dir/repo1/profiles/test"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
QualifiedPackageName qpn("cat/good");
@@ -123,12 +123,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "manifest_TEST_dir/repo1");
keys->insert("profiles", stringify(FSEntry::cwd() / "manifest_TEST_dir/repo1/profiles/test"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
QualifiedPackageName qpn("cat/bad-type");
@@ -147,12 +147,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "manifest_TEST_dir/repo1");
keys->insert("profiles", stringify(FSEntry::cwd() / "manifest_TEST_dir/repo1/profiles/test"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
QualifiedPackageName qpn("cat/bad-size");
@@ -171,12 +171,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "manifest_TEST_dir/repo1");
keys->insert("profiles", stringify(FSEntry::cwd() / "manifest_TEST_dir/repo1/profiles/test"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
QualifiedPackageName qpn("cat/bad-hash");
@@ -195,12 +195,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "manifest_TEST_dir/repo1");
keys->insert("profiles", stringify(FSEntry::cwd() / "manifest_TEST_dir/repo1/profiles/test"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
QualifiedPackageName qpn("cat/missing");
@@ -219,12 +219,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "manifest_TEST_dir/repo1");
keys->insert("profiles", stringify(FSEntry::cwd() / "manifest_TEST_dir/repo1/profiles/test"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
QualifiedPackageName qpn("cat/stray");
@@ -243,12 +243,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "manifest_TEST_dir/repo1");
keys->insert("profiles", stringify(FSEntry::cwd() / "manifest_TEST_dir/repo1/profiles/test"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
QualifiedPackageName qpn("cat/unused-distfile");
@@ -267,12 +267,12 @@ namespace test_cases
void run()
{
TestEnvironment env;
- tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "manifest_TEST_dir/repo1");
keys->insert("profiles", stringify(FSEntry::cwd() / "manifest_TEST_dir/repo1/profiles/test"));
- tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
+ std::tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
QualifiedPackageName qpn("cat/undigested-distfile");
diff --git a/paludis/repositories/e/qa/metadata_keys.cc b/paludis/repositories/e/qa/metadata_keys.cc
index 86072ad1d..0fba8ee71 100644
--- a/paludis/repositories/e/qa/metadata_keys.cc
+++ b/paludis/repositories/e/qa/metadata_keys.cc
@@ -51,9 +51,9 @@ namespace
bool PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
- void visit(const MetadataValueKey<tr1::shared_ptr<const PackageID> > & k)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & k)
{
- const tr1::shared_ptr<const PackageID> & PALUDIS_ATTRIBUTE((unused)) p(k.value());
+ const std::tr1::shared_ptr<const PackageID> & PALUDIS_ATTRIBUTE((unused)) p(k.value());
}
void visit(const MetadataTimeKey & k)
@@ -61,9 +61,9 @@ namespace
time_t PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
- void visit(const MetadataValueKey<tr1::shared_ptr<const Contents> > & k)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > & k)
{
- const tr1::shared_ptr<const Contents> & PALUDIS_ATTRIBUTE((unused)) c(k.value());
+ const std::tr1::shared_ptr<const Contents> & PALUDIS_ATTRIBUTE((unused)) c(k.value());
}
void visit(const MetadataValueKey<FSEntry>& k)
@@ -71,69 +71,69 @@ namespace
const FSEntry & PALUDIS_ATTRIBUTE((unused)) c(k.value());
}
- void visit(const MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > & k)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > & k)
{
- const tr1::shared_ptr<const RepositoryMaskInfo> & PALUDIS_ATTRIBUTE((unused)) i(k.value());
+ const std::tr1::shared_ptr<const RepositoryMaskInfo> & PALUDIS_ATTRIBUTE((unused)) i(k.value());
}
void visit(const MetadataSpecTreeKey<RestrictSpecTree> & k)
{
- const tr1::shared_ptr<RestrictSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
+ const std::tr1::shared_ptr<RestrictSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
void visit(const MetadataSpecTreeKey<ProvideSpecTree> & k)
{
- const tr1::shared_ptr<ProvideSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
+ const std::tr1::shared_ptr<ProvideSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
void visit(const MetadataSpecTreeKey<FetchableURISpecTree> & k)
{
- const tr1::shared_ptr<FetchableURISpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
+ const std::tr1::shared_ptr<FetchableURISpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
void visit(const MetadataSpecTreeKey<SimpleURISpecTree> & k)
{
- const tr1::shared_ptr<SimpleURISpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
+ const std::tr1::shared_ptr<SimpleURISpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
void visit(const MetadataSpecTreeKey<LicenseSpecTree> & k)
{
- const tr1::shared_ptr<LicenseSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
+ const std::tr1::shared_ptr<LicenseSpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
void visit(const MetadataSpecTreeKey<DependencySpecTree> & k)
{
- const tr1::shared_ptr<DependencySpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
+ const std::tr1::shared_ptr<DependencySpecTree::ConstItem> & PALUDIS_ATTRIBUTE((unused)) t(k.value());
}
void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
- const tr1::shared_ptr<const PackageIDSequence> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
+ const std::tr1::shared_ptr<const PackageIDSequence> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
- const tr1::shared_ptr<const Set<std::string> > & PALUDIS_ATTRIBUTE((unused)) s(k.value());
+ const std::tr1::shared_ptr<const Set<std::string> > & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
void visit(const MetadataCollectionKey<FSEntrySequence> & k)
{
- const tr1::shared_ptr<const FSEntrySequence> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
+ const std::tr1::shared_ptr<const FSEntrySequence> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
- const tr1::shared_ptr<const KeywordNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
+ const std::tr1::shared_ptr<const KeywordNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
void visit(const MetadataCollectionKey<IUseFlagSet> & k)
{
- const tr1::shared_ptr<const IUseFlagSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
+ const std::tr1::shared_ptr<const IUseFlagSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
void visit(const MetadataCollectionKey<UseFlagNameSet> & k)
{
- const tr1::shared_ptr<const UseFlagNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
+ const std::tr1::shared_ptr<const UseFlagNameSet> & PALUDIS_ATTRIBUTE((unused)) s(k.value());
}
void visit(const MetadataSectionKey & k)
@@ -148,7 +148,7 @@ bool
paludis::erepository::metadata_keys_check(
const FSEntry & entry,
QAReporter & reporter,
- const tr1::shared_ptr<const PackageID> & id,
+ const std::tr1::shared_ptr<const PackageID> & id,
const std::string & name)
{
Context context("When performing check '" + name + "' on ID '" + stringify(*id) + "':");
diff --git a/paludis/repositories/e/qa/metadata_keys.hh b/paludis/repositories/e/qa/metadata_keys.hh
index 1291dd3c0..3e5c3127f 100644
--- a/paludis/repositories/e/qa/metadata_keys.hh
+++ b/paludis/repositories/e/qa/metadata_keys.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
* Copyright (c) 2008 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -33,7 +33,7 @@ namespace paludis
bool metadata_keys_check(
const FSEntry &,
QAReporter &,
- const tr1::shared_ptr<const PackageID> &,
+ const std::tr1::shared_ptr<const PackageID> &,
const std::string &) PALUDIS_VISIBLE;
}
}
diff --git a/paludis/repositories/e/qa/qa.cc b/paludis/repositories/e/qa/qa.cc
index 76815bebe..03633b698 100644
--- a/paludis/repositories/e/qa/qa.cc
+++ b/paludis/repositories/e/qa/qa.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -36,7 +36,7 @@ extern "C"
void PALUDIS_VISIBLE register_repositories(paludis::RepositoryMaker * maker);
void PALUDIS_VISIBLE check_qa(
const Environment * const,
- const tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepository> &,
const QACheckProperties &,
const QACheckProperties &,
const QAMessageLevel,
@@ -50,7 +50,7 @@ void register_repositories(paludis::RepositoryMaker *)
void check_qa(
const Environment * const env,
- const tr1::shared_ptr<const ERepository> & repo,
+ const std::tr1::shared_ptr<const ERepository> & repo,
const QACheckProperties & ignore_if,
const QACheckProperties & ignore_unless,
const QAMessageLevel minimum_level,
diff --git a/paludis/repositories/e/qa/qa_checks.cc b/paludis/repositories/e/qa/qa_checks.cc
index 6cd561f29..97e2d4a71 100644
--- a/paludis/repositories/e/qa/qa_checks.cc
+++ b/paludis/repositories/e/qa/qa_checks.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -62,12 +62,12 @@ namespace paludis
template <>
struct Implementation<QAChecks>
{
- const tr1::shared_ptr<QAChecksGroup<TreeCheckFunction> > tree_checks_group;
- const tr1::shared_ptr<QAChecksGroup<EclassFileContentsCheckFunction> > eclass_file_contents_checks_group;
- const tr1::shared_ptr<QAChecksGroup<CategoryDirCheckFunction> > category_dir_checks_group;
- const tr1::shared_ptr<QAChecksGroup<PackageDirCheckFunction> > package_dir_checks_group;
- const tr1::shared_ptr<QAChecksGroup<PackageIDCheckFunction> > package_id_checks_group;
- const tr1::shared_ptr<QAChecksGroup<PackageIDFileContentsCheckFunction> > package_id_file_contents_checks_group;
+ const std::tr1::shared_ptr<QAChecksGroup<TreeCheckFunction> > tree_checks_group;
+ const std::tr1::shared_ptr<QAChecksGroup<EclassFileContentsCheckFunction> > eclass_file_contents_checks_group;
+ const std::tr1::shared_ptr<QAChecksGroup<CategoryDirCheckFunction> > category_dir_checks_group;
+ const std::tr1::shared_ptr<QAChecksGroup<PackageDirCheckFunction> > package_dir_checks_group;
+ const std::tr1::shared_ptr<QAChecksGroup<PackageIDCheckFunction> > package_id_checks_group;
+ const std::tr1::shared_ptr<QAChecksGroup<PackageIDFileContentsCheckFunction> > package_id_file_contents_checks_group;
Implementation() :
tree_checks_group(new QAChecksGroup<TreeCheckFunction>),
@@ -84,167 +84,167 @@ namespace paludis
QAChecks::QAChecks() :
PrivateImplementationPattern<QAChecks>(new Implementation<QAChecks>())
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
_imp->tree_checks_group->add_check("stray_tree_files",
- tr1::bind(stray_files_check, _2, _4, _1, is_stray_at_tree_dir, "stray_tree_files"));
+ std::tr1::bind(stray_files_check, _2, _4, _1, is_stray_at_tree_dir, "stray_tree_files"));
_imp->tree_checks_group->add_check("repo_name",
- tr1::bind(repo_name_check, _2, _1, "repo_name"));
+ std::tr1::bind(repo_name_check, _2, _1, "repo_name"));
_imp->tree_checks_group->add_check("categories",
- tr1::bind(categories_check, _2, _4, "categories"));
+ std::tr1::bind(categories_check, _2, _4, "categories"));
_imp->eclass_file_contents_checks_group->add_check("variable_assigns",
- tr1::bind(variable_assigns_check, _1, _2, tr1::shared_ptr<const ERepositoryID>(), _5, "variable_assigns"));
+ std::tr1::bind(variable_assigns_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "variable_assigns"));
_imp->eclass_file_contents_checks_group->add_check("deprecated_functions",
- tr1::bind(deprecated_functions_check, _1, _2, tr1::shared_ptr<const ERepositoryID>(), _5, "deprecated_functions"));
+ std::tr1::bind(deprecated_functions_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "deprecated_functions"));
_imp->eclass_file_contents_checks_group->add_check("subshell_die",
- tr1::bind(subshell_die_check, _1, _2, tr1::shared_ptr<const ERepositoryID>(), _5, "subshell_die"));
+ std::tr1::bind(subshell_die_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "subshell_die"));
_imp->eclass_file_contents_checks_group->add_check("header",
- tr1::bind(header_check, _1, _2, tr1::shared_ptr<const ERepositoryID>(), _5, "header"));
+ std::tr1::bind(header_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "header"));
_imp->eclass_file_contents_checks_group->add_check("function_keyword",
- tr1::bind(function_keyword_check, _1, _2, tr1::shared_ptr<const ERepositoryID>(), _5, "function_keyword"));
+ std::tr1::bind(function_keyword_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "function_keyword"));
_imp->eclass_file_contents_checks_group->add_check("whitespace",
- tr1::bind(whitespace_check, _1, _2, tr1::shared_ptr<const ERepositoryID>(), _5, "whitespace"));
+ std::tr1::bind(whitespace_check, _1, _2, std::tr1::shared_ptr<const ERepositoryID>(), _5, "whitespace"));
_imp->category_dir_checks_group->add_check("stray_category_dir_files",
- tr1::bind(stray_files_check, _2, _4, _1, is_stray_at_category_dir, "stray_category_dir_files"));
+ std::tr1::bind(stray_files_check, _2, _4, _1, is_stray_at_category_dir, "stray_category_dir_files"));
_imp->package_dir_checks_group->add_check("manifest",
- tr1::bind(manifest_check, _2, _1, _4, _5, "manifest"));
+ std::tr1::bind(manifest_check, _2, _1, _4, _5, "manifest"));
_imp->package_dir_checks_group->add_check("ebuild_count",
- tr1::bind(ebuild_count_check, _2, _1, _4, _5, "ebuild_count"));
+ std::tr1::bind(ebuild_count_check, _2, _1, _4, _5, "ebuild_count"));
_imp->package_dir_checks_group->add_check("changelog",
- tr1::bind(changelog_check, _2, _1, _5, "changelog"));
+ std::tr1::bind(changelog_check, _2, _1, _5, "changelog"));
_imp->package_dir_checks_group->add_check("misc_files",
- tr1::bind(misc_files_check, _2, _1, "misc_files"));
+ std::tr1::bind(misc_files_check, _2, _1, "misc_files"));
_imp->package_dir_checks_group->add_check("files_dir_size",
- tr1::bind(files_dir_size_check, _2, _1, "files_dir_size"));
+ std::tr1::bind(files_dir_size_check, _2, _1, "files_dir_size"));
_imp->package_id_checks_group->add_check("eapi_supported",
- tr1::bind(eapi_supported_check, _1, _2, _5, "eapi_supported"));
+ std::tr1::bind(eapi_supported_check, _1, _2, _5, "eapi_supported"));
_imp->package_id_checks_group->add_check("metadata_keys",
- tr1::bind(metadata_keys_check, _1, _2, _5, "metadata_keys"));
+ std::tr1::bind(metadata_keys_check, _1, _2, _5, "metadata_keys"));
_imp->package_id_checks_group->add_prerequirement("metadata_keys", "eapi_supported");
_imp->package_id_checks_group->add_check("short_description_key",
- tr1::bind(short_description_key_check, _1, _2, _5, "short_description_key"));
+ std::tr1::bind(short_description_key_check, _1, _2, _5, "short_description_key"));
_imp->package_id_checks_group->add_prerequirement("short_description_key", "metadata_keys");
_imp->package_id_checks_group->add_check("homepage_key",
- tr1::bind(homepage_key_check, _1, _2, _5, "homepage_key"));
+ std::tr1::bind(homepage_key_check, _1, _2, _5, "homepage_key"));
_imp->package_id_checks_group->add_prerequirement("homepage_key", "metadata_keys");
_imp->package_id_checks_group->add_check("iuse_key",
- tr1::bind(iuse_key_check, _1, _2, _4, _5, "iuse_key"));
+ std::tr1::bind(iuse_key_check, _1, _2, _4, _5, "iuse_key"));
_imp->package_id_checks_group->add_prerequirement("iuse_key", "metadata_keys");
_imp->package_id_checks_group->add_check("keywords_key",
- tr1::bind(keywords_key_check, _1, _2, _5, "keywords_key"));
+ std::tr1::bind(keywords_key_check, _1, _2, _5, "keywords_key"));
_imp->package_id_checks_group->add_prerequirement("keywords_key", "metadata_keys");
_imp->package_id_checks_group->add_check("license_key",
- tr1::bind(license_key_check, _1, _2, _4, _5, "license_key"));
+ std::tr1::bind(license_key_check, _1, _2, _4, _5, "license_key"));
_imp->package_id_checks_group->add_prerequirement("license_key", "metadata_keys");
_imp->package_id_checks_group->add_check("spec_keys",
- tr1::bind(spec_keys_check, _1, _2, _5, "spec_keys"));
+ std::tr1::bind(spec_keys_check, _1, _2, _5, "spec_keys"));
_imp->package_id_checks_group->add_prerequirement("spec_keys", "metadata_keys");
_imp->package_id_checks_group->add_check("extractors",
- tr1::bind(extractors_check, _1, _2, _5, "extractors"));
+ std::tr1::bind(extractors_check, _1, _2, _5, "extractors"));
_imp->package_id_checks_group->add_prerequirement("extractors", "metadata_keys");
_imp->package_id_checks_group->add_check("fetches_key",
- tr1::bind(fetches_key_check, _1, _2, _5, "fetches_key"));
+ std::tr1::bind(fetches_key_check, _1, _2, _5, "fetches_key"));
_imp->package_id_checks_group->add_prerequirement("fetches_key", "metadata_keys");
_imp->package_id_checks_group->add_check("restrict_key",
- tr1::bind(restrict_key_check, _1, _2, _5, "restrict_key"));
+ std::tr1::bind(restrict_key_check, _1, _2, _5, "restrict_key"));
_imp->package_id_checks_group->add_prerequirement("restrict_key", "metadata_keys");
_imp->package_id_checks_group->add_check("inherited_key",
- tr1::bind(inherited_key_check, _1, _2, _5, "inherited_key"));
+ std::tr1::bind(inherited_key_check, _1, _2, _5, "inherited_key"));
_imp->package_id_checks_group->add_prerequirement("inherited_key", "metadata_keys");
_imp->package_id_checks_group->add_check("visibility",
- tr1::bind(visibility_check, _1, _2, _3, _4, _5, "visibility"));
+ std::tr1::bind(visibility_check, _1, _2, _3, _4, _5, "visibility"));
_imp->package_id_checks_group->add_prerequirement("visibility", "metadata_keys");
_imp->package_id_file_contents_checks_group->add_check("default_functions",
- tr1::bind(default_functions_check, _1, _2, _5, _6, "default_functions"));
+ std::tr1::bind(default_functions_check, _1, _2, _5, _6, "default_functions"));
_imp->package_id_file_contents_checks_group->add_check("variable_assigns",
- tr1::bind(variable_assigns_check, _1, _2, _5, _6, "variable_assigns"));
+ std::tr1::bind(variable_assigns_check, _1, _2, _5, _6, "variable_assigns"));
_imp->package_id_file_contents_checks_group->add_check("deprecated_functions",
- tr1::bind(deprecated_functions_check, _1, _2, _5, _6, "deprecated_functions"));
+ std::tr1::bind(deprecated_functions_check, _1, _2, _5, _6, "deprecated_functions"));
_imp->package_id_file_contents_checks_group->add_check("kv_variables",
- tr1::bind(kv_variables_check, _1, _2, _5, _6, "kv_variables"));
+ std::tr1::bind(kv_variables_check, _1, _2, _5, _6, "kv_variables"));
_imp->package_id_file_contents_checks_group->add_check("root_variable",
- tr1::bind(root_variable_check, _1, _2, _5, _6, "root_variable"));
+ std::tr1::bind(root_variable_check, _1, _2, _5, _6, "root_variable"));
_imp->package_id_file_contents_checks_group->add_check("subshell_die",
- tr1::bind(subshell_die_check, _1, _2, _5, _6, "subshell_die"));
+ std::tr1::bind(subshell_die_check, _1, _2, _5, _6, "subshell_die"));
_imp->package_id_file_contents_checks_group->add_check("function_keyword",
- tr1::bind(function_keyword_check, _1, _2, _5, _6, "function_keyword"));
+ std::tr1::bind(function_keyword_check, _1, _2, _5, _6, "function_keyword"));
_imp->package_id_file_contents_checks_group->add_check("whitespace",
- tr1::bind(whitespace_check, _1, _2, _5, _6, "whitespace"));
+ std::tr1::bind(whitespace_check, _1, _2, _5, _6, "whitespace"));
_imp->package_id_file_contents_checks_group->add_check("header",
- tr1::bind(header_check, _1, _2, _5, _6, "header"));
+ std::tr1::bind(header_check, _1, _2, _5, _6, "header"));
}
QAChecks::~QAChecks()
{
}
-const tr1::shared_ptr<QAChecksGroup<TreeCheckFunction> >
+const std::tr1::shared_ptr<QAChecksGroup<TreeCheckFunction> >
QAChecks::tree_checks_group()
{
return _imp->tree_checks_group;
}
-const tr1::shared_ptr<QAChecksGroup<EclassFileContentsCheckFunction> >
+const std::tr1::shared_ptr<QAChecksGroup<EclassFileContentsCheckFunction> >
QAChecks::eclass_file_contents_checks_group()
{
return _imp->eclass_file_contents_checks_group;
}
-const tr1::shared_ptr<QAChecksGroup<CategoryDirCheckFunction> >
+const std::tr1::shared_ptr<QAChecksGroup<CategoryDirCheckFunction> >
QAChecks::category_dir_checks_group()
{
return _imp->category_dir_checks_group;
}
-const tr1::shared_ptr<QAChecksGroup<PackageDirCheckFunction> >
+const std::tr1::shared_ptr<QAChecksGroup<PackageDirCheckFunction> >
QAChecks::package_dir_checks_group()
{
return _imp->package_dir_checks_group;
}
-const tr1::shared_ptr<QAChecksGroup<PackageIDCheckFunction> >
+const std::tr1::shared_ptr<QAChecksGroup<PackageIDCheckFunction> >
QAChecks::package_id_checks_group()
{
return _imp->package_id_checks_group;
}
-const tr1::shared_ptr<QAChecksGroup<PackageIDFileContentsCheckFunction> >
+const std::tr1::shared_ptr<QAChecksGroup<PackageIDFileContentsCheckFunction> >
QAChecks::package_id_file_contents_checks_group()
{
return _imp->package_id_file_contents_checks_group;
diff --git a/paludis/repositories/e/qa/qa_checks.hh b/paludis/repositories/e/qa/qa_checks.hh
index b11b5a9e6..073c48725 100644
--- a/paludis/repositories/e/qa/qa_checks.hh
+++ b/paludis/repositories/e/qa/qa_checks.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -20,8 +20,6 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_QA_QA_CHECKS_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_QA_QA_CHECKS_HH 1
-#include <paludis/util/tr1_functional.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/instantiation_policy.hh>
@@ -35,55 +33,58 @@
#include <paludis/repositories/e/e_repository_id.hh>
#include <paludis/repositories/e/e_repository.hh>
+#include <tr1/functional>
+#include <tr1/memory>
+
namespace paludis
{
namespace erepository
{
- typedef tr1::function<bool (
+ typedef std::tr1::function<bool (
const FSEntry &,
QAReporter &,
const Environment * const,
- const tr1::shared_ptr<const ERepository> &
+ const std::tr1::shared_ptr<const ERepository> &
)> TreeCheckFunction;
- typedef tr1::function<bool (
+ typedef std::tr1::function<bool (
const FSEntry &,
QAReporter &,
const Environment * const,
- const tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepository> &,
const std::string &
)> EclassFileContentsCheckFunction;
- typedef tr1::function<bool (
+ typedef std::tr1::function<bool (
const FSEntry &,
QAReporter &,
const Environment * const,
- const tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepository> &,
const CategoryNamePart &
)> CategoryDirCheckFunction;
- typedef tr1::function<bool (
+ typedef std::tr1::function<bool (
const FSEntry &,
QAReporter &,
const Environment * const,
- const tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepository> &,
const QualifiedPackageName &
)> PackageDirCheckFunction;
- typedef tr1::function<bool (
+ typedef std::tr1::function<bool (
const FSEntry &,
QAReporter &,
const Environment * const,
- const tr1::shared_ptr<const ERepository> &,
- const tr1::shared_ptr<const ERepositoryID> &
+ const std::tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &
)> PackageIDCheckFunction;
- typedef tr1::function<bool (
+ typedef std::tr1::function<bool (
const FSEntry &,
QAReporter &,
const Environment * const,
- const tr1::shared_ptr<const ERepository> &,
- const tr1::shared_ptr<const ERepositoryID> &,
+ const std::tr1::shared_ptr<const ERepository> &,
+ const std::tr1::shared_ptr<const ERepositoryID> &,
const std::string &
)> PackageIDFileContentsCheckFunction;
@@ -98,22 +99,22 @@ namesp