aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 10:11:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:54:57 +0100
commit7a8a792ae878e2b432e0c67a813022117faa4e60 (patch)
treed9eac8e45ccc206bc6920d14e25f5613b54be02f /paludis/repositories
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.cc20
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.hh6
-rw-r--r--paludis/repositories/accounts/accounts_id.cc96
-rw-r--r--paludis/repositories/accounts/accounts_id.hh52
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc74
-rw-r--r--paludis/repositories/accounts/accounts_repository.hh44
-rw-r--r--paludis/repositories/accounts/accounts_repository_TEST.cc4
-rw-r--r--paludis/repositories/accounts/accounts_repository_store.cc48
-rw-r--r--paludis/repositories/accounts/accounts_repository_store.hh32
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.cc66
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.hh50
-rw-r--r--paludis/repositories/accounts/registration.cc6
-rw-r--r--paludis/repositories/cran/cran_dep_parser.cc6
-rw-r--r--paludis/repositories/cran/cran_dep_parser.hh2
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc67
-rw-r--r--paludis/repositories/cran/cran_installed_repository.hh28
-rw-r--r--paludis/repositories/cran/cran_installed_repository_TEST.cc8
-rw-r--r--paludis/repositories/cran/cran_package_id.cc120
-rw-r--r--paludis/repositories/cran/cran_package_id.hh52
-rw-r--r--paludis/repositories/cran/cran_repository.cc77
-rw-r--r--paludis/repositories/cran/cran_repository.hh32
-rw-r--r--paludis/repositories/cran/cran_repository_TEST.cc14
-rw-r--r--paludis/repositories/cran/keys.cc26
-rw-r--r--paludis/repositories/cran/keys.hh16
-rw-r--r--paludis/repositories/cran/package_dep_spec.cc44
-rw-r--r--paludis/repositories/cran/registration.cc6
-rw-r--r--paludis/repositories/e/aa_visitor_TEST.cc4
-rw-r--r--paludis/repositories/e/can_skip_phase.cc2
-rw-r--r--paludis/repositories/e/can_skip_phase.hh2
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.cc18
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.hh8
-rw-r--r--paludis/repositories/e/dep_parser.cc366
-rw-r--r--paludis/repositories/e/dep_parser.hh36
-rw-r--r--paludis/repositories/e/dep_parser_TEST.cc106
-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/depend_rdepend_TEST.cc38
-rw-r--r--paludis/repositories/e/dependencies_rewriter.cc12
-rw-r--r--paludis/repositories/e/e_choice_value.cc2
-rw-r--r--paludis/repositories/e/e_choice_value.hh6
-rw-r--r--paludis/repositories/e/e_choices_key.cc54
-rw-r--r--paludis/repositories/e/e_choices_key.hh10
-rw-r--r--paludis/repositories/e/e_installed_repository.cc28
-rw-r--r--paludis/repositories/e/e_installed_repository.hh12
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc206
-rw-r--r--paludis/repositories/e/e_installed_repository_id.hh86
-rw-r--r--paludis/repositories/e/e_key.cc168
-rw-r--r--paludis/repositories/e/e_key.hh70
-rw-r--r--paludis/repositories/e/e_mask.cc16
-rw-r--r--paludis/repositories/e/e_mask.hh8
-rw-r--r--paludis/repositories/e/e_repository.cc402
-rw-r--r--paludis/repositories/e/e_repository.hh64
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc220
-rw-r--r--paludis/repositories/e/e_repository_TEST_0.cc72
-rw-r--r--paludis/repositories/e/e_repository_TEST_1.cc26
-rw-r--r--paludis/repositories/e/e_repository_TEST_2.cc32
-rw-r--r--paludis/repositories/e/e_repository_TEST_3.cc18
-rw-r--r--paludis/repositories/e/e_repository_TEST_4.cc40
-rw-r--r--paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc22
-rw-r--r--paludis/repositories/e/e_repository_TEST_ever.cc26
-rw-r--r--paludis/repositories/e/e_repository_TEST_exheres_0.cc132
-rw-r--r--paludis/repositories/e/e_repository_TEST_exlibs.cc18
-rw-r--r--paludis/repositories/e/e_repository_TEST_pbin.cc30
-rw-r--r--paludis/repositories/e/e_repository_TEST_phases.cc26
-rw-r--r--paludis/repositories/e/e_repository_TEST_replacing.cc20
-rw-r--r--paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc20
-rw-r--r--paludis/repositories/e/e_repository_id.cc4
-rw-r--r--paludis/repositories/e/e_repository_id.hh36
-rw-r--r--paludis/repositories/e/e_repository_mask_file.cc10
-rw-r--r--paludis/repositories/e/e_repository_mask_file.hh4
-rw-r--r--paludis/repositories/e/e_repository_news.cc4
-rw-r--r--paludis/repositories/e/e_repository_params.cc4
-rw-r--r--paludis/repositories/e/e_repository_params.hh8
-rw-r--r--paludis/repositories/e/e_repository_sets.cc38
-rw-r--r--paludis/repositories/e/e_repository_sets.hh6
-rw-r--r--paludis/repositories/e/e_repository_sets_TEST.cc44
-rw-r--r--paludis/repositories/e/e_stripper.hh6
-rw-r--r--paludis/repositories/e/eapi-fwd.hh2
-rw-r--r--paludis/repositories/e/eapi.cc44
-rw-r--r--paludis/repositories/e/eapi.hh90
-rw-r--r--paludis/repositories/e/eapi_phase.cc2
-rw-r--r--paludis/repositories/e/ebuild.cc50
-rw-r--r--paludis/repositories/e/ebuild.hh64
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc17
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.hh6
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc350
-rw-r--r--paludis/repositories/e/ebuild_id.cc256
-rw-r--r--paludis/repositories/e/ebuild_id.hh116
-rw-r--r--paludis/repositories/e/eclass_mtimes.cc18
-rw-r--r--paludis/repositories/e/eclass_mtimes.hh4
-rw-r--r--paludis/repositories/e/exheres_layout.cc112
-rw-r--r--paludis/repositories/e/exheres_layout.hh38
-rw-r--r--paludis/repositories/e/exheres_profile.cc86
-rw-r--r--paludis/repositories/e/exheres_profile.hh38
-rw-r--r--paludis/repositories/e/exndbam_id.cc20
-rw-r--r--paludis/repositories/e/exndbam_id.hh4
-rw-r--r--paludis/repositories/e/exndbam_repository.cc91
-rw-r--r--paludis/repositories/e/exndbam_repository.hh34
-rw-r--r--paludis/repositories/e/exndbam_repository_TEST.cc42
-rw-r--r--paludis/repositories/e/extra_distribution_data.cc6
-rw-r--r--paludis/repositories/e/extra_distribution_data.hh14
-rw-r--r--paludis/repositories/e/fetch_visitor.cc28
-rw-r--r--paludis/repositories/e/fetch_visitor.hh10
-rw-r--r--paludis/repositories/e/fetch_visitor_TEST.cc10
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.cc30
-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.cc6
-rw-r--r--paludis/repositories/e/glsa.hh6
-rw-r--r--paludis/repositories/e/info_metadata_key.cc36
-rw-r--r--paludis/repositories/e/info_metadata_key.hh6
-rw-r--r--paludis/repositories/e/iuse.cc2
-rw-r--r--paludis/repositories/e/iuse.hh4
-rw-r--r--paludis/repositories/e/layout.cc14
-rw-r--r--paludis/repositories/e/layout.hh48
-rw-r--r--paludis/repositories/e/metadata_xml.cc8
-rw-r--r--paludis/repositories/e/metadata_xml.hh10
-rw-r--r--paludis/repositories/e/myoptions_requirements_verifier.cc22
-rw-r--r--paludis/repositories/e/myoptions_requirements_verifier.hh8
-rw-r--r--paludis/repositories/e/pipe_command_handler.cc42
-rw-r--r--paludis/repositories/e/pipe_command_handler.hh6
-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/profile.cc6
-rw-r--r--paludis/repositories/e/profile.hh40
-rw-r--r--paludis/repositories/e/profile_file.cc26
-rw-r--r--paludis/repositories/e/profile_file.hh6
-rw-r--r--paludis/repositories/e/registration.cc8
-rw-r--r--paludis/repositories/e/source_uri_finder.cc10
-rw-r--r--paludis/repositories/e/source_uri_finder.hh4
-rw-r--r--paludis/repositories/e/source_uri_finder_TEST.cc8
-rw-r--r--paludis/repositories/e/traditional_layout.cc111
-rw-r--r--paludis/repositories/e/traditional_layout.hh38
-rw-r--r--paludis/repositories/e/traditional_profile.cc116
-rw-r--r--paludis/repositories/e/traditional_profile.hh38
-rw-r--r--paludis/repositories/e/use_desc.cc12
-rw-r--r--paludis/repositories/e/use_desc.hh2
-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.cc6
-rw-r--r--paludis/repositories/e/vdb_merger.hh6
-rw-r--r--paludis/repositories/e/vdb_merger_TEST.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.cc175
-rw-r--r--paludis/repositories/e/vdb_repository.hh40
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc209
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc12
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh14
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc10
-rw-r--r--paludis/repositories/e/xml_things.cc46
-rw-r--r--paludis/repositories/e/xml_things.hh4
-rw-r--r--paludis/repositories/e/xml_things_TEST.cc4
-rw-r--r--paludis/repositories/e/xml_things_handle.hh4
-rw-r--r--paludis/repositories/fake/dep_parser.cc140
-rw-r--r--paludis/repositories/fake/dep_parser.hh22
-rw-r--r--paludis/repositories/fake/dep_parser_TEST.cc4
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc36
-rw-r--r--paludis/repositories/fake/fake_installed_repository.hh22
-rw-r--r--paludis/repositories/fake/fake_installed_repository_TEST.cc2
-rw-r--r--paludis/repositories/fake/fake_package_id.cc256
-rw-r--r--paludis/repositories/fake/fake_package_id.hh112
-rw-r--r--paludis/repositories/fake/fake_repository.cc22
-rw-r--r--paludis/repositories/fake/fake_repository.hh14
-rw-r--r--paludis/repositories/fake/fake_repository_TEST.cc2
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc32
-rw-r--r--paludis/repositories/fake/fake_repository_base.hh14
-rw-r--r--paludis/repositories/fake/registration.cc4
-rw-r--r--paludis/repositories/gems/extra_distribution_data.cc2
-rw-r--r--paludis/repositories/gems/gem_specification.cc112
-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.cc18
-rw-r--r--paludis/repositories/gems/gem_specifications.hh6
-rw-r--r--paludis/repositories/gems/gems_repository.cc68
-rw-r--r--paludis/repositories/gems/gems_repository.hh32
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc56
-rw-r--r--paludis/repositories/gems/installed_gems_repository.hh32
-rw-r--r--paludis/repositories/gems/registration.cc6
-rw-r--r--paludis/repositories/gems/yaml.cc16
-rw-r--r--paludis/repositories/repository/registration.cc4
-rw-r--r--paludis/repositories/repository/repository_id.cc88
-rw-r--r--paludis/repositories/repository/repository_id.hh46
-rw-r--r--paludis/repositories/repository/repository_repository.cc56
-rw-r--r--paludis/repositories/repository/repository_repository.hh34
-rw-r--r--paludis/repositories/repository/repository_repository_store.cc26
-rw-r--r--paludis/repositories/repository/repository_repository_store.hh10
-rw-r--r--paludis/repositories/unavailable/registration.cc4
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.cc92
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.hh56
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.cc54
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.hh34
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_TEST.cc12
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc10
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_dependencies_key.hh4
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_file-fwd.hh4
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_file.cc2
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.cc100
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.hh62
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_store.cc46
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_store.hh10
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc146
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh54
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc54
-rw-r--r--paludis/repositories/unpackaged/installed_repository.hh30
-rw-r--r--paludis/repositories/unpackaged/installed_repository_TEST.cc80
-rw-r--r--paludis/repositories/unpackaged/registration.cc6
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc108
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.hh50
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.cc20
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.hh10
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.cc60
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.hh30
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository_TEST.cc32
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.hh6
-rw-r--r--paludis/repositories/unwritten/registration.cc4
-rw-r--r--paludis/repositories/unwritten/unwritten_id.cc96
-rw-r--r--paludis/repositories/unwritten/unwritten_id.hh62
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.cc54
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.hh34
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_TEST.cc8
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_file.cc30
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_file.hh14
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_store.cc34
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_store.hh10
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc64
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh34
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc2
-rw-r--r--paludis/repositories/virtuals/package_id.cc124
-rw-r--r--paludis/repositories/virtuals/package_id.hh58
-rw-r--r--paludis/repositories/virtuals/registration.cc6
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc104
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh38
-rw-r--r--paludis/repositories/virtuals/virtuals_repository_TEST.cc26
233 files changed, 4875 insertions, 4886 deletions
diff --git a/paludis/repositories/accounts/accounts_dep_key.cc b/paludis/repositories/accounts/accounts_dep_key.cc
index eb137346f..fafcb0ca9 100644
--- a/paludis/repositories/accounts/accounts_dep_key.cc
+++ b/paludis/repositories/accounts/accounts_dep_key.cc
@@ -41,20 +41,20 @@ namespace paludis
struct Implementation<AccountsDepKey>
{
const Environment * const env;
- const std::tr1::shared_ptr<std::list<std::tr1::shared_ptr<PackageDepSpec> > > specs;
- const std::tr1::shared_ptr<DependencySpecTree> tree;
- const std::tr1::shared_ptr<DependenciesLabelSequence> initial_labels;
+ const std::shared_ptr<std::list<std::shared_ptr<PackageDepSpec> > > specs;
+ const std::shared_ptr<DependencySpecTree> tree;
+ const std::shared_ptr<DependenciesLabelSequence> initial_labels;
- Implementation(const Environment * const e, const std::tr1::shared_ptr<const Set<std::string> > & s) :
+ Implementation(const Environment * const e, const std::shared_ptr<const Set<std::string> > & s) :
env(e),
- specs(new std::list<std::tr1::shared_ptr<PackageDepSpec> >),
+ specs(new std::list<std::shared_ptr<PackageDepSpec> >),
tree(new DependencySpecTree(make_shared_ptr(new AllDepSpec))),
initial_labels(new DependenciesLabelSequence)
{
for (Set<std::string>::ConstIterator i(s->begin()), i_end(s->end()) ;
i != i_end ; ++i)
{
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ std::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
.package(CategoryNamePart("group") + PackageNamePart(*i))));
specs->push_back(spec);
tree->root()->append(spec);
@@ -67,7 +67,7 @@ namespace paludis
}
AccountsDepKey::AccountsDepKey(const Environment * const e,
- const std::tr1::shared_ptr<const Set<std::string> > & s) :
+ const std::shared_ptr<const Set<std::string> > & s) :
PrivateImplementationPattern<AccountsDepKey>(new Implementation<AccountsDepKey>(e, s))
{
}
@@ -94,13 +94,13 @@ AccountsDepKey::type() const
return mkt_dependencies;
}
-const std::tr1::shared_ptr<const DependencySpecTree>
+const std::shared_ptr<const DependencySpecTree>
AccountsDepKey::value() const
{
return _imp->tree;
}
-const std::tr1::shared_ptr<const DependenciesLabelSequence>
+const std::shared_ptr<const DependenciesLabelSequence>
AccountsDepKey::initial_labels() const
{
return _imp->initial_labels;
@@ -117,7 +117,7 @@ AccountsDepKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) c
{
std::stringstream s;
- for (std::list<std::tr1::shared_ptr<PackageDepSpec> >::const_iterator i(_imp->specs->begin()),
+ for (std::list<std::shared_ptr<PackageDepSpec> >::const_iterator i(_imp->specs->begin()),
i_end(_imp->specs->end()) ; i != i_end ; ++i)
{
if (! s.str().empty())
diff --git a/paludis/repositories/accounts/accounts_dep_key.hh b/paludis/repositories/accounts/accounts_dep_key.hh
index 520ad5625..839f37c60 100644
--- a/paludis/repositories/accounts/accounts_dep_key.hh
+++ b/paludis/repositories/accounts/accounts_dep_key.hh
@@ -33,21 +33,21 @@ namespace paludis
{
public:
AccountsDepKey(const Environment * const e,
- const std::tr1::shared_ptr<const Set<std::string> > &);
+ const std::shared_ptr<const Set<std::string> > &);
~AccountsDepKey();
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const DependencySpecTree> value() const
+ virtual const std::shared_ptr<const DependencySpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print_flat(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const DependenciesLabelSequence> initial_labels() const
+ virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index ead96d441..c84fac76f 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -52,11 +52,11 @@ namespace paludis
const QualifiedPackageName name;
const VersionSpec version;
- const std::tr1::shared_ptr<const Repository> repository;
+ const std::shared_ptr<const Repository> repository;
- const std::tr1::shared_ptr<const LiteralMetadataValueKey<FSEntry> > fs_location_key;
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key;
- const std::tr1::shared_ptr<const AccountsInstalledMask> mask;
+ const std::shared_ptr<const LiteralMetadataValueKey<FSEntry> > fs_location_key;
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key;
+ const std::shared_ptr<const AccountsInstalledMask> mask;
const bool is_user;
@@ -64,21 +64,21 @@ namespace paludis
mutable bool has_file_keys;
mutable bool has_metadata_keys;
- mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > username_key;
- mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > gecos_key;
- mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > preferred_uid_key;
- mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > primary_group_key;
- mutable std::tr1::shared_ptr<const LiteralMetadataStringSetKey> extra_groups_key;
- mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > home_key;
- mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > shell_key;
- mutable std::tr1::shared_ptr<const AccountsDepKey> dependencies_key;
+ mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > username_key;
+ mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > gecos_key;
+ mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > preferred_uid_key;
+ mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > primary_group_key;
+ mutable std::shared_ptr<const LiteralMetadataStringSetKey> extra_groups_key;
+ mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > home_key;
+ mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > shell_key;
+ mutable std::shared_ptr<const AccountsDepKey> dependencies_key;
- mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > groupname_key;
- mutable std::tr1::shared_ptr<const LiteralMetadataValueKey<std::string> > preferred_gid_key;
+ mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > groupname_key;
+ mutable std::shared_ptr<const LiteralMetadataValueKey<std::string> > preferred_gid_key;
Implementation(const Environment * const e,
- const QualifiedPackageName & q, const std::tr1::shared_ptr<const Repository> & r,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & f,
+ const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & f,
const FSEntry & l, const bool u, const bool m) :
env(e),
name(q),
@@ -96,8 +96,8 @@ namespace paludis
}
AccountsID::AccountsID(const Environment * const e,
- const QualifiedPackageName & q, const std::tr1::shared_ptr<const Repository> & r,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & f, const FSEntry & l,
+ const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & f, const FSEntry & l,
const bool u, const bool m) :
PrivateImplementationPattern<AccountsID>(new Implementation<AccountsID>(e, q, r, f, l, u, m)),
_imp(PrivateImplementationPattern<AccountsID>::_imp)
@@ -180,11 +180,11 @@ AccountsID::_need_file_keys() const
_imp->home_key.reset(new LiteralMetadataValueKey<std::string>("home", "Home Directory",
mkt_normal, k.get("home")));
- std::tr1::shared_ptr<Set<std::string> > all_groups_s(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > all_groups_s(new Set<std::string>);
if (! k.get("extra_groups").empty())
{
- std::tr1::shared_ptr<Set<std::string> > groups_s(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > groups_s(new Set<std::string>);
tokenise_whitespace(k.get("extra_groups"), groups_s->inserter());
std::copy(groups_s->begin(), groups_s->end(), all_groups_s->inserter());
_imp->extra_groups_key.reset(new LiteralMetadataStringSetKey("extra_groups", "Extra Groups",
@@ -249,7 +249,7 @@ AccountsID::version() const
return _imp->version;
}
-const std::tr1::shared_ptr<const Repository>
+const std::shared_ptr<const Repository>
AccountsID::repository() const
{
return _imp->repository;
@@ -286,82 +286,82 @@ AccountsID::uniquely_identifying_spec() const
_imp->env, UserPackageDepSpecOptions());
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
AccountsID::virtual_for_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
AccountsID::keywords_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
AccountsID::provide_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
+const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
AccountsID::contains_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
AccountsID::contained_in_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
AccountsID::build_dependencies_key() const
{
_need_file_keys();
return _imp->dependencies_key;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
AccountsID::run_dependencies_key() const
{
_need_file_keys();
return _imp->dependencies_key;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
AccountsID::post_dependencies_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
AccountsID::suggested_dependencies_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
AccountsID::dependencies_key() const
{
_need_file_keys();
return _imp->dependencies_key;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
AccountsID::fetches_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
AccountsID::homepage_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
AccountsID::short_description_key() const
{
if (_imp->is_user)
@@ -373,55 +373,55 @@ AccountsID::short_description_key() const
return _imp->groupname_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
AccountsID::long_description_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > >
AccountsID::contents_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataTimeKey>
+const std::shared_ptr<const MetadataTimeKey>
AccountsID::installed_time_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
AccountsID::from_repositories_key() const
{
return _imp->from_repositories_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
AccountsID::fs_location_key() const
{
return _imp->fs_location_key;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
AccountsID::behaviours_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > >
AccountsID::choices_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<SlotName> >
+const std::shared_ptr<const MetadataValueKey<SlotName> >
AccountsID::slot_key() const
{
return make_null_shared_ptr();
}
-std::tr1::shared_ptr<const Set<std::string> >
+std::shared_ptr<const Set<std::string> >
AccountsID::breaks_portage() const
{
return make_shared_ptr(new Set<std::string>);
@@ -447,7 +447,7 @@ AccountsID::supports_action(const SupportsActionTestBase & test) const
namespace
{
- std::tr1::shared_ptr<OutputManager> this_output_manager(const std::tr1::shared_ptr<OutputManager> & o, const Action &)
+ std::shared_ptr<OutputManager> this_output_manager(const std::shared_ptr<OutputManager> & o, const Action &)
{
return o;
}
@@ -477,7 +477,7 @@ AccountsID::perform_action(Action & action) const
+ "' to destination '" + stringify(install_action->options.destination()->name())
+ "' because destination does not provide destination_interface");
- std::tr1::shared_ptr<OutputManager> output_manager(install_action->options.make_output_manager()(
+ std::shared_ptr<OutputManager> output_manager(install_action->options.make_output_manager()(
*install_action));
std::string used_config_protect;
@@ -496,8 +496,8 @@ AccountsID::perform_action(Action & action) const
n::output_manager() = output_manager,
n::package_id() = shared_from_this(),
n::perform_uninstall() = install_action->options.perform_uninstall(),
- n::used_this_for_config_protect() = std::tr1::bind(
- &used_this_for_config_protect, std::tr1::ref(used_config_protect), std::tr1::placeholders::_1)
+ n::used_this_for_config_protect() = std::bind(
+ &used_this_for_config_protect, std::ref(used_config_protect), std::placeholders::_1)
));
}
break;
@@ -526,7 +526,7 @@ AccountsID::perform_action(Action & action) const
n::if_for_install_id() = shared_from_this(),
n::ignore_for_unmerge() = &ignore_nothing,
n::is_overwrite() = false,
- n::make_output_manager() = std::tr1::bind(&this_output_manager, output_manager, std::tr1::placeholders::_1)
+ n::make_output_manager() = std::bind(&this_output_manager, output_manager, std::placeholders::_1)
));
install_action->options.perform_uninstall()(*i, uo);
}
diff --git a/paludis/repositories/accounts/accounts_id.hh b/paludis/repositories/accounts/accounts_id.hh
index f023fcf26..0740cac62 100644
--- a/paludis/repositories/accounts/accounts_id.hh
+++ b/paludis/repositories/accounts/accounts_id.hh
@@ -32,7 +32,7 @@ namespace paludis
class AccountsID :
public PackageID,
private PrivateImplementationPattern<AccountsID>,
- public std::tr1::enable_shared_from_this<AccountsID>
+ public std::enable_shared_from_this<AccountsID>
{
private:
PrivateImplementationPattern<AccountsID>::ImpPtr & _imp;
@@ -47,8 +47,8 @@ namespace paludis
public:
AccountsID(const Environment * const,
- const QualifiedPackageName &, const std::tr1::shared_ptr<const Repository> &,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > &,
+ const QualifiedPackageName &, const std::shared_ptr<const Repository> &,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > &,
const FSEntry &, const bool is_user, const bool masked);
~AccountsID();
@@ -56,33 +56,33 @@ namespace paludis
virtual const QualifiedPackageName name() const;
virtual const VersionSpec version() const;
- virtual const std::tr1::shared_ptr<const Repository> repository() const;
+ virtual const std::shared_ptr<const Repository> repository() const;
virtual PackageDepSpec uniquely_identifying_spec() const;
///\name Specific metadata keys
///\{
- virtual const std::tr1::shared_ptr<const MetadataValueKey<SlotName> > slot_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 MetadataSpecTreeKey<ProvideSpecTree> > provide_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 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 MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > > choices_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > contents_key() const;
+ virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
///\}
@@ -94,7 +94,7 @@ namespace paludis
///\}
- virtual std::tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual std::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/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index d20f044fa..07aba8d75 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -46,7 +46,7 @@ using namespace paludis::accounts_repository;
namespace
{
- std::tr1::shared_ptr<AccountsHandler> make_handler(const std::string & handler)
+ std::shared_ptr<AccountsHandler> make_handler(const std::string & handler)
{
if (handler == "dummy")
return make_shared_ptr(new DummyAccountsHandler);
@@ -56,13 +56,13 @@ namespace
throw AccountsRepositoryConfigurationError("Unknown accounts handler '" + handler + "'");
}
- std::tr1::shared_ptr<AccountsRepositoryStore>
+ std::shared_ptr<AccountsRepositoryStore>
make_store(const AccountsRepository * const repo, const AccountsRepositoryParams & p)
{
return make_shared_ptr(new AccountsRepositoryStore(p.environment(), repo, false));
}
- std::tr1::shared_ptr<AccountsRepositoryStore>
+ std::shared_ptr<AccountsRepositoryStore>
make_installed_store(const AccountsRepository * const repo, const InstalledAccountsRepositoryParams & p)
{
return make_shared_ptr(new AccountsRepositoryStore(p.environment(), repo, true));
@@ -74,21 +74,21 @@ namespace paludis
template <>
struct Implementation<AccountsRepository>
{
- const std::tr1::shared_ptr<const AccountsRepositoryParams> params_if_not_installed;
- const std::tr1::shared_ptr<const InstalledAccountsRepositoryParams> params_if_installed;
- const std::tr1::shared_ptr<AccountsHandler> handler_if_installed;
+ const std::shared_ptr<const AccountsRepositoryParams> params_if_not_installed;
+ const std::shared_ptr<const InstalledAccountsRepositoryParams> params_if_installed;
+ const std::shared_ptr<AccountsHandler> handler_if_installed;
- const std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > format_key;
- const std::tr1::shared_ptr<LiteralMetadataValueKey<std::string> > handler_key;
- const std::tr1::shared_ptr<LiteralMetadataValueKey<FSEntry> > installed_root_key;
+ const std::shared_ptr<LiteralMetadataValueKey<std::string> > format_key;
+ const std::shared_ptr<LiteralMetadataValueKey<std::string> > handler_key;
+ const std::shared_ptr<LiteralMetadataValueKey<FSEntry> > installed_root_key;
- const ActiveObjectPtr<DeferredConstructionPtr<std::tr1::shared_ptr<AccountsRepositoryStore> > > store;
+ const ActiveObjectPtr<DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > > store;
Implementation(AccountsRepository * const repo, const AccountsRepositoryParams & p) :
params_if_not_installed(new AccountsRepositoryParams(p)),
format_key(new LiteralMetadataValueKey<std::string> ("format", "format", mkt_significant, "accounts")),
- store(DeferredConstructionPtr<std::tr1::shared_ptr<AccountsRepositoryStore> > (
- std::tr1::bind(&make_store, repo, std::tr1::cref(*params_if_not_installed))))
+ store(DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > (
+ std::bind(&make_store, repo, std::cref(*params_if_not_installed))))
{
}
@@ -98,8 +98,8 @@ namespace paludis
format_key(new LiteralMetadataValueKey<std::string> ("format", "format", mkt_significant, "installed-accounts")),
handler_key(new LiteralMetadataValueKey<std::string> ("handler", "handler", mkt_normal, p.handler())),
installed_root_key(new LiteralMetadataValueKey<FSEntry>("root", "root", mkt_normal, p.root())),
- store(DeferredConstructionPtr<std::tr1::shared_ptr<AccountsRepositoryStore> > (
- std::tr1::bind(&make_installed_store, repo, std::tr1::cref(*params_if_installed))))
+ store(DeferredConstructionPtr<std::shared_ptr<AccountsRepositoryStore> > (
+ std::bind(&make_installed_store, repo, std::cref(*params_if_installed))))
{
}
};
@@ -160,10 +160,10 @@ AccountsRepository::~AccountsRepository()
{
}
-std::tr1::shared_ptr<Repository>
+std::shared_ptr<Repository>
AccountsRepository::repository_factory_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
Context context("When making accounts repository from repo_file '" + f("repo_file") + "':");
@@ -171,17 +171,17 @@ AccountsRepository::repository_factory_create(
if (name_str.empty())
name_str = "accounts";
- return std::tr1::shared_ptr<AccountsRepository>(new AccountsRepository(
+ return std::shared_ptr<AccountsRepository>(new AccountsRepository(
make_named_values<AccountsRepositoryParams>(
n::environment() = env,
n::name() = RepositoryName(name_str)
)));
}
-std::tr1::shared_ptr<Repository>
+std::shared_ptr<Repository>
AccountsRepository::repository_factory_installed_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
Context context("When making accounts repository from repo_file '" + f("repo_file") + "':");
@@ -200,7 +200,7 @@ AccountsRepository::repository_factory_installed_create(
if (root_str != "/")
throw AccountsRepositoryConfigurationError("Values other than '/' for 'root' not yet supported");
- return std::tr1::shared_ptr<AccountsRepository>(new AccountsRepository(
+ return std::shared_ptr<AccountsRepository>(new AccountsRepository(
make_named_values<InstalledAccountsRepositoryParams>(
n::environment() = env,
n::handler() = handler,
@@ -212,7 +212,7 @@ AccountsRepository::repository_factory_installed_create(
RepositoryName
AccountsRepository::repository_factory_name(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
if (f("name").empty())
return RepositoryName("accounts");
@@ -223,7 +223,7 @@ AccountsRepository::repository_factory_name(
RepositoryName
AccountsRepository::repository_factory_installed_name(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
if (f("name").empty())
return RepositoryName("installed-accounts");
@@ -231,41 +231,41 @@ AccountsRepository::repository_factory_installed_name(
return RepositoryName(f("name"));
}
-std::tr1::shared_ptr<const RepositoryNameSet>
+std::shared_ptr<const RepositoryNameSet>
AccountsRepository::repository_factory_dependencies(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> &)
+ const std::function<std::string (const std::string &)> &)
{
return make_shared_ptr(new RepositoryNameSet);
}
-std::tr1::shared_ptr<const RepositoryNameSet>
+std::shared_ptr<const RepositoryNameSet>
AccountsRepository::repository_factory_installed_dependencies(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> &)
+ const std::function<std::string (const std::string &)> &)
{
return make_shared_ptr(new RepositoryNameSet);
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
AccountsRepository::format_key() const
{
return _imp->format_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
AccountsRepository::location_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
AccountsRepository::installed_root_key() const
{
return _imp->installed_root_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
AccountsRepository::sync_host_key() const
{
return make_null_shared_ptr();
@@ -309,31 +309,31 @@ AccountsRepository::has_package_named(const QualifiedPackageName & q) const
return _imp->store->has_package_named(q);
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
AccountsRepository::category_names() const
{
return _imp->store->category_names();
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
AccountsRepository::unimportant_category_names() const
{
return _imp->store->unimportant_category_names();
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
AccountsRepository::category_names_containing_package(const PackageNamePart & p) const
{
return Repository::category_names_containing_package(p);
}
-std::tr1::shared_ptr<const QualifiedPackageNameSet>
+std::shared_ptr<const QualifiedPackageNameSet>
AccountsRepository::package_names(const CategoryNamePart & c) const
{
return _imp->store->package_names(c);
}
-std::tr1::shared_ptr<const PackageIDSequence>
+std::shared_ptr<const PackageIDSequence>
AccountsRepository::package_ids(const QualifiedPackageName & p) const
{
return _imp->store->package_ids(p);
@@ -447,12 +447,12 @@ AccountsRepository::perform_hook(const Hook &)
}
bool
-AccountsRepository::sync(const std::tr1::shared_ptr<OutputManager> &) const
+AccountsRepository::sync(const std::shared_ptr<OutputManager> &) const
{
return false;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
AccountsRepository::accept_keywords_key() const
{
return make_null_shared_ptr();
diff --git a/paludis/repositories/accounts/accounts_repository.hh b/paludis/repositories/accounts/accounts_repository.hh
index f6c13086d..133a03dbc 100644
--- a/paludis/repositories/accounts/accounts_repository.hh
+++ b/paludis/repositories/accounts/accounts_repository.hh
@@ -56,7 +56,7 @@ namespace paludis
private PrivateImplementationPattern<AccountsRepository>,
public Repository,
public RepositoryDestinationInterface,
- public std::tr1::enable_shared_from_this<AccountsRepository>
+ public std::enable_shared_from_this<AccountsRepository>
{
private:
PrivateImplementationPattern<AccountsRepository>::ImpPtr & _imp;
@@ -77,15 +77,15 @@ namespace paludis
static RepositoryName repository_factory_name(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<Repository> repository_factory_create(
+ static std::shared_ptr<Repository> repository_factory_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
+ static std::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
///\}
@@ -94,26 +94,26 @@ namespace paludis
static RepositoryName repository_factory_installed_name(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<Repository> repository_factory_installed_create(
+ static std::shared_ptr<Repository> repository_factory_installed_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<const RepositoryNameSet> repository_factory_installed_dependencies(
+ static std::shared_ptr<const RepositoryNameSet> repository_factory_installed_dependencies(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
///\}
///\name Specific metadata keys
///\{
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
///\}
@@ -123,13 +123,13 @@ namespace paludis
virtual const bool is_unimportant() const;
virtual bool has_category_named(const CategoryNamePart & c) const;
virtual bool has_package_named(const QualifiedPackageName & q) const;
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const;
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names_containing_package(
+ virtual std::shared_ptr<const CategoryNamePartSet> category_names() const;
+ virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
+ virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package(
const PackageNamePart & p) const;
- virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart & c) const;
- virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p) const;
+ virtual std::shared_ptr<const PackageIDSequence> package_ids(const QualifiedPackageName & p) const;
virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const;
virtual bool some_ids_might_not_be_masked() const;
@@ -143,7 +143,7 @@ namespace paludis
virtual void regenerate_cache() const;
virtual HookResult perform_hook(const Hook & hook);
- virtual bool sync(const std::tr1::shared_ptr<OutputManager> &) const;
+ virtual bool sync(const std::shared_ptr<OutputManager> &) const;
///\}
diff --git a/paludis/repositories/accounts/accounts_repository_TEST.cc b/paludis/repositories/accounts/accounts_repository_TEST.cc
index b9a3b492a..ea5581a93 100644
--- a/paludis/repositories/accounts/accounts_repository_TEST.cc
+++ b/paludis/repositories/accounts/accounts_repository_TEST.cc
@@ -32,7 +32,7 @@
#include <paludis/package_database.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/memory>
+#include <memory>
using namespace paludis;
using namespace paludis::accounts_repository;
@@ -47,7 +47,7 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AccountsRepository> repo(new AccountsRepository(
+ std::shared_ptr<AccountsRepository> repo(new AccountsRepository(
make_named_values<AccountsRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("accounts")
diff --git a/paludis/repositories/accounts/accounts_repository_store.cc b/paludis/repositories/accounts/accounts_repository_store.cc
index 2fab2816b..66f031597 100644
--- a/paludis/repositories/accounts/accounts_repository_store.cc
+++ b/paludis/repositories/accounts/accounts_repository_store.cc
@@ -39,8 +39,8 @@
#include <paludis/metadata_key.hh>
#include <paludis/environment.hh>
#include <paludis/literal_metadata_key.hh>
-#include <tr1/functional>
-#include <tr1/unordered_map>
+#include <functional>
+#include <unordered_map>
#include <algorithm>
#include <set>
#include <sys/types.h>
@@ -50,12 +50,12 @@
using namespace paludis;
using namespace paludis::accounts_repository;
-typedef std::tr1::unordered_map<CategoryNamePart,
- std::tr1::shared_ptr<QualifiedPackageNameSet>,
+typedef std::unordered_map<CategoryNamePart,
+ std::shared_ptr<QualifiedPackageNameSet>,
Hash<CategoryNamePart> > PackageNames;
-typedef std::tr1::unordered_map<QualifiedPackageName,
- std::tr1::shared_ptr<PackageIDSequence>,
+typedef std::unordered_map<QualifiedPackageName,
+ std::shared_ptr<PackageIDSequence>,
Hash<QualifiedPackageName> > IDs;
namespace paludis
@@ -67,7 +67,7 @@ namespace paludis
const AccountsRepository * const repo;
const bool installed;
- std::tr1::shared_ptr<CategoryNamePartSet> categories;
+ std::shared_ptr<CategoryNamePartSet> categories;
mutable PackageNames package_names;
mutable IDs ids;
@@ -98,7 +98,7 @@ AccountsRepositoryStore::~AccountsRepositoryStore()
}
void
-AccountsRepositoryStore::_load(const std::tr1::shared_ptr<const Repository> & repo)
+AccountsRepositoryStore::_load(const std::shared_ptr<const Repository> & repo)
{
Context context("When loading data for AccountsRepository:");
@@ -132,17 +132,17 @@ AccountsRepositoryStore::_load(const std::tr1::shared_ptr<const Repository> & re
continue;
}
- std::tr1::shared_ptr<Set<std::string> > r_set(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > r_set(new Set<std::string>);
r_set->insert(stringify((*r)->name()));
- std::tr1::shared_ptr<LiteralMetadataStringSetKey> r_key(new LiteralMetadataStringSetKey("defined_by", "Defined by repository", mkt_internal, r_set));
+ std::shared_ptr<LiteralMetadataStringSetKey> r_key(new LiteralMetadataStringSetKey("defined_by", "Defined by repository", mkt_internal, r_set));
_load_one(repo, r_key, dir);
}
}
void
AccountsRepositoryStore::_load_one(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & dir)
{
Context context("When loading accounts from directory '" + stringify(dir) + "':");
@@ -163,8 +163,8 @@ AccountsRepositoryStore::_load_one(
void
AccountsRepositoryStore::_load_one_users(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & dir)
{
for (DirIterator d(dir, DirIteratorOptions()), d_end ; d != d_end ; ++d)
@@ -177,8 +177,8 @@ AccountsRepositoryStore::_load_one_users(
void
AccountsRepositoryStore::_load_one_user(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & filename)
{
CategoryNamePart cat("user");
@@ -219,8 +219,8 @@ AccountsRepositoryStore::_load_one_user(
void
AccountsRepositoryStore::_load_one_groups(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & dir)
{
for (DirIterator d(dir, DirIteratorOptions()), d_end ; d != d_end ; ++d)
@@ -233,8 +233,8 @@ AccountsRepositoryStore::_load_one_groups(
void
AccountsRepositoryStore::_load_one_group(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & filename)
{
CategoryNamePart cat("group");
@@ -285,19 +285,19 @@ AccountsRepositoryStore::has_package_named(const QualifiedPackageName & q) const
return _imp->ids.end() != _imp->ids.find(q);
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
AccountsRepositoryStore::category_names() const
{
return _imp->categories;
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
AccountsRepositoryStore::unimportant_category_names() const
{
return _imp->categories;
}
-std::tr1::shared_ptr<const QualifiedPackageNameSet>
+std::shared_ptr<const QualifiedPackageNameSet>
AccountsRepositoryStore::package_names(const CategoryNamePart & c) const
{
PackageNames::iterator p(_imp->package_names.find(c));
@@ -307,7 +307,7 @@ AccountsRepositoryStore::package_names(const CategoryNamePart & c) const
return p->second;
}
-std::tr1::shared_ptr<const PackageIDSequence>
+std::shared_ptr<const PackageIDSequence>
AccountsRepositoryStore::package_ids(const QualifiedPackageName & p) const
{
IDs::iterator i(_imp->ids.find(p));
diff --git a/paludis/repositories/accounts/accounts_repository_store.hh b/paludis/repositories/accounts/accounts_repository_store.hh
index c0109e8af..a192b9bce 100644
--- a/paludis/repositories/accounts/accounts_repository_store.hh
+++ b/paludis/repositories/accounts/accounts_repository_store.hh
@@ -27,7 +27,7 @@
#include <paludis/environment-fwd.hh>
#include <paludis/repository-fwd.hh>
#include <paludis/metadata_key-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -39,31 +39,31 @@ namespace paludis
private PrivateImplementationPattern<AccountsRepositoryStore>
{
private:
- void _load(const std::tr1::shared_ptr<const Repository> & repo);
+ void _load(const std::shared_ptr<const Repository> & repo);
void _load_one(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & dir);
void _load_one_users(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & dir);
void _load_one_user(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & file);
void _load_one_groups(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & dir);
void _load_one_group(
- const std::tr1::shared_ptr<const Repository> & repo,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
+ const std::shared_ptr<const Repository> & repo,
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & file);
public:
@@ -80,16 +80,16 @@ namespace paludis
bool has_package_named(const QualifiedPackageName & q) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ std::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- std::tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const
+ std::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ std::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart & c) const PALUDIS_ATTRIBUTE((warn_unused_result));
- std::tr1::shared_ptr<const PackageIDSequence> package_ids(
+ std::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName & p) const PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/repositories/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index a4213f80d..f1ba85513 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -55,18 +55,18 @@ namespace paludis
const QualifiedPackageName name;
const VersionSpec version;
- const std::tr1::shared_ptr<const Repository> repository;
+ const std::shared_ptr<const Repository> repository;
- static const std::tr1::shared_ptr<Set<std::string> > behaviours_set;
- const std::tr1::shared_ptr<const LiteralMetadataStringSetKey> behaviours_key;
+ static const std::shared_ptr<Set<std::string> > behaviours_set;
+ const std::shared_ptr<const LiteralMetadataStringSetKey> behaviours_key;
mutable Mutex mutex;
- mutable std::tr1::shared_ptr<const AccountsDepKey> dependencies_key;
+ mutable std::shared_ptr<const AccountsDepKey> dependencies_key;
const bool is_user;
Implementation(const Environment * const e,
- const QualifiedPackageName & q, const std::tr1::shared_ptr<const Repository> & r,
+ const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r,
const bool u) :
env(e),
name(q),
@@ -82,19 +82,19 @@ namespace paludis
namespace
{
- std::tr1::shared_ptr<Set<std::string> > make_behaviours()
+ std::shared_ptr<Set<std::string> > make_behaviours()
{
- std::tr1::shared_ptr<Set<std::string> > result(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > result(new Set<std::string>);
result->insert("transient");
result->insert("used");
return result;
}
}
-const std::tr1::shared_ptr<Set<std::string> > Implementation<InstalledAccountsID>::behaviours_set = make_behaviours();
+const std::shared_ptr<Set<std::string> > Implementation<InstalledAccountsID>::behaviours_set = make_behaviours();
InstalledAccountsID::InstalledAccountsID(const Environment * const e,
- const QualifiedPackageName & q, const std::tr1::shared_ptr<const Repository> & r, const bool u) :
+ const QualifiedPackageName & q, const std::shared_ptr<const Repository> & r, const bool u) :
PrivateImplementationPattern<InstalledAccountsID>(new Implementation<InstalledAccountsID>(e, q, r, u)),
_imp(PrivateImplementationPattern<InstalledAccountsID>::_imp)
{
@@ -112,7 +112,7 @@ InstalledAccountsID::need_keys_added() const
if (_imp->is_user && ! _imp->dependencies_key)
{
- std::tr1::shared_ptr<Set<std::string> > groups(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > groups(new Set<std::string>);
/* depend upon our primary group */
{
@@ -188,7 +188,7 @@ InstalledAccountsID::version() const
return _imp->version;
}
-const std::tr1::shared_ptr<const Repository>
+const std::shared_ptr<const Repository>
InstalledAccountsID::repository() const
{
return _imp->repository;
@@ -225,135 +225,135 @@ InstalledAccountsID::uniquely_identifying_spec() const
_imp->env, UserPackageDepSpecOptions());
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
InstalledAccountsID::virtual_for_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
InstalledAccountsID::keywords_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
InstalledAccountsID::provide_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
+const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
InstalledAccountsID::contains_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
InstalledAccountsID::contained_in_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
InstalledAccountsID::build_dependencies_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
InstalledAccountsID::run_dependencies_key() const
{
need_keys_added();
return _imp->dependencies_key;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
InstalledAccountsID::post_dependencies_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
InstalledAccountsID::dependencies_key() const
{
need_keys_added();
return _imp->dependencies_key;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
InstalledAccountsID::suggested_dependencies_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
InstalledAccountsID::fetches_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
InstalledAccountsID::homepage_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
InstalledAccountsID::short_description_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
InstalledAccountsID::long_description_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > >
InstalledAccountsID::contents_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataTimeKey>
+const std::shared_ptr<const MetadataTimeKey>
InstalledAccountsID::installed_time_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
InstalledAccountsID::from_repositories_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
InstalledAccountsID::fs_location_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
InstalledAccountsID::behaviours_key() const
{
return _imp->behaviours_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > >
InstalledAccountsID::choices_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<SlotName> >
+const std::shared_ptr<const MetadataValueKey<SlotName> >
InstalledAccountsID::slot_key() const
{
return make_null_shared_ptr();
}
-std::tr1::shared_ptr<const Set<std::string> >
+std::shared_ptr<const Set<std::string> >
InstalledAccountsID::breaks_portage() const
{
return make_shared_ptr(new Set<std::string>);
diff --git a/paludis/repositories/accounts/installed_accounts_id.hh b/paludis/repositories/accounts/installed_accounts_id.hh
index 1ac2b8422..3b7192d52 100644
--- a/paludis/repositories/accounts/installed_accounts_id.hh
+++ b/paludis/repositories/accounts/installed_accounts_id.hh
@@ -32,7 +32,7 @@ namespace paludis
class InstalledAccountsID :
public PackageID,
private PrivateImplementationPattern<InstalledAccountsID>,
- public std::tr1::enable_shared_from_this<InstalledAccountsID>
+ public std::enable_shared_from_this<InstalledAccountsID>
{
private:
PrivateImplementationPattern<InstalledAccountsID>::ImpPtr & _imp;
@@ -46,7 +46,7 @@ namespace paludis
public:
InstalledAccountsID(const Environment * const,
- const QualifiedPackageName &, const std::tr1::shared_ptr<const Repository> &,
+ const QualifiedPackageName &, const std::shared_ptr<const Repository> &,
const bool is_user);
~InstalledAccountsID();
@@ -54,33 +54,33 @@ namespace paludis
virtual const QualifiedPackageName name() const;
virtual const VersionSpec version() const;
- virtual const std::tr1::shared_ptr<const Repository> repository() const;
+ virtual const std::shared_ptr<const Repository> repository() const;
virtual PackageDepSpec uniquely_identifying_spec() const;
///\name Specific metadata keys
///\{
- virtual const std::tr1::shared_ptr<const MetadataValueKey<SlotName> > slot_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 MetadataSpecTreeKey<ProvideSpecTree> > provide_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 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 MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > > choices_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > contents_key() const;
+ virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
///\}
@@ -92,7 +92,7 @@ namespace paludis
///\}
- virtual std::tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual std::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/accounts/registration.cc b/paludis/repositories/accounts/registration.cc
index 27e716122..2be47da47 100644
--- a/paludis/repositories/accounts/registration.cc
+++ b/paludis/repositories/accounts/registration.cc
@@ -28,7 +28,7 @@ using namespace paludis::accounts_repository;
namespace
{
- int generic_importance(const Environment * const, const std::tr1::function<std::string (const std::string &)> & f)
+ int generic_importance(const Environment * const, const std::function<std::string (const std::string &)> & f)
{
if (! f("importance").empty())
return destringify<int>(f("importance"));
@@ -48,7 +48,7 @@ namespace paludis
void register_repositories<repository_groups::accounts>(const repository_groups::accounts * const,
RepositoryFactory * const factory)
{
- std::tr1::shared_ptr<Set<std::string> > accounts_formats(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > accounts_formats(new Set<std::string>);
accounts_formats->insert("accounts");
factory->add_repository_format(accounts_formats,
@@ -58,7 +58,7 @@ namespace paludis
&AccountsRepository::repository_factory_dependencies
);
- std::tr1::shared_ptr<Set<std::string> > installed_accounts_formats(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > installed_accounts_formats(new Set<std::string>);
installed_accounts_formats->insert("installed_accounts");
installed_accounts_formats->insert("installed-accounts");
diff --git a/paludis/repositories/cran/cran_dep_parser.cc b/paludis/repositories/cran/cran_dep_parser.cc
index 4961c478d..bf46ef1b7 100644
--- a/paludis/repositories/cran/cran_dep_parser.cc
+++ b/paludis/repositories/cran/cran_dep_parser.cc
@@ -32,12 +32,12 @@
using namespace paludis;
-std::tr1::shared_ptr<DependencySpecTree>
+std::shared_ptr<DependencySpecTree>
cranrepository::parse_depends(const std::string & s)
{
Context context("When parsing CRAN 'Depends:' string: '" + s + "':");
- std::tr1::shared_ptr<DependencySpecTree> result(new DependencySpecTree(make_shared_ptr(new AllDepSpec)));
+ std::shared_ptr<DependencySpecTree> result(new DependencySpecTree(make_shared_ptr(new AllDepSpec)));
std::list<std::string> specs;
@@ -67,7 +67,7 @@ cranrepository::parse_depends(const std::string & s)
{
Context local_context("When processing token '" + *a + "':");
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(cranrepository::parse_cran_package_dep_spec(
+ std::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(cranrepository::parse_cran_package_dep_spec(
strip_leading(strip_trailing(*a, " \r\n\t"), " \r\n\t"))));
result->root()->append(spec);
}
diff --git a/paludis/repositories/cran/cran_dep_parser.hh b/paludis/repositories/cran/cran_dep_parser.hh
index 5e8a15c5e..019b07883 100644
--- a/paludis/repositories/cran/cran_dep_parser.hh
+++ b/paludis/repositories/cran/cran_dep_parser.hh
@@ -29,7 +29,7 @@ namespace paludis
{
namespace cranrepository
{
- std::tr1::shared_ptr<DependencySpecTree> parse_depends(const std::string & s) PALUDIS_VISIBLE;
+ std::shared_ptr<DependencySpecTree> 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 98ae4a587..e64fe2542 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -51,16 +51,15 @@
#include <paludis/util/hashes.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <tr1/functional>
-#include <tr1/unordered_map>
+#include <unordered_map>
#include <functional>
#include <algorithm>
using namespace paludis;
-typedef std::tr1::unordered_map<
+typedef std::unordered_map<
QualifiedPackageName,
- std::tr1::shared_ptr<const cranrepository::CRANPackageID>,
+ std::shared_ptr<const cranrepository::CRANPackageID>,
Hash<QualifiedPackageName> > IDMap;
namespace paludis
@@ -76,9 +75,9 @@ namespace paludis
Implementation(const CRANInstalledRepositoryParams &);
~Implementation();
- 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;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > format_key;
};
}
@@ -215,39 +214,39 @@ CRANInstalledRepository::has_package_named(const QualifiedPackageName & q) const
return _imp->ids.end() != _imp->ids.find(q);
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
CRANInstalledRepository::category_names() const
{
- std::tr1::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
+ std::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
result->insert(CategoryNamePart("cran"));
return result;
}
-std::tr1::shared_ptr<const QualifiedPackageNameSet>
+std::shared_ptr<const QualifiedPackageNameSet>
CRANInstalledRepository::package_names(const CategoryNamePart & c) const
{
Context context("When fetching package names in category '" + stringify(c)
+ "' in " + stringify(name()) + ":");
- std::tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
+ std::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(),
- std::tr1::mem_fn(&std::pair<const QualifiedPackageName, std::tr1::shared_ptr<const cranrepository::CRANPackageID> >::first));
+ std::mem_fn(&std::pair<const QualifiedPackageName, std::shared_ptr<const cranrepository::CRANPackageID> >::first));
return result;
}
-std::tr1::shared_ptr<const PackageIDSequence>
+std::shared_ptr<const PackageIDSequence>
CRANInstalledRepository::package_ids(const QualifiedPackageName & n) const
{
Context context("When fetching versions of '" + stringify(n) + "' in "
+ stringify(name()) + ":");
- std::tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
+ std::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
if (! has_package_named(n))
return result;
@@ -260,12 +259,12 @@ CRANInstalledRepository::package_ids(const QualifiedPackageName & n) const
}
#if 0
-std::tr1::shared_ptr<const Contents>
+std::shared_ptr<const Contents>
CRANInstalledRepository::do_contents(const Package ID & id) const
{
Context context("When fetching contents for " + stringify(id) + ":");
- std::tr1::shared_ptr<Contents> result(new Contents);
+ std::shared_ptr<Contents> result(new Contents);
if (! _imp->entries_valid)
_imp->load_entries();
@@ -309,11 +308,11 @@ CRANInstalledRepository::do_contents(const Package ID & id) const
}
if ("obj" == tokens.at(0))
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsFileEntry(tokens.at(1))));
+ result->add(std::shared_ptr<ContentsEntry>(new ContentsFileEntry(tokens.at(1))));
else if ("dir" == tokens.at(0))
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsDirEntry(tokens.at(1))));
+ result->add(std::shared_ptr<ContentsEntry>(new ContentsDirEntry(tokens.at(1))));
else if ("misc" == tokens.at(0))
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsMiscEntry(tokens.at(1))));
+ result->add(std::shared_ptr<ContentsEntry>(new ContentsMiscEntry(tokens.at(1))));
else if ("sym" == tokens.at(0))
{
if (tokens.size() < 4)
@@ -325,7 +324,7 @@ CRANInstalledRepository::do_contents(const Package ID & id) const
continue;
}
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsSymEntry(
+ result->add(std::shared_ptr<ContentsEntry>(new ContentsSymEntry(
tokens.at(1), tokens.at(3))));
}
}
@@ -376,10 +375,10 @@ CRANInstalledRepository::do_installed_time(const QualifiedPackageName & q,
}
#endif
-std::tr1::shared_ptr<Repository>
+std::shared_ptr<Repository>
CRANInstalledRepository::repository_factory_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
Context context("When making CRAN installed repository from repo_file '" + f("repo_file") + "':");
@@ -394,7 +393,7 @@ CRANInstalledRepository::repository_factory_create(
if (! f("world").empty())
throw CRANInstalledRepositoryConfigurationError("Key 'world' is no longer supported.");
- return std::tr1::shared_ptr<Repository>(new CRANInstalledRepository(make_named_values<CRANInstalledRepositoryParams>(
+ return std::shared_ptr<Repository>(new CRANInstalledRepository(make_named_values<CRANInstalledRepositoryParams>(
n::environment() = env,
n::location() = location,
n::root() = root
@@ -404,15 +403,15 @@ CRANInstalledRepository::repository_factory_create(
RepositoryName
CRANInstalledRepository::repository_factory_name(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> &)
+ const std::function<std::string (const std::string &)> &)
{
return RepositoryName("installed-cran");
}
-std::tr1::shared_ptr<const RepositoryNameSet>
+std::shared_ptr<const RepositoryNameSet>
CRANInstalledRepository::repository_factory_dependencies(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> &)
+ const std::function<std::string (const std::string &)> &)
{
return make_shared_ptr(new RepositoryNameSet);
}
@@ -435,8 +434,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");
- std::tr1::shared_ptr<const VersionMetadata> vm(do_version_metadata(q, v));
- std::tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->env->bashrc_files());
+ std::shared_ptr<const VersionMetadata> vm(do_version_metadata(q, v));
+ std::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())
@@ -555,25 +554,25 @@ CRANInstalledRepository::need_keys_added() const
{
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
CRANInstalledRepository::format_key() const
{
return _imp->format_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
CRANInstalledRepository::location_key() const
{
return _imp->location_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
CRANInstalledRepository::installed_root_key() const
{
return _imp->installed_root_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
CRANInstalledRepository::sync_host_key() const
{
return make_null_shared_ptr();
@@ -592,12 +591,12 @@ CRANInstalledRepository::perform_hook(const Hook &)
}
bool
-CRANInstalledRepository::sync(const std::tr1::shared_ptr<OutputManager> &) const
+CRANInstalledRepository::sync(const std::shared_ptr<OutputManager> &) const
{
return false;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
CRANInstalledRepository::accept_keywords_key() const
{
return make_null_shared_ptr();
diff --git a/paludis/repositories/cran/cran_installed_repository.hh b/paludis/repositories/cran/cran_installed_repository.hh
index 9b83da009..3f4630ad5 100644
--- a/paludis/repositories/cran/cran_installed_repository.hh
+++ b/paludis/repositories/cran/cran_installed_repository.hh
@@ -87,15 +87,15 @@ namespace paludis
static RepositoryName repository_factory_name(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<Repository> repository_factory_create(
+ static std::shared_ptr<Repository> repository_factory_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
+ static std::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
///\}
@@ -123,15 +123,15 @@ namespace paludis
/* Repository */
- virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool has_package_named(const QualifiedPackageName &) const
@@ -146,15 +146,15 @@ namespace paludis
virtual bool some_ids_might_not_be_masked() const;
- virtual bool sync(const std::tr1::shared_ptr<OutputManager> &) const;
+ virtual bool sync(const std::shared_ptr<OutputManager> &) const;
/* Keys */
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
///\name Set methods
///\{
diff --git a/paludis/repositories/cran/cran_installed_repository_TEST.cc b/paludis/repositories/cran/cran_installed_repository_TEST.cc
index 0d1b2cd29..3c0351f17 100644
--- a/paludis/repositories/cran/cran_installed_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_installed_repository_TEST.cc
@@ -34,7 +34,7 @@ using namespace paludis;
namespace
{
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -54,13 +54,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::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");
- std::tr1::shared_ptr<Repository> repo(CRANInstalledRepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(CRANInstalledRepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
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 1d2b39416..8f79e6bca 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -44,7 +44,7 @@
#include <string>
#include <algorithm>
#include <list>
-#include <tr1/functional>
+#include <functional>
using namespace paludis;
using namespace paludis::cranrepository;
@@ -56,28 +56,28 @@ namespace paludis
{
const Environment * const env;
- 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;
+ const std::shared_ptr<const Repository> repository;
+ const std::shared_ptr<const CRANRepository> cran_repository;
+ const std::shared_ptr<const CRANInstalledRepository> cran_installed_repository;
QualifiedPackageName name;
VersionSpec version;
- 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;
+ std::shared_ptr<LiteralMetadataValueKey<FSEntry> > fs_location_key;
+ std::shared_ptr<LiteralMetadataValueKey<std::string> > url_key;
+ std::shared_ptr<LiteralMetadataValueKey<std::string> > short_description_key;
+ std::shared_ptr<LiteralMetadataValueKey<std::string> > long_description_key;
+ std::shared_ptr<LiteralMetadataValueKey<std::string> > license_key;
+ std::shared_ptr<PackageIDKey> contained_in_key;
+ std::shared_ptr<PackageIDSequenceKey> contains_key;
+ std::shared_ptr<DepKey> depends_key;
+ std::shared_ptr<DepKey> suggests_key;
- std::tr1::shared_ptr<DependenciesLabelSequence> suggests_labels;
- std::tr1::shared_ptr<DependenciesLabelSequence> depends_labels;
+ std::shared_ptr<DependenciesLabelSequence> suggests_labels;
+ std::shared_ptr<DependenciesLabelSequence> depends_labels;
Implementation(const Environment * const e,
- const std::tr1::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
+ const std::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
env(e),
repository(r),
cran_repository(r),
@@ -91,7 +91,7 @@ namespace paludis
}
Implementation(const Environment * const e,
- const std::tr1::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
+ const std::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
env(e),
repository(c),
cran_repository(c),
@@ -107,7 +107,7 @@ namespace paludis
};
}
-CRANPackageID::CRANPackageID(const Environment * const env, const std::tr1::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
+CRANPackageID::CRANPackageID(const Environment * const env, const std::shared_ptr<const CRANRepository> & r, const FSEntry & f) :
PrivateImplementationPattern<CRANPackageID>(new Implementation<CRANPackageID>(env, r, f)),
_imp(PrivateImplementationPattern<CRANPackageID>::_imp)
{
@@ -276,7 +276,7 @@ CRANPackageID::CRANPackageID(const Environment * const env, const std::tr1::shar
}
CRANPackageID::CRANPackageID(const Environment * const e,
- const std::tr1::shared_ptr<const CRANRepository> & c, const CRANPackageID * const r, const std::string & t) :
+ const std::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)
{
@@ -312,103 +312,103 @@ CRANPackageID::version() const
return _imp->version;
}
-const std::tr1::shared_ptr<const Repository>
+const std::shared_ptr<const Repository>
CRANPackageID::repository() const
{
return _imp->repository;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
CRANPackageID::virtual_for_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
+ return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
CRANPackageID::keywords_key() const
{
- return std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
+ return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
CRANPackageID::provide_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
CRANPackageID::dependencies_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
CRANPackageID::build_dependencies_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
CRANPackageID::run_dependencies_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
CRANPackageID::post_dependencies_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
CRANPackageID::suggested_dependencies_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
CRANPackageID::fetches_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
CRANPackageID::homepage_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
CRANPackageID::short_description_key() const
{
return _imp->short_description_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
CRANPackageID::long_description_key() const
{
return _imp->long_description_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > >
CRANPackageID::contents_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >();
+ return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > >();
}
-const std::tr1::shared_ptr<const MetadataTimeKey>
+const std::shared_ptr<const MetadataTimeKey>
CRANPackageID::installed_time_key() const
{
- return std::tr1::shared_ptr<const MetadataTimeKey>();
+ return std::shared_ptr<const MetadataTimeKey>();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
CRANPackageID::from_repositories_key() const
{
- return std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >();
+ return std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<SlotName> >
+const std::shared_ptr<const MetadataValueKey<SlotName> >
CRANPackageID::slot_key() const
{
return make_null_shared_ptr();
@@ -426,10 +426,10 @@ CRANPackageID::arbitrary_less_than_comparison(const PackageID &) const
return false;
}
-std::tr1::shared_ptr<const Set<std::string> >
+std::shared_ptr<const Set<std::string> >
CRANPackageID::breaks_portage() const
{
- std::tr1::shared_ptr<Set<std::string> > why(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > why(new Set<std::string>);
why->insert("format");
return why;
}
@@ -469,10 +469,10 @@ namespace
{
struct SupportsActionQuery
{
- const std::tr1::shared_ptr<const CRANRepository> cran_repository;
- const std::tr1::shared_ptr<const CRANInstalledRepository> cran_installed_repository;
+ const std::shared_ptr<const CRANRepository> cran_repository;
+ const std::shared_ptr<const CRANInstalledRepository> cran_installed_repository;
- SupportsActionQuery(const std::tr1::shared_ptr<const CRANRepository> & c, const std::tr1::shared_ptr<const CRANInstalledRepository> & r) :
+ SupportsActionQuery(const std::shared_ptr<const CRANRepository> & c, const std::shared_ptr<const CRANInstalledRepository> & r) :
cran_repository(c),
cran_installed_repository(r)
{
@@ -528,33 +528,33 @@ CRANPackageID::perform_action(Action & a) const
throw ActionFailedError("Unsupported action '" + a.simple_name() + "'");
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
+const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
CRANPackageID::contains_key() const
{
return _imp->contains_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
CRANPackageID::contained_in_key() const
{
return _imp->contained_in_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
CRANPackageID::fs_location_key() const
{
return _imp->fs_location_key;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
CRANPackageID::behaviours_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > >
CRANPackageID::choices_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > >();
+ return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > >();
}
diff --git a/paludis/repositories/cran/cran_package_id.hh b/paludis/repositories/cran/cran_package_id.hh
index eeef31805..0ecf2d363 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 std::tr1::enable_shared_from_this<CRANPackageID>
+ public std::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 std::tr1::shared_ptr<const CRANRepository> &,
+ CRANPackageID(const Environment * const, const std::shared_ptr<const CRANRepository> &,
const FSEntry &);
- CRANPackageID(const Environment * const, const std::tr1::shared_ptr<const CRANRepository> &,
+ CRANPackageID(const Environment * const, const std::shared_ptr<const CRANRepository> &,
const CRANPackageID * const, const std::string &);
~CRANPackageID();
@@ -54,36 +54,36 @@ namespace paludis
virtual const QualifiedPackageName name() const;
virtual const VersionSpec version() const;
- virtual const std::tr1::shared_ptr<const Repository> repository() const;
+ virtual const std::shared_ptr<const Repository> repository() const;
virtual PackageDepSpec uniquely_identifying_spec() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<SlotName> > slot_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 MetadataValueKey<std::tr1::shared_ptr<const Choices> > > choices_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_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<DependencySpecTree> > 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 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<Set<std::string> > > behaviours_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > contents_key() const;
+ virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn));
- virtual std::tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual std::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 238cd861f..d4fc874de 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -50,16 +50,15 @@
#include <paludis/output_manager.hh>
#include <paludis/syncer.hh>
#include <paludis/hook.hh>
-#include <tr1/unordered_map>
-#include <tr1/functional>
+#include <unordered_map>
#include <functional>
#include <algorithm>
using namespace paludis;
-typedef std::tr1::unordered_map<
+typedef std::unordered_map<
QualifiedPackageName,
- std::tr1::shared_ptr<const cranrepository::CRANPackageID>,
+ std::shared_ptr<const cranrepository::CRANPackageID>,
Hash<QualifiedPackageName> >
IDMap;
@@ -70,24 +69,24 @@ namespace paludis
{
CRANRepositoryParams params;
- mutable std::tr1::shared_ptr<Mutex> big_nasty_mutex;
+ mutable std::shared_ptr<Mutex> big_nasty_mutex;
mutable bool has_ids;
mutable IDMap ids;
- Implementation(const CRANRepositoryParams &, const std::tr1::shared_ptr<Mutex> &);
+ Implementation(const CRANRepositoryParams &, const std::shared_ptr<Mutex> &);
~Implementation();
- 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;
- std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_host_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > distdir_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > format_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > builddir_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > library_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > sync_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key;
};
}
-Implementation<CRANRepository>::Implementation(const CRANRepositoryParams & p, const std::tr1::shared_ptr<Mutex> & m) :
+Implementation<CRANRepository>::Implementation(const CRANRepositoryParams & p, const std::shared_ptr<Mutex> & m) :
params(p),
big_nasty_mutex(m),
has_ids(false),
@@ -160,45 +159,45 @@ CRANRepository::has_package_named(const QualifiedPackageName & q) const
return _imp->ids.end() != _imp->ids.find(q);
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
CRANRepository::category_names() const
{
Context context("When fetching category names in " + stringify(name()) + ":");
Lock l(*_imp->big_nasty_mutex);
- std::tr1::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
+ std::shared_ptr<CategoryNamePartSet> result(new CategoryNamePartSet);
result->insert(CategoryNamePart("cran"));
return result;
}
-std::tr1::shared_ptr<const QualifiedPackageNameSet>
+std::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);
- std::tr1::shared_ptr<QualifiedPackageNameSet> result(new QualifiedPackageNameSet);
+ std::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(),
- std::tr1::mem_fn(&std::pair<const QualifiedPackageName, std::tr1::shared_ptr<const cranrepository::CRANPackageID> >::first));
+ std::mem_fn(&std::pair<const QualifiedPackageName, std::shared_ptr<const cranrepository::CRANPackageID> >::first));
return result;
}
-std::tr1::shared_ptr<const PackageIDSequence>
+std::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);
- std::tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
+ std::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
if (! has_package_named(n))
return result;
@@ -223,7 +222,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()))
{
- std::tr1::shared_ptr<cranrepository::CRANPackageID> id(new cranrepository::CRANPackageID(_imp->params.environment(),
+ std::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)
@@ -233,7 +232,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(),
- std::tr1::static_pointer_cast<const cranrepository::CRANPackageID>(*i))).second)
+ std::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";
}
@@ -254,17 +253,17 @@ CRANRepository::fetch_repo_name(const std::string & location)
#if 0
void
-CRANRepository::do_install(const std::tr1::shared_ptr<const PackageID> & id_uncasted, const InstallOptions & o) const
+CRANRepository::do_install(const std::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 std::tr1::shared_ptr<const CRANPackageID> id(std::tr1::static_pointer_cast<const CRANPackageID>(id_uncasted));
+ const std::shared_ptr<const CRANPackageID> id(std::static_pointer_cast<const CRANPackageID>(id_uncasted));
if (id->bundle_member_key())
return;
- std::tr1::shared_ptr<const FSEntrySequence> bashrc_files(_imp->params.environment->bashrc_files());
+ std::shared_ptr<const FSEntrySequence> bashrc_files(_imp->params.environment->bashrc_files());
Command cmd(Command(LIBEXECDIR "/paludis/cran.bash fetch")
.with_setenv("CATEGORY", "cran")
@@ -342,7 +341,7 @@ CRANRepository::do_install(const std::tr1::shared_ptr<const PackageID> & id_unca
#endif
bool
-CRANRepository::sync(const std::tr1::shared_ptr<OutputManager> & output_manager) const
+CRANRepository::sync(const std::shared_ptr<OutputManager> & output_manager) const
{
Context context("When syncing repository '" + stringify(name()) + "':");
Lock l(*_imp->big_nasty_mutex);
@@ -390,10 +389,10 @@ CRANRepository::sync(const std::tr1::shared_ptr<OutputManager> & output_manager)
return true;
}
-std::tr1::shared_ptr<Repository>
+std::shared_ptr<Repository>
CRANRepository::repository_factory_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
Context context("When making CRAN repository from repo_file '" + f("repo_file") + "':");
@@ -421,7 +420,7 @@ CRANRepository::repository_factory_create(
if (builddir.empty())
builddir = "/var/tmp/paludis";
- return std::tr1::shared_ptr<Repository>(new CRANRepository(make_named_values<CRANRepositoryParams>(
+ return std::shared_ptr<Repository>(new CRANRepository(make_named_values<CRANRepositoryParams>(
n::builddir() = builddir,
n::distdir() = distdir,
n::environment() = env,
@@ -435,17 +434,17 @@ CRANRepository::repository_factory_create(
RepositoryName
CRANRepository::repository_factory_name(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
if (f("location").empty())
throw CRANRepositoryConfigurationError("Key 'location' not specified or empty");
return fetch_repo_name(f("location"));
}
-std::tr1::shared_ptr<const RepositoryNameSet>
+std::shared_ptr<const RepositoryNameSet>
CRANRepository::repository_factory_dependencies(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> &)
+ const std::function<std::string (const std::string &)> &)
{
return make_shared_ptr(new RepositoryNameSet);
}
@@ -534,25 +533,25 @@ CRANRepository::need_keys_added() const
{
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
CRANRepository::format_key() const
{
return _imp->format_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
CRANRepository::location_key() const
{
return _imp->location_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
CRANRepository::installed_root_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSEntry> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
CRANRepository::sync_host_key() const
{
return _imp->sync_host_key;
@@ -569,7 +568,7 @@ CRANRepository::perform_hook(const Hook &)
return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
CRANRepository::accept_keywords_key() const
{
return make_null_shared_ptr();
diff --git a/paludis/repositories/cran/cran_repository.hh b/paludis/repositories/cran/cran_repository.hh
index 91c50242f..e21dac5d3 100644
--- a/paludis/repositories/cran/cran_repository.hh
+++ b/paludis/repositories/cran/cran_repository.hh
@@ -25,7 +25,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/environment-fwd.hh>
-#include <tr1/memory>
+#include <memory>
#include <string>
/** \file
@@ -76,7 +76,7 @@ namespace paludis
class PALUDIS_VISIBLE CRANRepository :
public Repository,
private PrivateImplementationPattern<CRANRepository>,
- public std::tr1::enable_shared_from_this<CRANRepository>
+ public std::enable_shared_from_this<CRANRepository>
{
private:
PrivateImplementationPattern<CRANRepository>::ImpPtr & _imp;
@@ -104,15 +104,15 @@ namespace paludis
static RepositoryName repository_factory_name(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<Repository> repository_factory_create(
+ static std::shared_ptr<Repository> repository_factory_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
+ static std::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
///\}
@@ -126,15 +126,15 @@ namespace paludis
/* RepositorySyncableInterface */
- virtual bool sync(const std::tr1::shared_ptr<OutputManager> & output_deviant) const;
+ virtual bool sync(const std::shared_ptr<OutputManager> & output_deviant) const;
/* Repository */
- virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool has_package_named(const QualifiedPackageName &) const
@@ -143,7 +143,7 @@ namespace paludis
virtual bool has_category_named(const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -155,11 +155,11 @@ namespace paludis
/* Keys */
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
///\name Set methods
///\{
diff --git a/paludis/repositories/cran/cran_repository_TEST.cc b/paludis/repositories/cran/cran_repository_TEST.cc
index bec44f962..cefa23ea0 100644
--- a/paludis/repositories/cran/cran_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_repository_TEST.cc
@@ -35,7 +35,7 @@ using namespace paludis;
namespace
{
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -55,13 +55,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::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");
- std::tr1::shared_ptr<Repository> repo(CRANRepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(CRANRepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
TEST_CHECK(repo->has_category_named(CategoryNamePart("cran")));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/testpackage1")));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/testpackage2")));
@@ -75,13 +75,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::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");
- std::tr1::shared_ptr<Repository> repo(CRANRepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(CRANRepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/testbundle")));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/bundlepkg1")));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/bundlepkg2")));
diff --git a/paludis/repositories/cran/keys.cc b/paludis/repositories/cran/keys.cc
index 658133a77..c3adc4b64 100644
--- a/paludis/repositories/cran/keys.cc
+++ b/paludis/repositories/cran/keys.cc
@@ -33,7 +33,7 @@
#include <paludis/formatter.hh>
#include <paludis/action.hh>
#include <paludis/repository.hh>
-#include <tr1/functional>
+#include <functional>
using namespace paludis;
using namespace paludis::cranrepository;
@@ -48,7 +48,7 @@ PackageIDSequenceKey::PackageIDSequenceKey(const Environment * const e,
{
}
-const std::tr1::shared_ptr<const PackageIDSequence>
+const std::shared_ptr<const PackageIDSequence>
PackageIDSequenceKey::value() const
{
return _v;
@@ -73,7 +73,7 @@ PackageIDSequenceKey::type() const
}
void
-PackageIDSequenceKey::push_back(const std::tr1::shared_ptr<const PackageID> & i)
+PackageIDSequenceKey::push_back(const std::shared_ptr<const PackageID> & i)
{
_v->push_back(i);
}
@@ -81,11 +81,11 @@ PackageIDSequenceKey::push_back(const std::tr1::shared_ptr<const PackageID> & i)
std::string
PackageIDSequenceKey::pretty_print_flat(const Formatter<PackageID> & f) const
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
return join(indirect_iterator(value()->begin()), indirect_iterator(value()->end()), " ",
- std::tr1::bind(static_cast<std::string (Formatter<PackageID>::*)(const PackageID &, const format::Plain &) const>(
+ std::bind(static_cast<std::string (Formatter<PackageID>::*)(const PackageID &, const format::Plain &) const>(
&Formatter<PackageID>::format),
- std::tr1::cref(f), _1, format::Plain()));
+ std::cref(f), _1, format::Plain()));
}
PackageIDKey::PackageIDKey(const std::string & r, const std::string & h,
@@ -97,7 +97,7 @@ PackageIDKey::PackageIDKey(const std::string & r, const std::string & h,
{
}
-const std::tr1::shared_ptr<const PackageID>
+const std::shared_ptr<const PackageID>
PackageIDKey::value() const
{
return _v->shared_from_this();
@@ -146,15 +146,15 @@ namespace paludis
const std::string v;
mutable Mutex mutex;
- mutable std::tr1::shared_ptr<const DependencySpecTree> c;
- const std::tr1::shared_ptr<const DependenciesLabelSequence> labels;
+ mutable std::shared_ptr<const DependencySpecTree> c;
+ const std::shared_ptr<const DependenciesLabelSequence> labels;
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
Implementation(const Environment * const e, const std::string & vv,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> & s,
+ const std::shared_ptr<const DependenciesLabelSequence> & s,
const std::string & r, const std::string & h, const MetadataKeyType & t) :
env(e),
v(vv),
@@ -168,7 +168,7 @@ namespace paludis
}
DepKey::DepKey(const Environment * const e, const std::string & r, const std::string & h, const std::string & v,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> & s, const MetadataKeyType t) :
+ const std::shared_ptr<const DependenciesLabelSequence> & s, const MetadataKeyType t) :
PrivateImplementationPattern<DepKey>(new Implementation<DepKey>(e, v, s, r, h, t)),
_imp(PrivateImplementationPattern<DepKey>::_imp)
{
@@ -196,7 +196,7 @@ DepKey::type() const
return _imp->type;
}
-const std::tr1::shared_ptr<const DependencySpecTree>
+const std::shared_ptr<const DependencySpecTree>
DepKey::value() const
{
Lock l(_imp->mutex);
@@ -226,7 +226,7 @@ DepKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) const
return stringify(p);
}
-const std::tr1::shared_ptr<const DependenciesLabelSequence>
+const std::shared_ptr<const DependenciesLabelSequence>
DepKey::initial_labels() const
{
return _imp->labels;
diff --git a/paludis/repositories/cran/keys.hh b/paludis/repositories/cran/keys.hh
index 3400f14a9..1831f6aed 100644
--- a/paludis/repositories/cran/keys.hh
+++ b/paludis/repositories/cran/keys.hh
@@ -36,7 +36,7 @@ namespace paludis
{
private:
const Environment * const _env;
- const std::tr1::shared_ptr<PackageIDSequence> _v;
+ const std::shared_ptr<PackageIDSequence> _v;
const std::string _r;
const std::string _h;
@@ -46,10 +46,10 @@ namespace paludis
PackageIDSequenceKey(const Environment * const,
const std::string &, const std::string &, const MetadataKeyType);
- virtual const std::tr1::shared_ptr<const PackageIDSequence> value() const
+ virtual const std::shared_ptr<const PackageIDSequence> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- void push_back(const std::tr1::shared_ptr<const PackageID> &);
+ void push_back(const std::shared_ptr<const PackageID> &);
virtual std::string pretty_print_flat(const Formatter<PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -60,7 +60,7 @@ namespace paludis
};
class PackageIDKey :
- public MetadataValueKey<std::tr1::shared_ptr<const PackageID> >
+ public MetadataValueKey<std::shared_ptr<const PackageID> >
{
private:
const CRANPackageID * const _v;
@@ -72,7 +72,7 @@ namespace paludis
public:
PackageIDKey(const std::string &, const std::string &, const CRANPackageID * const, const MetadataKeyType);
- virtual const std::tr1::shared_ptr<const PackageID> value() const
+ virtual const std::shared_ptr<const PackageID> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const Formatter<PackageID> &) const
@@ -93,11 +93,11 @@ namespace paludis
public:
DepKey(const Environment * const,
const std::string &, const std::string &, const std::string &,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> &, const MetadataKeyType);
+ const std::shared_ptr<const DependenciesLabelSequence> &, const MetadataKeyType);
~DepKey();
- virtual const std::tr1::shared_ptr<const DependencySpecTree> value() const
+ virtual const std::shared_ptr<const DependencySpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const DependencySpecTree::ItemFormatter &) const
@@ -106,7 +106,7 @@ namespace paludis
virtual std::string pretty_print_flat(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const DependenciesLabelSequence> initial_labels() const
+ virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::string raw_name() 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 d7cbc5d83..f38d8b7cf 100644
--- a/paludis/repositories/cran/package_dep_spec.cc
+++ b/paludis/repositories/cran/package_dep_spec.cc
@@ -41,8 +41,8 @@ namespace
PackageDepSpecData
{
std::string unnormalised_package_name;
- std::tr1::shared_ptr<const QualifiedPackageName> package_v;
- std::tr1::shared_ptr<VersionRequirements> version_requirements_v;
+ std::shared_ptr<const QualifiedPackageName> package_v;
+ std::shared_ptr<VersionRequirements> version_requirements_v;
virtual std::string as_string() const
{
@@ -68,22 +68,22 @@ namespace
return result;
}
- virtual std::tr1::shared_ptr<const QualifiedPackageName> package_ptr() const
+ virtual std::shared_ptr<const QualifiedPackageName> package_ptr() const
{
return package_v;
}
- virtual std::tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const
+ virtual std::shared_ptr<const PackageNamePart> package_name_part_ptr() const
{
- return std::tr1::shared_ptr<const PackageNamePart>();
+ return std::shared_ptr<const PackageNamePart>();
}
- virtual std::tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const
+ virtual std::shared_ptr<const CategoryNamePart> category_name_part_ptr() const
{
- return std::tr1::shared_ptr<const CategoryNamePart>();
+ return std::shared_ptr<const CategoryNamePart>();
}
- virtual std::tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const
+ virtual std::shared_ptr<const VersionRequirements> version_requirements_ptr() const
{
return version_requirements_v;
}
@@ -93,29 +93,29 @@ namespace
return vr_and;
}
- virtual std::tr1::shared_ptr<const SlotRequirement> slot_requirement_ptr() const
+ virtual std::shared_ptr<const SlotRequirement> slot_requirement_ptr() const
{
- return std::tr1::shared_ptr<const SlotRequirement>();
+ return std::shared_ptr<const SlotRequirement>();
}
- virtual std::tr1::shared_ptr<const RepositoryName> from_repository_ptr() const
+ virtual std::shared_ptr<const RepositoryName> from_repository_ptr() const
{
- return std::tr1::shared_ptr<const RepositoryName>();
+ return std::shared_ptr<const RepositoryName>();
}
- virtual std::tr1::shared_ptr<const RepositoryName> in_repository_ptr() const
+ virtual std::shared_ptr<const RepositoryName> in_repository_ptr() const
{
- return std::tr1::shared_ptr<const RepositoryName>();
+ return std::shared_ptr<const RepositoryName>();
}
- virtual std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const
+ virtual std::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const
{
- return std::tr1::shared_ptr<const AdditionalPackageDepSpecRequirements>();
+ return std::shared_ptr<const AdditionalPackageDepSpecRequirements>();
}
- virtual std::tr1::shared_ptr<const MetadataSectionKey> annotations_key() const
+ virtual std::shared_ptr<const MetadataSectionKey> annotations_key() const
{
- return std::tr1::shared_ptr<const MetadataSectionKey>();
+ return std::shared_ptr<const MetadataSectionKey>();
}
CRANPackageDepSpecData & version_requirement(const VersionRequirement & v)
@@ -137,17 +137,17 @@ namespace
return *this;
}
- virtual std::tr1::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const
+ virtual std::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const
{
return make_null_shared_ptr();
}
- virtual std::tr1::shared_ptr<const FSEntry> installed_at_path_ptr() const
+ virtual std::shared_ptr<const FSEntry> installed_at_path_ptr() const
{
return make_null_shared_ptr();
}
- virtual std::tr1::shared_ptr<const InstallableToPath> installable_to_path_ptr() const
+ virtual std::shared_ptr<const InstallableToPath> installable_to_path_ptr() const
{
return make_null_shared_ptr();
}
@@ -164,7 +164,7 @@ paludis::cranrepository::parse_cran_package_dep_spec(const std::string & ss)
{
Context context("When parsing CRAN package dep spec '" + ss + "':");
- std::tr1::shared_ptr<CRANPackageDepSpecData> data(new CRANPackageDepSpecData);
+ std::shared_ptr<CRANPackageDepSpecData> data(new CRANPackageDepSpecData);
std::string s(ss);
std::string::size_type p(s.find('('));
diff --git a/paludis/repositories/cran/registration.cc b/paludis/repositories/cran/registration.cc
index 2fabe1b5f..1d178ba8a 100644
--- a/paludis/repositories/cran/registration.cc
+++ b/paludis/repositories/cran/registration.cc
@@ -28,7 +28,7 @@ using namespace paludis;
namespace
{
- int generic_importance(const Environment * const, const std::tr1::function<std::string (const std::string &)> & f)
+ int generic_importance(const Environment * const, const std::function<std::string (const std::string &)> & f)
{
if (! f("importance").empty())
return destringify<int>(f("importance"));
@@ -47,7 +47,7 @@ namespace paludis
template <>
void register_repositories<repository_groups::cran>(const repository_groups::cran * const, RepositoryFactory * const factory)
{
- std::tr1::shared_ptr<Set<std::string> > cran_formats(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > cran_formats(new Set<std::string>);
cran_formats->insert("cran");
factory->add_repository_format(
@@ -58,7 +58,7 @@ namespace paludis
&CRANRepository::repository_factory_dependencies
);
- std::tr1::shared_ptr<Set<std::string> > installed_cran_formats(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > installed_cran_formats(new Set<std::string>);
installed_cran_formats->insert("installed_cran");
installed_cran_formats->insert("installed-cran");
diff --git a/paludis/repositories/e/aa_visitor_TEST.cc b/paludis/repositories/e/aa_visitor_TEST.cc
index 84655a10a..9e5d40a8d 100644
--- a/paludis/repositories/e/aa_visitor_TEST.cc
+++ b/paludis/repositories/e/aa_visitor_TEST.cc
@@ -42,11 +42,11 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo"))));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::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"))->root()->accept(p1);
diff --git a/paludis/repositories/e/can_skip_phase.cc b/paludis/repositories/e/can_skip_phase.cc
index 50cd7599b..b0d8dafdf 100644
--- a/paludis/repositories/e/can_skip_phase.cc
+++ b/paludis/repositories/e/can_skip_phase.cc
@@ -65,7 +65,7 @@ namespace
}
bool
-paludis::erepository::can_skip_phase(const std::tr1::shared_ptr<const ERepositoryID> & id,
+paludis::erepository::can_skip_phase(const std::shared_ptr<const ERepositoryID> & id,
const EAPIPhase & phase)
{
if (! id->defined_phases_key())
diff --git a/paludis/repositories/e/can_skip_phase.hh b/paludis/repositories/e/can_skip_phase.hh
index a4d47eac8..a5e05857c 100644
--- a/paludis/repositories/e/can_skip_phase.hh
+++ b/paludis/repositories/e/can_skip_phase.hh
@@ -28,7 +28,7 @@ namespace paludis
{
namespace erepository
{
- bool can_skip_phase(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ bool can_skip_phase(const std::shared_ptr<const ERepositoryID> & id,
const EAPIPhase &) PALUDIS_ATTRIBUTE((warn_unused_result));
}
}
diff --git a/paludis/repositories/e/check_fetched_files_visitor.cc b/paludis/repositories/e/check_fetched_files_visitor.cc
index b978d7fa5..c3711438e 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.cc
+++ b/paludis/repositories/e/check_fetched_files_visitor.cc
@@ -60,7 +60,7 @@ namespace paludis
struct Implementation<CheckFetchedFilesVisitor>
{
const Environment * const env;
- const std::tr1::shared_ptr<const PackageID> id;
+ const std::shared_ptr<const PackageID> id;
const FSEntry distdir;
const bool check_unneeded;
const bool exclude_unmirrorable;
@@ -68,23 +68,23 @@ namespace paludis
const bool ignore_not_in_manifest;
std::set<std::string> done;
- const std::tr1::shared_ptr<Sequence<FetchActionFailure> > failures;
+ const std::shared_ptr<Sequence<FetchActionFailure> > failures;
bool need_nofetch;
bool in_nofetch;
- const std::tr1::shared_ptr<Manifest2Reader> m2r;
+ const std::shared_ptr<Manifest2Reader> m2r;
const UseManifest use_manifest;
- const std::tr1::shared_ptr<OutputManager> output_manager;
+ const std::shared_ptr<OutputManager> output_manager;
Implementation(
const Environment * const e,
- const std::tr1::shared_ptr<const PackageID> & i,
+ const std::shared_ptr<const PackageID> & i,
const FSEntry & d,
const bool c,
const bool n,
const FSEntry & m2,
const UseManifest um,
- const std::tr1::shared_ptr<OutputManager> & md,
+ const std::shared_ptr<OutputManager> & md,
const bool x,
const bool u,
const bool nm) :
@@ -108,13 +108,13 @@ namespace paludis
CheckFetchedFilesVisitor::CheckFetchedFilesVisitor(
const Environment * const e,
- const std::tr1::shared_ptr<const PackageID> & i,
+ const std::shared_ptr<const PackageID> & i,
const FSEntry & d,
const bool c,
const bool n,
const FSEntry & m2,
const UseManifest um,
- const std::tr1::shared_ptr<OutputManager> & md,
+ const std::shared_ptr<OutputManager> & md,
const bool x,
const bool u,
const bool nm) :
@@ -433,7 +433,7 @@ CheckFetchedFilesVisitor::visit(const FetchableURISpecTree::NodeType<FetchableUR
_imp->output_manager->stdout_stream() << std::endl;
}
-const std::tr1::shared_ptr<const Sequence<FetchActionFailure> >
+const std::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 85c597e8c..9f6d3a3b9 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.hh
+++ b/paludis/repositories/e/check_fetched_files_visitor.hh
@@ -30,7 +30,7 @@
#include <paludis/package_id-fwd.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/action-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -45,13 +45,13 @@ namespace paludis
public:
CheckFetchedFilesVisitor(
const Environment * const,
- const std::tr1::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const PackageID> &,
const FSEntry & distdir,
const bool check_unneeded,
const bool fetch_restrict,
const FSEntry & m2,
const UseManifest um,
- const std::tr1::shared_ptr<OutputManager> & output_manager,
+ const std::shared_ptr<OutputManager> & output_manager,
const bool exclude_unmirrorable,
const bool ignore_unfetched,
const bool ignore_not_in_manifest);
@@ -63,7 +63,7 @@ namespace paludis
void visit(const FetchableURISpecTree::NodeType<URILabelsDepSpec>::Type & node);
void visit(const FetchableURISpecTree::NodeType<FetchableURIDepSpec>::Type & node);
- const std::tr1::shared_ptr<const Sequence<FetchActionFailure> > failures() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::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/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 14f8b4a41..ae72788f8 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -70,12 +70,12 @@ namespace
{
struct Item
{
- NamedValue<n::item, std::tr1::shared_ptr<typename T_::BasicInnerNode> > item;
- NamedValue<n::spec, std::tr1::shared_ptr<DepSpec> > spec;
+ NamedValue<n::item, std::shared_ptr<typename T_::BasicInnerNode> > item;
+ NamedValue<n::spec, std::shared_ptr<DepSpec> > spec;
};
typedef std::list<Item> Stack;
- typedef std::tr1::function<void (const std::tr1::shared_ptr<DepSpec> &)> AnnotationsGoHere;
+ typedef std::function<void (const std::shared_ptr<DepSpec> &)> AnnotationsGoHere;
};
template <typename T_>
@@ -84,9 +84,9 @@ namespace
const typename ParseStackTypes<T_>::AnnotationsGoHere & annotations_go_here,
const std::string & s,
const EAPI & eapi,
- const std::tr1::shared_ptr<const PackageID> & id)
+ const std::shared_ptr<const PackageID> & id)
{
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
+ std::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
parse_elike_package_dep_spec(s, eapi.supported()->package_dep_spec_parse_options(),
eapi.supported()->version_spec_options(), id)));
h.begin()->item()->append(spec);
@@ -99,7 +99,7 @@ namespace
const typename ParseStackTypes<T_>::AnnotationsGoHere & annotations_go_here,
const std::string & s,
const EAPI & eapi,
- const std::tr1::shared_ptr<const PackageID> & id)
+ const std::shared_ptr<const PackageID> & id)
{
if ((! s.empty()) && ('!' == s.at(0)))
{
@@ -118,7 +118,7 @@ namespace
strong = true;
}
- std::tr1::shared_ptr<BlockDepSpec> spec(new BlockDepSpec(
+ std::shared_ptr<BlockDepSpec> spec(new BlockDepSpec(
s,
parse_elike_package_dep_spec(s.substr(specstart),
eapi.supported()->package_dep_spec_parse_options(),
@@ -138,7 +138,7 @@ namespace
const typename ParseStackTypes<T_>::AnnotationsGoHere & annotations_go_here,
const std::string & s)
{
- std::tr1::shared_ptr<LicenseDepSpec> spec(new LicenseDepSpec(s));
+ std::shared_ptr<LicenseDepSpec> spec(new LicenseDepSpec(s));
h.begin()->item()->append(spec);
annotations_go_here(spec);
}
@@ -149,7 +149,7 @@ namespace
const typename ParseStackTypes<T_>::AnnotationsGoHere & annotations_go_here,
const std::string & s)
{
- std::tr1::shared_ptr<PlainTextDepSpec> spec(new PlainTextDepSpec(s));
+ std::shared_ptr<PlainTextDepSpec> spec(new PlainTextDepSpec(s));
h.begin()->item()->append(spec);
annotations_go_here(spec);
}
@@ -160,7 +160,7 @@ namespace
const typename ParseStackTypes<T_>::AnnotationsGoHere & annotations_go_here,
const std::string & s)
{
- std::tr1::shared_ptr<SimpleURIDepSpec> spec(new SimpleURIDepSpec(s));
+ std::shared_ptr<SimpleURIDepSpec> spec(new SimpleURIDepSpec(s));
h.begin()->item()->append(spec);
annotations_go_here(spec);
}
@@ -176,7 +176,7 @@ namespace
{
if (t.empty() || eapi.supported()->dependency_spec_tree_parse_options()[dstpo_uri_supports_arrow])
{
- std::tr1::shared_ptr<FetchableURIDepSpec> spec(new FetchableURIDepSpec(t.empty() ? f : f + " -> " + t));
+ std::shared_ptr<FetchableURIDepSpec> spec(new FetchableURIDepSpec(t.empty() ? f : f + " -> " + t));
h.begin()->item()->append(spec);
annotations_go_here(spec);
}
@@ -216,11 +216,11 @@ namespace
void dependency_label_handler(
const typename ParseStackTypes<T_>::Stack & h,
const typename ParseStackTypes<T_>::AnnotationsGoHere & annotations_go_here,
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & id,
const std::string & s,
const EAPI & eapi)
{
- std::tr1::shared_ptr<DependenciesLabelsDepSpec> spec(parse_dependency_label(id, s, eapi));
+ std::shared_ptr<DependenciesLabelsDepSpec> spec(parse_dependency_label(id, s, eapi));
h.begin()->item()->append(spec);
annotations_go_here(spec);
}
@@ -232,7 +232,7 @@ namespace
const std::string & s,
const EAPI & eapi)
{
- std::tr1::shared_ptr<URILabelsDepSpec> spec(parse_uri_label(s, eapi));
+ std::shared_ptr<URILabelsDepSpec> spec(parse_uri_label(s, eapi));
h.begin()->item()->append(spec);
annotations_go_here(spec);
}
@@ -243,7 +243,7 @@ namespace
const typename ParseStackTypes<T_>::AnnotationsGoHere & annotations_go_here,
const std::string & s)
{
- std::tr1::shared_ptr<PlainTextLabelDepSpec> spec(parse_plain_text_label(s));
+ std::shared_ptr<PlainTextLabelDepSpec> spec(parse_plain_text_label(s));
h.begin()->item()->append(spec);
annotations_go_here(spec);
}
@@ -251,7 +251,7 @@ namespace
template <typename T_, typename A_>
void any_all_handler(typename ParseStackTypes<T_>::Stack & stack)
{
- std::tr1::shared_ptr<A_> spec(new A_);
+ std::shared_ptr<A_> spec(new A_);
stack.push_front(make_named_values<typename ParseStackTypes<T_>::Item>(
n::item() = stack.begin()->item()->append(spec),
n::spec() = spec
@@ -263,9 +263,9 @@ namespace
typename ParseStackTypes<T_>::Stack & stack,
const std::string & u,
const Environment * const env,
- const std::tr1::shared_ptr<const PackageID> & id)
+ const std::shared_ptr<const PackageID> & id)
{
- std::tr1::shared_ptr<ConditionalDepSpec> spec(new ConditionalDepSpec(parse_elike_conditional_dep_spec(
+ std::shared_ptr<ConditionalDepSpec> spec(new ConditionalDepSpec(parse_elike_conditional_dep_spec(
u, env, id, id->repository()->installed_root_key())));
stack.push_front(make_named_values<typename ParseStackTypes<T_>::Item>(
n::item() = stack.begin()->item()->append(spec),
@@ -302,28 +302,28 @@ namespace
{
}
- void set_annotations(std::tr1::shared_ptr<DepSpec> & spec, const std::tr1::shared_ptr<const Map<std::string, std::string> > & m)
+ void set_annotations(std::shared_ptr<DepSpec> & spec, const std::shared_ptr<const Map<std::string, std::string> > & m)
{
- std::tr1::shared_ptr<ELikeAnnotations> key(new ELikeAnnotations(m));
+ std::shared_ptr<ELikeAnnotations> key(new ELikeAnnotations(m));
spec->set_annotations_key(key);
}
- void set_thing_to_annotate(std::tr1::shared_ptr<DepSpec> & spec, const std::tr1::shared_ptr<DepSpec> & s)
+ void set_thing_to_annotate(std::shared_ptr<DepSpec> & spec, const std::shared_ptr<DepSpec> & s)
{
spec = s;
}
}
-std::tr1::shared_ptr<DependencySpecTree>
+std::shared_ptr<DependencySpecTree>
paludis::erepository::parse_depend(const std::string & s,
- const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, const EAPI & eapi)
+ const Environment * const env, const std::shared_ptr<const PackageID> & id, const EAPI & eapi)
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
ParseStackTypes<DependencySpecTree>::Stack stack;
- std::tr1::shared_ptr<AllDepSpec> spec(new AllDepSpec);
- std::tr1::shared_ptr<DepSpec> thing_to_annotate(spec);
- std::tr1::shared_ptr<DependencySpecTree> top(make_shared_ptr(new DependencySpecTree(spec)));
+ std::shared_ptr<AllDepSpec> spec(new AllDepSpec);
+ std::shared_ptr<DepSpec> thing_to_annotate(spec);
+ std::shared_ptr<DependencySpecTree> top(make_shared_ptr(new DependencySpecTree(spec)));
stack.push_front(make_named_values<ParseStackTypes<DependencySpecTree>::Item>(
n::item() = top->root(),
n::spec() = spec
@@ -331,25 +331,25 @@ paludis::erepository::parse_depend(const std::string & s,
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
- n::on_all() = std::tr1::bind(&any_all_handler<DependencySpecTree, AllDepSpec>, std::tr1::ref(stack)),
- n::on_annotations() = std::tr1::bind(&set_annotations, std::tr1::ref(thing_to_annotate), _1),
- n::on_any() = std::tr1::bind(&any_all_handler<DependencySpecTree, AnyDepSpec>, std::tr1::ref(stack)),
- n::on_arrow() = std::tr1::bind(&arrows_not_allowed_handler, s, _1, _2),
- n::on_error() = std::tr1::bind(&error_handler, s, _1),
- n::on_label() = std::tr1::bind(&dependency_label_handler<DependencySpecTree>,
- std::tr1::ref(stack),
- ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)),
+ n::on_all() = std::bind(&any_all_handler<DependencySpecTree, AllDepSpec>, std::ref(stack)),
+ n::on_annotations() = std::bind(&set_annotations, std::ref(thing_to_annotate), _1),
+ n::on_any() = std::bind(&any_all_handler<DependencySpecTree, AnyDepSpec>, std::ref(stack)),
+ n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
+ n::on_error() = std::bind(&error_handler, s, _1),
+ n::on_label() = std::bind(&dependency_label_handler<DependencySpecTree>,
+ std::ref(stack),
+ ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)),
id, _1, eapi),
- n::on_pop() = std::tr1::bind(&pop_handler<DependencySpecTree>, std::tr1::ref(stack),
- ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), s),
- n::on_should_be_empty() = std::tr1::bind(&should_be_empty_handler<DependencySpecTree>, std::tr1::ref(stack), s),
- n::on_string() = std::tr1::bind(&package_or_block_dep_spec_string_handler<DependencySpecTree>, std::tr1::ref(stack),
- ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), _1, eapi, id),
- n::on_use() = std::tr1::bind(&use_handler<DependencySpecTree>, std::tr1::ref(stack), _1, env, id),
- n::on_use_under_any() = std::tr1::bind(&use_under_any_handler, s, eapi)
+ n::on_pop() = std::bind(&pop_handler<DependencySpecTree>, std::ref(stack),
+ ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), s),
+ n::on_should_be_empty() = std::bind(&should_be_empty_handler<DependencySpecTree>, std::ref(stack), s),
+ n::on_string() = std::bind(&package_or_block_dep_spec_string_handler<DependencySpecTree>, std::ref(stack),
+ ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1, eapi, id),
+ n::on_use() = std::bind(&use_handler<DependencySpecTree>, std::ref(stack), _1, env, id),
+ n::on_use_under_any() = std::bind(&use_under_any_handler, s, eapi)
));
parse_elike_dependencies(s, callbacks);
@@ -357,16 +357,16 @@ paludis::erepository::parse_depend(const std::string & s,
return top;
}
-std::tr1::shared_ptr<ProvideSpecTree>
+std::shared_ptr<ProvideSpecTree>
paludis::erepository::parse_provide(const std::string & s,
- const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, const EAPI & eapi)
+ const Environment * const env, const std::shared_ptr<const PackageID> & id, const EAPI & eapi)
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
ParseStackTypes<ProvideSpecTree>::Stack stack;
- std::tr1::shared_ptr<AllDepSpec> spec(new AllDepSpec);
- std::tr1::shared_ptr<DepSpec> thing_to_annotate(spec);
- std::tr1::shared_ptr<ProvideSpecTree> top(make_shared_ptr(new ProvideSpecTree(spec)));
+ std::shared_ptr<AllDepSpec> spec(new AllDepSpec);
+ std::shared_ptr<DepSpec> thing_to_annotate(spec);
+ std::shared_ptr<ProvideSpecTree> top(make_shared_ptr(new ProvideSpecTree(spec)));
stack.push_front(make_named_values<ParseStackTypes<ProvideSpecTree>::Item>(
n::item() = top->root(),
n::spec() = spec
@@ -374,21 +374,21 @@ paludis::erepository::parse_provide(const std::string & s,
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
- n::on_all() = std::tr1::bind(&any_all_handler<ProvideSpecTree, AllDepSpec>, std::tr1::ref(stack)),
- n::on_annotations() = std::tr1::bind(&set_annotations, std::tr1::ref(thing_to_annotate), _1),
- n::on_any() = std::tr1::bind(&any_not_allowed_handler, s),
- n::on_arrow() = std::tr1::bind(&arrows_not_allowed_handler, s, _1, _2),
- n::on_error() = std::tr1::bind(&error_handler, s, _1),
- n::on_label() = std::tr1::bind(&labels_not_allowed_handler, s, _1),
- n::on_pop() = std::tr1::bind(&pop_handler<ProvideSpecTree>, std::tr1::ref(stack),
- ParseStackTypes<ProvideSpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), s),
- n::on_should_be_empty() = std::tr1::bind(&should_be_empty_handler<ProvideSpecTree>, std::tr1::ref(stack), s),
- n::on_string() = std::tr1::bind(&package_dep_spec_string_handler<ProvideSpecTree>, std::tr1::ref(stack),
- ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), _1, eapi, id),
- n::on_use() = std::tr1::bind(&use_handler<ProvideSpecTree>, std::tr1::ref(stack), _1, env, id),
- n::on_use_under_any() = std::tr1::bind(&use_under_any_handler, s, eapi)
+ n::on_all() = std::bind(&any_all_handler<ProvideSpecTree, AllDepSpec>, std::ref(stack)),
+ n::on_annotations() = std::bind(&set_annotations, std::ref(thing_to_annotate), _1),
+ n::on_any() = std::bind(&any_not_allowed_handler, s),
+ n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
+ n::on_error() = std::bind(&error_handler, s, _1),
+ n::on_label() = std::bind(&labels_not_allowed_handler, s, _1),
+ n::on_pop() = std::bind(&pop_handler<ProvideSpecTree>, std::ref(stack),
+ ParseStackTypes<ProvideSpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), s),
+ n::on_should_be_empty() = std::bind(&should_be_empty_handler<ProvideSpecTree>, std::ref(stack), s),
+ n::on_string() = std::bind(&package_dep_spec_string_handler<ProvideSpecTree>, std::ref(stack),
+ ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1, eapi, id),
+ n::on_use() = std::bind(&use_handler<ProvideSpecTree>, std::ref(stack), _1, env, id),
+ n::on_use_under_any() = std::bind(&use_under_any_handler, s, eapi)
));
parse_elike_dependencies(s, callbacks);
@@ -396,16 +396,16 @@ paludis::erepository::parse_provide(const std::string & s,
return top;
}
-std::tr1::shared_ptr<FetchableURISpecTree>
+std::shared_ptr<FetchableURISpecTree>
paludis::erepository::parse_fetchable_uri(const std::string & s,
- const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, const EAPI & eapi)
+ const Environment * const env, const std::shared_ptr<const PackageID> & id, const EAPI & eapi)
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
ParseStackTypes<FetchableURISpecTree>::Stack stack;
- std::tr1::shared_ptr<AllDepSpec> spec(new AllDepSpec);
- std::tr1::shared_ptr<DepSpec> thing_to_annotate(spec);
- std::tr1::shared_ptr<FetchableURISpecTree> top(make_shared_ptr(new FetchableURISpecTree(spec)));
+ std::shared_ptr<AllDepSpec> spec(new AllDepSpec);
+ std::shared_ptr<DepSpec> thing_to_annotate(spec);
+ std::shared_ptr<FetchableURISpecTree> top(make_shared_ptr(new FetchableURISpecTree(spec)));
stack.push_front(make_named_values<ParseStackTypes<FetchableURISpecTree>::Item>(
n::item() = top->root(),
n::spec() = spec
@@ -413,25 +413,25 @@ paludis::erepository::parse_fetchable_uri(const std::string & s,
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
- n::on_all() = std::tr1::bind(&any_all_handler<FetchableURISpecTree, AllDepSpec>, std::tr1::ref(stack)),
- n::on_annotations() = std::tr1::bind(&set_annotations, std::tr1::ref(thing_to_annotate), _1),
- n::on_any() = std::tr1::bind(&any_not_allowed_handler, s),
- n::on_arrow() = std::tr1::bind(&arrow_handler<FetchableURISpecTree>, std::tr1::ref(stack),
- ParseStackTypes<FetchableURISpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), s, _1, _2, eapi),
- n::on_error() = std::tr1::bind(&error_handler, s, _1),
- n::on_label() = std::tr1::bind(&fetchable_label_handler<FetchableURISpecTree>, std::tr1::ref(stack),
- ParseStackTypes<FetchableURISpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), _1, eapi),
- n::on_pop() = std::tr1::bind(&pop_handler<FetchableURISpecTree>, std::tr1::ref(stack),
- ParseStackTypes<FetchableURISpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), s),
- n::on_should_be_empty() = std::tr1::bind(&should_be_empty_handler<FetchableURISpecTree>, std::tr1::ref(stack), s),
- n::on_string() = std::tr1::bind(&arrow_handler<FetchableURISpecTree>, std::tr1::ref(stack),
- ParseStackTypes<FetchableURISpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), s, _1, "", eapi),
- n::on_use() = std::tr1::bind(&use_handler<FetchableURISpecTree>, std::tr1::ref(stack), _1, env, id),
- n::on_use_under_any() = std::tr1::bind(&use_under_any_handler, s, eapi)
+ n::on_all() = std::bind(&any_all_handler<FetchableURISpecTree, AllDepSpec>, std::ref(stack)),
+ n::on_annotations() = std::bind(&set_annotations, std::ref(thing_to_annotate), _1),
+ n::on_any() = std::bind(&any_not_allowed_handler, s),
+ n::on_arrow() = std::bind(&arrow_handler<FetchableURISpecTree>, std::ref(stack),
+ ParseStackTypes<FetchableURISpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), s, _1, _2, eapi),
+ n::on_error() = std::bind(&error_handler, s, _1),
+ n::on_label() = std::bind(&fetchable_label_handler<FetchableURISpecTree>, std::ref(stack),
+ ParseStackTypes<FetchableURISpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1, eapi),
+ n::on_pop() = std::bind(&pop_handler<FetchableURISpecTree>, std::ref(stack),
+ ParseStackTypes<FetchableURISpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), s),
+ n::on_should_be_empty() = std::bind(&should_be_empty_handler<FetchableURISpecTree>, std::ref(stack), s),
+ n::on_string() = std::bind(&arrow_handler<FetchableURISpecTree>, std::ref(stack),
+ ParseStackTypes<FetchableURISpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), s, _1, "", eapi),
+ n::on_use() = std::bind(&use_handler<FetchableURISpecTree>, std::ref(stack), _1, env, id),
+ n::on_use_under_any() = std::bind(&use_under_any_handler, s, eapi)
));
parse_elike_dependencies(s, callbacks);
@@ -439,16 +439,16 @@ paludis::erepository::parse_fetchable_uri(const std::string & s,
return top;
}
-std::tr1::shared_ptr<SimpleURISpecTree>
+std::shared_ptr<SimpleURISpecTree>
paludis::erepository::parse_simple_uri(const std::string & s,
- const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, const EAPI &)
+ const Environment * const env, const std::shared_ptr<const PackageID> & id, const EAPI &)
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
ParseStackTypes<SimpleURISpecTree>::Stack stack;
- std::tr1::shared_ptr<AllDepSpec> spec(new AllDepSpec);
- std::tr1::shared_ptr<DepSpec> thing_to_annotate(spec);
- std::tr1::shared_ptr<SimpleURISpecTree> top(make_shared_ptr(new SimpleURISpecTree(spec)));
+ std::shared_ptr<AllDepSpec> spec(new AllDepSpec);
+ std::shared_ptr<DepSpec> thing_to_annotate(spec);
+ std::shared_ptr<SimpleURISpecTree> top(make_shared_ptr(new SimpleURISpecTree(spec)));
stack.push_front(make_named_values<ParseStackTypes<SimpleURISpecTree>::Item>(
n::item() = top->root(),
n::spec() = spec
@@ -456,20 +456,20 @@ paludis::erepository::parse_simple_uri(const std::string & s,
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
- n::on_all() = std::tr1::bind(&any_all_handler<SimpleURISpecTree, AllDepSpec>, std::tr1::ref(stack)),
- n::on_annotations() = std::tr1::bind(&set_annotations, std::tr1::ref(thing_to_annotate), _1),
- n::on_any() = std::tr1::bind(&any_not_allowed_handler, s),
- n::on_arrow() = std::tr1::bind(&arrows_not_allowed_handler, s, _1, _2),
- n::on_error() = std::tr1::bind(&error_handler, s, _1),
- n::on_label() = std::tr1::bind(&labels_not_allowed_handler, s, _1),
- n::on_pop() = std::tr1::bind(&pop_handler<SimpleURISpecTree>, std::tr1::ref(stack),
- ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), s),
- n::on_should_be_empty() = std::tr1::bind(&should_be_empty_handler<SimpleURISpecTree>, std::tr1::ref(stack), s),
- n::on_string() = std::tr1::bind(&simple_uri_handler<SimpleURISpecTree>, std::tr1::ref(stack),
- ParseStackTypes<SimpleURISpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), _1),
- n::on_use() = std::tr1::bind(&use_handler<SimpleURISpecTree>, std::tr1::ref(stack), _1, env, id),
+ n::on_all() = std::bind(&any_all_handler<SimpleURISpecTree, AllDepSpec>, std::ref(stack)),
+ n::on_annotations() = std::bind(&set_annotations, std::ref(thing_to_annotate), _1),
+ n::on_any() = std::bind(&any_not_allowed_handler, s),
+ n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
+ n::on_error() = std::bind(&error_handler, s, _1),
+ n::on_label() = std::bind(&labels_not_allowed_handler, s, _1),
+ n::on_pop() = std::bind(&pop_handler<SimpleURISpecTree>, std::ref(stack),
+ ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), s),
+ n::on_should_be_empty() = std::bind(&should_be_empty_handler<SimpleURISpecTree>, std::ref(stack), s),
+ n::on_string() = std::bind(&simple_uri_handler<SimpleURISpecTree>, std::ref(stack),
+ ParseStackTypes<SimpleURISpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1),
+ n::on_use() = std::bind(&use_handler<SimpleURISpecTree>, std::ref(stack), _1, env, id),
n::on_use_under_any() = &do_nothing
));
@@ -478,16 +478,16 @@ paludis::erepository::parse_simple_uri(const std::string & s,
return top;
}
-std::tr1::shared_ptr<LicenseSpecTree>
+std::shared_ptr<LicenseSpecTree>
paludis::erepository::parse_license(const std::string & s,
- const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, const EAPI & eapi)
+ const Environment * const env, const std::shared_ptr<const PackageID> & id, const EAPI & eapi)
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
ParseStackTypes<LicenseSpecTree>::Stack stack;
- std::tr1::shared_ptr<AllDepSpec> spec(new AllDepSpec);
- std::tr1::shared_ptr<DepSpec> thing_to_annotate(spec);
- std::tr1::shared_ptr<LicenseSpecTree> top(make_shared_ptr(new LicenseSpecTree(spec)));
+ std::shared_ptr<AllDepSpec> spec(new AllDepSpec);
+ std::shared_ptr<DepSpec> thing_to_annotate(spec);
+ std::shared_ptr<LicenseSpecTree> top(make_shared_ptr(new LicenseSpecTree(spec)));
stack.push_front(make_named_values<ParseStackTypes<LicenseSpecTree>::Item>(
n::item() = top->root(),
n::spec() = spec
@@ -495,21 +495,21 @@ paludis::erepository::parse_license(const std::string & s,
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
- n::on_all() = std::tr1::bind(&any_all_handler<LicenseSpecTree, AllDepSpec>, std::tr1::ref(stack)),
- n::on_annotations() = std::tr1::bind(&set_annotations, std::tr1::ref(thing_to_annotate), _1),
- n::on_any() = std::tr1::bind(&any_all_handler<LicenseSpecTree, AnyDepSpec>, std::tr1::ref(stack)),
- n::on_arrow() = std::tr1::bind(&arrows_not_allowed_handler, s, _1, _2),
- n::on_error() = std::tr1::bind(&error_handler, s, _1),
- n::on_label() = std::tr1::bind(&labels_not_allowed_handler, s, _1),
- n::on_pop() = std::tr1::bind(&pop_handler<LicenseSpecTree>, std::tr1::ref(stack),
- ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), s),
- n::on_should_be_empty() = std::tr1::bind(&should_be_empty_handler<LicenseSpecTree>, std::tr1::ref(stack), s),
- n::on_string() = std::tr1::bind(&license_handler<LicenseSpecTree>, std::tr1::ref(stack),
- ParseStackTypes<LicenseSpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), _1),
- n::on_use() = std::tr1::bind(&use_handler<LicenseSpecTree>, std::tr1::ref(stack), _1, env, id),
- n::on_use_under_any() = std::tr1::bind(&use_under_any_handler, s, eapi)
+ n::on_all() = std::bind(&any_all_handler<LicenseSpecTree, AllDepSpec>, std::ref(stack)),
+ n::on_annotations() = std::bind(&set_annotations, std::ref(thing_to_annotate), _1),
+ n::on_any() = std::bind(&any_all_handler<LicenseSpecTree, AnyDepSpec>, std::ref(stack)),
+ n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
+ n::on_error() = std::bind(&error_handler, s, _1),
+ n::on_label() = std::bind(&labels_not_allowed_handler, s, _1),
+ n::on_pop() = std::bind(&pop_handler<LicenseSpecTree>, std::ref(stack),
+ ParseStackTypes<DependencySpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), s),
+ n::on_should_be_empty() = std::bind(&should_be_empty_handler<LicenseSpecTree>, std::ref(stack), s),
+ n::on_string() = std::bind(&license_handler<LicenseSpecTree>, std::ref(stack),
+ ParseStackTypes<LicenseSpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1),
+ n::on_use() = std::bind(&use_handler<LicenseSpecTree>, std::ref(stack), _1, env, id),
+ n::on_use_under_any() = std::bind(&use_under_any_handler, s, eapi)
));
parse_elike_dependencies(s, callbacks);
@@ -517,16 +517,16 @@ paludis::erepository::parse_license(const std::string & s,
return top;
}
-std::tr1::shared_ptr<PlainTextSpecTree>
+std::shared_ptr<PlainTextSpecTree>
paludis::erepository::parse_plain_text(const std::string & s,
- const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, const EAPI &)
+ const Environment * const env, const std::shared_ptr<const PackageID> & id, const EAPI &)
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
ParseStackTypes<PlainTextSpecTree>::Stack stack;
- std::tr1::shared_ptr<AllDepSpec> spec(new AllDepSpec);
- std::tr1::shared_ptr<DepSpec> thing_to_annotate(spec);
- std::tr1::shared_ptr<PlainTextSpecTree> top(make_shared_ptr(new PlainTextSpecTree(spec)));
+ std::shared_ptr<AllDepSpec> spec(new AllDepSpec);
+ std::shared_ptr<DepSpec> thing_to_annotate(spec);
+ std::shared_ptr<PlainTextSpecTree> top(make_shared_ptr(new PlainTextSpecTree(spec)));
stack.push_front(make_named_values<ParseStackTypes<PlainTextSpecTree>::Item>(
n::item() = top->root(),
n::spec() = spec
@@ -534,20 +534,20 @@ paludis::erepository::parse_plain_text(const std::string & s,
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
- n::on_all() = std::tr1::bind(&any_all_handler<PlainTextSpecTree, AllDepSpec>, std::tr1::ref(stack)),
- n::on_annotations() = std::tr1::bind(&set_annotations, std::tr1::ref(thing_to_annotate), _1),
- n::on_any() = std::tr1::bind(&any_not_allowed_handler, s),
- n::on_arrow() = std::tr1::bind(&arrows_not_allowed_handler, s, _1, _2),
- n::on_error() = std::tr1::bind(&error_handler, s, _1),
- n::on_label() = std::tr1::bind(&labels_not_allowed_handler, s, _1),
- n::on_pop() = std::tr1::bind(&pop_handler<PlainTextSpecTree>, std::tr1::ref(stack),
- ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), s),
- n::on_should_be_empty() = std::tr1::bind(&should_be_empty_handler<PlainTextSpecTree>, std::tr1::ref(stack), s),
- n::on_string() = std::tr1::bind(&plain_text_handler<PlainTextSpecTree>, std::tr1::ref(stack),
- ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), _1),
- n::on_use() = std::tr1::bind(&use_handler<PlainTextSpecTree>, std::tr1::ref(stack), _1, env, id),
+ n::on_all() = std::bind(&any_all_handler<PlainTextSpecTree, AllDepSpec>, std::ref(stack)),
+ n::on_annotations() = std::bind(&set_annotations, std::ref(thing_to_annotate), _1),
+ n::on_any() = std::bind(&any_not_allowed_handler, s),
+ n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
+ n::on_error() = std::bind(&error_handler, s, _1),
+ n::on_label() = std::bind(&labels_not_allowed_handler, s, _1),
+ n::on_pop() = std::bind(&pop_handler<PlainTextSpecTree>, std::ref(stack),
+ ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), s),
+ n::on_should_be_empty() = std::bind(&should_be_empty_handler<PlainTextSpecTree>, std::ref(stack), s),
+ n::on_string() = std::bind(&plain_text_handler<PlainTextSpecTree>, std::ref(stack),
+ ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1),
+ n::on_use() = std::bind(&use_handler<PlainTextSpecTree>, std::ref(stack), _1, env, id),
n::on_use_under_any() = &do_nothing
));
@@ -556,16 +556,16 @@ paludis::erepository::parse_plain_text(const std::string & s,
return top;
}
-std::tr1::shared_ptr<PlainTextSpecTree>
+std::shared_ptr<PlainTextSpecTree>
paludis::erepository::parse_myoptions(const std::string & s,
- const Environment * const env, const std::tr1::shared_ptr<const PackageID> & id, const EAPI &)
+ const Environment * const env, const std::shared_ptr<const PackageID> & id, const EAPI &)
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
ParseStackTypes<PlainTextSpecTree>::Stack stack;
- std::tr1::shared_ptr<AllDepSpec> spec(new AllDepSpec);
- std::tr1::shared_ptr<DepSpec> thing_to_annotate(spec);
- std::tr1::shared_ptr<PlainTextSpecTree> top(make_shared_ptr(new PlainTextSpecTree(spec)));
+ std::shared_ptr<AllDepSpec> spec(new AllDepSpec);
+ std::shared_ptr<DepSpec> thing_to_annotate(spec);
+ std::shared_ptr<PlainTextSpecTree> top(make_shared_ptr(new PlainTextSpecTree(spec)));
stack.push_front(make_named_values<ParseStackTypes<PlainTextSpecTree>::Item>(
n::item() = top->root(),
n::spec() = spec
@@ -573,22 +573,22 @@ paludis::erepository::parse_myoptions(const std::string & s,
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
- n::on_all() = std::tr1::bind(&any_all_handler<PlainTextSpecTree, AllDepSpec>, std::tr1::ref(stack)),
- n::on_annotations() = std::tr1::bind(&set_annotations, std::tr1::ref(thing_to_annotate), _1),
- n::on_any() = std::tr1::bind(&any_not_allowed_handler, s),
- n::on_arrow() = std::tr1::bind(&arrows_not_allowed_handler, s, _1, _2),
- n::on_error() = std::tr1::bind(&error_handler, s, _1),
- n::on_label() = std::tr1::bind(&plain_text_label_handler<PlainTextSpecTree>, std::tr1::ref(stack),
- ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), _1),
- n::on_pop() = std::tr1::bind(&pop_handler<PlainTextSpecTree>, std::tr1::ref(stack),
- ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), s),
- n::on_should_be_empty() = std::tr1::bind(&should_be_empty_handler<PlainTextSpecTree>, std::tr1::ref(stack), s),
- n::on_string() = std::tr1::bind(&plain_text_handler<PlainTextSpecTree>, std::tr1::ref(stack),
- ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::tr1::bind(
- &set_thing_to_annotate, std::tr1::ref(thing_to_annotate), _1)), _1),
- n::on_use() = std::tr1::bind(&use_handler<PlainTextSpecTree>, std::tr1::ref(stack), _1, env, id),
+ n::on_all() = std::bind(&any_all_handler<PlainTextSpecTree, AllDepSpec>, std::ref(stack)),
+ n::on_annotations() = std::bind(&set_annotations, std::ref(thing_to_annotate), _1),
+ n::on_any() = std::bind(&any_not_allowed_handler, s),
+ n::on_arrow() = std::bind(&arrows_not_allowed_handler, s, _1, _2),
+ n::on_error() = std::bind(&error_handler, s, _1),
+ n::on_label() = std::bind(&plain_text_label_handler<PlainTextSpecTree>, std::ref(stack),
+ ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1),
+ n::on_pop() = std::bind(&pop_handler<PlainTextSpecTree>, std::ref(stack),
+ ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), s),
+ n::on_should_be_empty() = std::bind(&should_be_empty_handler<PlainTextSpecTree>, std::ref(stack), s),
+ n::on_string() = std::bind(&plain_text_handler<PlainTextSpecTree>, std::ref(stack),
+ ParseStackTypes<PlainTextSpecTree>::AnnotationsGoHere(std::bind(
+ &set_thing_to_annotate, std::ref(thing_to_annotate), _1)), _1),
+ n::on_use() = std::bind(&use_handler<PlainTextSpecTree>, std::ref(stack), _1, env, id),
n::on_use_under_any() = &do_nothing
));
@@ -597,7 +597,7 @@ paludis::erepository::parse_myoptions(const std::string & s,
return top;
}
-std::tr1::shared_ptr<URILabelsDepSpec>
+std::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.name() + "':");
@@ -609,7 +609,7 @@ paludis::erepository::parse_uri_label(const std::string & s, const EAPI & e)
if (c.empty())
throw EDepParseError(s, "Unknown label");
- std::tr1::shared_ptr<URILabelsDepSpec> l(new URILabelsDepSpec);
+ std::shared_ptr<URILabelsDepSpec> l(new URILabelsDepSpec);
if (c == "URIMirrorsThenListedLabel")
l->add_label(make_shared_ptr(new URIMirrorsThenListedLabel(s.substr(0, s.length() - 1))));
@@ -629,7 +629,7 @@ paludis::erepository::parse_uri_label(const std::string & s, const EAPI & e)
return l;
}
-std::tr1::shared_ptr<PlainTextLabelDepSpec>
+std::shared_ptr<PlainTextLabelDepSpec>
paludis::erepository::parse_plain_text_label(const std::string & s)
{
Context context("When parsing label string '" + s + "':");
@@ -647,7 +647,7 @@ paludis::erepository::parse_plain_text_label(const std::string & s)
namespace
{
bool enabled_if_option(
- const std::tr1::shared_ptr<const PackageID> id,
+ const std::shared_ptr<const PackageID> id,
const std::string label,
const ChoiceNameWithPrefix n)
{
@@ -661,7 +661,7 @@ namespace
return false;
}
- const std::tr1::shared_ptr<const ChoiceValue> v(id->choices_key()->value()->find_by_name_with_prefix(n));
+ const std::shared_ptr<const ChoiceValue> v(id->choices_key()->value()->find_by_name_with_prefix(n));
if (! v)
{
Log::get_instance()->message("e.dep_parser.label_enabled.no_choice", ll_warning, lc_context)
@@ -674,9 +674,9 @@ namespace
}
}
-std::tr1::shared_ptr<DependenciesLabelsDepSpec>
+std::shared_ptr<DependenciesLabelsDepSpec>
paludis::erepository::parse_dependency_label(
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & id,
const std::string & s,
const EAPI & e)
{
@@ -689,7 +689,7 @@ paludis::erepository::parse_dependency_label(
std::string label(s.substr(0, s.length() - 1));
tokenise<delim_kind::AnyOfTag, delim_mode::DelimiterTag>(label, "+", "", std::inserter(labels, labels.end()));
- std::tr1::shared_ptr<DependenciesLabelsDepSpec> l(new DependenciesLabelsDepSpec);
+ std::shared_ptr<DependenciesLabelsDepSpec> l(new DependenciesLabelsDepSpec);
for (std::set<std::string>::iterator it = labels.begin(), it_e = labels.end(); it != it_e; ++it)
{
@@ -733,7 +733,7 @@ paludis::erepository::parse_dependency_label(
if (cc.empty())
l->add_label(make_shared_ptr(new DependenciesTestLabel(*it, return_literal_function(true))));
else
- l->add_label(make_shared_ptr(new DependenciesTestLabel(*it, std::tr1::bind(
+ l->add_label(make_shared_ptr(new DependenciesTestLabel(*it, std::bind(
&enabled_if_option, id, *it, ChoiceNameWithPrefix(cc)))));
}
else if (c == "WarnAndIgnore")
diff --git a/paludis/repositories/e/dep_parser.hh b/paludis/repositories/e/dep_parser.hh
index 357baab74..6ee9a6c27 100644
--- a/paludis/repositories/e/dep_parser.hh
+++ b/paludis/repositories/e/dep_parser.hh
@@ -52,62 +52,62 @@ namespace paludis
/**
* Parse a dependency heirarchy.
*/
- std::tr1::shared_ptr<DependencySpecTree> parse_depend(const std::string & s,
- const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::shared_ptr<DependencySpecTree> parse_depend(const std::string & s,
+ const Environment * const, const std::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a dep spec label.
*/
- std::tr1::shared_ptr<DependenciesLabelsDepSpec> parse_dependency_label(
- const std::tr1::shared_ptr<const PackageID> &,
+ std::shared_ptr<DependenciesLabelsDepSpec> parse_dependency_label(
+ const std::shared_ptr<const PackageID> &,
const std::string & s,
const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a provide heirarchy.
*/
- std::tr1::shared_ptr<ProvideSpecTree> parse_provide(const std::string & s,
- const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::shared_ptr<ProvideSpecTree> parse_provide(const std::string & s,
+ const Environment * const, const std::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a restrict or plain text heirarchy.
*/
- std::tr1::shared_ptr<PlainTextSpecTree> parse_plain_text(const std::string & s,
- const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::shared_ptr<PlainTextSpecTree> parse_plain_text(const std::string & s,
+ const Environment * const, const std::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a myoptions heirarchy.
*/
- std::tr1::shared_ptr<PlainTextSpecTree> parse_myoptions(const std::string & s,
- const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::shared_ptr<PlainTextSpecTree> parse_myoptions(const std::string & s,
+ const Environment * const, const std::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a fetchable uri heirarchy.
*/
- std::tr1::shared_ptr<FetchableURISpecTree> parse_fetchable_uri(const std::string & s,
- const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::shared_ptr<FetchableURISpecTree> parse_fetchable_uri(const std::string & s,
+ const Environment * const, const std::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a simple uri heirarchy.
*/
- std::tr1::shared_ptr<SimpleURISpecTree> parse_simple_uri(const std::string & s,
- const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::shared_ptr<SimpleURISpecTree> parse_simple_uri(const std::string & s,
+ const Environment * const, const std::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a license heirarchy.
*/
- std::tr1::shared_ptr<LicenseSpecTree> parse_license(const std::string & s,
- const Environment * const, const std::tr1::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
+ std::shared_ptr<LicenseSpecTree> parse_license(const std::string & s,
+ const Environment * const, const std::shared_ptr<const PackageID> &, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a URI label.
*/
- std::tr1::shared_ptr<URILabelsDepSpec> parse_uri_label(const std::string & s, const EAPI &) PALUDIS_VISIBLE;
+ std::shared_ptr<URILabelsDepSpec> parse_uri_label(const std::string & s, const EAPI &) PALUDIS_VISIBLE;
/**
* Parse a plain text label.
*/
- std::tr1::shared_ptr<PlainTextLabelDepSpec> parse_plain_text_label(const std::string & s) PALUDIS_VISIBLE;
+ std::shared_ptr<PlainTextLabelDepSpec> parse_plain_text_label(const std::string & s) PALUDIS_VISIBLE;
}
}
diff --git a/paludis/repositories/e/dep_parser_TEST.cc b/paludis/repositories/e/dep_parser_TEST.cc
index 483d4628c..0e5f9d89c 100644
--- a/paludis/repositories/e/dep_parser_TEST.cc
+++ b/paludis/repositories/e/dep_parser_TEST.cc
@@ -52,15 +52,15 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
StringifyFormatter ff;
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "");
@@ -78,15 +78,15 @@ namespace test_cases
void run()
{
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
StringifyFormatter ff;
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend(" \n \t",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "");
@@ -104,15 +104,15 @@ namespace test_cases
void run()
{
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
StringifyFormatter ff;
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("app-editors/vim",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "app-editors/vim");
@@ -131,24 +131,24 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d1(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d1(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend(">=app-editors/vim-6.4_alpha",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d1);
TEST_CHECK_EQUAL(stringify(d1), ">=app-editors/vim-6.4_alpha");
- DepSpecPrettyPrinter d2(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d2(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("=app-editors/vim-6.4_alpha-r1",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d2);
TEST_CHECK_EQUAL(stringify(d2), "=app-editors/vim-6.4_alpha-r1");
- DepSpecPrettyPrinter d3(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d3(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend(">=app-editors/vim-6.4_alpha:one",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d3);
TEST_CHECK_EQUAL(stringify(d3), ">=app-editors/vim-6.4_alpha:one");
@@ -167,14 +167,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("app-editors/vim app-misc/hilite \nsys-apps/findutils",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "app-editors/vim app-misc/hilite sys-apps/findutils");
@@ -189,14 +189,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("|| ( one/one two/two )",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "|| ( one/one two/two )");
@@ -211,14 +211,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("|| ( one/one foo? ( two/two ) )",
&env, id, *EAPIData::get_instance()->eapi_from_string("0"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "|| ( one/one foo? ( two/two ) )");
@@ -226,7 +226,7 @@ namespace test_cases
TEST_CHECK_THROWS(parse_depend("|| ( one/one foo? ( two/two ) )",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
- DepSpecPrettyPrinter e(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter e(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("|| ( one/one ( foo? ( two/two ) ) )",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(e);
TEST_CHECK_EQUAL(stringify(e), "|| ( one/one ( foo? ( two/two ) ) )");
@@ -245,14 +245,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend(" ( one/one two/two ) ",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "one/one two/two");
@@ -271,14 +271,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("foo? ( one/one )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "foo? ( one/one )");
}
@@ -296,14 +296,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("!foo? ( one/one )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "!foo? ( one/one )");
}
@@ -317,18 +317,18 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, true, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, true, false);
parse_fetchable_uri("a\n->\tb", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "a -> b\n");
- DepSpecPrettyPrinter e(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, true, false);
+ DepSpecPrettyPrinter e(0, std::shared_ptr<const PackageID>(), ff, 0, true, false);
parse_fetchable_uri("a-> b", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(e);
TEST_CHECK_EQUAL(stringify(e), "a->\nb\n");
@@ -349,14 +349,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK_THROWS(parse_depend("!foo? ( one/one",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("!foo? ( one/one ) )",
@@ -382,14 +382,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK_THROWS(parse_depend("||",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("|| ",
@@ -437,14 +437,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("build: one/one",
&env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "build: one/one");
@@ -461,14 +461,14 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_fetchable_uri("http://foo/bar manual: two",
&env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "http://foo/bar manual: two");
@@ -484,20 +484,20 @@ namespace test_cases
void run()
{
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
StringifyFormatter ff;
- DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("cat/first [[ foo = bar bar = baz ]] cat/second cat/third [[ moo = oink ]]",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "cat/first [[ bar = [ baz ] foo = [ bar ] ]] cat/second cat/third [[ moo = [ oink ] ]]");
- DepSpecPrettyPrinter e(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter e(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("bar? ( foo? ( cat/first [[ for = first ]] ) [[ for = foo ]] baz? ( ) [[ for = baz ]] ) [[ for = bar ]]",
&env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(e);
TEST_CHECK_EQUAL(stringify(e), "bar? ( foo? ( cat/first [[ for = [ first ] ]] ) "
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.cc b/paludis/repositories/e/dep_spec_pretty_printer.cc
index 01d26dcb6..dd9a65f6e 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer.cc
@@ -54,7 +54,7 @@ namespace paludis
{
std::stringstream s;
const Environment * const env;
- const std::tr1::shared_ptr<const PackageID> id;
+ const std::shared_ptr<const PackageID> id;
GenericSpecTree::ItemFormatter formatter;
unsigned indent;
bool extra_label_indent;
@@ -66,7 +66,7 @@ namespace paludis
Implementation(
const Environment * const e,
- const std::tr1::shared_ptr<const PackageID> & i,
+ const std::shared_ptr<const PackageID> & i,
const GenericSpecTree::ItemFormatter & f,
unsigned in,
bool b,
@@ -88,7 +88,7 @@ namespace paludis
DepSpecPrettyPrinter::DepSpecPrettyPrinter(
const Environment * const e,
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::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 fcf47847c..da2a582e7 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/e/dep_spec_pretty_printer.hh
@@ -78,7 +78,7 @@ namespace paludis
*/
DepSpecPrettyPrinter(
const Environment * const env,
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::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 679a01037..33c6c7883 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
@@ -43,34 +43,34 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter p1(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter p1(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("foo/bar bar/baz", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p1);
TEST_CHECK_STRINGIFY_EQUAL(p1, "foo/bar bar/baz");
- DepSpecPrettyPrinter p2(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter p2(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("foo/bar moo? ( bar/baz )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p2);
TEST_CHECK_STRINGIFY_EQUAL(p2, "foo/bar moo? ( bar/baz )");
- DepSpecPrettyPrinter p3(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter p3(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("|| ( a/b ( c/d e/f ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p3);
TEST_CHECK_STRINGIFY_EQUAL(p3, "|| ( a/b ( c/d e/f ) )");
- DepSpecPrettyPrinter p4(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter p4(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_license("( ( ( ) a ) b )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p4);
TEST_CHECK_STRINGIFY_EQUAL(p4, "a b");
- DepSpecPrettyPrinter p5(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter p5(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_fetchable_uri("( a -> b c x? ( d e ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p5);
TEST_CHECK_STRINGIFY_EQUAL(p5, "a -> b c x? ( d e )");
- DepSpecPrettyPrinter p6(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ DepSpecPrettyPrinter p6(0, std::shared_ptr<const PackageID>(), ff, 0, false, 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"))->root()->accept(p6);
TEST_CHECK_STRINGIFY_EQUAL(p6, "a manual: b x? ( c mirrors-first: d manual: e ) f");
@@ -85,31 +85,31 @@ namespace test_cases
{
StringifyFormatter ff;
TestEnvironment env;
- const std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
+ const std::shared_ptr<FakeRepository> repo(new FakeRepository(make_named_values<FakeRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("repo")
)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
- DepSpecPrettyPrinter p1(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true, false);
+ DepSpecPrettyPrinter p1(0, std::shared_ptr<const PackageID>(), ff, 1, true, false);
parse_depend("foo/bar bar/baz", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p1);
TEST_CHECK_STRINGIFY_EQUAL(p1, " foo/bar\n bar/baz\n");
- DepSpecPrettyPrinter p2(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true, false);
+ DepSpecPrettyPrinter p2(0, std::shared_ptr<const PackageID>(), ff, 1, true, false);
parse_depend("foo/bar moo? ( bar/baz )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p2);
TEST_CHECK_STRINGIFY_EQUAL(p2, " foo/bar\n moo? (\n bar/baz\n )\n");
- DepSpecPrettyPrinter p3(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true, false);
+ DepSpecPrettyPrinter p3(0, std::shared_ptr<const PackageID>(), ff, 1, true, false);
parse_depend("|| ( a/b ( c/d e/f ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p3);
TEST_CHECK_STRINGIFY_EQUAL(p3, " || (\n a/b\n (\n c/d\n"
" e/f\n )\n )\n");
- DepSpecPrettyPrinter p4(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true, false);
+ DepSpecPrettyPrinter p4(0, std::shared_ptr<const PackageID>(), ff, 1, true, false);
parse_license("( ( ( ) a ) b )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p4);
TEST_CHECK_STRINGIFY_EQUAL(p4, " a\n b\n");
- DepSpecPrettyPrinter p5(0, std::tr1::shared_ptr<const PackageID>(), ff, 1, true, false);
+ DepSpecPrettyPrinter p5(0, std::shared_ptr<const PackageID>(), ff, 1, true, 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"))->root()->accept(p5);
TEST_CHECK_STRINGIFY_EQUAL(p5, " a\n manual:\n b\n x? (\n c\n"
diff --git a/paludis/repositories/e/depend_rdepend_TEST.cc b/paludis/repositories/e/depend_rdepend_TEST.cc
index 29c774a7b..7755df513 100644
--- a/paludis/repositories/e/depend_rdepend_TEST.cc
+++ b/paludis/repositories/e/depend_rdepend_TEST.cc
@@ -44,18 +44,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -108,7 +108,7 @@ namespace
FSEntry root(FSEntry::cwd() / "depend_rdepend_TEST_dir" / "root");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "depend_rdepend_TEST_dir" / "repo"));
@@ -120,30 +120,30 @@ namespace
keys->insert("distdir", stringify(FSEntry::cwd() / "depend_rdepend_TEST_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "depend_rdepend_TEST_dir" / "build"));
keys->insert("root", stringify(root));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
v_keys->insert("format", "vdb");
v_keys->insert("names_cache", "/var/empty");
v_keys->insert("provides_cache", "/var/empty");
v_keys->insert("location", stringify(FSEntry::cwd() / "depend_rdepend_TEST_dir" / "vdb"));
v_keys->insert("root", stringify(root));
- std::tr1::shared_ptr<Repository> v_repo(VDBRepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> v_repo(VDBRepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, v_repo);
#ifdef ENABLE_VIRTUALS_REPOSITORY
- std::tr1::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
iv_keys->insert("root", "/");
iv_keys->insert("format", "installed_virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, iv_keys, std::tr1::placeholders::_1)));
- std::tr1::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
+ std::bind(from_keys, iv_keys, std::placeholders::_1)));
+ std::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
v_keys->insert("format", "virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, v_keys, std::tr1::placeholders::_1)));
+ std::bind(from_keys, v_keys, std::placeholders::_1)));
#endif
InstallAction action(make_named_values<InstallActionOptions>(
@@ -157,7 +157,7 @@ namespace
StringifyFormatter f;
{
- std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Package(
+ std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Package(
QualifiedPackageName("cat/eapi" + eapi + "donly")))]->begin());
TEST_CHECK_EQUAL(id->build_dependencies_key()->pretty_print_flat(f), "the/depend");
@@ -170,7 +170,7 @@ namespace
v_repo->invalidate();
- std::tr1::shared_ptr<const PackageID> v_id(*env[selection::RequireExactlyOne(generator::Package(
+ std::shared_ptr<const PackageID> v_id(*env[selection::RequireExactlyOne(generator::Package(
QualifiedPackageName("cat/eapi" + eapi + "donly")) |
filter::InstalledAtRoot(root))]->begin());
@@ -182,7 +182,7 @@ namespace
}
{
- std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Package(
+ std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Package(
QualifiedPackageName("cat/eapi" + eapi + "ronly")))]->begin());
TEST_CHECK_EQUAL(id->build_dependencies_key()->pretty_print_flat(f), "");
@@ -192,7 +192,7 @@ namespace
v_repo->invalidate();
- std::tr1::shared_ptr<const PackageID> v_id(*env[selection::RequireExactlyOne(generator::Package(
+ std::shared_ptr<const PackageID> v_id(*env[selection::RequireExactlyOne(generator::Package(
QualifiedPackageName("cat/eapi" + eapi + "ronly")) |
filter::InstalledAtRoot(root))]->begin());
@@ -201,7 +201,7 @@ namespace
}
{
- std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Package(
+ std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Package(
QualifiedPackageName("cat/eapi" + eapi + "both")))]->begin());
TEST_CHECK_EQUAL(id->build_dependencies_key()->pretty_print_flat(f), "the/depend");
@@ -211,7 +211,7 @@ namespace
v_repo->invalidate();
- std::tr1::shared_ptr<const PackageID> v_id(*env[selection::RequireExactlyOne(generator::Package(
+ std::shared_ptr<const PackageID> v_id(*env[selection::RequireExactlyOne(generator::Package(
QualifiedPackageName("cat/eapi" + eapi + "both")) |
filter::InstalledAtRoot(root))]->begin());
diff --git a/paludis/repositories/e/dependencies_rewriter.cc b/paludis/repositories/e/dependencies_rewriter.cc
index a48f24e19..bdec731fd 100644
--- a/paludis/repositories/e/dependencies_rewriter.cc
+++ b/paludis/repositories/e/dependencies_rewriter.cc
@@ -35,7 +35,7 @@
using namespace paludis;
using namespace paludis::erepository;
-typedef std::list<std::tr1::shared_ptr<DependenciesLabelSequence> > LabelsStack;
+typedef std::list<std::shared_ptr<DependenciesLabelSequence> > LabelsStack;
namespace
{
@@ -69,7 +69,7 @@ namespace paludis
std::string rdepend;
std::string pdepend;
- std::tr1::shared_ptr<DependenciesLabelSequence> default_labels;
+ std::shared_ptr<DependenciesLabelSequence> default_labels;
LabelsStack labels;
Implementation() :
@@ -134,7 +134,7 @@ DependenciesRewriter::visit(const DependencySpecTree::NodeType<DependenciesLabel
_imp->rdepend.append(" " + stringify(*node.spec()) + get_annotations(*node.spec()));
_imp->pdepend.append(" " + stringify(*node.spec()) + get_annotations(*node.spec()));
- std::tr1::shared_ptr<DependenciesLabelSequence> labels(new DependenciesLabelSequence);
+ std::shared_ptr<DependenciesLabelSequence> labels(new DependenciesLabelSequence);
std::copy(node.spec()->begin(), node.spec()->end(), labels->back_inserter());
*_imp->labels.begin() = labels;
}
@@ -143,7 +143,7 @@ void
DependenciesRewriter::visit(const DependencySpecTree::NodeType<AllDepSpec>::Type & node)
{
_imp->labels.push_front(*_imp->labels.begin());
- RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &_imp->labels));
+ RunOnDestruction restore_labels(std::bind(std::mem_fn(&LabelsStack::pop_front), &_imp->labels));
std::string d(_imp->depend), r(_imp->rdepend), p(_imp->pdepend);
_imp->depend.clear();
@@ -161,7 +161,7 @@ void
DependenciesRewriter::visit(const DependencySpecTree::NodeType<AnyDepSpec>::Type & node)
{
_imp->labels.push_front(*_imp->labels.begin());
- RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &_imp->labels));
+ RunOnDestruction restore_labels(std::bind(std::mem_fn(&LabelsStack::pop_front), &_imp->labels));
std::string d(_imp->depend), r(_imp->rdepend), p(_imp->pdepend);
_imp->depend.clear();
@@ -179,7 +179,7 @@ void
DependenciesRewriter::visit(const DependencySpecTree::NodeType<ConditionalDepSpec>::Type & node)
{
_imp->labels.push_front(*_imp->labels.begin());
- RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &_imp->labels));
+ RunOnDestruction restore_labels(std::bind(std::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_choice_value.cc b/paludis/repositories/e/e_choice_value.cc
index 736e2937a..86157c616 100644
--- a/paludis/repositories/e/e_choice_value.cc
+++ b/paludis/repositories/e/e_choice_value.cc
@@ -24,7 +24,7 @@ using namespace paludis;
using namespace paludis::erepository;
EChoiceValue::EChoiceValue(const ChoicePrefixName & r, const UnprefixedChoiceName & v, const ChoiceNameWithPrefix & np, const QualifiedPackageName & p,
- const std::tr1::shared_ptr<const UseDesc> & d,
+ const std::shared_ptr<const UseDesc> & d,
bool b, bool def, bool l, bool x, const std::string & o,
const std::string & pv) :
_prefix(r),
diff --git a/paludis/repositories/e/e_choice_value.hh b/paludis/repositories/e/e_choice_value.hh
index 20b0afec2..a27c5a530 100644
--- a/paludis/repositories/e/e_choice_value.hh
+++ b/paludis/repositories/e/e_choice_value.hh
@@ -23,7 +23,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/choice.hh>
#include <paludis/name.hh>
-#include <tr1/functional>
+#include <functional>
#include <string>
namespace paludis
@@ -40,7 +40,7 @@ namespace paludis
const UnprefixedChoiceName _unprefixed_name;
const ChoiceNameWithPrefix _name_with_prefix;
const QualifiedPackageName _package_name;
- const std::tr1::shared_ptr<const UseDesc> _use_desc;
+ const std::shared_ptr<const UseDesc> _use_desc;
const bool _enabled;
const bool _enabled_by_default;
const bool _locked;
@@ -53,7 +53,7 @@ namespace paludis
const UnprefixedChoiceName & n,
const ChoiceNameWithPrefix & np,
const QualifiedPackageName & p,
- const std::tr1::shared_ptr<const UseDesc> & d,
+ const std::shared_ptr<const UseDesc> & d,
bool b, bool def,
bool l, bool x,
const std::string & o,
diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc
index ad4002594..834351950 100644
--- a/paludis/repositories/e/e_choices_key.cc
+++ b/paludis/repositories/e/e_choices_key.cc
@@ -60,20 +60,20 @@ namespace paludis
struct Implementation<EChoicesKey>
{
mutable Mutex mutex;
- mutable std::tr1::shared_ptr<Choices> value;
+ mutable std::shared_ptr<Choices> value;
const Environment * const env;
- const std::tr1::shared_ptr<const ERepositoryID> id;
- const std::tr1::shared_ptr<const ERepository> maybe_e_repository;
- const std::tr1::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > maybe_descriptions;
+ const std::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepository> maybe_e_repository;
+ const std::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > maybe_descriptions;
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i,
- const std::tr1::shared_ptr<const ERepository> & p,
- const std::tr1::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & d,
+ Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i,
+ const std::shared_ptr<const ERepository> & p,
+ const std::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & d,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
id(i),
@@ -89,10 +89,10 @@ namespace paludis
EChoicesKey::EChoicesKey(
const Environment * const e,
- const std::tr1::shared_ptr<const ERepositoryID> & i,
+ const std::shared_ptr<const ERepositoryID> & i,
const std::string & r, const std::string & h, const MetadataKeyType t,
- const std::tr1::shared_ptr<const ERepository> & p,
- const std::tr1::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & d) :
+ const std::shared_ptr<const ERepository> & p,
+ const std::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & d) :
PrivateImplementationPattern<EChoicesKey>(new Implementation<EChoicesKey>(e, i, p, d, r, h, t))
{
}
@@ -193,9 +193,9 @@ namespace
}
};
- std::tr1::shared_ptr<ChoiceValue> make_myoption(
- const std::tr1::shared_ptr<const ERepositoryID> & id,
- std::tr1::shared_ptr<Choice> & choice,
+ std::shared_ptr<ChoiceValue> make_myoption(
+ const std::shared_ptr<const ERepositoryID> & id,
+ std::shared_ptr<Choice> & choice,
MyOptionsFinder::Values::const_iterator & v,
const Tribool s,
const bool b)
@@ -210,7 +210,7 @@ namespace
return id->make_choice_value(choice, v->first, s, false, b, description, false);
}
- std::string get_maybe_description(const std::tr1::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & m,
+ std::string get_maybe_description(const std::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & m,
const ChoiceNameWithPrefix & k)
{
if (m)
@@ -242,7 +242,7 @@ namespace
void add_choice_to_map(std::map<ChoiceNameWithPrefix, ChoiceOptions> & values,
const std::pair<ChoiceNameWithPrefix, ChoiceOptions> & flag,
- const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & key)
+ const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & key)
{
std::map<ChoiceNameWithPrefix, ChoiceOptions>::iterator i(values.find(flag.first));
if (values.end() == i)
@@ -268,7 +268,7 @@ namespace
}
}
-const std::tr1::shared_ptr<const Choices>
+const std::shared_ptr<const Choices>
EChoicesKey::value() const
{
Lock l(_imp->mutex);
@@ -294,7 +294,7 @@ EChoicesKey::populate_myoptions() const
{
Context local_context("When using raw_myoptions_key to populate choices:");
- std::tr1::shared_ptr<Choice> options(new Choice(make_named_values<ChoiceParams>(
+ std::shared_ptr<Choice> options(new Choice(make_named_values<ChoiceParams>(
n::consider_added_or_changed() = true,
n::contains_every_value() = false,
n::hidden() = false,
@@ -305,7 +305,7 @@ EChoicesKey::populate_myoptions() const
)));
_imp->value->add(options);
- std::tr1::shared_ptr<const Set<std::string> > hidden;
+ std::shared_ptr<const Set<std::string> > hidden;
if (_imp->id->raw_use_expand_hidden_key())
hidden = _imp->id->raw_use_expand_hidden_key()->value();
@@ -322,7 +322,7 @@ EChoicesKey::populate_myoptions() const
std::string lower_u;
std::transform(u->begin(), u->end(), std::back_inserter(lower_u), &::tolower);
- std::tr1::shared_ptr<Choice> exp(new Choice(make_named_values<ChoiceParams>(
+ std::shared_ptr<Choice> exp(new Choice(make_named_values<ChoiceParams>(
n::consider_added_or_changed() = true,
n::contains_every_value() = false,
n::hidden() = hidden ? hidden->end() != hidden->find(*u) : false,
@@ -368,7 +368,7 @@ EChoicesKey::populate_iuse() const
{
Context local_context("When using raw_iuse_key and raw_use_key to populate choices:");
- std::tr1::shared_ptr<Choice> use(new Choice(make_named_values<ChoiceParams>(
+ std::shared_ptr<Choice> use(new Choice(make_named_values<ChoiceParams>(
n::consider_added_or_changed() = true,
n::contains_every_value() = false,
n::hidden() = false,
@@ -381,7 +381,7 @@ EChoicesKey::populate_iuse() const
bool has_fancy_test_flag(false);
- std::tr1::shared_ptr<const Set<std::string> > hidden;
+ std::shared_ptr<const Set<std::string> > hidden;
if (_imp->id->raw_use_expand_hidden_key())
hidden = _imp->id->raw_use_expand_hidden_key()->value();
@@ -436,7 +436,7 @@ EChoicesKey::populate_iuse() const
for (std::map<ChoiceNameWithPrefix, ChoiceOptions>::const_iterator it(values.begin()),
it_end(values.end()) ; it != it_end ; ++it)
{
- std::tr1::shared_ptr<const ChoiceValue> choice(_imp->id->make_choice_value(
+ std::shared_ptr<const ChoiceValue> choice(_imp->id->make_choice_value(
use, UnprefixedChoiceName(stringify(it->first)), it->second.default_value(), false,
! it->second.implicit(), get_maybe_description(_imp->maybe_descriptions, it->first), false));
use->add(choice);
@@ -476,7 +476,7 @@ EChoicesKey::populate_iuse() const
std::string env_arch(_imp->id->eapi()->supported()->ebuild_environment_variables()->env_arch());
if ((! env_arch.empty()) && _imp->maybe_e_repository && ! _imp->id->eapi()->supported()->ebuild_options()->require_use_expand_in_iuse())
{
- std::tr1::shared_ptr<Choice> arch(new Choice(make_named_values<ChoiceParams>(
+ std::shared_ptr<Choice> arch(new Choice(make_named_values<ChoiceParams>(
n::consider_added_or_changed() = false,
n::contains_every_value() = false,
n::hidden() = true,
@@ -500,7 +500,7 @@ EChoicesKey::populate_iuse() const
{
std::string lower_u;
std::transform(u->begin(), u->end(), std::back_inserter(lower_u), &::tolower);
- std::tr1::shared_ptr<Choice> exp(new Choice(make_named_values<ChoiceParams>(
+ std::shared_ptr<Choice> exp(new Choice(make_named_values<ChoiceParams>(
n::consider_added_or_changed() = true,
n::contains_every_value() = ! _imp->id->eapi()->supported()->ebuild_options()->require_use_expand_in_iuse(),
n::hidden() = hidden ? hidden->end() != hidden->find(*u) : false,
@@ -515,12 +515,12 @@ EChoicesKey::populate_iuse() const
if (! _imp->id->eapi()->supported()->ebuild_options()->require_use_expand_in_iuse())
{
- std::tr1::shared_ptr<const Set<UnprefixedChoiceName> > e_values(_imp->env->known_choice_value_names(_imp->id, exp));
+ std::shared_ptr<const Set<UnprefixedChoiceName> > e_values(_imp->env->known_choice_value_names(_imp->id, exp));
std::copy(e_values->begin(), e_values->end(), std::inserter(values, values.begin()));
if (_imp->maybe_e_repository)
{
- std::tr1::shared_ptr<const Set<UnprefixedChoiceName> > r_values(
+ std::shared_ptr<const Set<UnprefixedChoiceName> > r_values(
_imp->maybe_e_repository->profile()->known_choice_value_names(_imp->id, exp));
std::copy(r_values->begin(), r_values->end(), std::inserter(values, values.begin()));
}
@@ -559,7 +559,7 @@ EChoicesKey::populate_iuse() const
if (has_fancy_test_flag)
{
- std::tr1::shared_ptr<const ChoiceValue> choice;
+ std::shared_ptr<const ChoiceValue> choice;
choice = _imp->value->find_by_name_with_prefix(ELikeRecommendedTestsChoiceValue::canonical_name_with_prefix());
if (! choice)
diff --git a/paludis/repositories/e/e_choices_key.hh b/paludis/repositories/e/e_choices_key.hh
index 7f15d4007..134ae3bd9 100644
--- a/paludis/repositories/e/e_choices_key.hh
+++ b/paludis/repositories/e/e_choices_key.hh
@@ -34,7 +34,7 @@ namespace paludis
class ERepositoryID;
class EChoicesKey :
- public MetadataValueKey<std::tr1::shared_ptr<const Choices> >,
+ public MetadataValueKey<std::shared_ptr<const Choices> >,
private PrivateImplementationPattern<EChoicesKey>
{
private:
@@ -44,16 +44,16 @@ namespace paludis
public:
EChoicesKey(
const Environment * const,
- const std::tr1::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const ERepositoryID> &,
const std::string &,
const std::string &,
const MetadataKeyType,
- const std::tr1::shared_ptr<const ERepository> & maybe_profile,
- const std::tr1::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & maybe_descriptions);
+ const std::shared_ptr<const ERepository> & maybe_profile,
+ const std::shared_ptr<const Map<ChoiceNameWithPrefix, std::string> > & maybe_descriptions);
~EChoicesKey();
- const std::tr1::shared_ptr<const Choices> value() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Choices> value() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index f0701a436..64c9035df 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -174,17 +174,17 @@ EInstalledRepository::is_unimportant() const
return false;
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
EInstalledRepository::unimportant_category_names() const
{
- std::tr1::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
+ std::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
result->insert(CategoryNamePart("virtual"));
return result;
}
std::string
EInstalledRepository::get_environment_variable(
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & id,
const std::string & var) const
{
Context context("When fetching environment variable '" + var + "' for '" +
@@ -220,7 +220,7 @@ EInstalledRepository::get_environment_variable(
void
EInstalledRepository::perform_config(
- const std::tr1::shared_ptr<const ERepositoryID> & id,
+ const std::shared_ptr<const ERepositoryID> & id,
const ConfigAction & a) const
{
Context context("When configuring '" + stringify(*id) + "':");
@@ -229,14 +229,14 @@ EInstalledRepository::perform_config(
throw ActionFailedError("Couldn't configure '" + stringify(*id) +
"' because root ('" + stringify(_imp->params.root()) + "') is not a directory");
- std::tr1::shared_ptr<OutputManager> output_manager(a.options.make_output_manager()(a));
+ std::shared_ptr<OutputManager> output_manager(a.options.make_output_manager()(a));
FSEntry ver_dir(id->fs_location_key()->value());
- std::tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
+ std::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
eclassdirs->push_back(ver_dir);
- std::tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
+ std::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
EAPIPhases phases(id->eapi()->supported()->ebuild_phases()->ebuild_config());
for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
@@ -275,7 +275,7 @@ EInstalledRepository::perform_config(
void
EInstalledRepository::perform_info(
- const std::tr1::shared_ptr<const ERepositoryID> & id,
+ const std::shared_ptr<const ERepositoryID> & id,
const InfoAction & a) const
{
Context context("When infoing '" + stringify(*id) + "':");
@@ -284,14 +284,14 @@ EInstalledRepository::perform_info(
throw ActionFailedError("Couldn't info '" + stringify(*id) +
"' because root ('" + stringify(_imp->params.root()) + "') is not a directory");
- std::tr1::shared_ptr<OutputManager> output_manager(a.options.make_output_manager()(a));
+ std::shared_ptr<OutputManager> output_manager(a.options.make_output_manager()(a));
FSEntry ver_dir(id->fs_location_key()->value());
- std::tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
+ std::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
eclassdirs->push_back(ver_dir);
- std::tr1::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
+ std::shared_ptr<FSEntry> load_env(new FSEntry(ver_dir / "environment.bz2"));
EAPIPhases phases(id->eapi()->supported()->ebuild_phases()->ebuild_info());
@@ -302,7 +302,7 @@ EInstalledRepository::perform_info(
continue;
/* try to find an info_vars file from the original repo */
- std::tr1::shared_ptr<const Set<std::string> > i;
+ std::shared_ptr<const Set<std::string> > i;
if (id->from_repositories_key())
{
for (Set<std::string>::ConstIterator o(id->from_repositories_key()->value()->begin()),
@@ -312,7 +312,7 @@ EInstalledRepository::perform_info(
RepositoryName rn(*o);
if (_imp->params.environment()->package_database()->has_repository_named(rn))
{
- const std::tr1::shared_ptr<const Repository> r(
+ const std::shared_ptr<const Repository> r(
_imp->params.environment()->package_database()->fetch_repository(rn));
Repository::MetadataConstIterator m(r->find_metadata("info_vars"));
if (r->end_metadata() != m)
@@ -397,7 +397,7 @@ EInstalledRepository::populate_sets() const
}
bool
-EInstalledRepository::sync(const std::tr1::shared_ptr<OutputManager> &) const
+EInstalledRepository::sync(const std::shared_ptr<OutputManager> &) const
{
return false;
}
diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh
index a3d957a47..a49220842 100644
--- a/paludis/repositories/e/e_installed_repository.hh
+++ b/paludis/repositories/e/e_installed_repository.hh
@@ -58,7 +58,7 @@ namespace paludis
/* RepositoryEnvironmentVariableInterface */
virtual std::string get_environment_variable(
- const std::tr1::shared_ptr<const PackageID> & for_package,
+ const std::shared_ptr<const PackageID> & for_package,
const std::string & var) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -75,7 +75,7 @@ namespace paludis
/* Repository */
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
+ virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
virtual const bool is_unimportant() const;
@@ -86,21 +86,21 @@ namespace paludis
HookResult perform_hook(const Hook & hook)
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool sync(const std::tr1::shared_ptr<OutputManager> &) const;
+ virtual bool sync(const std::shared_ptr<OutputManager> &) const;
///\name For use by EInstalledRepositoryID
///\{
virtual void perform_uninstall(
- const std::tr1::shared_ptr<const erepository::ERepositoryID> & id,
+ const std::shared_ptr<const erepository::ERepositoryID> & id,
const UninstallAction &) const = 0;
virtual void perform_config(
- const std::tr1::shared_ptr<const erepository::ERepositoryID> & id,
+ const std::shared_ptr<const erepository::ERepositoryID> & id,
const ConfigAction &) const;
virtual void perform_info(
- const std::tr1::shared_ptr<const erepository::ERepositoryID> & id,
+ const std::shared_ptr<const erepository::ERepositoryID> & id,
const InfoAction &) const;
///\}
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index c24e75f3a..ba1db6d54 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -64,46 +64,46 @@ namespace
struct EInstalledRepositoryIDKeys
{
- std::tr1::shared_ptr<const MetadataValueKey<SlotName> > slot;
- std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use;
- std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited;
- std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string > > > raw_iuse;
- std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string > > > raw_iuse_effective;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions;
- std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string > > > raw_use_expand;
- std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string > > > raw_use_expand_hidden;
- std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > > choices;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > raw_dependencies;
- 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<PlainTextSpecTree> > restrictions;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties;
- 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::string> > long_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 MetadataCollectionKey<Set<std::string> > > from_repositories;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > upstream_changelog;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > upstream_documentation;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > upstream_release_notes;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > remote_ids;
- std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > bugs_to;
- std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases;
-
- 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::shared_ptr<const MetadataValueKey<SlotName> > slot;
+ std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use;
+ std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited;
+ std::shared_ptr<const MetadataCollectionKey<Set<std::string > > > raw_iuse;
+ std::shared_ptr<const MetadataCollectionKey<Set<std::string > > > raw_iuse_effective;
+ std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions;
+ std::shared_ptr<const MetadataCollectionKey<Set<std::string > > > raw_use_expand;
+ std::shared_ptr<const MetadataCollectionKey<Set<std::string > > > raw_use_expand_hidden;
+ std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices;
+ std::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license;
+ std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide;
+ std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > raw_dependencies;
+ std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies;
+ std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies;
+ std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies;
+ std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrictions;
+ std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties;
+ std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > src_uri;
+ std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage;
+ std::shared_ptr<const MetadataValueKey<std::string> > short_description;
+ std::shared_ptr<const MetadataValueKey<std::string> > long_description;
+ std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > contents;
+ std::shared_ptr<const MetadataTimeKey> installed_time;
+ std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories;
+ std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > upstream_changelog;
+ std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > upstream_documentation;
+ std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > upstream_release_notes;
+ std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > remote_ids;
+ std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > bugs_to;
+ std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases;
+
+ std::shared_ptr<const MetadataValueKey<std::string> > asflags;
+ std::shared_ptr<const MetadataValueKey<std::string> > cbuild;
+ std::shared_ptr<const MetadataValueKey<std::string> > cflags;
+ std::shared_ptr<const MetadataValueKey<std::string> > chost;
+ std::shared_ptr<const MetadataValueKey<std::string> > ctarget;
+ std::shared_ptr<const MetadataValueKey<std::string> > cxxflags;
+ std::shared_ptr<const MetadataValueKey<std::string> > ldflags;
+ std::shared_ptr<const MetadataValueKey<std::string> > pkgmanager;
+ std::shared_ptr<const MetadataValueKey<std::string> > vdb_format;
};
}
@@ -117,23 +117,23 @@ namespace paludis
const QualifiedPackageName name;
const VersionSpec version;
const Environment * const environment;
- const std::tr1::shared_ptr<const Repository> repository;
+ const std::shared_ptr<const Repository> repository;
const FSEntry dir;
- mutable std::tr1::shared_ptr<EInstalledRepositoryIDKeys> keys;
+ mutable std::shared_ptr<EInstalledRepositoryIDKeys> keys;
/* fs location and eapi are special */
- std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location;
- std::tr1::shared_ptr<const EAPI> eapi;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > fs_location;
+ std::shared_ptr<const EAPI> eapi;
- std::tr1::shared_ptr<DependenciesLabelSequence> raw_dependencies_labels;
- std::tr1::shared_ptr<DependenciesLabelSequence> build_dependencies_labels;
- std::tr1::shared_ptr<DependenciesLabelSequence> run_dependencies_labels;
- std::tr1::shared_ptr<DependenciesLabelSequence> post_dependencies_labels;
+ std::shared_ptr<DependenciesLabelSequence> raw_dependencies_labels;
+ std::shared_ptr<DependenciesLabelSequence> build_dependencies_labels;
+ std::shared_ptr<DependenciesLabelSequence> run_dependencies_labels;
+ std::shared_ptr<DependenciesLabelSequence> post_dependencies_labels;
Implementation(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
- const std::tr1::shared_ptr<const Repository> r, const FSEntry & f) :
+ const std::shared_ptr<const Repository> r, const FSEntry & f) :
name(q),
version(v),
environment(e),
@@ -161,7 +161,7 @@ namespace paludis
EInstalledRepositoryID::EInstalledRepositoryID(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
- const std::tr1::shared_ptr<const Repository> & r,
+ const std::shared_ptr<const Repository> & r,
const FSEntry & f) :
PrivateImplementationPattern<EInstalledRepositoryID>(new Implementation<EInstalledRepositoryID>(q, v, e, r, f)),
_imp(PrivateImplementationPattern<EInstalledRepositoryID>::_imp)
@@ -202,8 +202,8 @@ EInstalledRepositoryID::need_keys_added() const
return;
}
- std::tr1::shared_ptr<const EAPIEbuildMetadataVariables> vars(eapi()->supported()->ebuild_metadata_variables());
- std::tr1::shared_ptr<const EAPIEbuildEnvironmentVariables> env(eapi()->supported()->ebuild_environment_variables());
+ std::shared_ptr<const EAPIEbuildMetadataVariables> vars(eapi()->supported()->ebuild_metadata_variables());
+ std::shared_ptr<const EAPIEbuildEnvironmentVariables> env(eapi()->supported()->ebuild_environment_variables());
if (! env->env_use().empty())
if ((_imp->dir / env->env_use()).exists())
@@ -313,7 +313,7 @@ EInstalledRepositoryID::need_keys_added() const
{
DependenciesRewriter rewriter;
std::string raw_deps_str(file_contents(_imp->dir / vars->dependencies()->name()));
- std::tr1::shared_ptr<DependencySpecTree> raw_deps(parse_depend(raw_deps_str,
+ std::shared_ptr<DependencySpecTree> raw_deps(parse_depend(raw_deps_str,
_imp->environment, shared_from_this(), *eapi()));
raw_deps->root()->accept(rewriter);
@@ -497,7 +497,7 @@ EInstalledRepositoryID::need_keys_added() const
add_metadata_key(_imp->keys->choices);
- std::tr1::shared_ptr<Set<std::string> > from_repositories_value(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > from_repositories_value(new Set<std::string>);
if ((_imp->dir / "REPOSITORY").exists())
from_repositories_value->insert(file_contents(_imp->dir / "REPOSITORY"));
if ((_imp->dir / "repository").exists())
@@ -629,13 +629,13 @@ EInstalledRepositoryID::version() const
return _imp->version;
}
-const std::tr1::shared_ptr<const Repository>
+const std::shared_ptr<const Repository>
EInstalledRepositoryID::repository() const
{
return _imp->repository;
}
-const std::tr1::shared_ptr<const EAPI>
+const std::shared_ptr<const EAPI>
EInstalledRepositoryID::eapi() const
{
Lock l(_imp->mutex);
@@ -659,199 +659,199 @@ EInstalledRepositoryID::eapi() const
return _imp->eapi;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
EInstalledRepositoryID::virtual_for_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
+ return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
+const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >
EInstalledRepositoryID::keywords_key() const
{
- return std::tr1::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
+ return std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> >();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::raw_use_key() const
{
need_keys_added();
return _imp->keys->raw_use;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::raw_iuse_key() const
{
need_keys_added();
return _imp->keys->raw_iuse;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::raw_iuse_effective_key() const
{
need_keys_added();
return _imp->keys->raw_iuse_effective;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
EInstalledRepositoryID::raw_myoptions_key() const
{
need_keys_added();
return _imp->keys->raw_myoptions;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::raw_use_expand_key() const
{
need_keys_added();
return _imp->keys->raw_use_expand;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::raw_use_expand_hidden_key() const
{
need_keys_added();
return _imp->keys->raw_use_expand_hidden;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> >
EInstalledRepositoryID::license_key() const
{
need_keys_added();
return _imp->keys->license;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::behaviours_key() const
{
return make_null_shared_ptr();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::inherited_key() const
{
need_keys_added();
return _imp->keys->inherited;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::defined_phases_key() const
{
need_keys_added();
return _imp->keys->defined_phases;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> >
EInstalledRepositoryID::provide_key() const
{
need_keys_added();
return _imp->keys->provide;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::dependencies_key() const
{
need_keys_added();
return _imp->keys->raw_dependencies;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::build_dependencies_key() const
{
need_keys_added();
return _imp->keys->build_dependencies;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::run_dependencies_key() const
{
need_keys_added();
return _imp->keys->run_dependencies;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::post_dependencies_key() const
{
need_keys_added();
return _imp->keys->post_dependencies;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >
EInstalledRepositoryID::suggested_dependencies_key() const
{
- return std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
+ return std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> >();
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
EInstalledRepositoryID::restrict_key() const
{
need_keys_added();
return _imp->keys->restrictions;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> >
EInstalledRepositoryID::properties_key() const
{
need_keys_added();
return _imp->keys->properties;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > >
EInstalledRepositoryID::choices_key() const
{
need_keys_added();
return _imp->keys->choices;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> >
EInstalledRepositoryID::fetches_key() const
{
need_keys_added();
return _imp->keys->src_uri;
}
-const std::tr1::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
+const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> >
EInstalledRepositoryID::homepage_key() const
{
need_keys_added();
return _imp->keys->homepage;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
EInstalledRepositoryID::short_description_key() const
{
need_keys_added();
return _imp->keys->short_description;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
EInstalledRepositoryID::long_description_key() const
{
need_keys_added();
return _imp->keys->long_description;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > >
EInstalledRepositoryID::contents_key() const
{
need_keys_added();
return _imp->keys->contents;
}
-const std::tr1::shared_ptr<const MetadataTimeKey>
+const std::shared_ptr<const MetadataTimeKey>
EInstalledRepositoryID::installed_time_key() const
{
need_keys_added();
return _imp->keys->installed_time;
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
EInstalledRepositoryID::from_repositories_key() const
{
need_keys_added();
return _imp->keys->from_repositories;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
EInstalledRepositoryID::fs_location_key() const
{
// Avoid loading whole metadata
@@ -931,26 +931,26 @@ namespace
{
struct PerformAction
{
- const std::tr1::shared_ptr<const erepository::ERepositoryID> id;
+ const std::shared_ptr<const erepository::ERepositoryID> id;
- PerformAction(const std::tr1::shared_ptr<const erepository::ERepositoryID> i) :
+ PerformAction(const std::shared_ptr<const erepository::ERepositoryID> i) :
id(i)
{
}
void visit(const UninstallAction & a)
{
- std::tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_uninstall(id, a);
+ std::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_uninstall(id, a);
}
void visit(const ConfigAction & a)
{
- std::tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_config(id, a);
+ std::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_config(id, a);
}
void visit(const InfoAction & a)
{
- std::tr1::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_info(id, a);
+ std::static_pointer_cast<const EInstalledRepository>(id->repository())->perform_info(id, a);
}
void visit(const InstallAction & a) PALUDIS_ATTRIBUTE((noreturn));
@@ -987,27 +987,27 @@ EInstalledRepositoryID::perform_action(Action & a) const
a.accept(b);
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
+const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >
EInstalledRepositoryID::contains_key() const
{
- return std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
+ return std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >
+const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
EInstalledRepositoryID::contained_in_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > >();
+ return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
}
-const std::tr1::shared_ptr<const MetadataValueKey<SlotName> >
+const std::shared_ptr<const MetadataValueKey<SlotName> >
EInstalledRepositoryID::slot_key() const
{
need_keys_added();
return _imp->keys->slot;
}
-std::tr1::shared_ptr<ChoiceValue>
-EInstalledRepositoryID::make_choice_value(const std::tr1::shared_ptr<const Choice> & c, const UnprefixedChoiceName & v,
+std::shared_ptr<ChoiceValue>
+EInstalledRepositoryID::make_choice_value(const std::shared_ptr<const Choice> & c, const UnprefixedChoiceName & v,
const Tribool, const bool, const bool explicitly_listed, const std::string & override_description, const bool) const
{
if (! eapi()->supported())
@@ -1028,16 +1028,16 @@ EInstalledRepositoryID::make_choice_value(const std::tr1::shared_ptr<const Choic
if (raw_use_key())
enabled = (raw_use_key()->value()->end() != raw_use_key()->value()->find(name_with_prefix));
- return make_shared_ptr(new EChoiceValue(c->prefix(), v, ChoiceNameWithPrefix(name_with_prefix), name(), std::tr1::shared_ptr<const UseDesc>(),
+ return make_shared_ptr(new EChoiceValue(c->prefix(), v, ChoiceNameWithPrefix(name_with_prefix), name(), std::shared_ptr<const UseDesc>(),
enabled, enabled, true, explicitly_listed, override_description, ""));
}
void
-EInstalledRepositoryID::add_build_options(const std::tr1::shared_ptr<Choices> & choices) const
+EInstalledRepositoryID::add_build_options(const std::shared_ptr<Choices> & choices) const
{
if (eapi()->supported())
{
- std::tr1::shared_ptr<Choice> build_options(new Choice(make_named_values<ChoiceParams>(
+ std::shared_ptr<Choice> build_options(new Choice(make_named_values<ChoiceParams>(
n::consider_added_or_changed() = false,
n::contains_every_value() = false,
n::hidden() = false,
diff --git a/paludis/repositories/e/e_installed_repository_id.hh b/paludis/repositories/e/e_installed_repository_id.hh
index 01167d69a..0b2dcace1 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 std::tr1::enable_shared_from_this<EInstalledRepositoryID>,
+ public std::enable_shared_from_this<EInstalledRepositoryID>,
private PrivateImplementationPattern<EInstalledRepositoryID>
{
private:
@@ -44,7 +44,7 @@ namespace paludis
EInstalledRepositoryID(const QualifiedPackageName &, const VersionSpec &,
const Environment * const,
- const std::tr1::shared_ptr<const Repository> &,
+ const std::shared_ptr<const Repository> &,
const FSEntry & file);
public:
@@ -55,43 +55,43 @@ namespace paludis
virtual const QualifiedPackageName name() const;
virtual const VersionSpec version() 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<SlotName> > slot_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 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<DependencySpecTree> > dependencies_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties_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 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<Set<std::string> > > from_repositories_key() const;
-
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_effective_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_hidden_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Choices> > > choices_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases_key() const;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
-
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
+ virtual const std::shared_ptr<const Repository> repository() const;
+ virtual const std::shared_ptr<const EAPI> eapi() const;
+
+ virtual const std::shared_ptr<const MetadataValueKey<SlotName> > slot_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > virtual_for_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<KeywordNameSet> > keywords_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<ProvideSpecTree> > provide_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > build_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > run_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > post_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > suggested_dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > dependencies_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<FetchableURISpecTree> > fetches_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<SimpleURISpecTree> > homepage_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > short_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Contents> > > contents_key() const;
+ virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
+
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_effective_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_hidden_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases_key() const;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const;
+
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const;
@@ -105,13 +105,13 @@ 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 std::tr1::shared_ptr<MetadataValueKey<std::tr1::shared_ptr<const Contents> > > make_contents_key() const = 0;
+ virtual std::shared_ptr<MetadataValueKey<std::shared_ptr<const Contents> > > make_contents_key() const = 0;
- virtual std::tr1::shared_ptr<ChoiceValue> make_choice_value(
- const std::tr1::shared_ptr<const Choice> &, const UnprefixedChoiceName &, const Tribool,
+ virtual std::shared_ptr<ChoiceValue> make_choice_value(
+ const std::shared_ptr<const Choice> &, const UnprefixedChoiceName &, const Tribool,
const bool, const bool, const std::string &, const bool) const;
- virtual void add_build_options(const std::tr1::shared_ptr<Choices> &) const;
+ virtual void add_build_options(const std::shared_ptr<Choices> &) const;
virtual void purge_invalid_cache() const;
virtual void can_drop_in_memory_cache() const;
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index 82553948d..11f47667e 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -52,15 +52,15 @@
#include <paludis/dep_spec_flattener.hh>
#include <paludis/literal_metadata_key.hh>
-#include <tr1/functional>
+#include <functional>
#include <list>
#include <vector>
using namespace paludis;
using namespace paludis::erepository;
-EMutableRepositoryMaskInfoKey::EMutableRepositoryMaskInfoKey(const std::tr1::shared_ptr<const ERepositoryID> &,
- const std::string & r, const std::string & h, const std::tr1::shared_ptr<const RepositoryMaskInfo> & v, const MetadataKeyType t) :
+EMutableRepositoryMaskInfoKey::EMutableRepositoryMaskInfoKey(const std::shared_ptr<const ERepositoryID> &,
+ const std::string & r, const std::string & h, const std::shared_ptr<const RepositoryMaskInfo> & v, const MetadataKeyType t) :
_value(v),
_r(r),
_h(h),
@@ -72,14 +72,14 @@ EMutableRepositoryMaskInfoKey::~EMutableRepositoryMaskInfoKey()
{
}
-const std::tr1::shared_ptr<const RepositoryMaskInfo>
+const std::shared_ptr<const RepositoryMaskInfo>
EMutableRepositoryMaskInfoKey::value() const
{
return _value;
}
void
-EMutableRepositoryMaskInfoKey::set_value(const std::tr1::shared_ptr<const RepositoryMaskInfo> & v)
+EMutableRepositoryMaskInfoKey::set_value(const std::shared_ptr<const RepositoryMaskInfo> & v)
{
_value = v;
}
@@ -108,11 +108,11 @@ namespace paludis
struct Implementation<EDependenciesKey>
{
const Environment * const env;
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<const DependencySpecTree> value;
- const std::tr1::shared_ptr<const DependenciesLabelSequence> labels;
+ mutable std::shared_ptr<const DependencySpecTree> value;
+ const std::shared_ptr<const DependenciesLabelSequence> labels;
const std::string raw_name;
const std::string human_name;
@@ -120,8 +120,8 @@ namespace paludis
Implementation(
const Environment * const e,
- const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> & s,
+ const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ const std::shared_ptr<const DependenciesLabelSequence> & s,
const std::string & r, const std::string & h, const MetadataKeyType & t) :
env(e),
id(i),
@@ -137,9 +137,9 @@ namespace paludis
EDependenciesKey::EDependenciesKey(
const Environment * const e,
- const std::tr1::shared_ptr<const ERepositoryID> & id,
+ const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> & l, const MetadataKeyType t) :
+ const std::shared_ptr<const DependenciesLabelSequence> & l, const MetadataKeyType t) :
PrivateImplementationPattern<EDependenciesKey>(new Implementation<EDependenciesKey>(e, id, v, l, r, h, t))
{
}
@@ -148,7 +148,7 @@ EDependenciesKey::~EDependenciesKey()
{
}
-const std::tr1::shared_ptr<const DependencySpecTree>
+const std::shared_ptr<const DependencySpecTree>
EDependenciesKey::value() const
{
Lock l(_imp->value_mutex);
@@ -160,7 +160,7 @@ EDependenciesKey::value() const
return _imp->value;
}
-const std::tr1::shared_ptr<const DependenciesLabelSequence>
+const std::shared_ptr<const DependenciesLabelSequence>
EDependenciesKey::initial_labels() const
{
return _imp->labels;
@@ -208,17 +208,17 @@ namespace paludis
struct Implementation<ELicenseKey>
{
const Environment * const env;
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<const LicenseSpecTree> value;
+ mutable std::shared_ptr<const LicenseSpecTree> value;
- const std::tr1::shared_ptr<const EAPIMetadataVariable> variable;
+ const std::shared_ptr<const EAPIMetadataVariable> variable;
const MetadataKeyType type;
Implementation(const Environment * const e,
- const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v,
- const std::tr1::shared_ptr<const EAPIMetadataVariable> & m, const MetadataKeyType t) :
+ const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ const std::shared_ptr<const EAPIMetadataVariable> & m, const MetadataKeyType t) :
env(e),
id(i),
string_value(v),
@@ -231,8 +231,8 @@ namespace paludis
ELicenseKey::ELicenseKey(
const Environment * const e,
- const std::tr1::shared_ptr<const ERepositoryID> & id,
- const std::tr1::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
+ const std::shared_ptr<const ERepositoryID> & id,
+ const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
PrivateImplementationPattern<ELicenseKey>(new Implementation<ELicenseKey>(e, id, v, m, t))
{
}
@@ -241,7 +241,7 @@ ELicenseKey::~ELicenseKey()
{
}
-const std::tr1::shared_ptr<const LicenseSpecTree>
+const std::shared_ptr<const LicenseSpecTree>
ELicenseKey::value() const
{
Lock l(_imp->value_mutex);
@@ -295,17 +295,17 @@ namespace paludis
struct Implementation<EFetchableURIKey>
{
const Environment * const env;
- const std::tr1::shared_ptr<const ERepositoryID> id;
- const std::tr1::shared_ptr<const EAPIMetadataVariable> variable;
+ const std::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const EAPIMetadataVariable> variable;
const std::string string_value;
const MetadataKeyType type;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<const FetchableURISpecTree> value;
- mutable std::tr1::shared_ptr<const URILabel> initial_label;
+ mutable std::shared_ptr<const FetchableURISpecTree> value;
+ mutable std::shared_ptr<const URILabel> initial_label;
- Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i,
- const std::tr1::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v,
+ Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i,
+ const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v,
const MetadataKeyType t) :
env(e),
id(i),
@@ -318,8 +318,8 @@ namespace paludis
}
EFetchableURIKey::EFetchableURIKey(const Environment * const e,
- const std::tr1::shared_ptr<const ERepositoryID> & id,
- const std::tr1::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
+ const std::shared_ptr<const ERepositoryID> & id,
+ const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
PrivateImplementationPattern<EFetchableURIKey>(new Implementation<EFetchableURIKey>(e, id, m, v, t))
{
}
@@ -328,7 +328,7 @@ EFetchableURIKey::~EFetchableURIKey()
{
}
-const std::tr1::shared_ptr<const FetchableURISpecTree>
+const std::shared_ptr<const FetchableURISpecTree>
EFetchableURIKey::value() const
{
Lock l(_imp->value_mutex);
@@ -359,7 +359,7 @@ EFetchableURIKey::pretty_print_flat(const FetchableURISpecTree::ItemFormatter &
return stringify(p);
}
-const std::tr1::shared_ptr<const URILabel>
+const std::shared_ptr<const URILabel>
EFetchableURIKey::initial_label() const
{
Lock l(_imp->value_mutex);
@@ -419,16 +419,16 @@ namespace paludis
struct Implementation<ESimpleURIKey>
{
const Environment * const env;
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<const SimpleURISpecTree> value;
+ mutable std::shared_ptr<const SimpleURISpecTree> value;
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i,
+ Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i,
const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
@@ -443,7 +443,7 @@ namespace paludis
}
ESimpleURIKey::ESimpleURIKey(const Environment * const e,
- const std::tr1::shared_ptr<const ERepositoryID> & id,
+ const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
PrivateImplementationPattern<ESimpleURIKey>(new Implementation<ESimpleURIKey>(e, id, v, r, h, t))
{
@@ -453,7 +453,7 @@ ESimpleURIKey::~ESimpleURIKey()
{
}
-const std::tr1::shared_ptr<const SimpleURISpecTree>
+const std::shared_ptr<const SimpleURISpecTree>
ESimpleURIKey::value() const
{
Lock l(_imp->value_mutex);
@@ -508,16 +508,16 @@ namespace paludis
struct Implementation<EPlainTextSpecKey>
{
const Environment * const env;
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<const PlainTextSpecTree> value;
+ mutable std::shared_ptr<const PlainTextSpecTree> value;
- const std::tr1::shared_ptr<const EAPIMetadataVariable> variable;
+ const std::shared_ptr<const EAPIMetadataVariable> variable;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v,
- const std::tr1::shared_ptr<const EAPIMetadataVariable> & m,
+ Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ const std::shared_ptr<const EAPIMetadataVariable> & m,
const MetadataKeyType t) :
env(e),
id(i),
@@ -530,8 +530,8 @@ namespace paludis
}
EPlainTextSpecKey::EPlainTextSpecKey(const Environment * const e,
- const std::tr1::shared_ptr<const ERepositoryID> & id,
- const std::tr1::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
+ const std::shared_ptr<const ERepositoryID> & id,
+ const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
PrivateImplementationPattern<EPlainTextSpecKey>(new Implementation<EPlainTextSpecKey>(e, id, v, m, t))
{
}
@@ -540,7 +540,7 @@ EPlainTextSpecKey::~EPlainTextSpecKey()
{
}
-const std::tr1::shared_ptr<const PlainTextSpecTree>
+const std::shared_ptr<const PlainTextSpecTree>
EPlainTextSpecKey::value() const
{
Lock l(_imp->value_mutex);
@@ -595,16 +595,16 @@ namespace paludis
struct Implementation<EMyOptionsKey>
{
const Environment * const env;
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<const PlainTextSpecTree> value;
+ mutable std::shared_ptr<const PlainTextSpecTree> value;
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
id(i),
@@ -618,7 +618,7 @@ namespace paludis
}
EMyOptionsKey::EMyOptionsKey(const Environment * const e,
- const std::tr1::shared_ptr<const ERepositoryID> & id,
+ const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
PrivateImplementationPattern<EMyOptionsKey>(new Implementation<EMyOptionsKey>(e, id, v, r, h, t))
{
@@ -628,7 +628,7 @@ EMyOptionsKey::~EMyOptionsKey()
{
}
-const std::tr1::shared_ptr<const PlainTextSpecTree>
+const std::shared_ptr<const PlainTextSpecTree>
EMyOptionsKey::value() const
{
Lock l(_imp->value_mutex);
@@ -683,16 +683,16 @@ namespace paludis
struct Implementation<EProvideKey>
{
const Environment * const env;
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<const ProvideSpecTree> value;
+ mutable std::shared_ptr<const ProvideSpecTree> value;
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
- Implementation(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ Implementation(const Environment * const e, const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
env(e),
id(i),
@@ -705,7 +705,7 @@ namespace paludis
};
}
-EProvideKey::EProvideKey(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & id,
+EProvideKey::EProvideKey(const Environment * const e, const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
PrivateImplementationPattern<EProvideKey>(new Implementation<EProvideKey>(e, id, v, r, h, t))
{
@@ -715,7 +715,7 @@ EProvideKey::~EProvideKey()
{
}
-const std::tr1::shared_ptr<const ProvideSpecTree>
+const std::shared_ptr<const ProvideSpecTree>
EProvideKey::value() const
{
Lock l(_imp->value_mutex);
@@ -769,17 +769,17 @@ namespace paludis
template <>
struct Implementation<EKeywordsKey>
{
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const Environment * const env;
const std::string string_value;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<KeywordNameSet> value;
+ mutable std::shared_ptr<KeywordNameSet> value;
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v,
+ Implementation(const std::shared_ptr<const ERepositoryID> & i, const Environment * const e, const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
id(i),
env(e),
@@ -792,7 +792,7 @@ namespace paludis
};
}
-EKeywordsKey::EKeywordsKey(const Environment * const e, const std::tr1::shared_ptr<const ERepositoryID> & id,
+EKeywordsKey::EKeywordsKey(const Environment * const e, const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
PrivateImplementationPattern<EKeywordsKey>(new Implementation<EKeywordsKey>(id, e, v, r, h, t))
{
@@ -802,7 +802,7 @@ EKeywordsKey::~EKeywordsKey()
{
}
-const std::tr1::shared_ptr<const KeywordNameSet>
+const std::shared_ptr<const KeywordNameSet>
EKeywordsKey::value() const
{
Lock l(_imp->value_mutex);
@@ -825,7 +825,7 @@ EKeywordsKey::pretty_print_flat(const Formatter<KeywordName> & f) const
if (! result.empty())
result.append(" ");
- std::tr1::shared_ptr<KeywordNameSet> k(new KeywordNameSet);
+ std::shared_ptr<KeywordNameSet> k(new KeywordNameSet);
k->insert(*i);
if (_imp->env->accept_keywords(k, *_imp->id))
result.append(f.format(*i, format::Accepted()));
@@ -859,16 +859,16 @@ namespace paludis
template <>
struct Implementation<EStringSetKey>
{
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const std::string string_value;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<Set<std::string> > value;
+ mutable std::shared_ptr<Set<std::string> > value;
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const std::string & v,
+ Implementation(const std::shared_ptr<const ERepositoryID> & i, const std::string & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
id(i),
string_value(v),
@@ -880,7 +880,7 @@ namespace paludis
};
}
-EStringSetKey::EStringSetKey(const std::tr1::shared_ptr<const ERepositoryID> & id,
+EStringSetKey::EStringSetKey(const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const std::string & v, const MetadataKeyType t) :
PrivateImplementationPattern<EStringSetKey>(new Implementation<EStringSetKey>(id, v, r, h, t))
{
@@ -890,7 +890,7 @@ EStringSetKey::~EStringSetKey()
{
}
-const std::tr1::shared_ptr<const Set<std::string> >
+const std::shared_ptr<const Set<std::string> >
EStringSetKey::value() const
{
Lock l(_imp->value_mutex);
@@ -933,8 +933,8 @@ namespace
std::string
EStringSetKey::pretty_print_flat(const Formatter<std::string> & f) const
{
- using namespace std::tr1::placeholders;
- return join(value()->begin(), value()->end(), " ", std::tr1::bind(&format_string, _1, f));
+ using namespace std::placeholders;
+ return join(value()->begin(), value()->end(), " ", std::bind(&format_string, _1, f));
}
namespace paludis
@@ -942,16 +942,16 @@ namespace paludis
template <>
struct Implementation<EContentsKey>
{
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const FSEntry filename;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<Contents> value;
+ mutable std::shared_ptr<Contents> value;
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const FSEntry & v,
+ Implementation(const std::shared_ptr<const ERepositoryID> & i, const FSEntry & v,
const std::string & r, const std::string & h, const MetadataKeyType & t) :
id(i),
filename(v),
@@ -963,7 +963,7 @@ namespace paludis
};
}
-EContentsKey::EContentsKey(const std::tr1::shared_ptr<const ERepositoryID> & id,
+EContentsKey::EContentsKey(const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const FSEntry & v, const MetadataKeyType t) :
PrivateImplementationPattern<EContentsKey>(new Implementation<EContentsKey>(id, v, r, h, t))
{
@@ -973,7 +973,7 @@ EContentsKey::~EContentsKey()
{
}
-const std::tr1::shared_ptr<const Contents>
+const std::shared_ptr<const Contents>
EContentsKey::value() const
{
Lock l(_imp->value_mutex);
@@ -1011,7 +1011,7 @@ EContentsKey::value() const
if ("obj" == tokens.at(0))
{
- std::tr1::shared_ptr<ContentsEntry> e(new ContentsFileEntry(tokens.at(1)));
+ std::shared_ptr<ContentsEntry> e(new ContentsFileEntry(tokens.at(1)));
e->add_metadata_key(make_shared_ptr(new LiteralMetadataTimeKey("mtime", "mtime", mkt_normal,
Timestamp(destringify<time_t>(tokens.at(3)), 0))));
e->add_metadata_key(make_shared_ptr(new LiteralMetadataValueKey<std::string>("md5", "md5", mkt_normal, tokens.at(2))));
@@ -1019,18 +1019,18 @@ EContentsKey::value() const
}
else if ("dir" == tokens.at(0))
{
- std::tr1::shared_ptr<ContentsEntry> e(new ContentsDirEntry(tokens.at(1)));
+ std::shared_ptr<ContentsEntry> e(new ContentsDirEntry(tokens.at(1)));
_imp->value->add(e);
}
else if ("sym" == tokens.at(0))
{
- std::tr1::shared_ptr<ContentsEntry> e(new ContentsSymEntry(tokens.at(1), tokens.at(2)));
+ std::shared_ptr<ContentsEntry> e(new ContentsSymEntry(tokens.at(1), tokens.at(2)));
e->add_metadata_key(make_shared_ptr(new LiteralMetadataTimeKey("mtime", "mtime", mkt_normal,
Timestamp(destringify<time_t>(tokens.at(3)), 0))));
_imp->value->add(e);
}
else if ("misc" == tokens.at(0) || "fif" == tokens.at(0) || "dev" == tokens.at(0))
- _imp->value->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsOtherEntry(tokens.at(1))));
+ _imp->value->add(std::shared_ptr<ContentsEntry>(new ContentsOtherEntry(tokens.at(1))));
else
Log::get_instance()->message("e.contents.unknown", ll_warning, lc_context) << "CONTENTS has unsupported entry type '" <<
tokens.at(0) << "', skipping";
@@ -1062,16 +1062,16 @@ namespace paludis
template <>
struct Implementation<EMTimeKey>
{
- const std::tr1::shared_ptr<const ERepositoryID> id;
+ const std::shared_ptr<const ERepositoryID> id;
const FSEntry filename;
mutable Mutex value_mutex;
- mutable std::tr1::shared_ptr<Timestamp> value;
+ mutable std::shared_ptr<Timestamp> value;
const std::string raw_name;
const std::string human_name;
const MetadataKeyType type;
- Implementation(const std::tr1::shared_ptr<const ERepositoryID> & i, const FSEntry & v,
+ Implementation(const std::shared_ptr<const ERepositoryID> & i, const FSEntry & v,
const std::string & r, const std::string & h, const MetadataKeyType t) :
id(i),
filename(v),
@@ -1083,7 +1083,7 @@ namespace paludis
};
}
-EMTimeKey::EMTimeKey(const std::tr1::shared_ptr<const ERepositoryID> & id,
+EMTimeKey::EMTimeKey(const std::shared_ptr<const ERepositoryID> & id,
const std::string & r, const std::string & h, const FSEntry & v, const MetadataKeyType t) :
PrivateImplementationPattern<EMTimeKey>(new Implementation<EMTimeKey>(id, v, r, h, t))
{
@@ -1141,10 +1141,10 @@ namespace paludis
struct Implementation<ESlotKey>
{
const SlotName value;
- const std::tr1::shared_ptr<const EAPIMetadataVariable> variable;
+ const std::shared_ptr<const EAPIMetadataVariable> variable;
const MetadataKeyType type;
- Implementation(const SlotName & v, const std::tr1::shared_ptr<const EAPIMetadataVariable> & m, const MetadataKeyType t) :
+ Implementation(const SlotName & v, const std::shared_ptr<const EAPIMetadataVariable> & m, const MetadataKeyType t) :
value(v),
variable(m),
type(t)
@@ -1153,7 +1153,7 @@ namespace paludis
};
}
-ESlotKey::ESlotKey(const std::tr1::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
+ESlotKey::ESlotKey(const std::shared_ptr<const EAPIMetadataVariable> & m, const std::string & v, const MetadataKeyType t) :
PrivateImplementationPattern<ESlotKey>(new Implementation<ESlotKey>(SlotName(v), m, t))
{
}
diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh
index ae5ce326e..da66a26bf 100644
--- a/paludis/repositories/e/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
@@ -35,23 +35,23 @@ namespace paludis
class ERepositoryID;
class EMutableRepositoryMaskInfoKey :
- public MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> >
+ public MetadataValueKey<std::shared_ptr<const RepositoryMaskInfo> >
{
private:
- std::tr1::shared_ptr<const RepositoryMaskInfo> _value;
+ std::shared_ptr<const RepositoryMaskInfo> _value;
const std::string _r;
const std::string _h;
const MetadataKeyType _t;
public:
- EMutableRepositoryMaskInfoKey(const std::tr1::shared_ptr<const ERepositoryID> &,
- const std::string &, const std::string &, const std::tr1::shared_ptr<const RepositoryMaskInfo> &, const MetadataKeyType);
+ EMutableRepositoryMaskInfoKey(const std::shared_ptr<const ERepositoryID> &,
+ const std::string &, const std::string &, const std::shared_ptr<const RepositoryMaskInfo> &, const MetadataKeyType);
~EMutableRepositoryMaskInfoKey();
- virtual const std::tr1::shared_ptr<const RepositoryMaskInfo> value() const
+ virtual const std::shared_ptr<const RepositoryMaskInfo> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- void set_value(const std::tr1::shared_ptr<const RepositoryMaskInfo> &);
+ void set_value(const std::shared_ptr<const RepositoryMaskInfo> &);
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -65,13 +65,13 @@ namespace paludis
public:
EDependenciesKey(
const Environment * const,
- const std::tr1::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> &,
+ const std::shared_ptr<const DependenciesLabelSequence> &,
const MetadataKeyType);
~EDependenciesKey();
- virtual const std::tr1::shared_ptr<const DependencySpecTree> value() const
+ virtual const std::shared_ptr<const DependencySpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const DependencySpecTree::ItemFormatter &) const
@@ -80,7 +80,7 @@ namespace paludis
virtual std::string pretty_print_flat(const DependencySpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const DependenciesLabelSequence> initial_labels() const
+ virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -94,13 +94,13 @@ namespace paludis
{
public:
EFetchableURIKey(const Environment * const,
- const std::tr1::shared_ptr<const ERepositoryID> &,
- const std::tr1::shared_ptr<const EAPIMetadataVariable> &,
+ const std::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const EAPIMetadataVariable> &,
const std::string &,
const MetadataKeyType);
~EFetchableURIKey();
- virtual const std::tr1::shared_ptr<const FetchableURISpecTree> value() const
+ virtual const std::shared_ptr<const FetchableURISpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const FetchableURISpecTree::ItemFormatter &) const
@@ -109,7 +109,7 @@ namespace paludis
virtual std::string pretty_print_flat(const FetchableURISpecTree::ItemFormatter &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const URILabel> initial_label() const
+ virtual const std::shared_ptr<const URILabel> initial_label() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -123,11 +123,11 @@ namespace paludis
{
public:
ESimpleURIKey(const Environment * const,
- const std::tr1::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~ESimpleURIKey();
- virtual const std::tr1::shared_ptr<const SimpleURISpecTree> value() const
+ virtual const std::shared_ptr<const SimpleURISpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const SimpleURISpecTree::ItemFormatter &) const
@@ -147,12 +147,12 @@ namespace paludis
{
public:
EPlainTextSpecKey(const Environment * const,
- const std::tr1::shared_ptr<const ERepositoryID> &,
- const std::tr1::shared_ptr<const EAPIMetadataVariable> &,
+ const std::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const EAPIMetadataVariable> &,
const std::string &, const MetadataKeyType);
~EPlainTextSpecKey();
- virtual const std::tr1::shared_ptr<const PlainTextSpecTree> value() const
+ virtual const std::shared_ptr<const PlainTextSpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const PlainTextSpecTree::ItemFormatter &) const
@@ -172,11 +172,11 @@ namespace paludis
{
public:
EMyOptionsKey(const Environment * const,
- const std::tr1::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EMyOptionsKey();
- virtual const std::tr1::shared_ptr<const PlainTextSpecTree> value() const
+ virtual const std::shared_ptr<const PlainTextSpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const PlainTextSpecTree::ItemFormatter &) const
@@ -196,11 +196,11 @@ namespace paludis
{
public:
EProvideKey(const Environment * const,
- const std::tr1::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EProvideKey();
- virtual const std::tr1::shared_ptr<const ProvideSpecTree> value() const
+ virtual const std::shared_ptr<const ProvideSpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const ProvideSpecTree::ItemFormatter &) const
@@ -221,12 +221,12 @@ namespace paludis
public:
ELicenseKey(
const Environment * const,
- const std::tr1::shared_ptr<const ERepositoryID> &,
- const std::tr1::shared_ptr<const EAPIMetadataVariable> &,
+ const std::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const EAPIMetadataVariable> &,
const std::string &, const MetadataKeyType);
~ELicenseKey();
- virtual const std::tr1::shared_ptr<const LicenseSpecTree> value() const
+ virtual const std::shared_ptr<const LicenseSpecTree> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print(const LicenseSpecTree::ItemFormatter &) const
@@ -247,11 +247,11 @@ namespace paludis
public:
EKeywordsKey(
const Environment * const,
- const std::tr1::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EKeywordsKey();
- const std::tr1::shared_ptr<const KeywordNameSet> value() const
+ const std::shared_ptr<const KeywordNameSet> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print_flat(const Formatter<KeywordName> &) const
@@ -267,11 +267,11 @@ namespace paludis
private PrivateImplementationPattern<EStringSetKey>
{
public:
- EStringSetKey(const std::tr1::shared_ptr<const ERepositoryID> &,
+ EStringSetKey(const std::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const std::string &, const MetadataKeyType);
~EStringSetKey();
- const std::tr1::shared_ptr<const Set<std::string> > value() const
+ const std::shared_ptr<const Set<std::string> > value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string pretty_print_flat(const Formatter<std::string> &) const
@@ -283,16 +283,16 @@ namespace paludis
};
class EContentsKey :
- public MetadataValueKey<std::tr1::shared_ptr<const Contents> >,
+ public MetadataValueKey<std::shared_ptr<const Contents> >,
private PrivateImplementationPattern<EContentsKey>
{
public:
EContentsKey(
- const std::tr1::shared_ptr<const ERepositoryID> &,
+ const std::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const FSEntry &, const MetadataKeyType);
~EContentsKey();
- const std::tr1::shared_ptr<const Contents> value() const
+ const std::shared_ptr<const Contents> value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -305,7 +305,7 @@ namespace paludis
private PrivateImplementationPattern<EMTimeKey>
{
public:
- EMTimeKey(const std::tr1::shared_ptr<const ERepositoryID> &,
+ EMTimeKey(const std::shared_ptr<const ERepositoryID> &,
const std::string &, const std::string &, const FSEntry &, const MetadataKeyType);
~EMTimeKey();
@@ -323,7 +323,7 @@ namespace paludis
{
public:
ESlotKey(
- const std::tr1::shared_ptr<const EAPIMetadataVariable> &,
+ const std::shared_ptr<const EAPIMetadataVariable> &,
const std::string &, const MetadataKeyType);
~ESlotKey();
diff --git a/paludis/repositories/e/e_mask.cc b/paludis/repositories/e/e_mask.cc
index 5adedd993..c363017f2 100644
--- a/paludis/repositories/e/e_mask.cc
+++ b/paludis/repositories/e/e_mask.cc
@@ -30,9 +30,9 @@ namespace paludis
{
const char key;
const std::string description;
- const std::tr1::shared_ptr<const MetadataKey> unaccepted_key;
+ const std::shared_ptr<const MetadataKey> unaccepted_key;
- Implementation(const char k, const std::string & d, const std::tr1::shared_ptr<const MetadataKey> & u) :
+ Implementation(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & u) :
key(k),
description(d),
unaccepted_key(u)
@@ -41,7 +41,7 @@ namespace paludis
};
}
-EUnacceptedMask::EUnacceptedMask(const char k, const std::string & d, const std::tr1::shared_ptr<const MetadataKey> & u) :
+EUnacceptedMask::EUnacceptedMask(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & u) :
PrivateImplementationPattern<EUnacceptedMask>(new Implementation<EUnacceptedMask>(k, d, u))
{
}
@@ -62,7 +62,7 @@ EUnacceptedMask::description() const
return _imp->description;
}
-const std::tr1::shared_ptr<const MetadataKey>
+const std::shared_ptr<const MetadataKey>
EUnacceptedMask::unaccepted_key() const
{
return _imp->unaccepted_key;
@@ -122,9 +122,9 @@ namespace paludis
{
const char key;
const std::string description;
- const std::tr1::shared_ptr<const MetadataKey> mask_key;
+ const std::shared_ptr<const MetadataKey> mask_key;
- Implementation(const char k, const std::string & d, const std::tr1::shared_ptr<const MetadataKey> & m) :
+ Implementation(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & m) :
key(k),
description(d),
mask_key(m)
@@ -133,7 +133,7 @@ namespace paludis
};
}
-ERepositoryMask::ERepositoryMask(const char k, const std::string & d, const std::tr1::shared_ptr<const MetadataKey> & m) :
+ERepositoryMask::ERepositoryMask(const char k, const std::string & d, const std::shared_ptr<const MetadataKey> & m) :
PrivateImplementationPattern<ERepositoryMask>(new Implementation<ERepositoryMask>(k, d, m))
{
}
@@ -154,7 +154,7 @@ ERepositoryMask::description() const
return _imp->description;
}
-const std::tr1::shared_ptr<const MetadataKey>
+const std::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 dcce2cdba..cb3081531 100644
--- a/paludis/repositories/e/e_mask.hh
+++ b/paludis/repositories/e/e_mask.hh
@@ -32,12 +32,12 @@ namespace paludis
private PrivateImplementationPattern<EUnacceptedMask>
{
public:
- EUnacceptedMask(const char, const std::string &, const std::tr1::shared_ptr<const MetadataKey> &);
+ EUnacceptedMask(const char, const std::string &, const std::shared_ptr<const MetadataKey> &);
~EUnacceptedMask();
char key() const;
const std::string description() const;
- const std::tr1::shared_ptr<const MetadataKey> unaccepted_key() const;
+ const std::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 std::tr1::shared_ptr<const MetadataKey> &);
+ ERepositoryMask(const char, const std::string &, const std::shared_ptr<const MetadataKey> &);
~ERepositoryMask();
virtual char key() const;
const std::string description() const;
- const std::tr1::shared_ptr<const MetadataKey> mask_key() const;
+ const std::shared_ptr<const MetadataKey> mask_key() const;
};
}
}
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index acf87715c..151466163 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -30,7 +30,6 @@
#include <paludis/repositories/e/e_repository_exceptions.hh>
#include <paludis/repositories/e/eapi.hh>
#include <paludis/repositories/e/eclass_mtimes.hh>
-#include <paludis/repositories/e/extra_distribution_data.hh>
#include <paludis/repositories/e/use_desc.hh>
#include <paludis/repositories/e/layout.hh>
#include <paludis/repositories/e/info_metadata_key.hh>
@@ -98,11 +97,10 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <tr1/functional>
-#include <tr1/unordered_map>
+#include <functional>
+#include <unordered_map>
#include <map>
#include <set>
-#include <functional>
#include <algorithm>
#include <vector>
#include <list>
@@ -126,20 +124,20 @@
using namespace paludis;
using namespace paludis::erepository;
-typedef std::tr1::unordered_map<QualifiedPackageName,
- std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, std::tr1::shared_ptr<const RepositoryMaskInfo> > >,
+typedef std::unordered_map<QualifiedPackageName,
+ std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >,
Hash<QualifiedPackageName> > RepositoryMaskMap;
-typedef std::tr1::unordered_map<std::string, std::tr1::shared_ptr<MirrorsSequence> > MirrorMap;
-typedef std::tr1::unordered_map<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec>, Hash<QualifiedPackageName> > VirtualsMap;
+typedef std::unordered_map<std::string, std::shared_ptr<MirrorsSequence> > MirrorMap;
+typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<const PackageDepSpec>, Hash<QualifiedPackageName> > VirtualsMap;
typedef std::map<FSEntry, std::string> EAPIForFileMap;
namespace
{
- std::tr1::shared_ptr<FSEntrySequence> get_master_locations(
- const std::tr1::shared_ptr<const ERepositorySequence> & r)
+ std::shared_ptr<FSEntrySequence> get_master_locations(
+ const std::shared_ptr<const ERepositorySequence> & r)
{
- std::tr1::shared_ptr<FSEntrySequence> result;
+ std::shared_ptr<FSEntrySequence> result;
if (r)
{
@@ -152,10 +150,10 @@ namespace
return result;
}
- std::tr1::shared_ptr<Sequence<std::string> > get_master_names(
- const std::tr1::shared_ptr<const ERepositorySequence> & r)
+ std::shared_ptr<Sequence<std::string> > get_master_names(
+ const std::shared_ptr<const ERepositorySequence> & r)
{
- std::tr1::shared_ptr<Sequence<std::string> > result;
+ std::shared_ptr<Sequence<std::string> > result;
if (r)
{
@@ -193,78 +191,78 @@ namespace paludis
ERepository * const repo;
const ERepositoryParams params;
- const std::tr1::shared_ptr<Mutexes> mutexes;
+ const std::shared_ptr<Mutexes> mutexes;
- std::tr1::shared_ptr<RepositoryNameCache> names_cache;
+ std::shared_ptr<RepositoryNameCache> names_cache;
mutable RepositoryMaskMap repo_mask;
mutable bool has_repo_mask;
const std::map<QualifiedPackageName, QualifiedPackageName> provide_map;
- mutable std::tr1::shared_ptr<Set<UnprefixedChoiceName> > arch_flags;
- mutable std::tr1::shared_ptr<const UseDesc> use_desc;
+ mutable std::shared_ptr<Set<UnprefixedChoiceName> > arch_flags;
+ mutable std::shared_ptr<const UseDesc> use_desc;
mutable bool has_mirrors;
mutable MirrorMap mirrors;
- mutable std::tr1::shared_ptr<erepository::Profile> profile_ptr;
- mutable std::tr1::shared_ptr<const FSEntry> main_profile_path;
+ mutable std::shared_ptr<erepository::Profile> profile_ptr;
+ mutable std::shared_ptr<const FSEntry> main_profile_path;
- mutable std::tr1::shared_ptr<ERepositoryNews> news_ptr;
+ mutable std::shared_ptr<ERepositoryNews> news_ptr;
- mutable std::tr1::shared_ptr<ERepositorySets> sets_ptr;
- const std::tr1::shared_ptr<Layout> layout;
+ mutable std::shared_ptr<ERepositorySets> sets_ptr;
+ const std::shared_ptr<Layout> layout;
mutable EAPIForFileMap eapi_for_file_map;
- Implementation(ERepository * const, const ERepositoryParams &, std::tr1::shared_ptr<Mutexes> = make_shared_ptr(new Mutexes));
+ Implementation(ERepository * const, const ERepositoryParams &, std::shared_ptr<Mutexes> = make_shared_ptr(new Mutexes));
~Implementation();
void need_profiles() const;
- 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<std::string> > profile_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 MetadataCollectionKey<Sequence<std::string> > > master_repositories_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_when_unspecified_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 MetadataCollectionKey<Set<std::string> > > info_vars_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > format_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > layout_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > profile_layout_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > location_key;
+ std::shared_ptr<const MetadataCollectionKey<FSEntrySequence> > profiles_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > cache_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > write_cache_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > append_repository_name_to_write_cache_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > ignore_deprecated_profiles;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > names_cache_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > distdir_key;
+ std::shared_ptr<const MetadataCollectionKey<FSEntrySequence> > eclassdirs_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > securitydir_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > setsdir_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > newsdir_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > sync_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > sync_options_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > builddir_key;
+ std::shared_ptr<const MetadataCollectionKey<Sequence<std::string> > > master_repositories_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > eapi_when_unknown_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > eapi_when_unspecified_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > profile_eapi_when_unspecified_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > use_manifest_key;
+ std::shared_ptr<const MetadataSectionKey> info_pkgs_key;
+ std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > info_vars_key;
#ifdef ENABLE_PBINS
- 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;
+ std::shared_ptr<const MetadataValueKey<std::string> > binary_destination_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > binary_src_uri_prefix_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > binary_keywords;
#endif
- std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > accounts_repository_data_location_key;
- std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > e_updates_location_key;
- std::tr1::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key;
- std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_host_key;
- std::list<std::tr1::shared_ptr<const MetadataKey> > about_keys;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > accounts_repository_data_location_key;
+ std::shared_ptr<const MetadataValueKey<FSEntry> > e_updates_location_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key;
+ std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key;
+ std::list<std::shared_ptr<const MetadataKey> > about_keys;
- std::tr1::shared_ptr<EclassMtimes> eclass_mtimes;
+ std::shared_ptr<EclassMtimes> eclass_mtimes;
time_t master_mtime;
};
Implementation<ERepository>::Implementation(ERepository * const r,
- const ERepositoryParams & p, std::tr1::shared_ptr<Mutexes> m) :
+ const ERepositoryParams & p, std::shared_ptr<Mutexes> m) :
repo(r),
params(p),
mutexes(m),
@@ -313,9 +311,9 @@ namespace paludis
builddir_key(new LiteralMetadataValueKey<FSEntry> (
"builddir", "builddir", mkt_normal, params.builddir())),
master_repositories_key(params.master_repositories() ?
- std::tr1::shared_ptr<MetadataCollectionKey<Sequence<std::string> > >(new LiteralMetadataStringSequenceKey(
+ std::shared_ptr<MetadataCollectionKey<Sequence<std::string> > >(new LiteralMetadataStringSequenceKey(
"master_repository", "master_repository", mkt_normal, get_master_names(params.master_repositories()))) :
- std::tr1::shared_ptr<MetadataCollectionKey<Sequence<std::string> > >()),
+ std::shared_ptr<MetadataCollectionKey<Sequence<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> (
@@ -326,17 +324,17 @@ namespace paludis
"use_manifest", "use_manifest", mkt_normal, stringify(params.use_manifest()))),
info_pkgs_key(layout->info_packages_files()->end() != std::find_if(layout->info_packages_files()->begin(),
layout->info_packages_files()->end(),
- std::tr1::bind(std::tr1::mem_fn(&FSEntry::is_regular_file_or_symlink_to_regular_file),
- std::tr1::placeholders::_1)) ?
+ std::bind(std::mem_fn(&FSEntry::is_regular_file_or_symlink_to_regular_file),
+ std::placeholders::_1)) ?
make_shared_ptr(new InfoPkgsMetadataKey(params.environment(), layout->info_packages_files(), repo)) :
- std::tr1::shared_ptr<InfoPkgsMetadataKey>()
+ std::shared_ptr<InfoPkgsMetadataKey>()
),
info_vars_key(layout->info_variables_files()->end() != std::find_if(layout->info_variables_files()->begin(),
layout->info_variables_files()->end(),
- std::tr1::bind(std::tr1::mem_fn(&FSEntry::is_regular_file_or_symlink_to_regular_file),
- std::tr1::placeholders::_1)) ?
+ std::bind(std::mem_fn(&FSEntry::is_regular_file_or_symlink_to_regular_file),
+ std::placeholders::_1)) ?
make_shared_ptr(new InfoVarsMetadataKey(layout->info_variables_files())) :
- std::tr1::shared_ptr<InfoVarsMetadataKey>()
+ std::shared_ptr<InfoVarsMetadataKey>()
),
#ifdef ENABLE_PBINS
binary_destination_key(new LiteralMetadataValueKey<std::string> (
@@ -395,7 +393,7 @@ namespace paludis
if (profile_ptr)
return;
- std::tr1::shared_ptr<const FSEntrySequence> profiles(params.profiles());
+ std::shared_ptr<const FSEntrySequence> profiles(params.profiles());
if (params.auto_profiles())
{
@@ -406,7 +404,7 @@ namespace paludis
if (f->is_regular_file_or_symlink_to_regular_file())
profiles_desc = *f;
- std::tr1::shared_ptr<FSEntrySequence> auto_profiles(new FSEntrySequence);
+ std::shared_ptr<FSEntrySequence> auto_profiles(new FSEntrySequence);
if (profiles_desc == FSEntry("/dev/null"))
{
@@ -562,8 +560,8 @@ ERepository::_add_metadata_keys() const
add_metadata_key(_imp->accept_keywords_key);
add_metadata_key(_imp->sync_host_key);
- std::for_each(_imp->about_keys.begin(), _imp->about_keys.end(), std::tr1::bind(
- std::tr1::mem_fn(&ERepository::add_metadata_key), this, std::tr1::placeholders::_1));
+ std::for_each(_imp->about_keys.begin(), _imp->about_keys.end(), std::bind(
+ std::mem_fn(&ERepository::add_metadata_key), this, std::placeholders::_1));
}
bool
@@ -578,25 +576,25 @@ ERepository::has_package_named(const QualifiedPackageName & q) const
return _imp->layout->has_package_named(q);
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
ERepository::category_names() const
{
return _imp->layout->category_names();
}
-std::tr1::shared_ptr<const QualifiedPackageNameSet>
+std::shared_ptr<const QualifiedPackageNameSet>
ERepository::package_names(const CategoryNamePart & c) const
{
return _imp->layout->package_names(c);
}
-std::tr1::shared_ptr<const PackageIDSequence>
+std::shared_ptr<const PackageIDSequence>
ERepository::package_ids(const QualifiedPackageName & n) const
{
return _imp->layout->package_ids(n);
}
-std::tr1::shared_ptr<const RepositoryMaskInfo>
+std::shared_ptr<const RepositoryMaskInfo>
ERepository::repository_masked(const PackageID & id) const
{
Lock l(_imp->mutexes->repo_mask_mutex);
@@ -605,12 +603,12 @@ ERepository::repository_masked(const PackageID & id) const
{
Context context("When querying repository mask for '" + stringify(id) + "':");
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
- std::tr1::shared_ptr<const FSEntrySequence> repository_mask_files(_imp->layout->repository_mask_files());
+ std::shared_ptr<const FSEntrySequence> repository_mask_files(_imp->layout->repository_mask_files());
ProfileFile<MaskFile> repository_mask_file(this);
std::for_each(repository_mask_files->begin(), repository_mask_files->end(),
- std::tr1::bind(&ProfileFile<MaskFile>::add_file, std::tr1::ref(repository_mask_file), _1));
+ std::bind(&ProfileFile<MaskFile>::add_file, std::ref(repository_mask_file), _1));
for (ProfileFile<MaskFile>::ConstIterator
line(repository_mask_file.begin()), line_end(repository_mask_file.end()) ;
@@ -618,10 +616,10 @@ ERepository::repository_masked(const PackageID & id) const
{
try
{
- std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(parse_elike_package_dep_spec(
+ std::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(parse_elike_package_dep_spec(
line->second.first, line->first->supported()->package_dep_spec_parse_options(),
line->first->supported()->version_spec_options(),
- std::tr1::shared_ptr<const PackageID>())));
+ std::shared_ptr<const PackageID>())));
if (a->package_ptr())
_imp->repo_mask[*a->package_ptr()].push_back(std::make_pair(a, line->second.second));
else
@@ -646,17 +644,17 @@ ERepository::repository_masked(const PackageID & id) const
RepositoryMaskMap::iterator r(_imp->repo_mask.find(id.name()));
if (_imp->repo_mask.end() == r)
- return std::tr1::shared_ptr<const RepositoryMaskInfo>();
+ return std::shared_ptr<const RepositoryMaskInfo>();
else
- for (std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, std::tr1::shared_ptr<const RepositoryMaskInfo> > >::const_iterator
+ for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::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, MatchPackageOptions()))
return k->second;
- return std::tr1::shared_ptr<const RepositoryMaskInfo>();
+ return std::shared_ptr<const RepositoryMaskInfo>();
}
-const std::tr1::shared_ptr<const Set<UnprefixedChoiceName> >
+const std::shared_ptr<const Set<UnprefixedChoiceName> >
ERepository::arch_flags() const
{
Lock l(_imp->mutexes->arch_flags_mutex);
@@ -666,7 +664,7 @@ ERepository::arch_flags() const
_imp->arch_flags.reset(new Set<UnprefixedChoiceName>);
bool found_one(false);
- std::tr1::shared_ptr<const FSEntrySequence> arch_list_files(_imp->layout->arch_list_files());
+ std::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)
{
@@ -697,7 +695,7 @@ ERepository::need_mirrors() const
if (! _imp->has_mirrors)
{
bool found_one(false);
- std::tr1::shared_ptr<const FSEntrySequence> mirror_files(_imp->layout->mirror_files());
+ std::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)
{
@@ -716,7 +714,7 @@ ERepository::need_mirrors() const
if (ee.size() > 6)
ee.resize(6);
- std::tr1::shared_ptr<MirrorsSequence> ms(new MirrorsSequence);
+ std::shared_ptr<MirrorsSequence> ms(new MirrorsSequence);
for (std::vector<std::string>::const_iterator e(next(ee.begin())),
e_end(ee.end()) ; e != e_end ; ++e)
ms->push_back(*e);
@@ -740,7 +738,7 @@ ERepository::need_mirrors() const
}
bool
-ERepository::sync(const std::tr1::shared_ptr<OutputManager> & output_manager) const
+ERepository::sync(const std::shared_ptr<OutputManager> & output_manager) const
{
Context context("When syncing repository '" + stringify(name()) + "':");
@@ -805,10 +803,10 @@ ERepository::purge_invalid_cache() const
if (! write_cache.is_directory_or_symlink_to_directory())
return;
- const std::tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(
+ const std::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(
_imp->params.eapi_when_unknown()));
- std::tr1::shared_ptr<EclassMtimes> eclass_mtimes(new EclassMtimes(this, _imp->params.eclassdirs()));
+ std::shared_ptr<EclassMtimes> eclass_mtimes(new EclassMtimes(this, _imp->params.eclassdirs()));
time_t master_mtime(0);
FSEntry master_mtime_file(_imp->params.location() / "metadata" / "timestamp");
if (master_mtime_file.exists())
@@ -831,7 +829,7 @@ ERepository::purge_invalid_cache() const
VersionSpec v(elike_get_remove_trailing_version(pv, eapi->supported()->version_spec_options()));
PackageNamePart p(pv);
- std::tr1::shared_ptr<const PackageIDSequence> ids(_imp->layout->package_ids(cnp + p));
+ std::shared_ptr<const PackageIDSequence> ids(_imp->layout->package_ids(cnp + p));
bool found(false);
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
@@ -840,7 +838,7 @@ ERepository::purge_invalid_cache() const
if (stringify((*i)->version()) != stringify(v))
continue;
- std::tr1::static_pointer_cast<const ERepositoryID>(*i)->purge_invalid_cache();
+ std::static_pointer_cast<const ERepositoryID>(*i)->purge_invalid_cache();
found = true;
break;
@@ -881,13 +879,13 @@ ERepository::update_news() const
_imp->news_ptr->update_news();
}
-const std::tr1::shared_ptr<const Layout>
+const std::shared_ptr<const Layout>
ERepository::layout() const
{
return _imp->layout;
}
-const std::tr1::shared_ptr<const Profile>
+const std::shared_ptr<const Profile>
ERepository::profile() const
{
_imp->need_profiles();
@@ -919,7 +917,7 @@ ERepository::environment_updated_profile_variable(const std::string & var) const
return join(values.begin(), last, " ");
}
-std::tr1::shared_ptr<const ERepository::VirtualsSequence>
+std::shared_ptr<const ERepository::VirtualsSequence>
ERepository::virtual_packages() const
{
Context context("When loading virtual packages for repository '" +
@@ -927,7 +925,7 @@ ERepository::virtual_packages() const
_imp->need_profiles();
- std::tr1::shared_ptr<VirtualsSequence> result(new VirtualsSequence);
+ std::shared_ptr<VirtualsSequence> result(new VirtualsSequence);
for (Map<QualifiedPackageName, PackageDepSpec>::ConstIterator i(_imp->profile_ptr->virtuals()->begin()),
i_end(_imp->profile_ptr->virtuals()->end()) ; i != i_end ; ++i)
@@ -945,13 +943,13 @@ ERepository::regenerate_cache() const
_imp->names_cache->regenerate_cache();
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::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);
- std::tr1::shared_ptr<const CategoryNamePartSet> result(
+ std::shared_ptr<const CategoryNamePartSet> result(
_imp->names_cache->category_names_containing_package(p));
return result ? result : Repository::category_names_containing_package(p);
@@ -999,10 +997,10 @@ ERepository::perform_hook(const Hook & hook)
return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
}
-std::tr1::shared_ptr<const CategoryNamePartSet>
+std::shared_ptr<const CategoryNamePartSet>
ERepository::unimportant_category_names() const
{
- std::tr1::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
+ std::shared_ptr<CategoryNamePartSet> result(make_shared_ptr(new CategoryNamePartSet));
result->insert(CategoryNamePart("virtual"));
return result;
}
@@ -1077,7 +1075,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
if (! manifest)
throw ERepositoryConfigurationError("Couldn't open Manifest for writing.");
- std::tr1::shared_ptr<Map<FSEntry, std::string> > files = _imp->layout->manifest_files(qpn);
+ std::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)
@@ -1108,7 +1106,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
manifest << " SHA256 " << sha256sum.hexsum() << std::endl;
}
- std::tr1::shared_ptr<const PackageIDSequence> versions;
+ std::shared_ptr<const PackageIDSequence> versions;
versions = package_ids(qpn);
std::set<std::string> done_files;
@@ -1117,7 +1115,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
v_end(versions->end()) ;
v != v_end ; ++v)
{
- std::tr1::shared_ptr<const PackageID> id = (*v);
+ std::shared_ptr<const PackageID> id = (*v);
if (! id->fetches_key())
continue;
AAVisitor aa;
@@ -1181,25 +1179,25 @@ ERepository::need_keys_added() const
return;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
ERepository::format_key() const
{
return _imp->format_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
ERepository::location_key() const
{
return _imp->location_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSEntry> >
ERepository::installed_root_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSEntry> >();
}
-const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
ERepository::info_vars_key() const
{
return _imp->info_vars_key;
@@ -1208,7 +1206,7 @@ ERepository::info_vars_key() const
RepositoryName
ERepository::repository_factory_name(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> & key_function)
+ const std::function<std::string (const std::string &)> & key_function)
{
Context context("When finding repository name for e repository from repo_file '" + key_function("repo_file") + "':");
@@ -1217,10 +1215,10 @@ ERepository::repository_factory_name(
return fetch_repo_name(FSEntry(key_function("location")));
}
-std::tr1::shared_ptr<Repository>
+std::shared_ptr<Repository>
ERepository::repository_factory_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
Context context("When making ebuild repository from repo_file '" + f("repo_file") + "':");
@@ -1230,12 +1228,12 @@ ERepository::repository_factory_create(
if ('/' != location.at(0))
throw ERepositoryConfigurationError("Key 'location' must start with a / (relative paths are not allowed)");
- std::tr1::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
+ std::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", KeyValueConfigFileOptions(),
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
: 0);
- std::tr1::shared_ptr<ERepositorySequence> master_repositories;
+ std::shared_ptr<ERepositorySequence> master_repositories;
if (! f("master_repository").empty())
{
if (layout_conf)
@@ -1249,7 +1247,7 @@ ERepository::repository_factory_create(
+ stringify(f("master_repository")) + "':");
RepositoryName master_repository_name(f("master_repository"));
- std::tr1::shared_ptr<Repository> master_repository_uncasted(
+ std::shared_ptr<Repository> master_repository_uncasted(
env->package_database()->fetch_repository(master_repository_name));
std::string format("unknown");
@@ -1259,7 +1257,7 @@ ERepository::repository_factory_create(
if (format != "e")
throw ERepositoryConfigurationError("Master repository format is '" + stringify(format) + "', not 'ebuild'");
- std::tr1::shared_ptr<ERepository> master_repository(std::tr1::static_pointer_cast<ERepository>(master_repository_uncasted));
+ std::shared_ptr<ERepository> master_repository(std::static_pointer_cast<ERepository>(master_repository_uncasted));
master_repositories.reset(new ERepositorySequence);
master_repositories->push_back(master_repository);
}
@@ -1275,7 +1273,7 @@ ERepository::repository_factory_create(
RepositoryName master_repository_name(*t);
try
{
- std::tr1::shared_ptr<Repository> master_repository_uncasted(
+ std::shared_ptr<Repository> master_repository_uncasted(
env->package_database()->fetch_repository(master_repository_name));
std::string format("unknown");
@@ -1285,7 +1283,7 @@ ERepository::repository_factory_create(
if (format != "e")
throw ERepositoryConfigurationError("Master repository format is '" + stringify(format) + "', not 'ebuild'");
- std::tr1::shared_ptr<ERepository> master_repository(std::tr1::static_pointer_cast<ERepository>(master_repository_uncasted));
+ std::shared_ptr<ERepository> master_repository(std::static_pointer_cast<ERepository>(master_repository_uncasted));
if (! master_repositories)
master_repositories.reset(new ERepositorySequence);
master_repositories->push_back(master_repository);
@@ -1299,7 +1297,7 @@ ERepository::repository_factory_create(
}
}
- std::tr1::shared_ptr<FSEntrySequence> profiles(new FSEntrySequence);
+ std::shared_ptr<FSEntrySequence> profiles(new FSEntrySequence);
bool profiles_explicitly_set(false), auto_profiles(false);
tokenise_whitespace(f("profiles"), create_inserter<FSEntry>(std::back_inserter(*profiles)));
if (profiles->empty())
@@ -1320,7 +1318,7 @@ ERepository::repository_factory_create(
else
profiles_explicitly_set = true;
- std::tr1::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
+ std::shared_ptr<FSEntrySequence> eclassdirs(new FSEntrySequence);
tokenise_whitespace(f("eclassdirs"), create_inserter<FSEntry>(std::back_inserter(*eclassdirs)));
if (eclassdirs->empty())
{
@@ -1503,7 +1501,7 @@ ERepository::repository_factory_create(
throw ERepositoryConfigurationError("binary_destination = true, but binary_keywords is unset or empty");
}
- return std::tr1::shared_ptr<ERepository>(new ERepository(make_named_values<ERepositoryParams>(
+ return std::shared_ptr<ERepository>(new ERepository(make_named_values<ERepositoryParams>(
n::append_repository_name_to_write_cache() = append_repository_name_to_write_cache,
n::auto_profiles() = auto_profiles,
n::binary_destination() = binary_destination,
@@ -1538,12 +1536,12 @@ ERepository::repository_factory_create(
)));
}
-std::tr1::shared_ptr<const RepositoryNameSet>
+std::shared_ptr<const RepositoryNameSet>
ERepository::repository_factory_dependencies(
const Environment * const,
- const std::tr1::function<std::string (const std::string &)> & f)
+ const std::function<std::string (const std::string &)> & f)
{
- std::tr1::shared_ptr<RepositoryNameSet> result(new RepositoryNameSet);
+ std::shared_ptr<RepositoryNameSet> result(new RepositoryNameSet);
if (! f("master_repository").empty())
result->insert(RepositoryName(f("master_repository")));
else
@@ -1552,7 +1550,7 @@ ERepository::repository_factory_dependencies(
if (location.empty())
throw ERepositoryConfigurationError("Key 'location' not specified or empty");
- std::tr1::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
+ std::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", KeyValueConfigFileOptions(),
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
: 0);
@@ -1570,7 +1568,7 @@ ERepository::repository_factory_dependencies(
return result;
}
-const std::tr1::shared_ptr<const UseDesc>
+const std::shared_ptr<const UseDesc>
ERepository::use_desc() const
{
Lock l(_imp->mutexes->use_desc_mutex);
@@ -1613,13 +1611,13 @@ ERepository::eapi_for_file(const FSEntry & f) const
namespace
{
- std::tr1::shared_ptr<const SetSpecTree> get_system_set(const std::tr1::shared_ptr<const SetSpecTree> s)
+ std::shared_ptr<const SetSpecTree> get_system_set(const std::shared_ptr<const SetSpecTree> s)
{
return s;
}
- std::tr1::shared_ptr<const SetSpecTree> get_set(
- const std::tr1::shared_ptr<const ERepositorySets> & s,
+ std::shared_ptr<const SetSpecTree> get_set(
+ const std::shared_ptr<const ERepositorySets> & s,
const SetName & n)
{
return s->package_set(n);
@@ -1629,7 +1627,7 @@ namespace
void
ERepository::populate_sets() const
{
- const std::tr1::shared_ptr<const SetNameSet> sets(_imp->sets_ptr->sets_list());
+ const std::shared_ptr<const SetNameSet> sets(_imp->sets_ptr->sets_list());
for (SetNameSet::ConstIterator s(sets->begin()), s_end(sets->end()) ;
s != s_end ; ++s)
{
@@ -1639,7 +1637,7 @@ ERepository::populate_sets() const
_imp->params.environment()->add_set(
*s,
SetName(stringify(*s) + "::" + stringify(name())),
- std::tr1::bind(&get_system_set, _imp->profile_ptr->system_packages()),
+ std::bind(&get_system_set, _imp->profile_ptr->system_packages()),
true);
}
else
@@ -1647,27 +1645,27 @@ ERepository::populate_sets() const
_imp->params.environment()->add_set(
*s,
SetName(stringify(*s) + "::" + stringify(name())),
- std::tr1::bind(&get_set, _imp->sets_ptr, *s),
+ std::bind(&get_set, _imp->sets_ptr, *s),
true);
if (stringify(*s) != "security" && stringify(*s) != "insecurity")
_imp->params.environment()->add_set(
SetName(stringify(*s) + "*"),
SetName(stringify(*s) + "::" + stringify(name()) + "*"),
- std::tr1::bind(&get_set, _imp->sets_ptr, SetName(stringify(*s) + "*")),
+ std::bind(&get_set, _imp->sets_ptr, SetName(stringify(*s) + "*")),
true);
}
}
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
ERepository::accept_keywords_key() const
{
need_keys_added();
return _imp->accept_keywords_key;
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
+const std::shared_ptr<const MetadataValueKey<std::string> >
ERepository::sync_host_key() const
{
return _imp->sync_host_key;
@@ -1711,12 +1709,12 @@ namespace
};
}
-const std::tr1::shared_ptr<const ERepositoryID>
+const std::shared_ptr<const ERepositoryID>
ERepository::make_id(const QualifiedPackageName & q, const FSEntry & f) const
{
Context context("When creating ID for '" + stringify(q) + "' from '" + stringify(f) + "':");
- std::tr1::shared_ptr<EbuildID> result(new EbuildID(q, extract_package_file_version(q, f),
+ std::shared_ptr<EbuildID> result(new EbuildID(q, extract_package_file_version(q, f),
_imp->params.environment(),
shared_from_this(), f, _guess_eapi(q, f),
_imp->master_mtime, _imp->eclass_mtimes));
@@ -1732,10 +1730,10 @@ namespace
std::list<const URILabelsDepSpec *> _labels;
const Environment * const env;
- const std::tr1::shared_ptr<const PackageID> id;
+ const std::shared_ptr<const PackageID> id;
public:
- AFinder(const Environment * const e, const std::tr1::shared_ptr<const PackageID> & i) :
+ AFinder(const Environment * const e, const std::shared_ptr<const PackageID> & i) :
env(e),
id(i)
{
@@ -1788,7 +1786,7 @@ namespace
{
std::string make_use(const Environment * const,
const ERepositoryID & id,
- std::tr1::shared_ptr<const Profile> profile)
+ std::shared_ptr<const Profile> profile)
{
if (! id.eapi()->supported())
{
@@ -1821,12 +1819,12 @@ namespace
return use;
}
- std::tr1::shared_ptr<Map<std::string, std::string> >
+ std::shared_ptr<Map<std::string, std::string> >
make_expand(const Environment * const,
const ERepositoryID & e,
- std::tr1::shared_ptr<const Profile> profile)
+ std::shared_ptr<const Profile> profile)
{
- std::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(
+ std::shared_ptr<Map<std::string, std::string> > expand_vars(
new Map<std::string, std::string>);
if (! e.eapi()->supported())
@@ -1845,8 +1843,8 @@ namespace
expand_vars->insert(stringify(*x), "");
Choices::ConstIterator k(std::find_if(e.choices_key()->value()->begin(), e.choices_key()->value()->end(),
- std::tr1::bind(std::equal_to<std::string>(), *x,
- std::tr1::bind(std::tr1::mem_fn(&Choice::raw_name), std::tr1::placeholders::_1))));
+ std::bind(std::equal_to<std::string>(), *x,
+ std::bind(std::mem_fn(&Choice::raw_name), std::placeholders::_1))));
if (k == e.choices_key()->value()->end())
continue;
@@ -1909,7 +1907,7 @@ namespace
return true;
}
- const std::tr1::shared_ptr<const MirrorsSequence>
+ const std::shared_ptr<const MirrorsSequence>
get_mirrors_fn(const std::string & m, const MirrorMap & map)
{
MirrorMap::const_iterator i(map.find(m));
@@ -1921,10 +1919,10 @@ namespace
}
void
-ERepository::fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ERepository::fetch(const std::shared_ptr<const ERepositoryID> & id,
const FetchAction & fetch_action) const
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
Context context("When fetching '" + stringify(*id) + "':");
@@ -2000,7 +1998,7 @@ ERepository::fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
archives = strip_trailing(archives, " ");
all_archives = strip_trailing(all_archives, " ");
- std::tr1::shared_ptr<OutputManager> output_manager(fetch_action.options.make_output_manager()(fetch_action));
+ std::shared_ptr<OutputManager> output_manager(fetch_action.options.make_output_manager()(fetch_action));
CheckFetchedFilesVisitor c(_imp->params.environment(), id, _imp->params.distdir(),
fetch_action.options.fetch_parts()[fp_unneeded], fetch_restrict,
@@ -2027,7 +2025,7 @@ ERepository::fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
_imp->params.distdir(), fetch_action.options.fetch_parts()[fp_unneeded],
fetch_userpriv_ok, mirrors_name,
id->fetches_key()->initial_label(), fetch_action.options.safe_resume(),
- output_manager, std::tr1::bind(&get_mirrors_fn, std::tr1::placeholders::_1, std::tr1::cref(_imp->mirrors)));
+ output_manager, std::bind(&get_mirrors_fn, std::placeholders::_1, std::cref(_imp->mirrors)));
id->fetches_key()->value()->root()->accept(f);
}
@@ -2041,10 +2039,10 @@ ERepository::fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
check_userpriv(FSEntry(_imp->params.builddir()), _imp->params.environment(),
id->eapi()->supported()->userpriv_cannot_use_root()));
std::string use(make_use(_imp->params.environment(), *id, profile()));
- std::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
+ std::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment(), *id, profile()));
- std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
+ std::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
EAPIPhases fetch_extra_phases(id->eapi()->supported()->ebuild_phases()->ebuild_fetch_extra());
if ((! fetch_action.options.ignore_unfetched()) && (fetch_extra_phases.begin_phases() != fetch_extra_phases.end_phases()))
@@ -2185,10 +2183,10 @@ ERepository::fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
}
void
-ERepository::pretend_fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ERepository::pretend_fetch(const std::shared_ptr<const ERepositoryID> & id,
PretendFetchAction & a) const
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
Context context("When pretending to fetch ID '" + stringify(*id) + "':");
@@ -2203,8 +2201,8 @@ ERepository::pretend_fetch(const std::tr1::shared_ptr<const ERepositoryID> & id,
namespace
{
- bool slot_is_same(const std::tr1::shared_ptr<const PackageID> & a,
- const std::tr1::shared_ptr<const PackageID> & b)
+ bool slot_is_same(const std::shared_ptr<const PackageID> & a,
+ const std::shared_ptr<const PackageID> & b)
{
if (a->slot_key())
return b->slot_key() && a->slot_key()->value() == b->slot_key()->value();
@@ -2217,7 +2215,7 @@ namespace
s = v;
}
- std::tr1::shared_ptr<OutputManager> this_output_manager(const std::tr1::shared_ptr<OutputManager> & o, const Action &)
+ std::shared_ptr<OutputManager> this_output_manager(const std::shared_ptr<OutputManager> & o, const Action &)
{
return o;
}
@@ -2226,7 +2224,7 @@ namespace
{
}
- bool ignore_merged(const std::tr1::shared_ptr<const FSEntrySet> & s,
+ bool ignore_merged(const std::shared_ptr<const FSEntrySet> & s,
const FSEntry & f)
{
return s->end() != s->find(f);
@@ -2234,17 +2232,17 @@ namespace
}
void
-ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ERepository::install(const std::shared_ptr<const ERepositoryID> & id,
const InstallAction & install_action) const
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
Context context("When installing '" + stringify(*id) + "'" +
(install_action.options.replacing()->empty() ? "" : " replacing { '"
+ join(indirect_iterator(install_action.options.replacing()->begin()),
indirect_iterator(install_action.options.replacing()->end()), "', '") + "' }") + ":");
- std::tr1::shared_ptr<OutputManager> output_manager(install_action.options.make_output_manager()(install_action));
+ std::shared_ptr<OutputManager> output_manager(install_action.options.make_output_manager()(install_action));
bool userpriv_restrict, test_restrict, strip_restrict;
{
@@ -2254,19 +2252,19 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
test_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "test"));
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "test"));
strip_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "strip")) ||
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "strip")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nostrip"));
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "nostrip"));
}
std::string archives, all_archives;
@@ -2324,10 +2322,10 @@ ERepository::install(const std::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::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
+ std::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment(), *id, profile()));
- std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
+ std::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
bool userpriv_ok((! userpriv_restrict) && (_imp->params.environment()->reduced_gid() != getgid()) &&
check_userpriv(FSEntry(_imp->params.distdir()), _imp->params.environment(), id->eapi()->supported()->userpriv_cannot_use_root()) &&
@@ -2337,9 +2335,9 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
stringify(id->name().package()) + "-" + stringify(id->version())));
std::string used_config_protect;
- std::tr1::shared_ptr<FSEntrySet> merged_entries(new FSEntrySet);
+ std::shared_ptr<FSEntrySet> merged_entries(new FSEntrySet);
- std::tr1::shared_ptr<const ChoiceValue> preserve_work_choice(
+ std::shared_ptr<const ChoiceValue> preserve_work_choice(
id->choices_key()->value()->find_by_name_with_prefix(
ELikePreserveWorkChoiceValue::canonical_name_with_prefix()));
@@ -2407,8 +2405,8 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
n::output_manager() = output_manager,
n::package_id() = id,
n::perform_uninstall() = install_action.options.perform_uninstall(),
- n::used_this_for_config_protect() = std::tr1::bind(
- &used_this_for_config_protect, std::tr1::ref(used_config_protect), std::tr1::placeholders::_1)
+ n::used_this_for_config_protect() = std::bind(
+ &used_this_for_config_protect, std::ref(used_config_protect), std::placeholders::_1)
));
}
else if (phase->option("strip"))
@@ -2427,9 +2425,9 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
Log::get_instance()->message("e.ebuild.libdir", ll_debug, lc_context) << "Using '" << libdir << "' for libdir";
- std::tr1::shared_ptr<const ChoiceValue> strip_choice(id->choices_key()->value()->find_by_name_with_prefix(
+ std::shared_ptr<const ChoiceValue> strip_choice(id->choices_key()->value()->find_by_name_with_prefix(
ELikeStripChoiceValue::canonical_name_with_prefix()));
- std::tr1::shared_ptr<const ChoiceValue> split_choice(id->choices_key()->value()->find_by_name_with_prefix(
+ std::shared_ptr<const ChoiceValue> split_choice(id->choices_key()->value()->find_by_name_with_prefix(
ELikeSplitChoiceValue::canonical_name_with_prefix()));
EStripper stripper(make_named_values<EStripperOptions>(
@@ -2452,7 +2450,7 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
if (test_restrict)
continue;
- std::tr1::shared_ptr<const ChoiceValue> choice(id->choices_key()->value()->find_by_name_with_prefix(
+ std::shared_ptr<const ChoiceValue> choice(id->choices_key()->value()->find_by_name_with_prefix(
ELikeOptionalTestsChoiceValue::canonical_name_with_prefix()));
if (choice && ! choice->enabled())
continue;
@@ -2462,14 +2460,14 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
if (test_restrict)
continue;
- std::tr1::shared_ptr<const ChoiceValue> choice(id->choices_key()->value()->find_by_name_with_prefix(
+ std::shared_ptr<const ChoiceValue> choice(id->choices_key()->value()->find_by_name_with_prefix(
ELikeRecommendedTestsChoiceValue::canonical_name_with_prefix()));
if (choice && ! choice->enabled())
continue;
}
else if (phase->option("expensive_tests"))
{
- std::tr1::shared_ptr<const ChoiceValue> choice(id->choices_key()->value()->find_by_name_with_prefix(
+ std::shared_ptr<const ChoiceValue> choice(id->choices_key()->value()->find_by_name_with_prefix(
ELikeExpensiveTestsChoiceValue::canonical_name_with_prefix()));
if (choice && ! choice->enabled())
continue;
@@ -2536,10 +2534,10 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
UninstallActionOptions uo(make_named_values<UninstallActionOptions>(
n::config_protect() = used_config_protect,
n::if_for_install_id() = id,
- n::ignore_for_unmerge() = std::tr1::bind(&ignore_merged, merged_entries,
- std::tr1::placeholders::_1),
+ n::ignore_for_unmerge() = std::bind(&ignore_merged, merged_entries,
+ std::placeholders::_1),
n::is_overwrite() = false,
- n::make_output_manager() = std::tr1::bind(&this_output_manager, output_manager, std::tr1::placeholders::_1)
+ n::make_output_manager() = std::bind(&this_output_manager, output_manager, std::placeholders::_1)
));
install_action.options.perform_uninstall()(*i, uo);
}
@@ -2548,14 +2546,14 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
}
void
-ERepository::info(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ERepository::info(const std::shared_ptr<const ERepositoryID> & id,
const InfoAction & a) const
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
Context context("When infoing '" + stringify(*id) + "':");
- std::tr1::shared_ptr<OutputManager> output_manager(a.options.make_output_manager()(a));
+ std::shared_ptr<OutputManager> output_manager(a.options.make_output_manager()(a));
bool userpriv_restrict;
{
@@ -2565,9 +2563,9 @@ ERepository::info(const std::tr1::shared_ptr<const ERepositoryID> & id,
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
}
bool userpriv_ok((! userpriv_restrict) && (_imp->params.environment()->reduced_gid() != getgid()) &&
check_userpriv(FSEntry(_imp->params.builddir()), _imp->params.environment(), id->eapi()->supported()->userpriv_cannot_use_root()));
@@ -2577,10 +2575,10 @@ ERepository::info(const std::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::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
+ std::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment(), *id, profile()));
- std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
+ std::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
EAPIPhases phases(id->eapi()->supported()->ebuild_phases()->ebuild_info());
for (EAPIPhases::ConstIterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
@@ -2635,10 +2633,10 @@ ERepository::info(const std::tr1::shared_ptr<const ERepositoryID> & id,
std::string
ERepository::get_environment_variable(
- const std::tr1::shared_ptr<const PackageID> & id_uncasted,
+ const std::shared_ptr<const PackageID> & id_uncasted,
const std::string & var) const
{
- const std::tr1::shared_ptr<const ERepositoryID> id(std::tr1::static_pointer_cast<const ERepositoryID>(id_uncasted));
+ const std::shared_ptr<const ERepositoryID> id(std::static_pointer_cast<const ERepositoryID>(id_uncasted));
EAPIPhases phases(id->eapi()->supported()->ebuild_phases()->ebuild_variable());
@@ -2649,7 +2647,7 @@ ERepository::get_environment_variable(
bool userpriv_restrict;
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment());
if (id->restrict_key())
@@ -2657,14 +2655,14 @@ ERepository::get_environment_variable(
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
}
bool userpriv_ok((! userpriv_restrict) && (_imp->params.environment()->reduced_gid() != getgid()) &&
check_userpriv(FSEntry(_imp->params.builddir()), _imp->params.environment(), id->eapi()->supported()->userpriv_cannot_use_root()));
- std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
+ std::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
EbuildVariableCommand cmd(make_named_values<EbuildCommandParams>(
n::builddir() = _imp->params.builddir(),
@@ -2709,7 +2707,7 @@ ERepository::merge(const MergeParams & m)
FSEntry binary_ebuild_location(layout()->binary_ebuild_location(
m.package_id()->name(), m.package_id()->version(),
- "pbin-1+" + std::tr1::static_pointer_cast<const ERepositoryID>(m.package_id())->eapi()->name()));
+ "pbin-1+" + std::static_pointer_cast<const ERepositoryID>(m.package_id())->eapi()->name()));
binary_ebuild_location.dirname().dirname().mkdir();
binary_ebuild_location.dirname().mkdir();
@@ -2724,8 +2722,8 @@ ERepository::merge(const MergeParams & m)
n::environment_file() = m.environment_file(),
n::image() = m.image_dir(),
n::maybe_output_manager() = m.output_manager(),
- n::merger_options() = std::tr1::static_pointer_cast<const ERepositoryID>(m.package_id())->eapi()->supported()->merger_options(),
- n::package_id() = std::tr1::static_pointer_cast<const ERepositoryID>(m.package_id())
+ n::merger_options() = std::static_pointer_cast<const ERepositoryID>(m.package_id())->eapi()->supported()->merger_options(),
+ n::package_id() = std::static_pointer_cast<const ERepositoryID>(m.package_id())
));
write_binary_ebuild_command();
@@ -2761,10 +2759,10 @@ ERepository::extract_package_file_version(const QualifiedPackageName & n, const
bool
ERepository::pretend(
- const std::tr1::shared_ptr<const ERepositoryID> & id,
+ const std::shared_ptr<const ERepositoryID> & id,
const PretendAction & a) const
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
Context context("When running pretend for '" + stringify(*id) + "':");
@@ -2785,20 +2783,20 @@ ERepository::pretend(
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
+ std::bind(std::equal_to<std::string>(), std::bind(std::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
}
bool userpriv_ok((! userpriv_restrict) && (_imp->params.environment()->reduced_gid() != getgid()) &&
check_userpriv(FSEntry(_imp->params.builddir()), _imp->params.environment(), id->eapi()->supported()->userpriv_cannot_use_root()));
std::string use(make_use(_imp->params.environment(), *id, profile()));
- std::tr1::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
+ std::shared_ptr<Map<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment(), *id, profile()));
- std::tr1::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
+ std::shared_ptr<const FSEntrySequence> exlibsdirs(layout()->exlibsdirs(id->name()));
- std::tr1::shared_ptr<OutputManager> output_manager;
+ std::shared_ptr<OutputManager> output_manager;
if (id->raw_myoptions_key())
{
diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh
index 949be118c..218abf043 100644
--- a/paludis/repositories/e/e_repository.hh
+++ b/paludis/repositories/e/e_repository.hh
@@ -29,7 +29,7 @@
#include <paludis/repositories/e/e_repository_id.hh>
#include <paludis/repositories/e/profile.hh>
#include <paludis/repositories/e/layout.hh>
-#include <tr1/memory>
+#include <memory>
#include <string>
/** \file
@@ -55,7 +55,7 @@ namespace paludis
public RepositoryVirtualsInterface,
public RepositoryDestinationInterface,
public RepositoryManifestInterface,
- public std::tr1::enable_shared_from_this<ERepository>,
+ public std::enable_shared_from_this<ERepository>,
private PrivateImplementationPattern<ERepository>
{
private:
@@ -88,7 +88,7 @@ namespace paludis
/* RepositoryVirtualsInterface */
- virtual std::tr1::shared_ptr<const VirtualsSequence> virtual_packages() const
+ virtual std::shared_ptr<const VirtualsSequence> virtual_packages() const
PALUDIS_ATTRIBUTE((warn_unused_result));
/* RepositoryDestinationInterface */
@@ -109,29 +109,29 @@ namespace paludis
/* RepositorySyncableInterface */
- virtual bool sync(const std::tr1::shared_ptr<OutputManager> &) const;
+ virtual bool sync(const std::shared_ptr<OutputManager> &) const;
/* RepositoryEnvironmentVariableInterface */
virtual std::string get_environment_variable(
- const std::tr1::shared_ptr<const PackageID> & for_package,
+ const std::shared_ptr<const PackageID> & for_package,
const std::string & var) const
PALUDIS_ATTRIBUTE((warn_unused_result));
/* Repository */
- virtual std::tr1::shared_ptr<const PackageIDSequence> package_ids(
+ virtual std::shared_ptr<const PackageIDSequence> package_ids(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> package_names(
+ virtual std::shared_ptr<const QualifiedPackageNameSet> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names() const
+ virtual std::shared_ptr<const CategoryNamePartSet> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> category_names_containing_package(
+ virtual std::shared_ptr<const CategoryNamePartSet> category_names_containing_package(
const PackageNamePart &) const;
virtual bool has_package_named(const QualifiedPackageName &) const
@@ -152,7 +152,7 @@ namespace paludis
HookResult perform_hook(const Hook &)
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
+ virtual std::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
virtual const bool is_unimportant() const;
/**
@@ -160,41 +160,41 @@ namespace paludis
*/
void update_news() const;
- const std::tr1::shared_ptr<const erepository::Layout> layout() const;
- const std::tr1::shared_ptr<const erepository::Profile> profile() const;
+ const std::shared_ptr<const erepository::Layout> layout() const;
+ const std::shared_ptr<const erepository::Profile> profile() const;
- std::tr1::shared_ptr<const RepositoryMaskInfo> repository_masked(const PackageID &) const;
+ std::shared_ptr<const RepositoryMaskInfo> repository_masked(const PackageID &) const;
void regenerate_cache() const;
/* Keys */
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > info_vars_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > info_vars_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
///\name RepositoryFactory functions
///\{
static RepositoryName repository_factory_name(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<Repository> repository_factory_create(
+ static std::shared_ptr<Repository> repository_factory_create(
Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
- static std::tr1::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
+ static std::shared_ptr<const RepositoryNameSet> repository_factory_dependencies(
const Environment * const env,
- const std::tr1::function<std::string (const std::string &)> &);
+ const std::function<std::string (const std::string &)> &);
///\}
- const std::tr1::shared_ptr<const Set<UnprefixedChoiceName> > arch_flags() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const UseDesc> use_desc() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Set<UnprefixedChoiceName> > arch_flags() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const UseDesc> use_desc() const PALUDIS_ATTRIBUTE((warn_unused_result));
const std::string eapi_for_file(const FSEntry &) const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -214,23 +214,23 @@ namespace paludis
VersionSpec extract_package_file_version(const QualifiedPackageName &, const FSEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const erepository::ERepositoryID> make_id(
+ const std::shared_ptr<const erepository::ERepositoryID> make_id(
const QualifiedPackageName &, const FSEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- void fetch(const std::tr1::shared_ptr<const erepository::ERepositoryID> &,
+ void fetch(const std::shared_ptr<const erepository::ERepositoryID> &,
const FetchAction &) const;
- void pretend_fetch(const std::tr1::shared_ptr<const erepository::ERepositoryID> &,
+ void pretend_fetch(const std::shared_ptr<const erepository::ERepositoryID> &,
PretendFetchAction &) const;
- void install(const std::tr1::shared_ptr<const erepository::ERepositoryID> &,
+ void install(const std::shared_ptr<const erepository::ERepositoryID> &,
const InstallAction &) const;
- bool pretend(const std::tr1::shared_ptr<const erepository::ERepositoryID> &,
+ bool pretend(const std::shared_ptr<const erepository::ERepositoryID> &,
const PretendAction &) const;
- void info(const std::tr1::shared_ptr<const erepository::ERepositoryID> &,
+ void info(const std::shared_ptr<const erepository::ERepositoryID> &,
const InfoAction &) const;
const std::string get_package_file_manifest_key(const FSEntry &, const QualifiedPackageName &) const;
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 26c3acfa8..e2abb8b6a 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -51,7 +51,7 @@
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -62,18 +62,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -99,14 +99,14 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "test-repo-1");
}
} test_e_repository_repo_name;
@@ -119,14 +119,14 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo2"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo2/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "x-repo2");
}
} test_e_repository_no_repo_name;
@@ -139,14 +139,14 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo3"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo3/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "x-repo3");
}
} test_e_repository_empty_repo_name;
@@ -159,14 +159,14 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
@@ -188,20 +188,20 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- std::tr1::shared_ptr<const CategoryNamePartSet> c(repo->category_names());
+ std::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")));
@@ -219,14 +219,14 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
@@ -256,14 +256,14 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
repo->package_names(CategoryNamePart("cat-one"));
repo->package_names(CategoryNamePart("cat-two"));
@@ -297,16 +297,16 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
- std::tr1::shared_ptr<const QualifiedPackageNameSet> names;
+ std::shared_ptr<const QualifiedPackageNameSet> names;
for (int pass = 1 ; pass <= 2 ; ++pass)
{
@@ -347,16 +347,16 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo5"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo5/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
- std::tr1::shared_ptr<const QualifiedPackageNameSet> names;
+ std::shared_ptr<const QualifiedPackageNameSet> names;
for (int pass = 1 ; pass <= 2 ; ++pass)
{
@@ -376,38 +376,38 @@ namespace test_cases
void run()
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- std::tr1::shared_ptr<const PackageIDSequence> versions;
+ std::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()),
- std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("1", VersionSpecOptions()))));
+ std::bind(std::equal_to<VersionSpec>(), std::bind(std::mem_fn(&PackageID::version), _1), VersionSpec("1", VersionSpecOptions()))));
TEST_CHECK(indirect_iterator(versions->end()) != std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("1.1-r1", VersionSpecOptions()))));
+ std::bind(std::equal_to<VersionSpec>(), std::bind(std::mem_fn(&PackageID::version), _1), VersionSpec("1.1-r1", VersionSpecOptions()))));
TEST_CHECK(indirect_iterator(versions->end()) == std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("2", VersionSpecOptions()))));
+ std::bind(std::equal_to<VersionSpec>(), std::bind(std::mem_fn(&PackageID::version), _1), VersionSpec("2", VersionSpecOptions()))));
versions = repo->package_ids(QualifiedPackageName("cat-one/pkg-neither"));
TEST_CHECK(versions->empty());
@@ -422,37 +422,37 @@ namespace test_cases
void run()
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo8"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo8/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- std::tr1::shared_ptr<const PackageIDSequence> versions;
+ std::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()),
- std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("1", VersionSpecOptions()))));
+ std::bind(std::equal_to<VersionSpec>(), std::bind(std::mem_fn(&PackageID::version), _1), VersionSpec("1", VersionSpecOptions()))));
TEST_CHECK(indirect_iterator(versions->end()) != std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("1.1-r1", VersionSpecOptions()))));
+ std::bind(std::equal_to<VersionSpec>(), std::bind(std::mem_fn(&PackageID::version), _1), VersionSpec("1.1-r1", VersionSpecOptions()))));
TEST_CHECK(indirect_iterator(versions->end()) == std::find_if(
indirect_iterator(versions->begin()), indirect_iterator(versions->end()),
- std::tr1::bind(std::equal_to<VersionSpec>(), std::tr1::bind(std::tr1::mem_fn(&PackageID::version), _1), VersionSpec("2", VersionSpecOptions()))));
+ std::bind(std::equal_to<VersionSpec>(), std::bind(std::mem_fn(&PackageID::version), _1), VersionSpec("2", VersionSpecOptions()))));
versions = repo->package_ids(QualifiedPackageName("cat-one/pkg-neither"));
TEST_CHECK(versions->empty());
@@ -478,7 +478,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
@@ -486,15 +486,15 @@ namespace test_cases
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo7"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo7/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 3 ; ++pass)
{
TestMessageSuffix pass_suffix("pass=" + stringify(pass), true);
- const std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
@@ -504,32 +504,32 @@ 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, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pd(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id1->build_dependencies_key());
id1->build_dependencies_key()->value()->root()->accept(pd);
TEST_CHECK_STRINGIFY_EQUAL(pd, "foo/bar");
- erepository::DepSpecPrettyPrinter pr(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pr(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id1->run_dependencies_key());
id1->run_dependencies_key()->value()->root()->accept(pr);
TEST_CHECK_STRINGIFY_EQUAL(pr, "foo/bar");
- const std::tr1::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->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, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pd2(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id2->build_dependencies_key());
id2->build_dependencies_key()->value()->root()->accept(pd2);
TEST_CHECK_STRINGIFY_EQUAL(pd2, "foo/bar bar/baz");
- erepository::DepSpecPrettyPrinter pr2(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pr2(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id2->run_dependencies_key());
id2->run_dependencies_key()->value()->root()->accept(pr2);
TEST_CHECK_STRINGIFY_EQUAL(pr2, "foo/bar");
- const std::tr1::shared_ptr<const PackageID> id3(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id3(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-3",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
@@ -561,27 +561,27 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo7"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo7/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- const std::tr1::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-two-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
- TEST_CHECK_EQUAL(std::tr1::static_pointer_cast<const erepository::ERepositoryID>(id1)->eapi()->name(), "UNKNOWN");
+ TEST_CHECK_EQUAL(std::static_pointer_cast<const erepository::ERepositoryID>(id1)->eapi()->name(), "UNKNOWN");
TEST_CHECK(! id1->short_description_key());
}
}
@@ -591,10 +591,10 @@ namespace test_cases
{
ERepositoryQueryUseTest() : TestCase("USE query") { }
- void test_choice(const std::tr1::shared_ptr<const PackageID> & p, const std::string & n, bool enabled, bool enabled_by_default, bool locked, const std::string & u = "")
+ void test_choice(const std::shared_ptr<const PackageID> & p, const std::string & n, bool enabled, bool enabled_by_default, bool locked, const std::string & u = "")
{
TestMessageSuffix s(stringify(*p) + "[" + n + "]", true);
- std::tr1::shared_ptr<const ChoiceValue> choice(p->choices_key()->value()->find_by_name_with_prefix(ChoiceNameWithPrefix(n)));
+ std::shared_ptr<const ChoiceValue> choice(p->choices_key()->value()->find_by_name_with_prefix(ChoiceNameWithPrefix(n)));
TEST_CHECK(choice);
TEST_CHECK_EQUAL(choice->unprefixed_name(), UnprefixedChoiceName(u.empty() ? n : u));
TEST_CHECK_EQUAL(choice->enabled(), enabled);
@@ -606,28 +606,28 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo9"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo9/profiles/child"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<ERepository> repo(std::tr1::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1))));
+ std::shared_ptr<ERepository> repo(std::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1))));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- const std::tr1::shared_ptr<const PackageID> p1(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> p1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
- const std::tr1::shared_ptr<const PackageID> p2(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> p2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-two/pkg-two-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
- const std::tr1::shared_ptr<const PackageID> p4(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> p4(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
@@ -688,26 +688,26 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys18(
+ std::shared_ptr<Map<std::string, std::string> > keys18(
new Map<std::string, std::string>);
keys18->insert("format", "e");
keys18->insert("names_cache", "/var/empty");
keys18->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo18"));
keys18->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo18/profiles/profile"));
keys18->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo18(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys18, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo18(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys18, std::placeholders::_1)));
env.package_database()->add_repository(1, repo18);
- std::tr1::shared_ptr<Map<std::string, std::string> > keys19(
+ std::shared_ptr<Map<std::string, std::string> > keys19(
new Map<std::string, std::string>);
keys19->insert("format", "e");
keys19->insert("names_cache", "/var/empty");
keys19->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo19"));
keys19->insert("master_repository", "test-repo-18");
keys19->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo19(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys19, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo19(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys19, std::placeholders::_1)));
env.package_database()->add_repository(1, repo19);
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
@@ -746,15 +746,15 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo10"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo10/profiles/profile/subprofile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -782,21 +782,21 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo15"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo15/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<ERepository> repo(std::tr1::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1))));
+ std::shared_ptr<ERepository> repo(std::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1))));
env.package_database()->add_repository(1, repo);
bool has_one(false), has_two(false);
int count(0);
- std::tr1::shared_ptr<const RepositoryVirtualsInterface::VirtualsSequence> seq(repo->virtual_packages());
+ std::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->virtual_name()))
@@ -825,21 +825,21 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo15"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo15/profiles/profile/subprofile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<ERepository> repo(std::tr1::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1))));
+ std::shared_ptr<ERepository> repo(std::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1))));
env.package_database()->add_repository(1, repo);
bool has_one(false), has_two(false), has_three(false);
int count(0);
- std::tr1::shared_ptr<const RepositoryVirtualsInterface::VirtualsSequence> seq(repo->virtual_packages());
+ std::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->virtual_name()))
@@ -874,15 +874,15 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo11"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo11/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<ERepository> repo(std::tr1::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1))));
+ std::shared_ptr<ERepository> repo(std::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1))));
repo->make_manifest(QualifiedPackageName("category/package"));
std::multiset<std::string> made_manifest, reference_manifest;
@@ -920,7 +920,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::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", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo12"));
@@ -931,8 +931,8 @@ 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"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
FetchAction action(make_named_values<FetchActionOptions>(
@@ -943,12 +943,12 @@ namespace test_cases
n::ignore_unfetched() = false,
n::make_output_manager() = &make_standard_output_manager,
n::safe_resume() = true,
- n::want_phase() = std::tr1::bind(return_literal_function(wp_yes))
+ n::want_phase() = std::bind(return_literal_function(wp_yes))
));
{
TestMessageSuffix suffix("no files", true);
- const std::tr1::shared_ptr<const PackageID> no_files_id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> no_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(no_files_id);
@@ -959,7 +959,7 @@ namespace test_cases
{
TestMessageSuffix suffix("fetched files", true);
- const std::tr1::shared_ptr<const PackageID> fetched_files_id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> fetched_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(fetched_files_id);
@@ -971,7 +971,7 @@ namespace test_cases
{
TestMessageSuffix suffix("fetchable files", true);
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "fetchable-1.txt").is_regular_file());
- const std::tr1::shared_ptr<const PackageID> fetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> fetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(fetchable_files_id);
@@ -982,7 +982,7 @@ namespace test_cases
{
TestMessageSuffix suffix("arrow files", true);
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "arrowed.txt").is_regular_file());
- const std::tr1::shared_ptr<const PackageID> arrow_files_id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> arrow_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/arrow-files",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(arrow_files_id);
@@ -992,7 +992,7 @@ namespace test_cases
{
TestMessageSuffix suffix("unfetchable files", true);
- const std::tr1::shared_ptr<const PackageID> unfetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> unfetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unfetchable-files",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(unfetchable_files_id);
@@ -1000,7 +1000,7 @@ namespace test_cases
}
{
- const std::tr1::shared_ptr<const PackageID> no_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> no_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files-restricted",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(no_files_restricted_id);
@@ -1008,7 +1008,7 @@ namespace test_cases
}
{
- const std::tr1::shared_ptr<const PackageID> fetched_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> fetched_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files-restricted",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(fetched_files_restricted_id);
@@ -1016,7 +1016,7 @@ namespace test_cases
}
{
- const std::tr1::shared_ptr<const PackageID> fetchable_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> fetchable_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files-restricted",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(fetchable_files_restricted_id);
@@ -1033,15 +1033,15 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo11"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo11/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
- std::tr1::shared_ptr<ERepository> repo(std::tr1::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1))));
+ std::shared_ptr<ERepository> repo(std::static_pointer_cast<ERepository>(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1))));
env.package_database()->add_repository(1, repo);
FetchAction action(make_named_values<FetchActionOptions>(
@@ -1052,10 +1052,10 @@ namespace test_cases
n::ignore_unfetched() = false,
n::make_output_manager() = &make_standard_output_manager,
n::safe_resume() = true,
- n::want_phase() = std::tr1::bind(return_literal_function(wp_yes))
+ n::want_phase() = std::bind(return_literal_function(wp_yes))
));
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::AllVersionsSorted(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::AllVersionsSorted(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_0.cc b/paludis/repositories/e/e_repository_TEST_0.cc
index acd9d3bde..f43bcee67 100644
--- a/paludis/repositories/e/e_repository_TEST_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_0.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -112,7 +112,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_0_dir" / "repo"));
@@ -123,11 +123,11 @@ namespace test_cases
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_0_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_0_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -139,15 +139,15 @@ namespace test_cases
env.package_database()->add_repository(2, installed_repo);
#ifdef ENABLE_VIRTUALS_REPOSITORY
- std::tr1::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
iv_keys->insert("root", "/");
iv_keys->insert("format", "installed_virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, iv_keys, std::tr1::placeholders::_1)));
- std::tr1::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
+ std::bind(from_keys, iv_keys, std::placeholders::_1)));
+ std::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
v_keys->insert("format", "virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, v_keys, std::tr1::placeholders::_1)));
+ std::bind(from_keys, v_keys, std::placeholders::_1)));
#endif
InstallAction action(make_named_values<InstallActionOptions>(
@@ -160,7 +160,7 @@ namespace test_cases
#ifdef ENABLE_VIRTUALS_REPOSITORY
{
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=virtual/virtual-pretend-installed-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -169,7 +169,7 @@ namespace test_cases
{
TestMessageSuffix suffix("in-ebuild die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -178,7 +178,7 @@ namespace test_cases
{
TestMessageSuffix suffix("in-subshell die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -187,7 +187,7 @@ namespace test_cases
{
TestMessageSuffix suffix("success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -196,7 +196,7 @@ namespace test_cases
{
TestMessageSuffix suffix("unpack die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -205,7 +205,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/econf-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -214,7 +214,7 @@ namespace test_cases
{
TestMessageSuffix suffix("emake fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -223,7 +223,7 @@ namespace test_cases
{
TestMessageSuffix suffix("emake die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -232,7 +232,7 @@ namespace test_cases
{
TestMessageSuffix suffix("einstall die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/einstall-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -241,7 +241,7 @@ namespace test_cases
{
TestMessageSuffix suffix("keepdir die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -250,7 +250,7 @@ namespace test_cases
{
TestMessageSuffix suffix("dobin fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -259,7 +259,7 @@ namespace test_cases
{
TestMessageSuffix suffix("dobin die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -268,7 +268,7 @@ namespace test_cases
{
TestMessageSuffix suffix("fperms fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -277,7 +277,7 @@ namespace test_cases
{
TestMessageSuffix suffix("fperms die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -286,7 +286,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf source 0", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -296,7 +296,7 @@ namespace test_cases
{
TestMessageSuffix suffix("doman 0", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -306,7 +306,7 @@ namespace test_cases
{
TestMessageSuffix suffix("no src_prepare 0", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -316,7 +316,7 @@ namespace test_cases
{
TestMessageSuffix suffix("no src_configure 0", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -326,7 +326,7 @@ namespace test_cases
{
TestMessageSuffix suffix("best version", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -335,7 +335,7 @@ namespace test_cases
{
TestMessageSuffix suffix("has version", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -344,7 +344,7 @@ namespace test_cases
{
TestMessageSuffix suffix("match", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -353,7 +353,7 @@ namespace test_cases
{
TestMessageSuffix suffix("vars", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/vars-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -362,7 +362,7 @@ namespace test_cases
{
TestMessageSuffix suffix("expand vars", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/expand-vars-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -371,7 +371,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf disable dependency tracking", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-disable-dependency-tracking-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_1.cc b/paludis/repositories/e/e_repository_TEST_1.cc
index 1334e7d2b..67a4293d4 100644
--- a/paludis/repositories/e/e_repository_TEST_1.cc
+++ b/paludis/repositories/e/e_repository_TEST_1.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -105,7 +105,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_1_dir" / "repo"));
@@ -116,11 +116,11 @@ namespace test_cases
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_1_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_1_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -139,7 +139,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf source 1", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -149,7 +149,7 @@ namespace test_cases
{
TestMessageSuffix suffix("dosym success 1", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-success-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -159,7 +159,7 @@ namespace test_cases
{
TestMessageSuffix suffix("doman 1", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -169,7 +169,7 @@ namespace test_cases
{
TestMessageSuffix suffix("no src_prepare 1", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -179,7 +179,7 @@ namespace test_cases
{
TestMessageSuffix suffix("no src_configure 1", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_2.cc b/paludis/repositories/e/e_repository_TEST_2.cc
index fc579ca5b..38ead4077 100644
--- a/paludis/repositories/e/e_repository_TEST_2.cc
+++ b/paludis/repositories/e/e_repository_TEST_2.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -105,7 +105,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_2_dir" / "repo"));
@@ -116,11 +116,11 @@ namespace test_cases
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_2_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_2_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -139,7 +139,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf source 2", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -149,7 +149,7 @@ namespace test_cases
{
TestMessageSuffix suffix("doman 2", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -159,7 +159,7 @@ namespace test_cases
{
TestMessageSuffix suffix("src_prepare 2", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -169,7 +169,7 @@ namespace test_cases
{
TestMessageSuffix suffix("src_configure 2", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -179,7 +179,7 @@ namespace test_cases
{
TestMessageSuffix suffix("default src_configure 2", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default-src_configure-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -189,7 +189,7 @@ namespace test_cases
{
TestMessageSuffix suffix("default src_compile 2", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default-src_compile-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -199,7 +199,7 @@ namespace test_cases
{
TestMessageSuffix suffix("default_src_compile 2", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default_src_compile-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -209,7 +209,7 @@ namespace test_cases
{
TestMessageSuffix suffix("src_compile via default function 2", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_compile-via-default-func-2",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_3.cc b/paludis/repositories/e/e_repository_TEST_3.cc
index ff5dc8c45..d60d28090 100644
--- a/paludis/repositories/e/e_repository_TEST_3.cc
+++ b/paludis/repositories/e/e_repository_TEST_3.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -105,7 +105,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_3_dir" / "repo"));
@@ -116,11 +116,11 @@ namespace test_cases
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_3_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_3_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -139,7 +139,7 @@ namespace test_cases
{
TestMessageSuffix suffix("prefix", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/prefix-3",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
index 1cbcff9f9..3400b9457 100644
--- a/paludis/repositories/e/e_repository_TEST_4.cc
+++ b/paludis/repositories/e/e_repository_TEST_4.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -105,7 +105,7 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_4_dir" / "repo"));
@@ -116,11 +116,11 @@ namespace test_cases
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_4_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_4_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -143,7 +143,7 @@ namespace test_cases
{
TestMessageSuffix suffix("pkg_pretend", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg_pretend-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -154,7 +154,7 @@ namespace test_cases
{
TestMessageSuffix suffix("pkg_pretend-failure", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg_pretend-failure-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -165,7 +165,7 @@ namespace test_cases
{
TestMessageSuffix suffix("default_src_install 4", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default_src_install-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -175,7 +175,7 @@ namespace test_cases
{
TestMessageSuffix suffix("docompress 4", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/docompress-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -185,7 +185,7 @@ namespace test_cases
{
TestMessageSuffix suffix("dodoc -r", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dodoc-r-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -195,7 +195,7 @@ namespace test_cases
{
TestMessageSuffix suffix("doins symlink", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doins-symlink-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -205,7 +205,7 @@ namespace test_cases
{
TestMessageSuffix suffix("banned functions 4", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/banned-functions-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -215,7 +215,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf disable dependency tracking", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-disable-dependency-tracking-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -225,7 +225,7 @@ namespace test_cases
{
TestMessageSuffix suffix("strict use", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -235,7 +235,7 @@ namespace test_cases
{
TestMessageSuffix suffix("strict use fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-fail-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -245,7 +245,7 @@ namespace test_cases
{
TestMessageSuffix suffix("strict use injection", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-injection-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -255,7 +255,7 @@ namespace test_cases
{
TestMessageSuffix suffix("global scope use", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/global-scope-use-4",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
index bf31c6059..faf73c622 100644
--- a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
+++ b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -95,34 +95,34 @@ namespace test_cases
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dependencies_rewriter_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dependencies_rewriter_dir" / "repo/profiles/profile"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dependencies_rewriter_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
StringifyFormatter ff;
- erepository::DepSpecPrettyPrinter pd(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pd(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id->build_dependencies_key());
id->build_dependencies_key()->value()->root()->accept(pd);
TEST_CHECK_STRINGIFY_EQUAL(pd, "( cat/pkg1 build: cat/pkg2 build+run: cat/pkg3 suggestion: post: )");
- erepository::DepSpecPrettyPrinter pr(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pr(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id->run_dependencies_key());
id->run_dependencies_key()->value()->root()->accept(pr);
TEST_CHECK_STRINGIFY_EQUAL(pr, "( cat/pkg1 build: build+run: cat/pkg3 suggestion: post: )");
- erepository::DepSpecPrettyPrinter pp(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pp(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id->post_dependencies_key());
id->post_dependencies_key()->value()->root()->accept(pp);
TEST_CHECK_STRINGIFY_EQUAL(pp, "( build: build+run: suggestion: cat/pkg4 post: cat/pkg5 )");
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index 3d3ab23bb..ae6bf936e 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -113,7 +113,7 @@ namespace
#endif
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_ever_dir" / "repo1"));
@@ -124,11 +124,11 @@ namespace
keys->insert("profile_eapi", "exheres-0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_ever_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_ever_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -140,15 +140,15 @@ namespace
env.package_database()->add_repository(2, installed_repo);
#ifdef ENABLE_VIRTUALS_REPOSITORY
- std::tr1::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
iv_keys->insert("root", "/");
iv_keys->insert("format", "installed_virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, iv_keys, std::tr1::placeholders::_1)));
- std::tr1::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
+ std::bind(from_keys, iv_keys, std::placeholders::_1)));
+ std::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
v_keys->insert("format", "virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, v_keys, std::tr1::placeholders::_1)));
+ std::bind(from_keys, v_keys, std::placeholders::_1)));
#endif
InstallAction action(make_named_values<InstallActionOptions>(
@@ -159,7 +159,7 @@ namespace
n::want_phase() = &want_all_phases
));
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index 263728011..9a974265d 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -110,7 +110,7 @@ namespace test_cases
#endif
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_exheres_0_dir" / "repo"));
@@ -121,11 +121,11 @@ namespace test_cases
keys->insert("profile_eapi_when_unspecified", "exheres-0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_exheres_0_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_exheres_0_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -137,15 +137,15 @@ namespace test_cases
env.package_database()->add_repository(2, installed_repo);
#ifdef ENABLE_VIRTUALS_REPOSITORY
- std::tr1::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
iv_keys->insert("root", "/");
iv_keys->insert("format", "installed_virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, iv_keys, std::tr1::placeholders::_1)));
- std::tr1::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
+ std::bind(from_keys, iv_keys, std::placeholders::_1)));
+ std::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
v_keys->insert("format", "virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, v_keys, std::tr1::placeholders::_1)));
+ std::bind(from_keys, v_keys, std::placeholders::_1)));
#endif
InstallAction action(make_named_values<InstallActionOptions>(
@@ -158,7 +158,7 @@ namespace test_cases
{
TestMessageSuffix suffix("in-ebuild die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -167,7 +167,7 @@ namespace test_cases
{
TestMessageSuffix suffix("in-subshell die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -176,7 +176,7 @@ namespace test_cases
{
TestMessageSuffix suffix("success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -185,7 +185,7 @@ namespace test_cases
{
TestMessageSuffix suffix("expatch success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -194,7 +194,7 @@ namespace test_cases
{
TestMessageSuffix suffix("expatch success-dir", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-success-dir",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -203,7 +203,7 @@ namespace test_cases
{
TestMessageSuffix suffix("expatch die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -212,7 +212,7 @@ namespace test_cases
{
TestMessageSuffix suffix("expatch unrecognised", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-unrecognised",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -221,7 +221,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal expatch fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-expatch-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -230,7 +230,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal expatch die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-expatch-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -239,7 +239,7 @@ namespace test_cases
{
TestMessageSuffix suffix("unpack die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -248,7 +248,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal unpack fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-unpack-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -257,7 +257,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal unpack die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-unpack-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -266,7 +266,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/econf-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -275,7 +275,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal econf", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-econf",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -284,7 +284,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal econf die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-econf-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -293,7 +293,7 @@ namespace test_cases
{
TestMessageSuffix suffix("emake fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -302,7 +302,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal emake", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-emake",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -311,7 +311,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal emake die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-emake-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -320,7 +320,7 @@ namespace test_cases
{
TestMessageSuffix suffix("einstall fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/einstall-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -329,7 +329,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal einstall", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -338,7 +338,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal einstall die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -347,7 +347,7 @@ namespace test_cases
{
TestMessageSuffix suffix("keepdir success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -356,7 +356,7 @@ namespace test_cases
{
TestMessageSuffix suffix("keepdir fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -365,7 +365,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal keepdir", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-keepdir",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -374,7 +374,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal keepdir die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-keepdir-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -383,7 +383,7 @@ namespace test_cases
{
TestMessageSuffix suffix("dobin success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -392,7 +392,7 @@ namespace test_cases
{
TestMessageSuffix suffix("dobin fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -401,7 +401,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal dobin success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -410,7 +410,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal dobin fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -419,7 +419,7 @@ namespace test_cases
{
TestMessageSuffix suffix("nonfatal dobin die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-die",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -428,7 +428,7 @@ namespace test_cases
{
TestMessageSuffix suffix("herebin success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/herebin-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -437,7 +437,7 @@ namespace test_cases
{
TestMessageSuffix suffix("herebin fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/herebin-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -446,7 +446,7 @@ namespace test_cases
{
TestMessageSuffix suffix("hereconfd success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereconfd-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -455,7 +455,7 @@ namespace test_cases
{
TestMessageSuffix suffix("hereconfd fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereconfd-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -464,7 +464,7 @@ namespace test_cases
{
TestMessageSuffix suffix("hereenvd success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereenvd-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -473,7 +473,7 @@ namespace test_cases
{
TestMessageSuffix suffix("hereenvd fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereenvd-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -482,7 +482,7 @@ namespace test_cases
{
TestMessageSuffix suffix("hereinitd success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereinitd-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -491,7 +491,7 @@ namespace test_cases
{
TestMessageSuffix suffix("hereinitd fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereinitd-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -500,7 +500,7 @@ namespace test_cases
{
TestMessageSuffix suffix("hereins success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereins-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -509,7 +509,7 @@ namespace test_cases
{
TestMessageSuffix suffix("hereins fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereins-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -518,7 +518,7 @@ namespace test_cases
{
TestMessageSuffix suffix("heresbin success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/heresbin-success",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -527,7 +527,7 @@ namespace test_cases
{
TestMessageSuffix suffix("heresbin fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/heresbin-fail",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -536,7 +536,7 @@ namespace test_cases
{
TestMessageSuffix suffix("best version", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -545,7 +545,7 @@ namespace test_cases
{
TestMessageSuffix suffix("has version", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -554,7 +554,7 @@ namespace test_cases
{
TestMessageSuffix suffix("match", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -563,7 +563,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf phase", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-phase-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -572,7 +572,7 @@ namespace test_cases
{
TestMessageSuffix suffix("econf vars", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-vars-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -581,7 +581,7 @@ namespace test_cases
{
TestMessageSuffix suffix("expand vars", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/expand-vars-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -590,7 +590,7 @@ namespace test_cases
{
TestMessageSuffix suffix("doman success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-success-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -599,7 +599,7 @@ namespace test_cases
{
TestMessageSuffix suffix("doman nofatal", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-nonfatal-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -608,7 +608,7 @@ namespace test_cases
{
TestMessageSuffix suffix("doman failure", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-failure-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -617,7 +617,7 @@ namespace test_cases
{
TestMessageSuffix suffix("change globals", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/change-globals-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -626,7 +626,7 @@ namespace test_cases
{
TestMessageSuffix suffix("install", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/install-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -635,7 +635,7 @@ namespace test_cases
{
TestMessageSuffix suffix("install s", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/install-s-0",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_exlibs.cc b/paludis/repositories/e/e_repository_TEST_exlibs.cc
index 996a17f39..1cb9241cf 100644
--- a/paludis/repositories/e/e_repository_TEST_exlibs.cc
+++ b/paludis/repositories/e/e_repository_TEST_exlibs.cc
@@ -47,7 +47,7 @@
#include <paludis/standard_output_manager.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -121,7 +121,7 @@ namespace
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_exlibs_dir" / "repo1"));
@@ -132,11 +132,11 @@ namespace
keys->insert("profile_eapi", "exheres-0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_exlibs_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_exlibs_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -153,7 +153,7 @@ namespace
n::want_phase() = &want_all_phases
));
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc
index 3daf9234f..f8b7a1952 100644
--- a/paludis/repositories/e/e_repository_TEST_pbin.cc
+++ b/paludis/repositories/e/e_repository_TEST_pbin.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -113,7 +113,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
FSEntry root(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / "root");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / ("repo" + base_eapi)));
@@ -125,11 +125,11 @@ namespace test_cases
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / "build"));
keys->insert("root", stringify(root));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<Map<std::string, std::string> > b_keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > b_keys(new Map<std::string, std::string>);
b_keys->insert("format", "e");
b_keys->insert("names_cache", "/var/empty");
b_keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / ("binrepo" + base_eapi)));
@@ -145,18 +145,18 @@ namespace test_cases
b_keys->insert("master_repository", "repo" + base_eapi);
b_keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / "build"));
b_keys->insert("root", stringify(root));
- std::tr1::shared_ptr<Repository> b_repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, b_keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> b_repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, b_keys, std::placeholders::_1)));
env.package_database()->add_repository(2, b_repo);
- std::tr1::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
v_keys->insert("format", "vdb");
v_keys->insert("names_cache", "/var/empty");
v_keys->insert("provides_cache", "/var/empty");
v_keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / "vdb"));
v_keys->insert("root", stringify(root));
- std::tr1::shared_ptr<Repository> v_repo(VDBRepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> v_repo(VDBRepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, v_repo);
{
@@ -169,7 +169,7 @@ namespace test_cases
));
TestMessageSuffix suffix("prefix", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/simple-1",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
@@ -190,7 +190,7 @@ namespace test_cases
));
TestMessageSuffix suffix("prefix", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/simple-1::binrepo" + base_eapi,
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index 4b39575c8..da548f8ec 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -121,7 +121,7 @@ namespace
#endif
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_phases_dir" / "repo1"));
@@ -132,11 +132,11 @@ namespace
keys->insert("profile_eapi", "exheres-0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_phases_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_phases_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -148,15 +148,15 @@ namespace
env.package_database()->add_repository(2, installed_repo);
#ifdef ENABLE_VIRTUALS_REPOSITORY
- std::tr1::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > iv_keys(new Map<std::string, std::string>);
iv_keys->insert("root", "/");
iv_keys->insert("format", "installed_virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, iv_keys, std::tr1::placeholders::_1)));
- std::tr1::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
+ std::bind(from_keys, iv_keys, std::placeholders::_1)));
+ std::shared_ptr<Map<std::string, std::string> > v_keys(new Map<std::string, std::string>);
v_keys->insert("format", "virtuals");
env.package_database()->add_repository(-2, RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, v_keys, std::tr1::placeholders::_1)));
+ std::bind(from_keys, v_keys, std::placeholders::_1)));
#endif
extra_settings(env);
@@ -169,7 +169,7 @@ namespace
n::want_phase() = &want_all_phases
));
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_TEST_replacing.cc b/paludis/repositories/e/e_repository_TEST_replacing.cc
index 3743f8b28..1acbcf4a7 100644
--- a/paludis/repositories/e/e_repository_TEST_replacing.cc
+++ b/paludis/repositories/e/e_repository_TEST_replacing.cc
@@ -40,7 +40,7 @@
#include <paludis/standard_output_manager.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -51,18 +51,18 @@ using namespace paludis;
namespace
{
- void do_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions & uo)
+ void do_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions & uo)
{
UninstallAction a(uo);
id->perform_action(a);
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -114,7 +114,7 @@ namespace
{
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_replacing_dir" / repo_path));
@@ -126,11 +126,11 @@ namespace
keys->insert("profile_eapi", eapi);
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_replacing_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_replacing_dir" / "build"));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -142,7 +142,7 @@ namespace
installed_repo->add_version("cat", replacing_pkg_name, "3")->set_slot(SlotName("3"));
env.package_database()->add_repository(2, installed_repo);
- const std::tr1::shared_ptr<const PackageIDSequence> rlist(env[selection::AllVersionsSorted(generator::Matches(
+ const std::shared_ptr<const PackageIDSequence> rlist(env[selection::AllVersionsSorted(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(replacing, &env, UserPackageDepSpecOptions())),
MatchPackageOptions()) |
filter::InstalledAtRoot(env.root()))]);
@@ -155,7 +155,7 @@ namespace
n::want_phase() = &want_all_phases
));
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
&env, UserPackageDepSpecOptions())), MatchPackageOptions()) |
filter::SupportsAction<InstallAction>())]->last());
diff --git a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
index eee5c7dcb..0973b9f02 100644
--- a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
+++ b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
@@ -47,7 +47,7 @@
#include <paludis/choice.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <tr1/functional>
+#include <functional>
#include <set>
#include <string>
@@ -58,18 +58,18 @@ using namespace paludis;
namespace
{
- void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
+ void cannot_uninstall(const std::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
{
if (id)
throw InternalError(PALUDIS_HERE, "cannot uninstall");
}
- std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
+ std::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
{
return make_shared_ptr(new StandardOutputManager);
}
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -106,7 +106,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "repo"));
@@ -118,8 +118,8 @@ namespace test_cases
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "symlinked_build"));
keys->insert("root", stringify(FSEntry(stringify(FSEntry::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "root")).realpath()));
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
keys.reset(new Map<std::string, std::string>);
@@ -129,8 +129,8 @@ namespace test_cases
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "vdb"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "build"));
keys->insert("root", stringify(FSEntry(stringify(FSEntry::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "root")).realpath()));
- std::tr1::shared_ptr<Repository> installed_repo(VDBRepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> installed_repo(VDBRepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, installed_repo);
InstallAction action(make_named_values<InstallActionOptions>(
@@ -141,7 +141,7 @@ namespace test_cases
n::want_phase() = &want_all_phases
));
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
+ const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/pkg",
&env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
TEST_CHECK(id);
diff --git a/paludis/repositories/e/e_repository_id.cc b/paludis/repositories/e/e_repository_id.cc
index 850c24503..5f9ef1854 100644
--- a/paludis/repositories/e/e_repository_id.cc
+++ b/paludis/repositories/e/e_repository_id.cc
@@ -25,10 +25,10 @@
using namespace paludis;
using namespace paludis::erepository;
-std::tr1::shared_ptr<const Set<std::string> >
+std::shared_ptr<const Set<std::string> >
ERepositoryID::breaks_portage() const
{
- std::tr1::shared_ptr<Set<std::string> > why(new Set<std::string>);
+ std::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()->supported()) || eapi()->supported()->breaks_portage())
diff --git a/paludis/repositories/e/e_repository_id.hh b/paludis/repositories/e/e_repository_id.hh
index ee90e6c81..1584275b2 100644
--- a/paludis/repositories/e/e_repository_id.hh
+++ b/paludis/repositories/e/e_repository_id.hh
@@ -32,27 +32,27 @@ namespace paludis
public PackageID
{
public:
- 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<PlainTextSpecTree> > restrict_key() const = 0;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties_key() const = 0;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_key() const = 0;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_key() const = 0;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_effective_key() const = 0;
- virtual const std::tr1::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions_key() const = 0;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_key() const = 0;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_hidden_key() const = 0;
- virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases_key() const = 0;
-
- virtual std::tr1::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
-
- virtual std::tr1::shared_ptr<ChoiceValue> make_choice_value(
- const std::tr1::shared_ptr<const Choice> &, const UnprefixedChoiceName &, const Tribool,
+ virtual const std::shared_ptr<const EAPI> eapi() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > inherited_key() const = 0;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<LicenseSpecTree> > license_key() const = 0;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > restrict_key() const = 0;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > properties_key() const = 0;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_key() const = 0;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_key() const = 0;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_iuse_effective_key() const = 0;
+ virtual const std::shared_ptr<const MetadataSpecTreeKey<PlainTextSpecTree> > raw_myoptions_key() const = 0;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_key() const = 0;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > raw_use_expand_hidden_key() const = 0;
+ virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > defined_phases_key() const = 0;
+
+ virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
+
+ virtual std::shared_ptr<ChoiceValue> make_choice_value(
+ const std::shared_ptr<const Choice> &, const UnprefixedChoiceName &, const Tribool,
const bool, const bool, const std::string &, const bool)
const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual void add_build_options(const std::tr1::shared_ptr<Choices> &) const = 0;
+ virtual void add_build_options(const std::shared_ptr<Choices> &) const = 0;
virtual void purge_invalid_cache() const = 0;
};
diff --git a/paludis/repositories/e/e_repository_mask_file.cc b/paludis/repositories/e/e_repository_mask_file.cc
index 3a1373759..59e2c3abc 100644
--- a/paludis/repositories/e/e_repository_mask_file.cc
+++ b/paludis/repositories/e/e_repository_mask_file.cc
@@ -34,7 +34,7 @@
using namespace paludis;
using namespace paludis::erepository;
-typedef std::list<std::pair<const std::string, std::tr1::shared_ptr<const RepositoryMaskInfo> > > MaskFileLines;
+typedef std::list<std::pair<const std::string, std::shared_ptr<const RepositoryMaskInfo> > > MaskFileLines;
namespace paludis
{
@@ -59,7 +59,7 @@ MaskFile::MaskFile(const FSEntry & f, const LineConfigFileOptions & opts) :
myopts += lcfo_no_skip_blank_lines;
LineConfigFile file(f, myopts);
- std::tr1::shared_ptr<Sequence<std::string> > comment(new Sequence<std::string>);
+ std::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)
{
@@ -74,7 +74,7 @@ MaskFile::MaskFile(const FSEntry & f, const LineConfigFileOptions & opts) :
{
if (comment_used)
{
- std::tr1::shared_ptr<Sequence<std::string> > cpy(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > cpy(new Sequence<std::string>);
std::copy(comment->begin(), comment->end(), cpy->back_inserter());
comment = cpy;
comment_used = false;
@@ -83,7 +83,7 @@ MaskFile::MaskFile(const FSEntry & f, const LineConfigFileOptions & opts) :
continue;
}
- _imp->lines.push_back(std::make_pair(*it, std::tr1::shared_ptr<RepositoryMaskInfo>(new RepositoryMaskInfo(
+ _imp->lines.push_back(std::make_pair(*it, std::shared_ptr<RepositoryMaskInfo>(new RepositoryMaskInfo(
make_named_values<RepositoryMaskInfo>(n::comment() = comment, n::mask_file() = f)))));
comment_used = true;
}
@@ -106,5 +106,5 @@ MaskFile::~MaskFile()
}
template class WrappedForwardIterator<MaskFile::ConstIteratorTag,
- const std::pair<const std::string, std::tr1::shared_ptr<const RepositoryMaskInfo> > >;
+ const std::pair<const std::string, std::shared_ptr<const RepositoryMaskInfo> > >;
diff --git a/paludis/repositories/e/e_repository_mask_file.hh b/paludis/repositories/e/e_repository_mask_file.hh
index dc88f5b51..d1c4a3b96 100644
--- a/paludis/repositories/e/e_repository_mask_file.hh
+++ b/paludis/repositories/e/e_repository_mask_file.hh
@@ -55,7 +55,7 @@ namespace paludis
struct ConstIteratorTag;
typedef WrappedForwardIterator<ConstIteratorTag,
- const std::pair<const std::string, std::tr1::shared_ptr<const RepositoryMaskInfo> > > ConstIterator;
+ const std::pair<const std::string, std::shared_ptr<const RepositoryMaskInfo> > > ConstIterator;
ConstIterator begin() const;
ConstIterator end() const;
@@ -64,7 +64,7 @@ namespace paludis
}
extern template class WrappedForwardIterator<erepository::MaskFile::ConstIteratorTag,
- const std::pair<const std::string, std::tr1::shared_ptr<const RepositoryMaskInfo> > >;
+ const std::pair<const std::string, std::shared_ptr<const RepositoryMaskInfo> > >;
}
#endif
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index df81dc98c..d3823e7f8 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -174,7 +174,7 @@ ERepositoryNews::update_news() const
generator::Matches(PackageDepSpec(parse_elike_package_dep_spec(*i,
eapi.supported()->package_dep_spec_parse_options(),
eapi.supported()->version_spec_options(),
- std::tr1::shared_ptr<const PackageID>())), MatchPackageOptions()) |
+ std::shared_ptr<const PackageID>())), MatchPackageOptions()) |
filter::InstalledAtRoot(_imp->environment->root()))]->empty())
local_show = true;
show &= local_show;
@@ -197,7 +197,7 @@ ERepositoryNews::update_news() const
Context header_context("When checking Display-If-Profile headers:");
bool local_show(false);
- std::tr1::shared_ptr<const FSEntrySequence> c(_imp->params.profiles());
+ std::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.cc b/paludis/repositories/e/e_repository_params.cc
index 026eae555..8c9c56d2b 100644
--- a/paludis/repositories/e/e_repository_params.cc
+++ b/paludis/repositories/e/e_repository_params.cc
@@ -31,5 +31,5 @@ using namespace paludis::erepository;
#include <paludis/repositories/e/e_repository_params-se.cc>
-template class Sequence<std::tr1::shared_ptr<const ERepository> >;
-template class WrappedForwardIterator<Sequence<std::tr1::shared_ptr<const ERepository> >::ConstIteratorTag, const std::tr1::shared_ptr<const ERepository> >;
+template class Sequence<std::shared_ptr<const ERepository> >;
+template class WrappedForwardIterator<Sequence<std::shared_ptr<const ERepository> >::ConstIteratorTag, const std::shared_ptr<const ERepository> >;
diff --git a/paludis/repositories/e/e_repository_params.hh b/paludis/repositories/e/e_repository_params.hh
index 58389bdde..73381b7fa 100644
--- a/paludis/repositories/e/e_repository_params.hh
+++ b/paludis/repositories/e/e_repository_params.hh
@@ -35,7 +35,7 @@ namespace paludis
class PackageDatabase;
class ERepository;
- typedef Sequence<std::tr1::shared_ptr<const ERepository> > ERepositorySequence;
+ typedef Sequence<std::shared_ptr<const ERepository> > ERepositorySequence;
namespace n
{
@@ -89,18 +89,18 @@ namespace paludis
NamedValue<n::distdir, FSEntry> distdir;
NamedValue<n::eapi_when_unknown, std::string> eapi_when_unknown;
NamedValue<n::eapi_when_unspecified, std::string> eapi_when_unspecified;
- NamedValue<n::eclassdirs, std::tr1::shared_ptr<const FSEntrySequence> > eclassdirs;
+ NamedValue<n::eclassdirs, std::shared_ptr<const FSEntrySequence> > eclassdirs;
NamedValue<n::entry_format, std::string> entry_format;
NamedValue<n::environment, Environment *> environment;
NamedValue<n::ignore_deprecated_profiles, bool> ignore_deprecated_profiles;
NamedValue<n::layout, std::string> layout;
NamedValue<n::location, FSEntry> location;
- NamedValue<n::master_repositories, std::tr1::shared_ptr<const ERepositorySequence> > master_repositories;
+ NamedValue<n::master_repositories, std::shared_ptr<const ERepositorySequence> > master_repositories;
NamedValue<n::names_cache, FSEntry> names_cache;
NamedValue<n::newsdir, FSEntry> newsdir;
NamedValue<n::profile_eapi_when_unspecified, std::string> profile_eapi_when_unspecified;
NamedValue<n::profile_layout, std::string> profile_layout;
- NamedValue<n::profiles, std::tr1::shared_ptr<const FSEntrySequence> > profiles;
+ NamedValue<n::profiles, std::shared_ptr<const FSEntrySequence> > profiles;
NamedValue<n::profiles_explicitly_set, bool> profiles_explicitly_set;
NamedValue<n::securitydir, FSEntry> securitydir;
NamedValue<n::setsdir, FSEntry> setsdir;
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index e34345ade..095b39e34 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -52,7 +52,7 @@
#include <paludis/filtered_generator.hh>
#include <paludis/action-fwd.hh>
#include <paludis/metadata_key.hh>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <list>
#include <map>
@@ -97,10 +97,10 @@ ERepositorySets::~ERepositorySets()
{
}
-const std::tr1::shared_ptr<const SetSpecTree>
+const std::shared_ptr<const SetSpecTree>
ERepositorySets::package_set(const SetName & ss) const
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
if ("system" == ss.value())
throw InternalError(PALUDIS_HERE, "system set should've been handled by ERepository");
@@ -113,7 +113,7 @@ ERepositorySets::package_set(const SetName & ss) const
if ((_imp->params.setsdir() / (stringify(s.first) + ".conf")).exists())
{
- std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(ss, stringify(_imp->e_repository->name())));
+ std::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) + "':");
@@ -121,7 +121,7 @@ ERepositorySets::package_set(const SetName & ss) const
SetFile f(make_named_values<SetFileParams>(
n::environment() = _imp->environment,
n::file_name() = ff,
- n::parser() = std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->environment, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All()),
+ n::parser() = std::bind(&parse_user_package_dep_spec, _1, _imp->environment, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All()),
n::set_operator_mode() = s.second,
n::tag() = tag,
n::type() = sft_paludis_conf
@@ -133,26 +133,26 @@ ERepositorySets::package_set(const SetName & ss) const
return make_null_shared_ptr();
}
-std::tr1::shared_ptr<const SetNameSet>
+std::shared_ptr<const SetNameSet>
ERepositorySets::sets_list() const
{
Context context("While generating the list of sets:");
- std::tr1::shared_ptr<SetNameSet> result(new SetNameSet);
+ std::shared_ptr<SetNameSet> result(new SetNameSet);
result->insert(SetName("insecurity"));
result->insert(SetName("security"));
result->insert(SetName("system"));
if (_imp->params.setsdir().exists())
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
std::list<FSEntry> repo_sets;
std::remove_copy_if(
DirIterator(_imp->params.setsdir()),
DirIterator(),
std::back_inserter(repo_sets),
- std::tr1::bind(std::logical_not<bool>(), std::tr1::bind(is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ std::bind(std::logical_not<bool>(), std::bind(is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::list<FSEntry>::const_iterator f(repo_sets.begin()),
f_end(repo_sets.end());
@@ -250,17 +250,17 @@ namespace
}
}
-const std::tr1::shared_ptr<const SetSpecTree>
+const std::shared_ptr<const SetSpecTree>
ERepositorySets::security_set(bool insecurity) const
{
Context context("When building security or insecurity package set:");
- std::tr1::shared_ptr<SetSpecTree> security_packages(new SetSpecTree(make_shared_ptr(new AllDepSpec)));
+ std::shared_ptr<SetSpecTree> security_packages(new SetSpecTree(make_shared_ptr(new AllDepSpec)));
if (!_imp->params.securitydir().is_directory_or_symlink_to_directory())
return security_packages;
- std::map<std::string, std::tr1::shared_ptr<GLSADepTag> > glsa_tags;
+ std::map<std::string, std::shared_ptr<GLSADepTag> > glsa_tags;
for (DirIterator f(_imp->params.securitydir()), f_end ; f != f_end; ++f)
{
@@ -269,7 +269,7 @@ ERepositorySets::security_set(bool insecurity) const
Context local_context("When parsing security advisory '" + stringify(*f) + "':");
- const std::tr1::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(
+ const std::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string(
_imp->e_repository->eapi_for_file(*f)));
if (! eapi->supported())
throw GLSAError("Can't use advisory '" + stringify(*f) +
@@ -280,14 +280,14 @@ ERepositorySets::security_set(bool insecurity) const
try
{
- std::tr1::shared_ptr<const GLSA> glsa(GLSA::create_from_xml_file(stringify(*f)));
+ std::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)
{
- std::tr1::shared_ptr<const PackageIDSequence> candidates;
+ std::shared_ptr<const PackageIDSequence> candidates;
if (insecurity)
candidates = (*_imp->environment)[selection::AllVersionsSorted(generator::Package(glsa_pkg->name()))];
else
@@ -302,12 +302,12 @@ ERepositorySets::security_set(bool insecurity) const
continue;
if (glsa_tags.end() == glsa_tags.find(glsa->id()))
- glsa_tags.insert(std::make_pair(glsa->id(), std::tr1::shared_ptr<GLSADepTag>(
+ glsa_tags.insert(std::make_pair(glsa->id(), std::shared_ptr<GLSADepTag>(
new GLSADepTag(glsa->id(), glsa->title(), *f))));
if (insecurity)
{
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
+ std::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
.package((*c)->name())
.version_requirement(make_named_values<VersionRequirement>(
@@ -325,7 +325,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);
- std::tr1::shared_ptr<const PackageIDSequence> available(
+ std::shared_ptr<const PackageIDSequence> available(
(*_imp->environment)[selection::AllVersionsSorted(
generator::Package(glsa_pkg->name()) |
filter::SameSlot(*c) |
@@ -341,7 +341,7 @@ ERepositorySets::security_set(bool insecurity) const
continue;
}
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ std::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
.package((*r)->name())
.version_requirement(make_named_values<VersionRequirement>(
n::version_operator() = vo_equal,
diff --git a/paludis/repositories/e/e_repository_sets.hh b/paludis/repositories/e/e_repository_sets.hh
index 1a8676d2f..38906b2ae 100644
--- a/paludis/repositories/e/e_repository_sets.hh
+++ b/paludis/repositories/e/e_repository_sets.hh
@@ -60,17 +60,17 @@ namespace paludis
/**
* Fetch a package set other than system.
*/
- const std::tr1::shared_ptr<const SetSpecTree> package_set(const SetName & s) const;
+ const std::shared_ptr<const SetSpecTree> package_set(const SetName & s) const;
/**
* Fetch the security or insecurity set.
*/
- const std::tr1::shared_ptr<const SetSpecTree> security_set(bool insecure) const;
+ const std::shared_ptr<const SetSpecTree> security_set(bool insecure) const;
/**
* Give a list of all the sets in this repo.
*/
- std::tr1::shared_ptr<const SetNameSet> sets_list() const;
+ std::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 b4922f3cf..59ceb00c6 100644
--- a/paludis/repositories/e/e_repository_sets_TEST.cc
+++ b/paludis/repositories/e/e_repository_sets_TEST.cc
@@ -36,7 +36,7 @@ using namespace paludis;
namespace
{
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -56,16 +56,16 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_sets_TEST_dir/repo1"));
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const SetNameSet> sets_list(env.set_names());
+ std::shared_ptr<const SetNameSet> sets_list(env.set_names());
TEST_CHECK_EQUAL(join(sets_list->begin(), sets_list->end(), " "), "everything insecurity "
"insecurity::test-repo-1 "
"installed-packages installed-packages::default "
@@ -83,14 +83,14 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_sets_TEST_dir/repo1"));
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
- std::tr1::shared_ptr<FakeInstalledRepository> installed(new FakeInstalledRepository(
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
+ std::shared_ptr<FakeInstalledRepository> installed(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -101,10 +101,10 @@ namespace test_cases
env.package_database()->add_repository(0, installed);
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const SetSpecTree> set1(env.set(SetName("set1::test-repo-1")));
+ std::shared_ptr<const SetSpecTree> set1(env.set(SetName("set1::test-repo-1")));
TEST_CHECK(set1);
StringifyFormatter ff;
- erepository::DepSpecPrettyPrinter pretty(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pretty(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
set1->root()->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "cat-one/foo >=cat-two/bar-2");
}
@@ -123,18 +123,18 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_sets_TEST_dir/repo1"));
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<const SetSpecTree> insecurity(env.set(SetName("insecurity::test-repo-1")));
+ std::shared_ptr<const SetSpecTree> insecurity(env.set(SetName("insecurity::test-repo-1")));
StringifyFormatter ff;
- erepository::DepSpecPrettyPrinter pretty(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pretty(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
insecurity->root()->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "=cat-four/xyzzy-2.0.1::test-repo-1 =cat-four/xyzzy-2.0.2::test-repo-1 =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 "
@@ -154,16 +154,16 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(
+ std::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_sets_TEST_dir/repo1"));
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
- std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
+ std::bind(from_keys, keys, std::placeholders::_1)));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> installed(new FakeInstalledRepository(
+ std::shared_ptr<FakeInstalledRepository> installed(new FakeInstalledRepository(
make_named_values<FakeInstalledRepositoryParams>(
n::environment() = &env,
n::name() = RepositoryName("installed"),
@@ -177,9 +177,9 @@ namespace test_cases
installed->add_version("cat-four", "xyzzy", "2.0.1")->set_slot(SlotName("2"));
env.package_database()->add_repository(0, installed);
- std::tr1::shared_ptr<const SetSpecTree> security(env.set(SetName("security::test-repo-1")));
+ std::shared_ptr<const SetSpecTree> security(env.set(SetName("security::test-repo-1")));
StringifyFormatter ff;
- erepository::DepSpecPrettyPrinter pretty(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
+ erepository::DepSpecPrettyPrinter pretty(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
security->root()->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "=cat-four/xyzzy-2.0.3::test-repo-1 =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 695b1be42..ca82cc2a8 100644
--- a/paludis/repositories/e/e_stripper.hh
+++ b/paludis/repositories/e/e_stripper.hh
@@ -24,7 +24,7 @@
#include <paludis/package_id-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/output_manager-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -44,8 +44,8 @@ namespace paludis
{
NamedValue<n::debug_dir, FSEntry> debug_dir;
NamedValue<n::image_dir, FSEntry> image_dir;
- NamedValue<n::output_manager, std::tr1::shared_ptr<OutputManager> > output_manager;
- NamedValue<n::package_id, std::tr1::shared_ptr<const PackageID> > package_id;
+ NamedValue<n::output_manager, std::shared_ptr<OutputManager> > output_manager;
+ NamedValue<n::package_id, std::shared_ptr<const PackageID> > package_id;
NamedValue<n::split, bool> split;
NamedValue<n::strip, bool> strip;
};
diff --git a/paludis/repositories/e/eapi-fwd.hh b/paludis/repositories/e/eapi-fwd.hh
index 8dcfe9b67..777ada946 100644
--- a/paludis/repositories/e/eapi-fwd.hh
+++ b/paludis/repositories/e/eapi-fwd.hh
@@ -24,7 +24,7 @@
#include <paludis/merger-fwd.hh>
#include <paludis/name-fwd.hh>
#include <paludis/elike_package_dep_spec-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index f39fccd47..678385954 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -36,7 +36,7 @@
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/make_named_values.hh>
-#include <tr1/unordered_map>
+#include <unordered_map>
#include <map>
#include <vector>
#include <list>
@@ -68,7 +68,7 @@ namespace
return destringify<T_>(check_get(k, key));
}
- std::tr1::shared_ptr<const EAPIEbuildEnvironmentVariables> make_ebuild_environment_variables(const KeyValueConfigFile & k)
+ std::shared_ptr<const EAPIEbuildEnvironmentVariables> make_ebuild_environment_variables(const KeyValueConfigFile & k)
{
return make_shared_ptr(new EAPIEbuildEnvironmentVariables(make_named_values<EAPIEbuildEnvironmentVariables>(
n::description_choices() = check_get(k, "description_choices"),
@@ -104,7 +104,7 @@ namespace
)));
}
- std::tr1::shared_ptr<EAPIMetadataVariable> make_metadata_variable(const KeyValueConfigFile & k, const std::string & s)
+ std::shared_ptr<EAPIMetadataVariable> make_metadata_variable(const KeyValueConfigFile & k, const std::string & s)
{
return make_shared_ptr(new EAPIMetadataVariable(make_named_values<EAPIMetadataVariable>(
n::description() = check_get(k, "description_" + s),
@@ -113,7 +113,7 @@ namespace
)));
}
- std::tr1::shared_ptr<const EAPIEbuildMetadataVariables> make_ebuild_metadata_variables(const KeyValueConfigFile & k)
+ std::shared_ptr<const EAPIEbuildMetadataVariables> make_ebuild_metadata_variables(const KeyValueConfigFile & k)
{
return make_shared_ptr(new EAPIEbuildMetadataVariables(make_named_values<EAPIEbuildMetadataVariables>(
n::bugs_to() = make_metadata_variable(k, "bugs_to"),
@@ -148,14 +148,14 @@ namespace
)));
}
- std::tr1::shared_ptr<Set<std::string> > make_set(const std::string & s)
+ std::shared_ptr<Set<std::string> > make_set(const std::string & s)
{
- std::tr1::shared_ptr<Set<std::string> > result(new Set<std::string>);
+ std::shared_ptr<Set<std::string> > result(new Set<std::string>);
tokenise_whitespace(s, result->inserter());
return result;
}
- std::tr1::shared_ptr<const EAPIEbuildOptions> make_ebuild_options(const KeyValueConfigFile & k)
+ std::shared_ptr<const EAPIEbuildOptions> make_ebuild_options(const KeyValueConfigFile & k)
{
return make_shared_ptr(new EAPIEbuildOptions(make_named_values<EAPIEbuildOptions>(
n::binary_from_env_variables() = check_get(k, "binary_from_env_variables"),
@@ -197,7 +197,7 @@ namespace
)));
}
- std::tr1::shared_ptr<const EAPIEbuildPhases> make_ebuild_phases(const KeyValueConfigFile & k)
+ std::shared_ptr<const EAPIEbuildPhases> make_ebuild_phases(const KeyValueConfigFile & k)
{
return make_shared_ptr(new EAPIEbuildPhases(make_named_values<EAPIEbuildPhases>(
n::ebuild_bad_options() = check_get(k, "ebuild_bad_options"),
@@ -214,7 +214,7 @@ namespace
)));
}
- std::tr1::shared_ptr<const EAPIPipeCommands> make_pipe_commands(const KeyValueConfigFile & k)
+ std::shared_ptr<const EAPIPipeCommands> make_pipe_commands(const KeyValueConfigFile & k)
{
return make_shared_ptr(new EAPIPipeCommands(make_named_values<EAPIPipeCommands>(
n::no_slot_or_repo() = destringify_key<bool>(k, "pipe_commands_no_slot_or_repo"),
@@ -222,7 +222,7 @@ namespace
)));
}
- std::tr1::shared_ptr<const EAPIToolsOptions> make_tool_options(const KeyValueConfigFile & k)
+ std::shared_ptr<const EAPIToolsOptions> make_tool_options(const KeyValueConfigFile & k)
{
return make_shared_ptr(new EAPIToolsOptions(make_named_values<EAPIToolsOptions>(
n::dodoc_r() = destringify_key<bool>(k, "dodoc_r"),
@@ -237,7 +237,7 @@ namespace
)));
}
- std::tr1::shared_ptr<const EAPIAnnotations> make_annotations(const KeyValueConfigFile & k)
+ std::shared_ptr<const EAPIAnnotations> make_annotations(const KeyValueConfigFile & k)
{
return make_shared_ptr(new EAPIAnnotations(make_named_values<EAPIAnnotations>(
n::myoptions_description() = k.get("annotations_myoptions_description"),
@@ -249,7 +249,7 @@ namespace
)));
}
- std::tr1::shared_ptr<const EAPIChoicesOptions> make_choices_options(const KeyValueConfigFile & k)
+ std::shared_ptr<const EAPIChoicesOptions> make_choices_options(const KeyValueConfigFile & k)
{
return make_shared_ptr(new EAPIChoicesOptions(make_named_values<EAPIChoicesOptions>(
n::fancy_test_flag() = check_get(k, "fancy_test_flag"),
@@ -261,7 +261,7 @@ namespace
)));
}
- std::tr1::shared_ptr<const SupportedEAPI> make_supported_eapi(const KeyValueConfigFile & k)
+ std::shared_ptr<const SupportedEAPI> make_supported_eapi(const KeyValueConfigFile & k)
{
ELikePackageDepSpecOptions package_dep_spec_parse_options;
{
@@ -341,7 +341,7 @@ namespace paludis
template<>
struct Implementation<EAPIData>
{
- std::tr1::unordered_map<std::string, std::tr1::shared_ptr<const EAPI>, Hash<std::string> > values;
+ std::unordered_map<std::string, std::shared_ptr<const EAPI>, Hash<std::string> > values;
Implementation()
{
@@ -355,10 +355,10 @@ namespace paludis
Context cc("When loading EAPI file '" + stringify(*d) + "':");
KeyValueConfigFile k(*d, KeyValueConfigFileOptions(),
- std::tr1::bind(&predefined, stringify(d->dirname()), std::tr1::placeholders::_1, std::tr1::placeholders::_2),
+ std::bind(&predefined, stringify(d->dirname()), std::placeholders::_1, std::placeholders::_2),
&KeyValueConfigFile::no_transformation);
- std::tr1::shared_ptr<EAPI> eapi(new EAPI(make_named_values<EAPI>(
+ std::shared_ptr<EAPI> eapi(new EAPI(make_named_values<EAPI>(
n::exported_name() = check_get(k, "exported_name"),
n::name() = strip_trailing_string(d->basename(), ".conf"),
n::supported() = make_supported_eapi(k)
@@ -367,7 +367,7 @@ namespace paludis
values.insert(std::make_pair(strip_trailing_string(d->basename(), ".conf"), eapi));
}
- std::tr1::unordered_map<std::string, std::tr1::shared_ptr<const EAPI>, Hash<std::string> >::const_iterator i(values.find("0"));
+ std::unordered_map<std::string, std::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
@@ -390,27 +390,27 @@ EAPIData::~EAPIData()
{
}
-std::tr1::shared_ptr<const EAPI>
+std::shared_ptr<const EAPI>
EAPIData::eapi_from_string(const std::string & s) const
{
- std::tr1::unordered_map<std::string, std::tr1::shared_ptr<const EAPI>, Hash<std::string> >::const_iterator i(_imp->values.find(s));
+ std::unordered_map<std::string, std::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(make_named_values<EAPI>(
n::exported_name() = s,
n::name() = s,
- n::supported() = std::tr1::shared_ptr<const SupportedEAPI>())
+ n::supported() = std::shared_ptr<const SupportedEAPI>())
));
}
-std::tr1::shared_ptr<const EAPI>
+std::shared_ptr<const EAPI>
EAPIData::unknown_eapi() const
{
return make_shared_ptr(new EAPI(make_named_values<EAPI>(
n::exported_name() = "UNKNOWN",
n::name() = "UNKNOWN",
- n::supported() = std::tr1::shared_ptr<const SupportedEAPI>())
+ n::supported() = std::shared_ptr<const SupportedEAPI>())
));
}
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 213af9ef2..278de16b9 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -31,7 +31,7 @@
#include <paludis/name.hh>
#include <paludis/dep_spec-fwd.hh>
#include <paludis/merger-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -241,39 +241,39 @@ namespace paludis
/**
* Make an EAPI.
*/
- std::tr1::shared_ptr<const EAPI> eapi_from_string(const std::string &) const;
+ std::shared_ptr<const EAPI> eapi_from_string(const std::string &) const;
/**
* Make the unknown EAPI.
*/
- std::tr1::shared_ptr<const EAPI> unknown_eapi() const;
+ std::shared_ptr<const EAPI> unknown_eapi() const;
};
struct EAPI
{
NamedValue<n::exported_name, std::string> exported_name;
NamedValue<n::name, std::string> name;
- NamedValue<n::supported, std::tr1::shared_ptr<const SupportedEAPI> > supported;
+ NamedValue<n::supported, std::shared_ptr<const SupportedEAPI> > supported;
};
struct SupportedEAPI
{
- NamedValue<n::annotations, std::tr1::shared_ptr<const EAPIAnnotations> > annotations;
+ NamedValue<n::annotations, std::shared_ptr<const EAPIAnnotations> > annotations;
NamedValue<n::breaks_portage, bool> breaks_portage;
NamedValue<n::can_be_pbin, bool> can_be_pbin;
- NamedValue<n::choices_options, std::tr1::shared_ptr<const EAPIChoicesOptions> > choices_options;
- NamedValue<n::dependency_labels, std::tr1::shared_ptr<const EAPILabels> > dependency_labels;
+ NamedValue<n::choices_options, std::shared_ptr<const EAPIChoicesOptions> > choices_options;
+ NamedValue<n::dependency_labels, std::shared_ptr<const EAPILabels> > dependency_labels;
NamedValue<n::dependency_spec_tree_parse_options, erepository::DependencySpecTreeParseOptions> dependency_spec_tree_parse_options;
- NamedValue<n::ebuild_environment_variables, std::tr1::shared_ptr<const EAPIEbuildEnvironmentVariables> > ebuild_environment_variables;
- NamedValue<n::ebuild_metadata_variables, std::tr1::shared_ptr<const EAPIEbuildMetadataVariables> > ebuild_metadata_variables;
- NamedValue<n::ebuild_options, std::tr1::shared_ptr<const EAPIEbuildOptions> > ebuild_options;
- NamedValue<n::ebuild_phases, std::tr1::shared_ptr<const EAPIEbuildPhases> > ebuild_phases;
+ NamedValue<n::ebuild_environment_variables, std::shared_ptr<const EAPIEbuildEnvironmentVariables> > ebuild_environment_variables;
+ NamedValue<n::ebuild_metadata_variables, std::shared_ptr<const EAPIEbuildMetadataVariables> > ebuild_metadata_variables;
+ NamedValue<n::ebuild_options, std::shared_ptr<const EAPIEbuildOptions> > ebuild_options;
+ NamedValue<n::ebuild_phases, std::shared_ptr<const EAPIEbuildPhases> > ebuild_phases;
NamedValue<n::iuse_flag_parse_options, IUseFlagParseOptions> iuse_flag_parse_options;
NamedValue<n::merger_options, MergerOptions> merger_options;
NamedValue<n::package_dep_spec_parse_options, ELikePackageDepSpecOptions> package_dep_spec_parse_options;
- NamedValue<n::pipe_commands, std::tr1::shared_ptr<const EAPIPipeCommands> > pipe_commands;
- NamedValue<n::tools_options, std::tr1::shared_ptr<const EAPIToolsOptions> > tools_options;
- NamedValue<n::uri_labels, std::tr1::shared_ptr<const EAPILabels> > uri_labels;
+ NamedValue<n::pipe_commands, std::shared_ptr<const EAPIPipeCommands> > pipe_commands;
+ NamedValue<n::tools_options, std::shared_ptr<const EAPIToolsOptions> > tools_options;
+ NamedValue<n::uri_labels, std::shared_ptr<const EAPILabels> > uri_labels;
NamedValue<n::userpriv_cannot_use_root, bool> userpriv_cannot_use_root;
NamedValue<n::version_spec_options, VersionSpecOptions> version_spec_options;
};
@@ -331,35 +331,35 @@ namespace paludis
struct EAPIEbuildMetadataVariables
{
- NamedValue<n::bugs_to, std::tr1::shared_ptr<const EAPIMetadataVariable> > bugs_to;
- NamedValue<n::build_depend, std::tr1::shared_ptr<const EAPIMetadataVariable> > build_depend;
- NamedValue<n::defined_phases, std::tr1::shared_ptr<const EAPIMetadataVariable> > defined_phases;
- NamedValue<n::dependencies, std::tr1::shared_ptr<const EAPIMetadataVariable> > dependencies;
- NamedValue<n::eapi, std::tr1::shared_ptr<const EAPIMetadataVariable> > eapi;
- NamedValue<n::homepage, std::tr1::shared_ptr<const EAPIMetadataVariable> > homepage;
- NamedValue<n::inherited, std::tr1::shared_ptr<const EAPIMetadataVariable> > inherited;
- NamedValue<n::iuse, std::tr1::shared_ptr<const EAPIMetadataVariable> > iuse;
- NamedValue<n::iuse_effective, std::tr1::shared_ptr<const EAPIMetadataVariable> > iuse_effective;
- NamedValue<n::keywords, std::tr1::shared_ptr<const EAPIMetadataVariable> > keywords;
- NamedValue<n::license, std::tr1::shared_ptr<const EAPIMetadataVariable> > license;
- NamedValue<n::long_description, std::tr1::shared_ptr<const EAPIMetadataVariable> > long_description;
+ NamedValue<n::bugs_to, std::shared_ptr<const EAPIMetadataVariable> > bugs_to;
+ NamedValue<n::build_depend, std::shared_ptr<const EAPIMetadataVariable> > build_depend;
+ NamedValue<n::defined_phases, std::shared_ptr<const EAPIMetadataVariable> > defined_phases;
+ NamedValue<n::dependencies, std::shared_ptr<const EAPIMetadataVariable> > dependencies;
+ NamedValue<n::eapi, std::shared_ptr<const EAPIMetadataVariable> > eapi;
+ NamedValue<n::homepage, std::shared_ptr<const EAPIMetadataVariable> > homepage;
+ NamedValue<n::inherited, std::shared_ptr<const EAPIMetadataVariable> > inherited;
+ NamedValue<n::iuse, std::shared_ptr<const EAPIMetadataVariable> > iuse;
+ NamedValue<n::iuse_effective, std::shared_ptr<const EAPIMetadataVariable> > iuse_effective;
+ NamedValue<n::keywords, std::shared_ptr<const EAPIMetadataVariable> > keywords;
+ NamedValue<n::license, std::shared_ptr<const EAPIMetadataVariable> > license;
+ NamedValue<n::long_description, std::shared_ptr<const EAPIMetadataVariable> > long_description;
NamedValue<n::minimum_flat_list_size, int> minimum_flat_list_size;
- NamedValue<n::myoptions, std::tr1::shared_ptr<const EAPIMetadataVariable> > myoptions;
- NamedValue<n::pdepend, std::tr1::shared_ptr<const EAPIMetadataVariable> > pdepend;
- NamedValue<n::properties, std::tr1::shared_ptr<const EAPIMetadataVariable> > properties;
- NamedValue<n::provide, std::tr1::shared_ptr<const EAPIMetadataVariable> > provide;
- NamedValue<n::remote_ids, std::tr1::shared_ptr<const EAPIMetadataVariable> > remote_ids;
- NamedValue<n::restrictions, std::tr1::shared_ptr<const EAPIMetadataVariable> > restrictions;
- NamedValue<n::run_depend, std::tr1::shared_ptr<const EAPIMetadataVariable> > run_depend;
- NamedValue<n::short_description, std::tr1::shared_ptr<const EAPIMetadataVariable> > short_description;
- NamedValue<n::slot, std::tr1::shared_ptr<const EAPIMetadataVariable> > slot;
- NamedValue<n::src_uri, std::tr1::shared_ptr<const EAPIMetadataVariable> > src_uri;
- NamedValue<n::upstream_changelog, std::tr1::shared_ptr<const EAPIMetadataVariable> > upstream_changelog;
- NamedValue<n::upstream_documentation, std::tr1::shared_ptr<const EAPIMetadataVariable> > upstream_documentation;
- NamedValue<n::upstream_release_notes, std::tr1::shared_ptr<const EAPIMetadataVariable> > upstream_release_notes;
- NamedValue<n::use, std::tr1::shared_ptr<const EAPIMetadataVariable> > use;
- NamedValue<n::use_expand, std::tr1::shared_ptr<const EAPIMetadataVariable> > use_expand;
- NamedValue<n::use_expand_hidden, std::tr1::shared_ptr<const EAPIMetadataVariable> > use_expand_hidden;
+ NamedValue<n::myoptions, std::shared_ptr<const EAPIMetadataVariable> > myoptions;
+ NamedValue<n::pdepend, std::shared_ptr<const EAPIMetadataVariable> > pdepend;
+ NamedValue<n::properties, std::shared_ptr<const EAPIMetadataVariable> > properties;
+ NamedValue<n::provide, std::shared_ptr<const EAPIMetadataVariable> > provide;
+ NamedValue<n::remote_ids, std::shared_ptr<const EAPIMetadataVariable> > remote_ids;
+ NamedValue<n::restrictions, std::shared_ptr<const EAPIMetadataVariable> > restrictions;
+ NamedValue<n::run_depend, std::shared_ptr<const EAPIMetadataVariable> > run_depend;
+ NamedValue<n::short_description, std::shared_ptr<const EAPIMetadataVariable> > short_description;
+ NamedValue<n::slot, std::shared_ptr<const EAPIMetadataVariable> > slot;
+ NamedValue<n::src_uri, std::shared_ptr<const EAPIMetadataVariable> > src_uri;
+ NamedValue<n::upstream_changelog, std::shared_ptr<const EAPIMetadataVariable> > upstream_changelog;
+ NamedValue<n::upstream_documentation, std::shared_ptr<const EAPIMetadataVariable> > upstream_documentation;
+ NamedValue<n::upstream_release_notes, std::shared_ptr<const EAPIMetadataVariable> > upstream_release_notes;
+ NamedValue<n::use, std::shared_ptr<const EAPIMetadataVariable> > use;
+ NamedValue<n::use_expand, std::shared_ptr<const EAPIMetadataVariable> > use_expand;
+ NamedValue<n::use_expand_hidden, std::shared_ptr<const EAPIMetadataVariable> > use_expand_hidden;
};
struct EAPIEbuildOptions
@@ -386,9 +386,9 @@ namespace paludis
NamedValue<n::non_empty_variables, std::string> non_empty_variables;
NamedValue<n::rdepend_defaults_to_depend, bool> rdepend_defaults_to_depend;
NamedValue<n::require_use_expand_in_iuse, bool> require_use_expand_in_iuse;
- NamedValue<n::restrict_fetch, std::tr1::shared_ptr<Set<std::string> > > restrict_fetch;
- NamedValue<n::restrict_mirror, std::tr1::shared_ptr<Set<std::string> > > restrict_mirror;
- NamedValue<n::restrict_primaryuri, std::tr1::shared_ptr<Set<std::string> > > restrict_primaryuri;
+ NamedValue<n::restrict_fetch, std::shared_ptr<Set<std::string> > > restrict_fetch;
+ NamedValue<n::restrict_mirror, std::shared_ptr<Set<std::string> > > restrict_mirror;
+ NamedValue<n::restrict_primaryuri, std::shared_ptr<Set<std::string> > > restrict_primaryuri;
NamedValue<n::save_base_variables, std::string> save_base_variables;
NamedValue<n::save_unmodifiable_variables, std::string> save_unmodifiable_variables;
NamedValue<n::save_variables, std::string> save_variables;
diff --git a/paludis/repositories/e/eapi_phase.cc b/paludis/repositories/e/eapi_phase.cc
index 370e77ebe..b7b923766 100644
--- a/paludis/repositories/e/eapi_phase.cc
+++ b/paludis/repositories/e/eapi_phase.cc
@@ -32,7 +32,7 @@
using namespace paludis;
using namespace paludis::erepository;
-typedef std::list<std::tr1::shared_ptr<const EAPIPhase> > EAPIPhasesList;
+typedef std::list<std::shared_ptr<const EAPIPhase> > EAPIPhasesList;
namespace paludis
{
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index bf48f0a83..7b3e48549 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -54,7 +54,7 @@
#include <sys/time.h>
#include <unistd.h>
#include <time.h>
-#include <tr1/functional>
+#include <functional>
#include <list>
#include <set>
@@ -92,9 +92,9 @@ EbuildCommand::failure()
namespace
{
- std::string get_jobs(const std::tr1::shared_ptr<const PackageID> & id)
+ std::string get_jobs(const std::shared_ptr<const PackageID> & id)
{
- std::tr1::shared_ptr<const ChoiceValue> choice;
+ std::shared_ptr<const ChoiceValue> choice;
if (id->choices_key())
choice = id->choices_key()->value()->find_by_name_with_prefix(
ELikeJobsChoiceValue::canonical_name_with_prefix());
@@ -104,9 +104,9 @@ namespace
return "";
}
- bool get_trace(const std::tr1::shared_ptr<const PackageID> & id)
+ bool get_trace(const std::shared_ptr<const PackageID> & id)
{
- std::tr1::shared_ptr<const ChoiceValue> choice;
+ std::shared_ptr<const ChoiceValue> choice;
if (id->choices_key())
choice = id->choices_key()->value()->find_by_name_with_prefix(
ELikeTraceChoiceValue::canonical_name_with_prefix());
@@ -145,15 +145,15 @@ EbuildCommand::operator() ()
cmd.with_uid_gid(params.environment()->reduced_uid(), params.environment()->reduced_gid());
}
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
- cmd.with_pipe_command_handler("PALUDIS_PIPE_COMMAND", std::tr1::bind(&pipe_command_handler, params.environment(),
+ cmd.with_pipe_command_handler("PALUDIS_PIPE_COMMAND", std::bind(&pipe_command_handler, params.environment(),
params.package_id(), _1, params.maybe_output_manager()));
- std::tr1::shared_ptr<const FSEntrySequence> syncers_dirs(params.environment()->syncers_dirs());
- std::tr1::shared_ptr<const FSEntrySequence> bashrc_files(params.environment()->bashrc_files());
- std::tr1::shared_ptr<const FSEntrySequence> fetchers_dirs(params.environment()->fetchers_dirs());
- std::tr1::shared_ptr<const FSEntrySequence> hook_dirs(params.environment()->hook_dirs());
+ std::shared_ptr<const FSEntrySequence> syncers_dirs(params.environment()->syncers_dirs());
+ std::shared_ptr<const FSEntrySequence> bashrc_files(params.environment()->bashrc_files());
+ std::shared_ptr<const FSEntrySequence> fetchers_dirs(params.environment()->fetchers_dirs());
+ std::shared_ptr<const FSEntrySequence> hook_dirs(params.environment()->hook_dirs());
cmd = extend_command(cmd
.with_setenv("PV", stringify(params.package_id()->version().remove_revision()))
@@ -462,7 +462,7 @@ EbuildMetadataCommand::do_run_command(const Command & cmd)
namespace
{
- std::string get(const std::tr1::shared_ptr<const Map<std::string, std::string> > & k, const std::string & s)
+ std::string get(const std::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)
@@ -472,7 +472,7 @@ namespace
}
void
-EbuildMetadataCommand::load(const std::tr1::shared_ptr<const EbuildID> & id)
+EbuildMetadataCommand::load(const std::shared_ptr<const EbuildID> & id)
{
Context context("When loading generated metadata for '" + stringify(*params.package_id()) + "':");
@@ -969,17 +969,17 @@ WriteVDBEntryCommand::WriteVDBEntryCommand(const WriteVDBEntryParams & p) :
void
WriteVDBEntryCommand::operator() ()
{
- using namespace std::tr1::placeholders;
+ using namespace std::placeholders;
std::string ebuild_cmd(getenv_with_default("PALUDIS_EBUILD_DIR", LIBEXECDIR "/paludis") +
"/write_vdb_entry.bash '" +
stringify(params.output_directory()) + "' '" +
stringify(params.environment_file()) + "'");