aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-20 16:22:51 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-05-20 16:22:51 +0000
commit4762032193e34e16b70ad04a029257ae61faee1f (patch)
treef4c079355526d80fc311682c639ce74140ba6b73
parent7c70a0fc4a77810859f26adaf35969f00dbdd60c (diff)
downloadpaludis-4762032193e34e16b70ad04a029257ae61faee1f.tar.gz
paludis-4762032193e34e16b70ad04a029257ae61faee1f.tar.xz
Change how we access tr1 to make things easier for third party clients. Fixes: ticket:238
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac19
-rw-r--r--doc/examples/pwp_basic_cplusplus_app.cc5
-rw-r--r--paludis/config_file.cc36
-rw-r--r--paludis/config_file.hh10
-rw-r--r--paludis/config_file_TEST.cc4
-rw-r--r--paludis/contents.cc4
-rw-r--r--paludis/contents.hh6
-rw-r--r--paludis/dep_list/dep_list.cc166
-rw-r--r--paludis/dep_list/dep_list.hh38
-rw-r--r--paludis/dep_list/dep_list.sr8
-rw-r--r--paludis/dep_list/dep_list_TEST.cc32
-rw-r--r--paludis/dep_list/dep_list_TEST.hh8
-rw-r--r--paludis/dep_list/dep_list_TEST_blockers.cc18
-rw-r--r--paludis/dep_list/exceptions.cc4
-rw-r--r--paludis/dep_list/exceptions.hh2
-rw-r--r--paludis/dep_list/range_rewriter.hh6
-rw-r--r--paludis/dep_list/range_rewriter_TEST.cc2
-rw-r--r--paludis/dep_list/uninstall_list.cc74
-rw-r--r--paludis/dep_list/uninstall_list.hh8
-rw-r--r--paludis/dep_list/uninstall_list.sr2
-rw-r--r--paludis/dep_list/uninstall_list_TEST.cc6
-rw-r--r--paludis/dep_spec.cc130
-rw-r--r--paludis/dep_spec.hh50
-rw-r--r--paludis/dep_spec_TEST.cc10
-rw-r--r--paludis/dep_spec_flattener.cc6
-rw-r--r--paludis/dep_spec_flattener.hh2
-rw-r--r--paludis/dep_spec_pretty_printer_TEST.cc16
-rw-r--r--paludis/dep_tag.cc14
-rw-r--r--paludis/dep_tag.hh4
-rw-r--r--paludis/dep_tag.sr2
-rw-r--r--paludis/digests/Makefile.am6
-rw-r--r--paludis/eapi.cc12
-rw-r--r--paludis/eapi.sr2
-rw-r--r--paludis/environment.hh24
-rw-r--r--paludis/environment_implementation.cc56
-rw-r--r--paludis/environment_implementation.hh22
-rw-r--r--paludis/environment_implementation_TEST.cc12
-rw-r--r--paludis/environments/adapted/adapted_environment.cc34
-rw-r--r--paludis/environments/adapted/adapted_environment.hh28
-rw-r--r--paludis/environments/adapted/adapted_environment_TEST.cc2
-rw-r--r--paludis/environments/environment_maker.cc4
-rw-r--r--paludis/environments/environment_maker.hh4
-rw-r--r--paludis/environments/no_config/no_config_environment.cc30
-rw-r--r--paludis/environments/no_config/no_config_environment.hh14
-rw-r--r--paludis/environments/paludis/bashable_conf.cc4
-rw-r--r--paludis/environments/paludis/bashable_conf.hh4
-rw-r--r--paludis/environments/paludis/keywords_conf.cc12
-rw-r--r--paludis/environments/paludis/keywords_conf.hh2
-rw-r--r--paludis/environments/paludis/licenses_conf.cc10
-rw-r--r--paludis/environments/paludis/mirrors_conf.cc6
-rw-r--r--paludis/environments/paludis/mirrors_conf.hh2
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc12
-rw-r--r--paludis/environments/paludis/paludis_config.cc80
-rw-r--r--paludis/environments/paludis/paludis_config.hh14
-rw-r--r--paludis/environments/paludis/paludis_environment.cc52
-rw-r--r--paludis/environments/paludis/paludis_environment.hh22
-rw-r--r--paludis/environments/paludis/paludis_environment_TEST.cc12
-rw-r--r--paludis/environments/paludis/registration.cc4
-rw-r--r--paludis/environments/paludis/repository_config_entry.sr2
-rw-r--r--paludis/environments/paludis/use_conf.cc16
-rw-r--r--paludis/environments/paludis/use_conf.hh2
-rw-r--r--paludis/environments/paludis/use_config_entry.sr22
-rw-r--r--paludis/environments/portage/portage_environment.cc68
-rw-r--r--paludis/environments/portage/portage_environment.hh14
-rw-r--r--paludis/environments/portage/portage_environment_TEST.cc4
-rw-r--r--paludis/environments/portage/registration.cc4
-rw-r--r--paludis/environments/test/test_environment.cc8
-rw-r--r--paludis/environments/test/test_environment.hh6
-rw-r--r--paludis/hooker.cc22
-rw-r--r--paludis/match_package.cc2
-rw-r--r--paludis/package_database.cc40
-rw-r--r--paludis/package_database.hh12
-rw-r--r--paludis/package_database_TEST.cc50
-rw-r--r--paludis/portage_dep_parser.cc34
-rw-r--r--paludis/portage_dep_parser.hh18
-rw-r--r--paludis/qa/create_metadata_check.cc2
-rw-r--r--paludis/qa/dep_any_check.cc2
-rw-r--r--paludis/qa/dep_flags_check.cc6
-rw-r--r--paludis/qa/dep_packages_check.cc2
-rw-r--r--paludis/qa/deps_exist_check.cc2
-rw-r--r--paludis/qa/deps_visible_check.cc10
-rw-r--r--paludis/qa/description_check.cc2
-rw-r--r--paludis/qa/ebuild_check.cc2
-rw-r--r--paludis/qa/ebuild_check.hh6
-rw-r--r--paludis/qa/ebuild_count_check.cc6
-rw-r--r--paludis/qa/extract_check.cc2
-rw-r--r--paludis/qa/file_check.cc2
-rw-r--r--paludis/qa/file_check.hh8
-rw-r--r--paludis/qa/has_ebuilds_check.cc6
-rw-r--r--paludis/qa/homepage_check.cc2
-rw-r--r--paludis/qa/inherits_check.cc2
-rw-r--r--paludis/qa/iuse_check.cc2
-rw-r--r--paludis/qa/keywords_check.cc2
-rw-r--r--paludis/qa/license_check.cc2
-rw-r--r--paludis/qa/metadata_check.cc8
-rw-r--r--paludis/qa/metadata_file.cc4
-rw-r--r--paludis/qa/package_dir_check.cc2
-rw-r--r--paludis/qa/package_dir_check.hh6
-rw-r--r--paludis/qa/parse_deps_check.cc2
-rw-r--r--paludis/qa/pdepend_overlap_check.cc2
-rw-r--r--paludis/qa/per_profile_ebuild_check.cc2
-rw-r--r--paludis/qa/per_profile_ebuild_check.hh6
-rw-r--r--paludis/qa/profile_check.cc2
-rw-r--r--paludis/qa/profile_check.hh8
-rw-r--r--paludis/qa/profiles_check.cc2
-rw-r--r--paludis/qa/profiles_check.hh8
-rw-r--r--paludis/qa/qa_environment.cc2
-rw-r--r--paludis/qa/qa_environment.hh2
-rw-r--r--paludis/qa/qa_environment.sr2
-rw-r--r--paludis/qa/restrict_check.cc2
-rw-r--r--paludis/qa/slot_check.cc2
-rw-r--r--paludis/qa/src_uri_check.cc2
-rw-r--r--paludis/query.cc162
-rw-r--r--paludis/query.hh40
-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_description.cc14
-rw-r--r--paludis/repositories/cran/cran_description.hh2
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc64
-rw-r--r--paludis/repositories/cran/cran_installed_repository.hh18
-rw-r--r--paludis/repositories/cran/cran_repository.cc42
-rw-r--r--paludis/repositories/cran/cran_repository.hh16
-rw-r--r--paludis/repositories/cran/cran_repository_TEST.cc8
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc20
-rw-r--r--paludis/repositories/fake/fake_installed_repository.hh4
-rw-r--r--paludis/repositories/fake/fake_repository.cc10
-rw-r--r--paludis/repositories/fake/fake_repository.hh8
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc62
-rw-r--r--paludis/repositories/fake/fake_repository_base.hh26
-rw-r--r--paludis/repositories/gems/cache.cc14
-rw-r--r--paludis/repositories/gems/cache.sr8
-rw-r--r--paludis/repositories/gems/gems_repository.cc34
-rw-r--r--paludis/repositories/gems/gems_repository.hh14
-rw-r--r--paludis/repositories/gems/gems_repository.sr2
-rw-r--r--paludis/repositories/gems/gems_repository_TEST.cc4
-rw-r--r--paludis/repositories/gems/make_gems_repository.cc6
-rw-r--r--paludis/repositories/gems/make_gems_repository.hh4
-rw-r--r--paludis/repositories/gems/yaml.cc34
-rw-r--r--paludis/repositories/gems/yaml.hh14
-rw-r--r--paludis/repositories/gentoo/ebin.cc8
-rw-r--r--paludis/repositories/gentoo/ebin_entries.cc28
-rw-r--r--paludis/repositories/gentoo/ebin_entries.hh10
-rw-r--r--paludis/repositories/gentoo/ebuild.cc16
-rw-r--r--paludis/repositories/gentoo/ebuild.hh4
-rw-r--r--paludis/repositories/gentoo/ebuild.sr14
-rw-r--r--paludis/repositories/gentoo/ebuild/merge.cc6
-rw-r--r--paludis/repositories/gentoo/ebuild_entries.cc68
-rw-r--r--paludis/repositories/gentoo/ebuild_entries.hh10
-rw-r--r--paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc16
-rw-r--r--paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh8
-rw-r--r--paludis/repositories/gentoo/eclass_mtimes.cc6
-rw-r--r--paludis/repositories/gentoo/eclass_mtimes.hh2
-rw-r--r--paludis/repositories/gentoo/glsa.cc10
-rw-r--r--paludis/repositories/gentoo/glsa.hh4
-rw-r--r--paludis/repositories/gentoo/layout.cc10
-rw-r--r--paludis/repositories/gentoo/layout.hh14
-rw-r--r--paludis/repositories/gentoo/make_ebin_repository.cc24
-rw-r--r--paludis/repositories/gentoo/make_ebin_repository.hh8
-rw-r--r--paludis/repositories/gentoo/make_ebuild_repository.cc22
-rw-r--r--paludis/repositories/gentoo/make_ebuild_repository.hh8
-rw-r--r--paludis/repositories/gentoo/portage_repository.cc94
-rw-r--r--paludis/repositories/gentoo/portage_repository.hh30
-rw-r--r--paludis/repositories/gentoo/portage_repository_TEST.cc84
-rw-r--r--paludis/repositories/gentoo/portage_repository_entries.cc2
-rw-r--r--paludis/repositories/gentoo/portage_repository_entries.hh10
-rw-r--r--paludis/repositories/gentoo/portage_repository_news.cc2
-rw-r--r--paludis/repositories/gentoo/portage_repository_params.sr6
-rw-r--r--paludis/repositories/gentoo/portage_repository_profile.cc24
-rw-r--r--paludis/repositories/gentoo/portage_repository_profile.hh4
-rw-r--r--paludis/repositories/gentoo/portage_repository_sets.cc68
-rw-r--r--paludis/repositories/gentoo/portage_repository_sets.hh6
-rw-r--r--paludis/repositories/gentoo/registration.cc4
-rw-r--r--paludis/repositories/gentoo/traditional_layout.cc36
-rw-r--r--paludis/repositories/gentoo/traditional_layout.hh8
-rw-r--r--paludis/repositories/gentoo/vdb_merger.cc4
-rw-r--r--paludis/repositories/gentoo/vdb_repository.cc120
-rw-r--r--paludis/repositories/gentoo/vdb_repository.hh32
-rw-r--r--paludis/repositories/gentoo/vdb_repository_TEST.cc32
-rw-r--r--paludis/repositories/gentoo/vdb_unmerger.cc2
-rw-r--r--paludis/repositories/gentoo/xml_things.cc16
-rw-r--r--paludis/repositories/gentoo/xml_things_TEST.cc4
-rw-r--r--paludis/repositories/repository_maker.cc4
-rw-r--r--paludis/repositories/repository_maker.hh4
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc28
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh12
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc74
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh12
-rw-r--r--paludis/repositories/virtuals/vr_entry.hh4
-rw-r--r--paludis/repository-fwd.hh2
-rw-r--r--paludis/repository.cc20
-rw-r--r--paludis/repository.hh68
-rw-r--r--paludis/repository.sr6
-rw-r--r--paludis/repository_name_cache.cc18
-rw-r--r--paludis/repository_name_cache.hh2
-rw-r--r--paludis/repository_name_cache_TEST.cc22
-rw-r--r--paludis/selinux/security_context.cc14
-rw-r--r--paludis/selinux/security_context.hh12
-rw-r--r--paludis/set_file.cc44
-rw-r--r--paludis/set_file.hh2
-rw-r--r--paludis/set_file.sr2
-rw-r--r--paludis/set_file_TEST.cc4
-rw-r--r--paludis/syncer.cc8
-rw-r--r--paludis/tasks/find_unused_packages_task.cc22
-rw-r--r--paludis/tasks/find_unused_packages_task.hh2
-rw-r--r--paludis/tasks/install_task.cc34
-rw-r--r--paludis/tasks/install_task.hh4
-rw-r--r--paludis/tasks/report_task.cc20
-rw-r--r--paludis/tasks/stage_builder_task.cc6
-rw-r--r--paludis/tasks/stage_builder_task.hh16
-rw-r--r--paludis/tasks/sync_task.cc2
-rw-r--r--paludis/tasks/uninstall_task.cc32
-rw-r--r--paludis/tasks/uninstall_task.hh6
-rw-r--r--paludis/util/collection.hh4
-rw-r--r--paludis/util/collection_concrete.hh2
-rw-r--r--paludis/util/dir_iterator.cc8
-rw-r--r--paludis/util/files.m43
-rw-r--r--paludis/util/fs_entry.hh4
-rw-r--r--paludis/util/graph-impl.hh2
-rw-r--r--paludis/util/graph.cc4
-rw-r--r--paludis/util/graph.hh6
-rw-r--r--paludis/util/is_file_with_extension.hh2
-rw-r--r--paludis/util/iterator.hh26
-rw-r--r--paludis/util/iterator_TEST.cc22
-rw-r--r--paludis/util/stringify.hh4
-rw-r--r--paludis/util/strip.hh10
-rw-r--r--paludis/util/system.cc16
-rw-r--r--paludis/util/system.hh4
-rw-r--r--paludis/util/tr1_functional.hh (renamed from tr1/tr1_functional.hh)42
-rw-r--r--paludis/util/tr1_memory.hh (renamed from tr1/tr1_memory.hh)28
-rw-r--r--paludis/util/tr1_type_traits.hh (renamed from tr1/tr1_type_traits.hh)26
-rw-r--r--paludis/util/virtual_constructor_TEST.cc16
-rw-r--r--paludis/version_metadata.cc24
-rw-r--r--paludis/version_metadata.hh4
-rw-r--r--paludis/version_metadata.sr20
-rw-r--r--python/contents.cc14
-rw-r--r--python/dep_spec.cc6
-rw-r--r--python/environment.cc8
-rw-r--r--python/package_database.cc6
-rwxr-xr-xpython/paludis_python.hh8
-rw-r--r--python/repository.cc6
-rw-r--r--python/version_metadata.cc2
-rw-r--r--ruby/check.cc96
-rw-r--r--ruby/contents.cc78
-rw-r--r--ruby/dep_list.cc52
-rw-r--r--ruby/dep_spec.cc110
-rw-r--r--ruby/dep_tag.cc42
-rw-r--r--ruby/environment.cc44
-rw-r--r--ruby/find_unused_packages_task.cc2
-rw-r--r--ruby/package_database.cc38
-rw-r--r--ruby/paludis_ruby.cc4
-rw-r--r--ruby/paludis_ruby.hh40
-rw-r--r--ruby/qa_environment.cc10
-rw-r--r--ruby/repository.cc130
-rw-r--r--ruby/version_metadata.cc78
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.cc2
-rw-r--r--src/clients/adjutrix/downgrade_check.cc12
-rw-r--r--src/clients/adjutrix/find_dropped_keywords.cc10
-rw-r--r--src/clients/adjutrix/find_insecure_packages.cc4
-rw-r--r--src/clients/adjutrix/find_reverse_deps.cc24
-rw-r--r--src/clients/adjutrix/find_stable_candidates.cc10
-rw-r--r--src/clients/adjutrix/find_unused_packages.cc6
-rw-r--r--src/clients/adjutrix/keywords_graph.cc28
-rw-r--r--src/clients/adjutrix/what_needs_keywording.cc12
-rw-r--r--src/clients/contrarius/contrarius.cc18
-rw-r--r--src/clients/contrarius/contrarius_stage_options.sr12
-rw-r--r--src/clients/contrarius/install.cc20
-rw-r--r--src/clients/contrarius/install.hh2
-rw-r--r--src/clients/contrarius/stage.cc20
-rw-r--r--src/clients/contrarius/stage.hh18
-rw-r--r--src/clients/contrarius/stage_builder.cc10
-rw-r--r--src/clients/contrarius/stage_builder.hh10
-rw-r--r--src/clients/inquisitio/do_search.cc16
-rw-r--r--src/clients/inquisitio/extractor.cc6
-rw-r--r--src/clients/inquisitio/extractor.hh2
-rw-r--r--src/clients/inquisitio/inquisitio.cc2
-rw-r--r--src/clients/inquisitio/matcher.cc6
-rw-r--r--src/clients/inquisitio/matcher.hh2
-rw-r--r--src/clients/paludis/applets.cc34
-rw-r--r--src/clients/paludis/applets.hh12
-rw-r--r--src/clients/paludis/do_config.cc18
-rw-r--r--src/clients/paludis/do_config.hh4
-rw-r--r--src/clients/paludis/do_contents.cc14
-rw-r--r--src/clients/paludis/do_contents.hh4
-rw-r--r--src/clients/paludis/install.cc32
-rw-r--r--src/clients/paludis/install.hh2
-rw-r--r--src/clients/paludis/list.cc22
-rw-r--r--src/clients/paludis/list.hh8
-rw-r--r--src/clients/paludis/owner.cc12
-rw-r--r--src/clients/paludis/owner.hh4
-rw-r--r--src/clients/paludis/paludis.cc6
-rw-r--r--src/clients/paludis/query.cc20
-rw-r--r--src/clients/paludis/query.hh2
-rw-r--r--src/clients/paludis/report.cc4
-rw-r--r--src/clients/paludis/report.hh2
-rw-r--r--src/clients/paludis/sync.cc4
-rw-r--r--src/clients/paludis/sync.hh2
-rw-r--r--src/clients/paludis/uninstall.cc10
-rw-r--r--src/clients/paludis/uninstall.hh4
-rw-r--r--src/clients/qualudis/qualudis.cc6
-rw-r--r--src/output/console_install_task.cc70
-rw-r--r--src/output/console_install_task.hh30
-rw-r--r--src/output/console_query_task.cc14
-rw-r--r--src/output/console_query_task.hh6
-rw-r--r--src/output/use_flag_pretty_printer.cc14
-rw-r--r--src/output/use_flag_pretty_printer.hh18
-rw-r--r--tr1/Makefile.am74
307 files changed, 2707 insertions, 2712 deletions
diff --git a/Makefile.am b/Makefile.am
index 5b1f922..6008b5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in configure config/* aclocal.m4 \
config.h config.h.in INSTALL COPYING
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip std-options
EXTRA_DIST = autogen.bash automake-deps-dist-hack.tmp
-SUBDIRS = misc tr1 test paludis python ruby src doc hooks eselect vim bash-completion zsh-completion
+SUBDIRS = misc test paludis python ruby src doc hooks eselect vim bash-completion zsh-completion
DISTCHECK_CONFIGURE_FLAGS = --enable-qa --enable-ruby --enable-glsa --enable-vim --enable-python \
--with-ruby-install-dir='$${DESTDIR}$${prefix}/ruby_dir' \
diff --git a/configure.ac b/configure.ac
index 13fca45..71601ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,8 @@ AC_SUBST([VERSION_LIB_REVISION])
AM_INIT_AUTOMAKE(paludis, [$VERSION_FULL])
AC_LANG([C++])
+
+PALUDIS_CXXFLAGS=
dnl }}}
dnl {{{ monolithic build
@@ -212,7 +214,9 @@ int main(int, char **)
return *x;
}
],
- [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([yes])
+ PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_MEMORY_IS_STD_TR1=1"
+ ],
[AC_MSG_RESULT([no])
AC_MSG_CHECKING([for boost::shared_ptr<>])
AC_COMPILE_IFELSE([
@@ -224,6 +228,7 @@ int main(int, char **)
}
],
[AC_MSG_RESULT([yes])
+ PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_MEMORY_IS_BOOST=1"
need_pointer_wrappers=yes],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([Your compiler doesn't support tr1 and boost is not installed])])])
@@ -241,7 +246,9 @@ int main(int, char **)
return x;
}
],
- [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([yes])
+ PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_TYPE_TRAITS_IS_STD_TR1=1"
+ ],
[AC_MSG_RESULT([no])
AC_MSG_CHECKING([for boost::remove_pointer<>])
AC_COMPILE_IFELSE([
@@ -253,6 +260,7 @@ int main(int, char **)
}
],
[AC_MSG_RESULT([yes])
+ PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_TYPE_TRAITS_IS_BOOST=1"
need_type_traits_wrappers=yes],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([Your compiler doesn't support tr1 and boost is not installed])])])
@@ -282,7 +290,9 @@ int main(int, char **)
std::tr1::bind(std::tr1::mem_fn(&S::x), &s, _1));
}
],
- [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([yes])
+ PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_FUNCTIONAL_IS_STD_TR1=1"
+ ],
[AC_MSG_RESULT([no])
AC_MSG_CHECKING([for boost::bind<>])
AC_COMPILE_IFELSE([
@@ -306,6 +316,7 @@ int main(int, char **)
}
],
[AC_MSG_RESULT([yes])
+ PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_FUNCTIONAL_IS_BOOST=1"
need_bind_wrappers=yes],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([Your compiler doesn't support tr1 and boost is not installed])])])
@@ -420,7 +431,6 @@ then
AC_MSG_RESULT([no])
fi
-PALUDIS_CXXFLAGS=
PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST=
PALUDIS_CXXFLAGS_NO_WREDUNDANT_DECLS=
PALUDIS_CXXFLAGS_NO_WSHADOW=
@@ -1116,7 +1126,6 @@ AC_OUTPUT(
src/clients/qualudis/Makefile
src/clients/adjutrix/Makefile
test/Makefile
- tr1/Makefile
vim/Makefile
vim/ftdetect/Makefile
vim/syntax/Makefile
diff --git a/doc/examples/pwp_basic_cplusplus_app.cc b/doc/examples/pwp_basic_cplusplus_app.cc
index ffdaba4..72095cf 100644
--- a/doc/examples/pwp_basic_cplusplus_app.cc
+++ b/doc/examples/pwp_basic_cplusplus_app.cc
@@ -4,7 +4,6 @@
#include <paludis/environments/environment_maker.hh>
#include <iostream>
-#include <tr1/memory>
#include <cstdlib>
using std::cout;
@@ -15,10 +14,10 @@ int main(int, char *[])
{
try
{
- std::tr1::shared_ptr<paludis::Environment> env(
+ paludis::tr1::shared_ptr<paludis::Environment> env(
paludis::EnvironmentMaker::get_instance()->make_from_spec(""));
- std::tr1::shared_ptr<const paludis::PackageDatabaseEntryCollection> packages(
+ paludis::tr1::shared_ptr<const paludis::PackageDatabaseEntryCollection> packages(
env->package_database()->query(
paludis::query::Matches(paludis::PackageDepSpec("app-editors/vim", paludis::pds_pm_eapi_0_strict)) &
paludis::query::InstalledAtRoot(env->root()), paludis::qo_order_by_version));
diff --git a/paludis/config_file.cc b/paludis/config_file.cc
index aa2723e..17f3c47 100644
--- a/paludis/config_file.cc
+++ b/paludis/config_file.cc
@@ -66,7 +66,7 @@ namespace paludis
template<>
struct Implementation<ConfigFile::Source>
{
- std::tr1::shared_ptr<std::istream> stream_to_delete;
+ tr1::shared_ptr<std::istream> stream_to_delete;
std::istream & stream;
std::string filename;
@@ -89,7 +89,7 @@ namespace paludis
{
}
- Implementation(std::tr1::shared_ptr<std::istream> s, std::istream & t, const std::string & f) :
+ Implementation(tr1::shared_ptr<std::istream> s, std::istream & t, const std::string & f) :
stream_to_delete(s),
stream(t),
filename(f)
@@ -238,12 +238,12 @@ namespace paludis
template<>
struct Implementation<KeyValueConfigFile::Defaults>
{
- std::tr1::shared_ptr<const KeyValueConfigFile> kv;
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > a;
+ tr1::shared_ptr<const KeyValueConfigFile> kv;
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > a;
std::string (* f)(const std::string &, const std::string &);
- Implementation(std::tr1::shared_ptr<const KeyValueConfigFile> kvv,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > av,
+ Implementation(tr1::shared_ptr<const KeyValueConfigFile> kvv,
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > av,
std::string (* fv)(const std::string &, const std::string &)) :
kv(kvv),
a(av),
@@ -254,44 +254,44 @@ namespace paludis
}
template<>
-KeyValueConfigFile::Defaults::Defaults(std::tr1::shared_ptr<const KeyValueConfigFile> v) :
+KeyValueConfigFile::Defaults::Defaults(tr1::shared_ptr<const KeyValueConfigFile> v) :
PrivateImplementationPattern<KeyValueConfigFile::Defaults>(new Implementation<KeyValueConfigFile::Defaults>(v,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >(), 0))
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >(), 0))
{
}
template<>
-KeyValueConfigFile::Defaults::Defaults(std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > a) :
+KeyValueConfigFile::Defaults::Defaults(tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > a) :
PrivateImplementationPattern<KeyValueConfigFile::Defaults>(new Implementation<KeyValueConfigFile::Defaults>(
- std::tr1::shared_ptr<const KeyValueConfigFile>(), a, 0))
+ tr1::shared_ptr<const KeyValueConfigFile>(), a, 0))
{
}
template<>
-KeyValueConfigFile::Defaults::Defaults(std::tr1::shared_ptr<KeyValueConfigFile> v) :
+KeyValueConfigFile::Defaults::Defaults(tr1::shared_ptr<KeyValueConfigFile> v) :
PrivateImplementationPattern<KeyValueConfigFile::Defaults>(new Implementation<KeyValueConfigFile::Defaults>(v,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >(), 0))
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >(), 0))
{
}
template<>
-KeyValueConfigFile::Defaults::Defaults(std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > a) :
+KeyValueConfigFile::Defaults::Defaults(tr1::shared_ptr<AssociativeCollection<std::string, std::string> > a) :
PrivateImplementationPattern<KeyValueConfigFile::Defaults>(new Implementation<KeyValueConfigFile::Defaults>(
- std::tr1::shared_ptr<const KeyValueConfigFile>(), a, 0))
+ tr1::shared_ptr<const KeyValueConfigFile>(), a, 0))
{
}
KeyValueConfigFile::Defaults::Defaults(std::string (* f) (const std::string &, const std::string &)) :
PrivateImplementationPattern<KeyValueConfigFile::Defaults>(new Implementation<KeyValueConfigFile::Defaults>(
- std::tr1::shared_ptr<const KeyValueConfigFile>(),
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >(), f))
+ tr1::shared_ptr<const KeyValueConfigFile>(),
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >(), f))
{
}
KeyValueConfigFile::Defaults::Defaults() :
PrivateImplementationPattern<KeyValueConfigFile::Defaults>(new Implementation<KeyValueConfigFile::Defaults>(
- std::tr1::shared_ptr<const KeyValueConfigFile>(),
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >(), 0))
+ tr1::shared_ptr<const KeyValueConfigFile>(),
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >(), 0))
{
}
diff --git a/paludis/config_file.hh b/paludis/config_file.hh
index 7dc8a8b..79eb5a0 100644
--- a/paludis/config_file.hh
+++ b/paludis/config_file.hh
@@ -30,7 +30,7 @@
#include <iosfwd>
#include <string>
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
/** \file
* Declarations for the ConfigFile classes.
@@ -335,7 +335,7 @@ namespace paludis
* \ingroup grpkvconfigfile
*/
template<>
- KeyValueConfigFile::Defaults::Defaults(std::tr1::shared_ptr<const KeyValueConfigFile>);
+ KeyValueConfigFile::Defaults::Defaults(tr1::shared_ptr<const KeyValueConfigFile>);
/**
* Use a string pair collection for defaults.
@@ -343,7 +343,7 @@ namespace paludis
* \ingroup grpkvconfigfile
*/
template<>
- KeyValueConfigFile::Defaults::Defaults(std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >);
+ KeyValueConfigFile::Defaults::Defaults(tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >);
/**
* Use another KeyValueConfigFile for defaults (non-const).
@@ -351,7 +351,7 @@ namespace paludis
* \ingroup grpkvconfigfile
*/
template<>
- KeyValueConfigFile::Defaults::Defaults(std::tr1::shared_ptr<KeyValueConfigFile>);
+ KeyValueConfigFile::Defaults::Defaults(tr1::shared_ptr<KeyValueConfigFile>);
/**
* Use a string pair collection for defaults (non-const).
@@ -359,7 +359,7 @@ namespace paludis
* \ingroup grpkvconfigfile
*/
template<>
- KeyValueConfigFile::Defaults::Defaults(std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> >);
+ KeyValueConfigFile::Defaults::Defaults(tr1::shared_ptr<AssociativeCollection<std::string, std::string> >);
}
#endif
diff --git a/paludis/config_file_TEST.cc b/paludis/config_file_TEST.cc
index eb379dd..11509d0 100644
--- a/paludis/config_file_TEST.cc
+++ b/paludis/config_file_TEST.cc
@@ -227,7 +227,7 @@ namespace test_cases
TEST_CHECK_EQUAL(ff.get("z"), "foofoo\\$");
std::stringstream t;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > t_defs(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > t_defs(
new AssociativeCollection<std::string, std::string>::Concrete);
t_defs->insert("a", "moo");
t_defs->insert("d", "bar");
@@ -261,7 +261,7 @@ namespace test_cases
std::stringstream d_s;
d_s << "foo=oink" << std::endl;
- std::tr1::shared_ptr<KeyValueConfigFile> d_ff(new KeyValueConfigFile(d_s, KeyValueConfigFileOptions(), &getenv_with_default));
+ tr1::shared_ptr<KeyValueConfigFile> d_ff(new KeyValueConfigFile(d_s, KeyValueConfigFileOptions(), &getenv_with_default));
std::stringstream s;
s << "x=${foo}" << std::endl;
diff --git a/paludis/contents.cc b/paludis/contents.cc
index 17681c3..264204a 100644
--- a/paludis/contents.cc
+++ b/paludis/contents.cc
@@ -90,7 +90,7 @@ namespace paludis
template<>
struct Implementation<Contents>
{
- std::list<std::tr1::shared_ptr<const ContentsEntry> > c;
+ std::list<tr1::shared_ptr<const ContentsEntry> > c;
};
}
@@ -104,7 +104,7 @@ Contents::~Contents()
}
void
-Contents::add(std::tr1::shared_ptr<const ContentsEntry> c)
+Contents::add(tr1::shared_ptr<const ContentsEntry> c)
{
_imp->c.push_back(c);
}
diff --git a/paludis/contents.hh b/paludis/contents.hh
index 4a35d62..14cac86 100644
--- a/paludis/contents.hh
+++ b/paludis/contents.hh
@@ -24,7 +24,7 @@
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <string>
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
@@ -225,12 +225,12 @@ namespace paludis
///\}
/// Add a new entry.
- void add(std::tr1::shared_ptr<const ContentsEntry> c);
+ void add(tr1::shared_ptr<const ContentsEntry> c);
///\name Iterate over our entries
///\{
- typedef libwrapiter::ForwardIterator<Contents, const std::tr1::shared_ptr<const ContentsEntry> > Iterator;
+ typedef libwrapiter::ForwardIterator<Contents, const tr1::shared_ptr<const ContentsEntry> > Iterator;
Iterator begin() const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/dep_list/dep_list.cc b/paludis/dep_list/dep_list.cc
index 21686a0..9410884 100644
--- a/paludis/dep_list/dep_list.cc
+++ b/paludis/dep_list/dep_list.cc
@@ -77,7 +77,7 @@ namespace paludis
struct Implementation<DepList>
{
const Environment * const env;
- std::tr1::shared_ptr<DepListOptions> opts;
+ tr1::shared_ptr<DepListOptions> opts;
MergeList merge_list;
MergeList::const_iterator current_merge_list_entry;
@@ -86,7 +86,7 @@ namespace paludis
MergeListIndex merge_list_index;
- std::tr1::shared_ptr<const DepSpec> current_top_level_target;
+ tr1::shared_ptr<const DepSpec> current_top_level_target;
bool throw_on_blocker;
@@ -173,7 +173,7 @@ namespace
/* see EffSTL 9 for why this is so painful */
if (e.tags->empty())
return;
- std::tr1::shared_ptr<DepListEntryTags> t(new DepListEntryTags::Concrete);
+ tr1::shared_ptr<DepListEntryTags> t(new DepListEntryTags::Concrete);
GenerationGreaterThan pred(g);
for (DepListEntryTags::Iterator i(e.tags->begin()), i_end(e.tags->end()) ;
i != i_end ; ++i)
@@ -284,7 +284,7 @@ namespace
{
}
- bool operator() (std::tr1::shared_ptr<const DepSpec> spec)
+ bool operator() (tr1::shared_ptr<const DepSpec> spec)
{
const UseDepSpec * const u(spec->as_use_dep_spec());
if (0 != u)
@@ -303,13 +303,13 @@ namespace
{
}
- bool operator() (std::tr1::shared_ptr<const DepSpec> spec)
+ bool operator() (tr1::shared_ptr<const DepSpec> spec)
{
const PackageDepSpec * const u(spec->as_package_dep_spec());
if (0 != u && u->package_ptr())
{
return ! env->package_database()->query(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(*u->package_ptr()))),
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(*u->package_ptr()))),
is_installed_only, qo_whatever)->empty();
}
else
@@ -323,9 +323,9 @@ struct DepList::QueryVisitor :
{
bool result;
const DepList * const d;
- std::tr1::shared_ptr<const DestinationsCollection> destinations;
+ tr1::shared_ptr<const DestinationsCollection> destinations;
- QueryVisitor(const DepList * const dd, std::tr1::shared_ptr<const DestinationsCollection> ddd) :
+ QueryVisitor(const DepList * const dd, tr1::shared_ptr<const DestinationsCollection> ddd) :
result(true),
d(dd),
destinations(ddd)
@@ -356,14 +356,14 @@ DepList::QueryVisitor::visit(const PackageDepSpec * const a)
result = false;
// TODO: check destinations
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> matches(d->_imp->env->package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> matches(d->_imp->env->package_database()->query(
*a, is_installed_only, qo_whatever));
for (PackageDatabaseEntryCollection::Iterator m(matches->begin()), m_end(matches->end()) ;
m != m_end ; ++m)
{
/* check that we haven't been replaced by something in the same slot */
- std::tr1::shared_ptr<const VersionMetadata> vm(d->_imp->env->package_database()->fetch_repository(m->repository)->
+ tr1::shared_ptr<const VersionMetadata> vm(d->_imp->env->package_database()->fetch_repository(m->repository)->
version_metadata(m->name, m->version));
SlotName slot(vm->slot);
@@ -371,7 +371,7 @@ DepList::QueryVisitor::visit(const PackageDepSpec * const a)
d->_imp->merge_list_index.equal_range(m->name));
bool replaced(false);
- PackageDepSpec spec(std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(m->name)));
+ PackageDepSpec spec(tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(m->name)));
while (p.second != ((p.first = std::find_if(p.first, p.second,
MatchDepListEntryAgainstPackageDepSpec(d->_imp->env, &spec)))))
{
@@ -430,7 +430,7 @@ void
DepList::QueryVisitor::visit(const AnyDepSpec * const a)
{
/* empty || ( ) must resolve to true */
- std::list<std::tr1::shared_ptr<const DepSpec> > viable_children;
+ std::list<tr1::shared_ptr<const DepSpec> > viable_children;
std::copy(a->begin(), a->end(), filter_inserter(std::back_inserter(viable_children),
IsViableAnyDepSpecChild(d->_imp->env, d->_imp->current_pde())));
@@ -443,7 +443,7 @@ DepList::QueryVisitor::visit(const AnyDepSpec * const a)
}
result = true;
- for (std::list<std::tr1::shared_ptr<const DepSpec> >::const_iterator c(viable_children.begin()),
+ for (std::list<tr1::shared_ptr<const DepSpec> >::const_iterator c(viable_children.begin()),
c_end(viable_children.end()) ; c != c_end ; ++c)
{
(*c)->accept(this);
@@ -475,9 +475,9 @@ struct DepList::AddVisitor :
DepSpecVisitorTypes::ConstVisitor::VisitChildren<AddVisitor, AllDepSpec>
{
DepList * const d;
- std::tr1::shared_ptr<const DestinationsCollection> destinations;
+ tr1::shared_ptr<const DestinationsCollection> destinations;
- AddVisitor(DepList * const dd, std::tr1::shared_ptr<const DestinationsCollection> ddd) :
+ AddVisitor(DepList * const dd, tr1::shared_ptr<const DestinationsCollection> ddd) :
d(dd),
destinations(ddd)
{
@@ -504,7 +504,7 @@ DepList::AddVisitor::visit(const PackageDepSpec * const a)
/* find already installed things */
// TODO: check destinations
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> already_installed(d->_imp->env->package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> already_installed(d->_imp->env->package_database()->query(
*a, is_installed_only, qo_order_by_version));
/* are we already on the merge list? */
@@ -528,7 +528,7 @@ DepList::AddVisitor::visit(const PackageDepSpec * const a)
if (d->_imp->opts->dependency_tags && d->_imp->current_pde())
existing_merge_list_entry->tags->insert(DepTagEntry::create()
- .tag(std::tr1::shared_ptr<DepTag>(new DependencyDepTag(*d->_imp->current_pde())))
+ .tag(tr1::shared_ptr<DepTag>(new DependencyDepTag(*d->_imp->current_pde())))
.generation(d->_imp->merge_list_generation));
/* add an appropriate destination */
@@ -560,7 +560,7 @@ DepList::AddVisitor::visit(const PackageDepSpec * const a)
/* find installable candidates, and find the best visible candidate */
const PackageDatabaseEntry * best_visible_candidate(0);
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> installable_candidates(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> installable_candidates(
d->_imp->env->package_database()->query(*a, is_installable_only, qo_order_by_version));
for (PackageDatabaseEntryCollection::ReverseIterator p(installable_candidates->rbegin()),
@@ -662,7 +662,7 @@ DepList::AddVisitor::visit(const PackageDepSpec * const a)
if (! a->use_requirements_ptr())
throw AllMaskedError(*a);
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> match_except_reqs(d->_imp->env->package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> match_except_reqs(d->_imp->env->package_database()->query(
*a->without_use_requirements(), is_any, qo_whatever));
for (PackageDatabaseEntryCollection::Iterator i(match_except_reqs->begin()),
@@ -682,7 +682,7 @@ DepList::AddVisitor::visit(const PackageDepSpec * const a)
}
}
- std::tr1::shared_ptr<const VersionMetadata> best_visible_candidate_metadata(
+ tr1::shared_ptr<const VersionMetadata> best_visible_candidate_metadata(
d->_imp->env->package_database()->fetch_repository(best_visible_candidate->repository)->
version_metadata(best_visible_candidate->name, best_visible_candidate->version));
SlotName slot(best_visible_candidate_metadata->slot);
@@ -691,7 +691,7 @@ DepList::AddVisitor::visit(const PackageDepSpec * const a)
best_visible_candidate_as_string.append(" (for " + stringify(
best_visible_candidate_metadata->virtual_interface->virtual_for) + ")");
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> already_installed_in_same_slot(
+ tr1::shared_ptr<PackageDatabaseEntryCollection> already_installed_in_same_slot(
new PackageDatabaseEntryCollection::Concrete);
for (PackageDatabaseEntryCollection::Iterator aa(already_installed->begin()),
aa_end(already_installed->end()) ; aa != aa_end ; ++aa)
@@ -747,15 +747,15 @@ DepList::AddVisitor::visit(const PackageDepSpec * const a)
case dl_downgrade_error:
case dl_downgrade_warning:
{
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> are_we_downgrading(
+ tr1::shared_ptr<PackageDatabaseEntryCollection> are_we_downgrading(
d->_imp->env->package_database()->query(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(
+ tr1::shared_ptr<QualifiedPackageName>(
new QualifiedPackageName(best_visible_candidate->name)),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(new SlotName(slot))),
+ tr1::shared_ptr<SlotName>(new SlotName(slot))),
is_installed_only, qo_order_by_version));
if (are_we_downgrading->empty())
@@ -764,7 +764,7 @@ DepList::AddVisitor::visit(const PackageDepSpec * const a)
if (are_we_downgrading->last()->version <= best_visible_candidate->version)
break;
- std::tr1::shared_ptr<const VersionMetadata> are_we_downgrading_last_metadata(
+ tr1::shared_ptr<const VersionMetadata> are_we_downgrading_last_metadata(
d->_imp->env->package_database()->fetch_repository(
are_we_downgrading->last()->repository)->version_metadata(
are_we_downgrading->last()->name, are_we_downgrading->last()->version));
@@ -821,7 +821,7 @@ void
DepList::AddVisitor::visit(const AnyDepSpec * const a)
{
/* annoying requirement: || ( foo? ( ... ) ) resolves to empty if !foo. */
- std::list<std::tr1::shared_ptr<const DepSpec> > viable_children;
+ std::list<tr1::shared_ptr<const DepSpec> > viable_children;
std::copy(a->begin(), a->end(), filter_inserter(std::back_inserter(viable_children),
IsViableAnyDepSpecChild(d->_imp->env, d->_imp->current_pde())));
@@ -838,7 +838,7 @@ DepList::AddVisitor::visit(const AnyDepSpec * const a)
/* see if any of our children is already installed. if any is, add it so that
* any upgrades kick in */
- for (std::list<std::tr1::shared_ptr<const DepSpec> >::const_iterator c(viable_children.begin()),
+ for (std::list<tr1::shared_ptr<const DepSpec> >::const_iterator c(viable_children.begin()),
c_end(viable_children.end()) ; c != c_end ; ++c)
{
if (d->already_installed(**c, destinations))
@@ -850,11 +850,11 @@ DepList::AddVisitor::visit(const AnyDepSpec * const a)
/* if we have something like || ( a >=b-2 ) and b-1 is installed, try to go for
* the b-2 bit first */
- std::list<std::tr1::shared_ptr<const DepSpec> > pda_children;
+ std::list<tr1::shared_ptr<const DepSpec> > pda_children;
std::copy(viable_children.begin(), viable_children.end(),
filter_inserter(std::back_inserter(pda_children), IsInterestingPDADepSpecChild(d->_imp->env)));
- for (std::list<std::tr1::shared_ptr<const DepSpec> >::const_iterator c(pda_children.begin()),
+ for (std::list<tr1::shared_ptr<const DepSpec> >::const_iterator c(pda_children.begin()),
c_end(pda_children.end()) ; c != c_end ; ++c)
{
try
@@ -871,7 +871,7 @@ DepList::AddVisitor::visit(const AnyDepSpec * const a)
}
/* install first available viable option */
- for (std::list<std::tr1::shared_ptr<const DepSpec> >::const_iterator c(viable_children.begin()),
+ for (std::list<tr1::shared_ptr<const DepSpec> >::const_iterator c(viable_children.begin()),
c_end(viable_children.end()) ; c != c_end ; ++c)
{
try
@@ -907,11 +907,11 @@ DepList::AddVisitor::visit(const BlockDepSpec * const a)
bool check_whole_list(false);
std::list<MergeList::const_iterator> will_be_installed;
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> already_installed;
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> already_installed;
if (a->blocked_spec()->package_ptr())
{
- PackageDepSpec just_package(std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
+ PackageDepSpec just_package(tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
*a->blocked_spec()->package_ptr())));
already_installed = d->_imp->env->package_database()->query(
just_package, is_installed_only, qo_whatever);
@@ -951,7 +951,7 @@ DepList::AddVisitor::visit(const BlockDepSpec * const a)
if (! match_package(*d->_imp->env, *a->blocked_spec(), *aa))
continue;
- std::tr1::shared_ptr<const VersionMetadata> metadata(d->_imp->env->package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> metadata(d->_imp->env->package_database()->fetch_repository(
aa->repository)->version_metadata(aa->name, aa->version));
bool replaced(false);
for (std::list<MergeList::const_iterator>::const_iterator r(will_be_installed.begin()),
@@ -1063,9 +1063,9 @@ struct DepList::ShowSuggestVisitor :
DepSpecVisitorTypes::ConstVisitor::VisitChildren<ShowSuggestVisitor, AnyDepSpec>
{
DepList * const d;
- std::tr1::shared_ptr<const DestinationsCollection> destinations;
+ tr1::shared_ptr<const DestinationsCollection> destinations;
- ShowSuggestVisitor(DepList * const dd, std::tr1::shared_ptr<const DestinationsCollection> ddd) :
+ ShowSuggestVisitor(DepList * const dd, tr1::shared_ptr<const DestinationsCollection> ddd) :
d(dd),
destinations(ddd)
{
@@ -1102,7 +1102,7 @@ DepList::ShowSuggestVisitor::visit(const PackageDepSpec * const a)
{
Context context("When adding suggested dep '" + stringify(*a) + "':");
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> matches(d->_imp->env->package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> matches(d->_imp->env->package_database()->query(
*a, is_installable_only, qo_order_by_version));
if (matches->empty())
{
@@ -1132,7 +1132,7 @@ DepList::~DepList()
{
}
-std::tr1::shared_ptr<DepListOptions>
+tr1::shared_ptr<DepListOptions>
DepList::options()
{
return _imp->opts;
@@ -1146,19 +1146,19 @@ DepList::clear()
}
void
-DepList::add_in_role(std::tr1::shared_ptr<const DepSpec> spec, const std::string & role,
- std::tr1::shared_ptr<const DestinationsCollection> destinations)
+DepList::add_in_role(tr1::shared_ptr<const DepSpec> spec, const std::string & role,
+ tr1::shared_ptr<const DestinationsCollection> destinations)
{
Context context("When adding " + role + ":");
add(spec, destinations);
}
void
-DepList::add(std::tr1::shared_ptr<const DepSpec> spec, std::tr1::shared_ptr<const DestinationsCollection> destinations)
+DepList::add(tr1::shared_ptr<const DepSpec> spec, tr1::shared_ptr<const DestinationsCollection> destinations)
{
DepListTransaction transaction(_imp->merge_list, _imp->merge_list_index, _imp->merge_list_generation);
- Save<std::tr1::shared_ptr<const DepSpec> > save_current_top_level_target(&_imp->current_top_level_target,
+ Save<tr1::shared_ptr<const DepSpec> > save_current_top_level_target(&_imp->current_top_level_target,
_imp->current_top_level_target ? _imp->current_top_level_target : spec);
AddVisitor visitor(this, destinations);
@@ -1167,20 +1167,20 @@ DepList::add(std::tr1::shared_ptr<const DepSpec> spec, std::tr1::shared_ptr<cons
}
void
-DepList::add_package(const PackageDatabaseEntry & p, std::tr1::shared_ptr<const DepTag> tag,
- std::tr1::shared_ptr<const DestinationsCollection> destinations)
+DepList::add_package(const PackageDatabaseEntry & p, tr1::shared_ptr<const DepTag> tag,
+ tr1::shared_ptr<const DestinationsCollection> destinations)
{
Context context("When adding package '" + stringify(p) + "':");
Save<MergeList::iterator> save_merge_list_insert_position(&_imp->merge_list_insert_position);
- std::tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(
p.repository)->version_metadata(p.name, p.version));
/* create our merge list entry. insert pre deps before ourself in the list. insert
* post deps after ourself, and after any provides. */
- std::tr1::shared_ptr<SortedCollection<DepListEntryDestination> > our_merge_entry_destinations(
+ tr1::shared_ptr<SortedCollection<DepListEntryDestination> > our_merge_entry_destinations(
new SortedCollection<DepListEntryDestination>::Concrete);
if (! metadata->virtual_interface)
our_merge_entry_destinations->insert(
@@ -1193,7 +1193,7 @@ DepList::add_package(const PackageDatabaseEntry & p, std::tr1::shared_ptr<const
.metadata(metadata)
.generation(_imp->merge_list_generation)
.state(dle_no_deps)
- .tags(std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
+ .tags(tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
.destinations(our_merge_entry_destinations)
.associated_entry(0)
.kind(metadata->virtual_interface ? dlk_virtual : dlk_package))),
@@ -1208,7 +1208,7 @@ DepList::add_package(const PackageDatabaseEntry & p, std::tr1::shared_ptr<const
if (_imp->opts->dependency_tags && _imp->current_pde())
our_merge_entry_position->tags->insert(DepTagEntry::create()
- .tag(std::tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
+ .tag(tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
.generation(_imp->merge_list_generation));
Save<MergeList::const_iterator> save_current_merge_list_entry(&_imp->current_merge_list_entry,
@@ -1222,12 +1222,12 @@ DepList::add_package(const PackageDatabaseEntry & p, std::tr1::shared_ptr<const
DepSpecFlattener f(_imp->env, _imp->current_pde(), metadata->ebuild_interface->provide());
for (DepSpecFlattener::Iterator i(f.begin()), i_end(f.end()) ; i != i_end ; ++i)
{
- std::tr1::shared_ptr<VersionRequirements> v(new VersionRequirements::Concrete);
+ tr1::shared_ptr<VersionRequirements> v(new VersionRequirements::Concrete);
v->push_back(VersionRequirement(vo_equal, p.version));
- std::tr1::shared_ptr<PackageDepSpec> pp(new PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName((*i)->text())),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<PackageDepSpec> pp(new PackageDepSpec(
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName((*i)->text())),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
v, vr_and));
std::pair<MergeListIndex::iterator, MergeListIndex::iterator> z;
@@ -1242,7 +1242,7 @@ DepList::add_package(const PackageDatabaseEntry & p, std::tr1::shared_ptr<const
if (zz != z.second)
continue;
- std::tr1::shared_ptr<const VersionMetadata> m;
+ tr1::shared_ptr<const VersionMetadata> m;
if (_imp->env->package_database()->fetch_repository(RepositoryName("virtuals"))->has_version(
QualifiedPackageName((*i)->text()), p.version))
@@ -1250,7 +1250,7 @@ DepList::add_package(const PackageDatabaseEntry & p, std::tr1::shared_ptr<const
QualifiedPackageName((*i)->text()), p.version);
else
{
- std::tr1::shared_ptr<VersionMetadata> mm(new FakedVirtualVersionMetadata(metadata->slot,
+ tr1::shared_ptr<VersionMetadata> mm(new FakedVirtualVersionMetadata(metadata->slot,
PackageDatabaseEntry(p.name, p.version, RepositoryName("virtuals"))));
m = mm;
}
@@ -1261,8 +1261,8 @@ DepList::add_package(const PackageDatabaseEntry & p, std::tr1::shared_ptr<const
.metadata(m)
.generation(_imp->merge_list_generation)
.state(dle_has_all_deps)
- .tags(std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
- .destinations(std::tr1::shared_ptr<SortedCollection<DepListEntryDestination> >(
+ .tags(tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
+ .destinations(tr1::shared_ptr<SortedCollection<DepListEntryDestination> >(
new SortedCollection<DepListEntryDestination>::Concrete))
.associated_entry(&*_imp->current_merge_list_entry)
.kind(dlk_provided)));
@@ -1319,7 +1319,7 @@ DepList::add_error_package(const PackageDatabaseEntry & p, const DepListEntryKin
{
if (_imp->current_pde())
pp.first->second->tags->insert(DepTagEntry::create()
- .tag(std::tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
+ .tag(tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
.generation(_imp->merge_list_generation));
return;
}
@@ -1333,15 +1333,15 @@ DepList::add_error_package(const PackageDatabaseEntry & p, const DepListEntryKin
p.repository)->version_metadata(p.name, p.version))
.generation(_imp->merge_list_generation)
.state(dle_has_all_deps)
- .tags(std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
- .destinations(std::tr1::shared_ptr<SortedCollection<DepListEntryDestination> >(
+ .tags(tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
+ .destinations(tr1::shared_ptr<SortedCollection<DepListEntryDestination> >(
new SortedCollection<DepListEntryDestination>::Concrete))
.associated_entry(&*_imp->current_merge_list_entry)
.kind(kind)));
if (_imp->current_pde())
our_merge_entry_position->tags->insert(DepTagEntry::create()
- .tag(std::tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
+ .tag(tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
.generation(_imp->merge_list_generation));
_imp->merge_list_index.insert(std::make_pair(p.name, our_merge_entry_position));
@@ -1349,7 +1349,7 @@ DepList::add_error_package(const PackageDatabaseEntry & p, const DepListEntryKin
void
DepList::add_suggested_package(const PackageDatabaseEntry & p,
- const std::tr1::shared_ptr<const DestinationsCollection> destinations)
+ const tr1::shared_ptr<const DestinationsCollection> destinations)
{
std::pair<MergeListIndex::iterator, MergeListIndex::const_iterator> pp(
_imp->merge_list_index.equal_range(p.name));
@@ -1362,7 +1362,7 @@ DepList::add_suggested_package(const PackageDatabaseEntry & p,
return;
}
- std::tr1::shared_ptr<SortedCollection<DepListEntryDestination> > our_merge_entry_destinations(
+ tr1::shared_ptr<SortedCollection<DepListEntryDestination> > our_merge_entry_destinations(
new SortedCollection<DepListEntryDestination>::Concrete);
our_merge_entry_destinations->insert(DepListEntryDestination(find_destination(p, destinations),
_imp->merge_list_generation));
@@ -1375,22 +1375,22 @@ DepList::add_suggested_package(const PackageDatabaseEntry & p,
p.repository)->version_metadata(p.name, p.version))
.generation(_imp->merge_list_generation)
.state(dle_has_all_deps)
- .tags(std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
+ .tags(tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
.destinations(our_merge_entry_destinations)
.associated_entry(&*_imp->current_merge_list_entry)
.kind(dlk_suggested)));
if (_imp->current_pde())
our_merge_entry_position->tags->insert(DepTagEntry::create()
- .tag(std::tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
+ .tag(tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
.generation(_imp->merge_list_generation));
_imp->merge_list_index.insert(std::make_pair(p.name, our_merge_entry_position));
}
void
-DepList::add_predeps(std::tr1::shared_ptr<const DepSpec> d, const DepListDepsOption opt, const std::string & s,
- std::tr1::shared_ptr<const DestinationsCollection> destinations)
+DepList::add_predeps(tr1::shared_ptr<const DepSpec> d, const DepListDepsOption opt, const std::string & s,
+ tr1::shared_ptr<const DestinationsCollection> destinations)
{
if (dl_deps_pre == opt || dl_deps_pre_or_post == opt)
{
@@ -1410,8 +1410,8 @@ DepList::add_predeps(std::tr1::shared_ptr<const DepSpec> d, const DepListDepsOpt
}
void
-DepList::add_postdeps(std::tr1::shared_ptr<const DepSpec> d, const DepListDepsOption opt, const std::string & s,
- std::tr1::shared_ptr<const DestinationsCollection> destinations)
+DepList::add_postdeps(tr1::shared_ptr<const DepSpec> d, const DepListDepsOption opt, const std::string & s,
+ tr1::shared_ptr<const DestinationsCollection> destinations)
{
if (dl_deps_pre_or_post == opt || dl_deps_post == opt || dl_deps_try_post == opt)
{
@@ -1443,13 +1443,13 @@ DepList::add_postdeps(std::tr1::shared_ptr<const DepSpec> d, const DepListDepsOp
}
void
-DepList::add_already_installed_package(const PackageDatabaseEntry & p, std::tr1::shared_ptr<const DepTag> tag,
- const std::tr1::shared_ptr<const DestinationsCollection> destinations)
+DepList::add_already_installed_package(const PackageDatabaseEntry & p, tr1::shared_ptr<const DepTag> tag,
+ const tr1::shared_ptr<const DestinationsCollection> destinations)
{
Context context("When adding installed package '" + stringify(p) + "':");
Save<MergeList::iterator> save_merge_list_insert_position(&_imp->merge_list_insert_position);
- std::tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(
p.repository)->version_metadata(p.name, p.version));
MergeList::iterator our_merge_entry(_imp->merge_list.insert(_imp->merge_list_insert_position,
@@ -1457,9 +1457,9 @@ DepList::add_already_installed_package(const PackageDatabaseEntry & p, std::tr1:
.package(p)
.metadata(metadata)
.generation(_imp->merge_list_generation)
- .tags(std::tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
+ .tags(tr1::shared_ptr<DepListEntryTags>(new DepListEntryTags::Concrete))
.state(dle_has_pre_deps)
- .destinations(std::tr1::shared_ptr<SortedCollection<DepListEntryDestination> >(
+ .destinations(tr1::shared_ptr<SortedCollection<DepListEntryDestination> >(
new SortedCollection<DepListEntryDestination>::Concrete))
.associated_entry(0)
.kind(dlk_already_installed)));
@@ -1472,7 +1472,7 @@ DepList::add_already_installed_package(const PackageDatabaseEntry & p, std::tr1:
if (_imp->opts->dependency_tags && _imp->current_pde())
our_merge_entry->tags->insert(DepTagEntry::create()
- .tag(std::tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
+ .tag(tr1::shared_ptr<DepTag>(new DependencyDepTag(*_imp->current_pde())))
.generation(_imp->merge_list_generation));
Save<MergeList::const_iterator> save_current_merge_list_entry(&_imp->current_merge_list_entry,
@@ -1625,7 +1625,7 @@ DepList::prefer_installed_over_uninstalled(const PackageDatabaseEntry & installe
}
bool
-DepList::already_installed(const DepSpec & spec, std::tr1::shared_ptr<const DestinationsCollection> destinations) const
+DepList::already_installed(const DepSpec & spec, tr1::shared_ptr<const DestinationsCollection> destinations) const
{
QueryVisitor visitor(this, destinations);
spec.accept(&visitor);
@@ -1688,9 +1688,9 @@ DepList::has_errors() const
return end() != std::find_if(begin(), end(), IsError());
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
DepList::find_destination(const PackageDatabaseEntry & p,
- std::tr1::shared_ptr<const DestinationsCollection> dd)
+ tr1::shared_ptr<const DestinationsCollection> dd)
{
for (DestinationsCollection::Iterator d(dd->begin()), d_end(dd->end()) ;
d != d_end ; ++d)
@@ -1701,10 +1701,10 @@ DepList::find_destination(const PackageDatabaseEntry & p,
throw NoDestinationError(p, dd);
}
-std::tr1::shared_ptr<DestinationsCollection>
-paludis::extract_dep_list_entry_destinations(std::tr1::shared_ptr<SortedCollection<DepListEntryDestination> > d)
+tr1::shared_ptr<DestinationsCollection>
+paludis::extract_dep_list_entry_destinations(tr1::shared_ptr<SortedCollection<DepListEntryDestination> > d)
{
- std::tr1::shared_ptr<DestinationsCollection> result(new DestinationsCollection::Concrete);
+ tr1::shared_ptr<DestinationsCollection> result(new DestinationsCollection::Concrete);
for (SortedCollection<DepListEntryDestination>::Iterator i(d->begin()), i_end(d->end()) ;
i != i_end ; ++i)
result->insert(i->destination);
diff --git a/paludis/dep_list/dep_list.hh b/paludis/dep_list/dep_list.hh
index 836bd42..8377bef 100644
--- a/paludis/dep_list/dep_list.hh
+++ b/paludis/dep_list/dep_list.hh
@@ -62,14 +62,14 @@ namespace paludis
/**
* Find an appropriate destination for a package.
*/
- std::tr1::shared_ptr<Repository> find_destination(const PackageDatabaseEntry &,
- std::tr1::shared_ptr<const DestinationsCollection>);
+ tr1::shared_ptr<Repository> find_destination(const PackageDatabaseEntry &,
+ tr1::shared_ptr<const DestinationsCollection>);
/**
* Add a DepSpec with role context.
*/
- void add_in_role(std::tr1::shared_ptr<const DepSpec>, const std::string & role,
- std::tr1::shared_ptr<const DestinationsCollection>);
+ void add_in_role(tr1::shared_ptr<const DepSpec>, const std::string & role,
+ tr1::shared_ptr<const DestinationsCollection>);
/**
* Return whether we prefer the first parameter, which is installed,
@@ -81,14 +81,14 @@ namespace paludis
/**
* Add a package to the list.
*/
- void add_package(const PackageDatabaseEntry &, std::tr1::shared_ptr<const DepTag>,
- std::tr1::shared_ptr<const DestinationsCollection> destinations);
+ void add_package(const PackageDatabaseEntry &, tr1::shared_ptr<const DepTag>,
+ tr1::shared_ptr<const DestinationsCollection> destinations);
/**
* Add an already installed package to the list.
*/
- void add_already_installed_package(const PackageDatabaseEntry &, std::tr1::shared_ptr<const DepTag>,
- std::tr1::shared_ptr<const DestinationsCollection> destinations);
+ void add_already_installed_package(const PackageDatabaseEntry &, tr1::shared_ptr<const DepTag>,
+ tr1::shared_ptr<const DestinationsCollection> destinations);
/**
* Add an error package to the list.
@@ -99,19 +99,19 @@ namespace paludis
* Add a suggested package to the list.
*/
void add_suggested_package(const PackageDatabaseEntry &,
- std::tr1::shared_ptr<const DestinationsCollection> destinations);
+ tr1::shared_ptr<const DestinationsCollection> destinations);
/**
* Add predependencies.
*/
- void add_predeps(std::tr1::shared_ptr<const DepSpec>, const DepListDepsOption, const std::string &,
- std::tr1::shared_ptr<const DestinationsCollection> destinations);
+ void add_predeps(tr1::shared_ptr<const DepSpec>, const DepListDepsOption, const std::string &,
+ tr1::shared_ptr<const DestinationsCollection> destinations);
/**
* Add postdependencies.
*/
- void add_postdeps(std::tr1::shared_ptr<const DepSpec>, const DepListDepsOption, const std::string &,
- std::tr1::shared_ptr<const DestinationsCollection> destinations);
+ void add_postdeps(tr1::shared_ptr<const DepSpec>, const DepListDepsOption, const std::string &,
+ tr1::shared_ptr<const DestinationsCollection> destinations);
/**
* Return whether the specified PackageDatabaseEntry is matched by
@@ -132,14 +132,14 @@ namespace paludis
/**
* Our options.
*/
- std::tr1::shared_ptr<DepListOptions> options();
+ tr1::shared_ptr<DepListOptions> options();
/**
* Add the packages required to resolve an additional dependency
* spec.
*/
- void add(std::tr1::shared_ptr<const DepSpec>,
- std::tr1::shared_ptr<const DestinationsCollection> target_destinations);
+ void add(tr1::shared_ptr<const DepSpec>,
+ tr1::shared_ptr<const DestinationsCollection> target_destinations);
/**
* Clear the list.
@@ -150,7 +150,7 @@ namespace paludis
* Return whether a spec structure is already installed.
*/
bool already_installed(const DepSpec &,
- std::tr1::shared_ptr<const DestinationsCollection> target_destinations) const;
+ tr1::shared_ptr<const DestinationsCollection> target_destinations) const;
/**
* Whether we have any errors.
@@ -174,8 +174,8 @@ namespace paludis
*
* \ingroup grpdepresolver
*/
- std::tr1::shared_ptr<DestinationsCollection> extract_dep_list_entry_destinations(
- std::tr1::shared_ptr<SortedCollection<DepListEntryDestination> >) PALUDIS_VISIBLE;
+ tr1::shared_ptr<DestinationsCollection> extract_dep_list_entry_destinations(
+ tr1::shared_ptr<SortedCollection<DepListEntryDestination> >) PALUDIS_VISIBLE;
}
#endif
diff --git a/paludis/dep_list/dep_list.sr b/paludis/dep_list/dep_list.sr
index 3e8b0e1..1b43d23 100644
--- a/paludis/dep_list/dep_list.sr
+++ b/paludis/dep_list/dep_list.sr
@@ -51,7 +51,7 @@ make_class_DepListEntryDestination()
{
visible
- key destination "std::tr1::shared_ptr<Repository>"
+ key destination "tr1::shared_ptr<Repository>"
key generation long
allow_named_args
@@ -78,9 +78,9 @@ make_class_DepListEntry()
key package PackageDatabaseEntry
key associated_entry "const DepListEntry *"
- key metadata "std::tr1::shared_ptr<const VersionMetadata>"
- key tags "std::tr1::shared_ptr<DepListEntryTags>"
- key destinations "std::tr1::shared_ptr<SortedCollection<DepListEntryDestination> >"
+ key metadata "tr1::shared_ptr<const VersionMetadata>"
+ key tags "tr1::shared_ptr<DepListEntryTags>"
+ key destinations "tr1::shared_ptr<SortedCollection<DepListEntryDestination> >"
key generation long
key state DepListEntryState
diff --git a/paludis/dep_list/dep_list_TEST.cc b/paludis/dep_list/dep_list_TEST.cc
index f4742c3..a2ccbba 100644
--- a/paludis/dep_list/dep_list_TEST.cc
+++ b/paludis/dep_list/dep_list_TEST.cc
@@ -1276,9 +1276,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> destination_repo(new FakeInstalledRepository(&env,
+ tr1::shared_ptr<FakeInstalledRepository> destination_repo(new FakeInstalledRepository(&env,
RepositoryName("installed_repo")));
env.package_database()->add_repository(2, destination_repo);
@@ -1314,9 +1314,9 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
- std::tr1::shared_ptr<FakeInstalledRepository> destination_repo(new FakeInstalledRepository(&env,
+ tr1::shared_ptr<FakeInstalledRepository> destination_repo(new FakeInstalledRepository(&env,
RepositoryName("installed_repo")));
env.package_database()->add_repository(2, destination_repo);
@@ -1353,11 +1353,11 @@ namespace test_cases
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
repo->add_version("cat", "one", "1");
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(
+ tr1::shared_ptr<FakeInstalledRepository> installed_repo(
new FakeInstalledRepository(&env, RepositoryName("installed_repo")));
env.package_database()->add_repository(2, installed_repo);
installed_repo->add_version("cat", "one", "2");
@@ -1379,11 +1379,11 @@ namespace test_cases
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
repo->add_version("cat", "one", "1")->deps_interface->set_build_depend("cat/two");
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(
+ tr1::shared_ptr<FakeInstalledRepository> installed_repo(
new FakeInstalledRepository(&env, RepositoryName("installed_repo")));
env.package_database()->add_repository(2, installed_repo);
installed_repo->add_version("cat", "two", "2");
@@ -1406,11 +1406,11 @@ namespace test_cases
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
repo->add_version("cat", "one", "1")->deps_interface->set_build_depend("cat/two");
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(
+ tr1::shared_ptr<FakeInstalledRepository> installed_repo(
new FakeInstalledRepository(&env, RepositoryName("installed_repo")));
env.package_database()->add_repository(2, installed_repo);
installed_repo->add_version("cat", "two", "2");
@@ -1434,11 +1434,11 @@ namespace test_cases
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
repo->add_version("cat", "one", "1")->deps_interface->set_build_depend("cat/two");
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(
+ tr1::shared_ptr<FakeInstalledRepository> installed_repo(
new FakeInstalledRepository(&env, RepositoryName("installed_repo")));
env.package_database()->add_repository(2, installed_repo);
installed_repo->add_version("cat", "two", "2");
@@ -1479,12 +1479,12 @@ namespace test_cases
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
repo->add_version("cat", "one", "1")->deps_interface->set_build_depend("cat/two");
repo->add_version("cat", "two", "2");
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(
+ tr1::shared_ptr<FakeInstalledRepository> installed_repo(
new FakeInstalledRepository(&env, RepositoryName("installed_repo")));
env.package_database()->add_repository(2, installed_repo);
installed_repo->add_version("cat", "two", "0");
@@ -1512,7 +1512,7 @@ namespace test_cases
{
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
+ tr1::shared_ptr<FakeRepository> repo(new FakeRepository(&env, RepositoryName("repo")));
env.package_database()->add_repository(1, repo);
repo->add_version("cat", "zero", "1")->deps_interface->set_build_depend(
"( cat/one cat/two cat/three-live cat/four-cvs cat/five-svn cat/six-darcs )");
@@ -1523,7 +1523,7 @@ namespace test_cases
repo->add_version("cat", "five-svn", "0");
repo->add_version("cat", "six-darcs", "0");
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(
+ tr1::shared_ptr<FakeInstalledRepository> installed_repo(
new FakeInstalledRepository(&env, RepositoryName("installed_repo")));
env.package_database()->add_repository(2, installed_repo);
installed_repo->add_version("cat", "one", "scm");
diff --git a/paludis/dep_list/dep_list_TEST.hh b/paludis/dep_list/dep_list_TEST.hh
index 965b4b7..9a2c528 100644
--- a/paludis/dep_list/dep_list_TEST.hh
+++ b/paludis/dep_list/dep_list_TEST.hh
@@ -86,10 +86,10 @@ namespace test_cases
{
protected:
TestEnvironment env;
- std::tr1::shared_ptr<FakeRepository> repo;
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo;
- std::tr1::shared_ptr<VirtualsRepository> virtuals_repo;
- std::tr1::shared_ptr<InstalledVirtualsRepository> installed_virtuals_repo;
+ tr1::shared_ptr<FakeRepository> repo;
+ tr1::shared_ptr<FakeInstalledRepository> installed_repo;
+ tr1::shared_ptr<VirtualsRepository> virtuals_repo;
+ tr1::shared_ptr<InstalledVirtualsRepository> installed_virtuals_repo;
std::list<std::string> expected;
std::string merge_target;
bool done_populate;
diff --git a/paludis/dep_list/dep_list_TEST_blockers.cc b/paludis/dep_list/dep_list_TEST_blockers.cc
index a01b41d..243edbd 100644
--- a/paludis/dep_list/dep_list_TEST_blockers.cc
+++ b/paludis/dep_list/dep_list_TEST_blockers.cc
@@ -83,7 +83,7 @@ namespace test_cases
void populate_repo()
{
repo->add_version("cat", "one", "1")->deps_interface->set_build_depend("cat/two");
- std::tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "1"));
+ tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "1"));
two_m->deps_interface->set_build_depend("!virtual/two");
two_m->ebuild_interface->set_provide("virtual/two");
}
@@ -104,7 +104,7 @@ namespace test_cases
void populate_repo()
{
repo->add_version("cat", "one", "1")->deps_interface->set_build_depend("cat/two");
- std::tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "1"));
+ tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "1"));
two_m->deps_interface->set_build_depend("!virtual/two");
two_m->ebuild_interface->set_provide("virtual/two");
installed_repo->add_version("other", "two", "1")->ebuild_interface->set_provide("virtual/two");
@@ -211,11 +211,11 @@ namespace test_cases
void populate_repo()
{
- std::tr1::shared_ptr<VersionMetadata> one_m(repo->add_version("cat", "one", "1"));
+ tr1::shared_ptr<VersionMetadata> one_m(repo->add_version("cat", "one", "1"));
one_m->ebuild_interface->set_provide("virtual/one");
one_m->deps_interface->set_build_depend("!virtual/one");
one_m->deps_interface->set_run_depend("!virtual/one");
- std::tr1::shared_ptr<VersionMetadata> i_one_m(installed_repo->add_version("cat", "one", "1"));
+ tr1::shared_ptr<VersionMetadata> i_one_m(installed_repo->add_version("cat", "one", "1"));
i_one_m->ebuild_interface->set_provide("virtual/one");
i_one_m->deps_interface->set_run_depend("!virtual/one");
}
@@ -234,11 +234,11 @@ namespace test_cases
void populate_repo()
{
- std::tr1::shared_ptr<VersionMetadata> one_m(repo->add_version("cat", "one", "1"));
+ tr1::shared_ptr<VersionMetadata> one_m(repo->add_version("cat", "one", "1"));
one_m->ebuild_interface->set_provide("virtual/one");
one_m->deps_interface->set_build_depend("!virtual/one");
one_m->deps_interface->set_run_depend("!virtual/one");
- std::tr1::shared_ptr<VersionMetadata> i_one_m(installed_repo->add_version("cat", "one", "1"));
+ tr1::shared_ptr<VersionMetadata> i_one_m(installed_repo->add_version("cat", "one", "1"));
i_one_m->ebuild_interface->set_provide("virtual/one");
i_one_m->deps_interface->set_run_depend("!virtual/one");
}
@@ -263,7 +263,7 @@ namespace test_cases
void populate_repo()
{
repo->add_version("cat", "one", "1")->deps_interface->set_build_depend("cat/two");
- std::tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "2"));
+ tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "2"));
two_m->ebuild_interface->set_provide("virtual/two");
two_m->deps_interface->set_build_depend("!virtual/two");
installed_repo->add_version("cat", "two", "1")->ebuild_interface->set_provide("virtual/two");
@@ -312,7 +312,7 @@ namespace test_cases
void populate_repo()
{
repo->add_version("cat", "one", "1")->deps_interface->set_build_depend("cat/two");
- std::tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "2"));
+ tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "2"));
two_m->deps_interface->set_build_depend("!<virtual/two-2");
two_m->ebuild_interface->set_provide("virtual/two");
installed_repo->add_version("cat", "two", "1")->ebuild_interface->set_provide("virtual/two");
@@ -341,7 +341,7 @@ namespace test_cases
void populate_repo()
{
repo->add_version("cat", "one", "1")->deps_interface->set_build_depend("cat/two");
- std::tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "2"));
+ tr1::shared_ptr<VersionMetadata> two_m(repo->add_version("cat", "two", "2"));
two_m->deps_interface->set_build_depend("!<virtual/two-2");
two_m->ebuild_interface->set_provide("virtual/two");
installed_repo->add_version("other", "two", "1")->ebuild_interface->set_provide("virtual/two");
diff --git a/paludis/dep_list/exceptions.cc b/paludis/dep_list/exceptions.cc
index 4e7555e..32a4945 100644
--- a/paludis/dep_list/exceptions.cc
+++ b/paludis/dep_list/exceptions.cc
@@ -60,7 +60,7 @@ DowngradeNotAllowedError::~DowngradeNotAllowedError() throw ()
namespace
{
std::string
- destinations_to_string(std::tr1::shared_ptr<const DestinationsCollection> dd)
+ destinations_to_string(tr1::shared_ptr<const DestinationsCollection> dd)
{
std::string result;
bool need_comma(false);
@@ -78,7 +78,7 @@ namespace
}
NoDestinationError::NoDestinationError(const PackageDatabaseEntry & p,
- std::tr1::shared_ptr<const DestinationsCollection> d) throw () :
+ tr1::shared_ptr<const DestinationsCollection> d) throw () :
DepListError("No suitable destination for '" + stringify(p) + "' in (" +
destinations_to_string(d) + ")")
{
diff --git a/paludis/dep_list/exceptions.hh b/paludis/dep_list/exceptions.hh
index d33be97..0130ca3 100644
--- a/paludis/dep_list/exceptions.hh
+++ b/paludis/dep_list/exceptions.hh
@@ -181,7 +181,7 @@ namespace paludis
///\{
NoDestinationError(const PackageDatabaseEntry &,
- std::tr1::shared_ptr<const DestinationsCollection>) throw ();
+ tr1::shared_ptr<const DestinationsCollection>) throw ();
///\}
};
diff --git a/paludis/dep_list/range_rewriter.hh b/paludis/dep_list/range_rewriter.hh
index f146cd2..840dfb0 100644
--- a/paludis/dep_list/range_rewriter.hh
+++ b/paludis/dep_list/range_rewriter.hh
@@ -36,7 +36,7 @@ namespace paludis
public DepSpecVisitorTypes::ConstVisitor
{
private:
- std::tr1::shared_ptr<PackageDepSpec> _spec;
+ tr1::shared_ptr<PackageDepSpec> _spec;
bool _invalid;
public:
@@ -52,10 +52,10 @@ namespace paludis
* Our rewritten spec, or a zero pointer if we couldn't do any
* rewriting.
*/
- std::tr1::shared_ptr<const PackageDepSpec> spec() const
+ tr1::shared_ptr<const PackageDepSpec> spec() const
{
if (_invalid)
- return std::tr1::shared_ptr<const PackageDepSpec>();
+ return tr1::shared_ptr<const PackageDepSpec>();
return _spec;
}
diff --git a/paludis/dep_list/range_rewriter_TEST.cc b/paludis/dep_list/range_rewriter_TEST.cc
index 36f8f77..57e59b4 100644
--- a/paludis/dep_list/range_rewriter_TEST.cc
+++ b/paludis/dep_list/range_rewriter_TEST.cc
@@ -39,7 +39,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const CompositeDepSpec> p(PortageDepParser::parse_depend("=a/b-1 =a/b-2", pds_pm_permissive));
+ tr1::shared_ptr<const CompositeDepSpec> p(PortageDepParser::parse_depend("=a/b-1 =a/b-2", pds_pm_permissive));
RangeRewriter r;
TEST_CHECK(! r.spec());
diff --git a/paludis/dep_list/uninstall_list.cc b/paludis/dep_list/uninstall_list.cc
index 49aa38e..dd8fc6f 100644
--- a/paludis/dep_list/uninstall_list.cc
+++ b/paludis/dep_list/uninstall_list.cc
@@ -63,7 +63,7 @@ namespace paludis
UninstallListOptions options;
std::list<UninstallListEntry> uninstall_list;
- mutable MakeHashedMap<PackageDatabaseEntry, std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> >::Type
+ mutable MakeHashedMap<PackageDatabaseEntry, tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> >::Type
dep_collector_cache;
Implementation(const Environment * const e, const UninstallListOptions & o) :
@@ -110,7 +110,7 @@ UninstallList::add(const PackageDatabaseEntry & e, const PackageDatabaseEntry *
_imp->uninstall_list.end(), MatchUninstallListEntry(e)))))
{
if (t)
- i->tags->insert(std::tr1::shared_ptr<DepTag>(new DependencyDepTag(*t)));
+ i->tags->insert(tr1::shared_ptr<DepTag>(new DependencyDepTag(*t)));
return;
}
@@ -133,10 +133,10 @@ UninstallList::add_unused()
{
Context context("When finding unused packages:");
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> world(collect_world()),
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> world(collect_world()),
everything(collect_all_installed());
- std::tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection>
+ tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection>
world_plus_deps(new ArbitrarilyOrderedPackageDatabaseEntryCollection::Concrete),
unused(new ArbitrarilyOrderedPackageDatabaseEntryCollection::Concrete);
@@ -146,7 +146,7 @@ UninstallList::add_unused()
while (old_size != world_plus_deps->size())
{
old_size = world_plus_deps->size();
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> new_world_deps(collect_depped_upon(world_plus_deps));
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> new_world_deps(collect_depped_upon(world_plus_deps));
world_plus_deps->insert(new_world_deps->begin(), new_world_deps->end());
}
@@ -182,15 +182,15 @@ UninstallList::add_package(const PackageDatabaseEntry & e, const PackageDatabase
{
Context context("When adding package '" + stringify(e) + "' to the uninstall list:");
- std::tr1::shared_ptr<const VersionMetadata> m(_imp->env->package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> m(_imp->env->package_database()->fetch_repository(
e.repository)->version_metadata(e.name, e.version));
std::list<UninstallListEntry>::iterator i(_imp->uninstall_list.insert(
_imp->uninstall_list.end(), UninstallListEntry(
- e, m->virtual_interface, std::tr1::shared_ptr<SortedCollection<std::tr1::shared_ptr<DepTag> > >(
- new SortedCollection<std::tr1::shared_ptr<DepTag> >::Concrete))));
+ e, m->virtual_interface, tr1::shared_ptr<SortedCollection<tr1::shared_ptr<DepTag> > >(
+ new SortedCollection<tr1::shared_ptr<DepTag> >::Concrete))));
if (t)
- i->tags->insert(std::tr1::shared_ptr<DepTag>(new DependencyDepTag(*t)));
+ i->tags->insert(tr1::shared_ptr<DepTag>(new DependencyDepTag(*t)));
}
void
@@ -204,12 +204,12 @@ UninstallList::move_package_to_end(const PackageDatabaseEntry & e)
_imp->uninstall_list.splice(_imp->uninstall_list.end(), _imp->uninstall_list, i);
}
-std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>
+tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>
UninstallList::collect_all_installed() const
{
Context context("When collecting all installed packages:");
- std::tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> result(
+ tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> result(
new ArbitrarilyOrderedPackageDatabaseEntryCollection::Concrete);
for (PackageDatabase::RepositoryIterator i(_imp->env->package_database()->begin_repositories()),
i_end(_imp->env->package_database()->end_repositories()) ; i != i_end ; ++i)
@@ -217,15 +217,15 @@ UninstallList::collect_all_installed() const
if (! (*i)->installed_interface)
continue;
- std::tr1::shared_ptr<const CategoryNamePartCollection> cats((*i)->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cats((*i)->category_names());
for (CategoryNamePartCollection::Iterator c(cats->begin()), c_end(cats->end()) ;
c != c_end ; ++c)
{
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs((*i)->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs((*i)->package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(pkgs->begin()), p_end(pkgs->end()) ;
p != p_end ; ++p)
{
- std::tr1::shared_ptr<const VersionSpecCollection> vers((*i)->version_specs(*p));
+ tr1::shared_ptr<const VersionSpecCollection> vers((*i)->version_specs(*p));
for (VersionSpecCollection::Iterator v(vers->begin()), v_end(vers->end()) ;
v != v_end ; ++v)
result->insert(PackageDatabaseEntry(*p, *v, (*i)->name()));
@@ -248,7 +248,7 @@ namespace
const Environment * const env;
const PackageDatabaseEntry pkg;
- std::tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> matches;
+ tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> matches;
DepCollector(const Environment * const ee, const PackageDatabaseEntry & e) :
env(ee),
@@ -259,7 +259,7 @@ namespace
void visit(const PackageDepSpec * const a)
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> m(env->package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> m(env->package_database()->query(
*a, is_installed_only, qo_order_by_version));
matches->insert(m->begin(), m->end());
}
@@ -281,12 +281,12 @@ namespace
};
}
-std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>
-UninstallList::collect_depped_upon(std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> targets) const
+tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>
+UninstallList::collect_depped_upon(tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> targets) const
{
Context context("When collecting depended upon packages:");
- std::tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> result(
+ tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> result(
new ArbitrarilyOrderedPackageDatabaseEntryCollection::Concrete);
for (PackageDatabaseEntryCollection::Iterator i(targets->begin()), i_end(targets->end()) ;
@@ -295,13 +295,13 @@ UninstallList::collect_depped_upon(std::tr1::shared_ptr<const ArbitrarilyOrdered
Context local_context("When collecting depended upon packages for '" + stringify(*i) + "':");
MakeHashedMap<PackageDatabaseEntry,
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> >::Type::const_iterator
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> >::Type::const_iterator
cache(_imp->dep_collector_cache.find(*i));
if (cache == _imp->dep_collector_cache.end())
{
DepCollector c(_imp->env, *i);
- std::tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(
i->repository)->version_metadata(i->name, i->version));
if (metadata->deps_interface)
{
@@ -311,7 +311,7 @@ UninstallList::collect_depped_upon(std::tr1::shared_ptr<const ArbitrarilyOrdered
metadata->deps_interface->suggested_depend()->accept(&c);
}
cache = _imp->dep_collector_cache.insert(std::make_pair(*i,
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>(c.matches))).first;
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>(c.matches))).first;
}
result->insert(cache->second->begin(), cache->second->end());
@@ -326,23 +326,23 @@ UninstallList::add_unused_dependencies()
Context context("When adding unused dependencies:");
bool added(true);
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> everything(collect_all_installed());
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> everything(collect_all_installed());
while (added)
{
added = false;
/* find packages that're depped upon by anything in our uninstall list */
- std::tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> uninstall_list_targets(
+ tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> uninstall_list_targets(
new ArbitrarilyOrderedPackageDatabaseEntryCollection::Concrete);
for (std::list<UninstallListEntry>::const_iterator i(_imp->uninstall_list.begin()),
i_end(_imp->uninstall_list.end()) ; i != i_end ; ++i)
uninstall_list_targets->insert(i->package);
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> depped_upon_list(
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> depped_upon_list(
collect_depped_upon(uninstall_list_targets));
/* find packages that're depped upon by anything not in our uninstall list */
- std::tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> everything_except_uninstall_list_targets(
+ tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> everything_except_uninstall_list_targets(
new ArbitrarilyOrderedPackageDatabaseEntryCollection::Concrete);
std::set_difference(everything->begin(), everything->end(),
uninstall_list_targets->begin(), uninstall_list_targets->end(),
@@ -353,18 +353,18 @@ UninstallList::add_unused_dependencies()
+ join(everything_except_uninstall_list_targets->begin(),
everything_except_uninstall_list_targets->end(), " ") + "'");
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> depped_upon_not_list(
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> depped_upon_not_list(
collect_depped_upon(everything_except_uninstall_list_targets));
/* find unused dependencies */
- std::tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> unused_dependencies(
+ tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> unused_dependencies(
new ArbitrarilyOrderedPackageDatabaseEntryCollection::Concrete);
std::set_difference(depped_upon_list->begin(), depped_upon_list->end(),
depped_upon_not_list->begin(), depped_upon_not_list->end(), unused_dependencies->inserter(),
ArbitrarilyOrderedPackageDatabaseEntryCollectionComparator());
/* if any of them aren't already on the list, and aren't in world, add them and recurse */
- std::tr1::shared_ptr<DepSpec> world(_imp->env->set(SetName("world")));
+ tr1::shared_ptr<DepSpec> world(_imp->env->set(SetName("world")));
for (PackageDatabaseEntryCollection::Iterator i(unused_dependencies->begin()),
i_end(unused_dependencies->end()) ; i != i_end ; ++i)
{
@@ -386,20 +386,20 @@ UninstallList::add_dependencies(const PackageDatabaseEntry & e)
{
Context context("When adding things that depend upon '" + stringify(e) + "':");
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> everything(collect_all_installed());
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> everything(collect_all_installed());
for (PackageDatabaseEntryCollection::Iterator i(everything->begin()),
i_end(everything->end()) ; i != i_end ; ++i)
{
Context local_context("When seeing whether '" + stringify(*i) + "' has a dep:");
MakeHashedMap<PackageDatabaseEntry,
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> >::Type::const_iterator
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> >::Type::const_iterator
cache(_imp->dep_collector_cache.find(*i));
if (cache == _imp->dep_collector_cache.end())
{
DepCollector c(_imp->env, *i);
- std::tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> metadata(_imp->env->package_database()->fetch_repository(
i->repository)->version_metadata(i->name, i->version));
if (metadata->deps_interface)
{
@@ -409,7 +409,7 @@ UninstallList::add_dependencies(const PackageDatabaseEntry & e)
metadata->deps_interface->suggested_depend()->accept(&c);
}
cache = _imp->dep_collector_cache.insert(std::make_pair(*i,
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>(c.matches))).first;
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>(c.matches))).first;
}
if (cache->second->end() == cache->second->find(e))
@@ -422,16 +422,16 @@ UninstallList::add_dependencies(const PackageDatabaseEntry & e)
}
}
-std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>
+tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection>
UninstallList::collect_world() const
{
Context local_context("When collecting world packages:");
- std::tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> result(
+ tr1::shared_ptr<ArbitrarilyOrderedPackageDatabaseEntryCollection> result(
new ArbitrarilyOrderedPackageDatabaseEntryCollection::Concrete);
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> everything(collect_all_installed());
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> everything(collect_all_installed());
- std::tr1::shared_ptr<DepSpec> world(_imp->env->set(SetName("world")));
+ tr1::shared_ptr<DepSpec> world(_imp->env->set(SetName("world")));
for (PackageDatabaseEntryCollection::Iterator i(everything->begin()),
i_end(everything->end()) ; i != i_end ; ++i)
if (match_package_in_heirarchy(*_imp->env, *world, *i))
diff --git a/paludis/dep_list/uninstall_list.hh b/paludis/dep_list/uninstall_list.hh
index 24519eb..74a5d7f 100644
--- a/paludis/dep_list/uninstall_list.hh
+++ b/paludis/dep_list/uninstall_list.hh
@@ -50,12 +50,12 @@ namespace paludis
void add_unused_dependencies();
void add_dependencies(const PackageDatabaseEntry &);
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> collect_depped_upon(
- const std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> targets) const;
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> collect_depped_upon(
+ const tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> targets) const;
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> collect_all_installed() const;
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> collect_all_installed() const;
- std::tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> collect_world() const;
+ tr1::shared_ptr<const ArbitrarilyOrderedPackageDatabaseEntryCollection> collect_world() const;
public:
///\name Basic operations
diff --git a/paludis/dep_list/uninstall_list.sr b/paludis/dep_list/uninstall_list.sr
index 71f6242..321d58f 100644
--- a/paludis/dep_list/uninstall_list.sr
+++ b/paludis/dep_list/uninstall_list.sr
@@ -31,7 +31,7 @@ make_class_UninstallListEntry()
key package PackageDatabaseEntry
key skip_uninstall bool
- key tags "std::tr1::shared_ptr<SortedCollection<std::tr1::shared_ptr<DepTag> > >"
+ key tags "tr1::shared_ptr<SortedCollection<tr1::shared_ptr<DepTag> > >"
allow_named_args
diff --git a/paludis/dep_list/uninstall_list_TEST.cc b/paludis/dep_list/uninstall_list_TEST.cc
index bbeae43..45f9f69 100644
--- a/paludis/dep_list/uninstall_list_TEST.cc
+++ b/paludis/dep_list/uninstall_list_TEST.cc
@@ -55,9 +55,9 @@ namespace test_cases
{
protected:
TestEnvironment env;
- std::tr1::shared_ptr<FakeInstalledRepository> installed_repo;
- std::tr1::shared_ptr<VirtualsRepository> virtuals_repo;
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> targets;
+ tr1::shared_ptr<FakeInstalledRepository> installed_repo;
+ tr1::shared_ptr<VirtualsRepository> virtuals_repo;
+ tr1::shared_ptr<PackageDatabaseEntryCollection> targets;
std::list<std::string> expected;
bool done_populate;
diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc
index 392bb1d..7139066 100644
--- a/paludis/dep_spec.cc
+++ b/paludis/dep_spec.cc
@@ -65,7 +65,7 @@ namespace paludis
template<>
struct Implementation<CompositeDepSpec>
{
- std::list<std::tr1::shared_ptr<const DepSpec> > children;
+ std::list<tr1::shared_ptr<const DepSpec> > children;
};
template<>
@@ -73,26 +73,26 @@ namespace paludis
{
bool unique;
- std::tr1::shared_ptr<QualifiedPackageName> package_ptr;
- std::tr1::shared_ptr<CategoryNamePart> category_name_part_ptr;
- std::tr1::shared_ptr<PackageNamePart> package_name_part_ptr;
- std::tr1::shared_ptr<VersionRequirements> version_requirements;
+ tr1::shared_ptr<QualifiedPackageName> package_ptr;
+ tr1::shared_ptr<CategoryNamePart> category_name_part_ptr;
+ tr1::shared_ptr<PackageNamePart> package_name_part_ptr;
+ tr1::shared_ptr<VersionRequirements> version_requirements;
VersionRequirementsMode version_requirements_mode;
- std::tr1::shared_ptr<SlotName> slot;
- std::tr1::shared_ptr<RepositoryName> repository;
- std::tr1::shared_ptr<UseRequirements> use_requirements;
- std::tr1::shared_ptr<const DepTag> tag;
+ tr1::shared_ptr<SlotName> slot;
+ tr1::shared_ptr<RepositoryName> repository;
+ tr1::shared_ptr<UseRequirements> use_requirements;
+ tr1::shared_ptr<const DepTag> tag;
Implementation(
- std::tr1::shared_ptr<QualifiedPackageName> q,
- std::tr1::shared_ptr<CategoryNamePart> c,
- std::tr1::shared_ptr<PackageNamePart> p,
- std::tr1::shared_ptr<VersionRequirements> v,
+ tr1::shared_ptr<QualifiedPackageName> q,
+ tr1::shared_ptr<CategoryNamePart> c,
+ tr1::shared_ptr<PackageNamePart> p,
+ tr1::shared_ptr<VersionRequirements> v,
VersionRequirementsMode m,
- std::tr1::shared_ptr<SlotName> s,
- std::tr1::shared_ptr<RepositoryName> r,
- std::tr1::shared_ptr<UseRequirements> u,
- std::tr1::shared_ptr<const DepTag> t) :
+ tr1::shared_ptr<SlotName> s,
+ tr1::shared_ptr<RepositoryName> r,
+ tr1::shared_ptr<UseRequirements> u,
+ tr1::shared_ptr<const DepTag> t) :
unique(false),
package_ptr(q),
category_name_part_ptr(c),
@@ -118,7 +118,7 @@ CompositeDepSpec::~CompositeDepSpec()
}
void
-CompositeDepSpec::add_child(std::tr1::shared_ptr<const DepSpec> c)
+CompositeDepSpec::add_child(tr1::shared_ptr<const DepSpec> c)
{
_imp->children.push_back(c);
}
@@ -179,7 +179,7 @@ PackageDepSpec::as_package_dep_spec() const
return this;
}
-BlockDepSpec::BlockDepSpec(std::tr1::shared_ptr<const PackageDepSpec> a) :
+BlockDepSpec::BlockDepSpec(tr1::shared_ptr<const PackageDepSpec> a) :
StringDepSpec("!" + a->text()),
_spec(a)
{
@@ -188,15 +188,15 @@ BlockDepSpec::BlockDepSpec(std::tr1::shared_ptr<const PackageDepSpec> a) :
PackageDepSpec::PackageDepSpec(const QualifiedPackageName & our_package) :
StringDepSpec(stringify(our_package)),
PrivateImplementationPattern<PackageDepSpec>(new Implementation<PackageDepSpec>(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(our_package)),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(our_package)),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(),
- std::tr1::shared_ptr<RepositoryName>(),
- std::tr1::shared_ptr<UseRequirements>(),
- std::tr1::shared_ptr<const DepTag>()))
+ tr1::shared_ptr<SlotName>(),
+ tr1::shared_ptr<RepositoryName>(),
+ tr1::shared_ptr<UseRequirements>(),
+ tr1::shared_ptr<const DepTag>()))
{
}
@@ -220,15 +220,15 @@ PackageDepSpec::PackageDepSpec(const PackageDepSpec & other) :
PackageDepSpec::PackageDepSpec(const std::string & ss) :
StringDepSpec(ss),
PrivateImplementationPattern<PackageDepSpec>(new Implementation<PackageDepSpec>(
- std::tr1::shared_ptr<QualifiedPackageName>(),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<QualifiedPackageName>(),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(),
- std::tr1::shared_ptr<RepositoryName>(),
- std::tr1::shared_ptr<UseRequirements>(),
- std::tr1::shared_ptr<const DepTag>()))
+ tr1::shared_ptr<SlotName>(),
+ tr1::shared_ptr<RepositoryName>(),
+ tr1::shared_ptr<UseRequirements>(),
+ tr1::shared_ptr<const DepTag>()))
{
_do_parse(ss, pds_pm_permissive);
_imp->unique = true;
@@ -237,30 +237,30 @@ PackageDepSpec::PackageDepSpec(const std::string & ss) :
PackageDepSpec::PackageDepSpec(const std::string & ss, const PackageDepSpecParseMode p) :
StringDepSpec(ss),
PrivateImplementationPattern<PackageDepSpec>(new Implementation<PackageDepSpec>(
- std::tr1::shared_ptr<QualifiedPackageName>(),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<QualifiedPackageName>(),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(),
- std::tr1::shared_ptr<RepositoryName>(),
- std::tr1::shared_ptr<UseRequirements>(),
- std::tr1::shared_ptr<const DepTag>()))
+ tr1::shared_ptr<SlotName>(),
+ tr1::shared_ptr<RepositoryName>(),
+ tr1::shared_ptr<UseRequirements>(),
+ tr1::shared_ptr<const DepTag>()))
{
_do_parse(ss, p);
_imp->unique = true;
}
PackageDepSpec::PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName> q,
- std::tr1::shared_ptr<CategoryNamePart> c,
- std::tr1::shared_ptr<PackageNamePart> p,
- std::tr1::shared_ptr<VersionRequirements> v,
+ tr1::shared_ptr<QualifiedPackageName> q,
+ tr1::shared_ptr<CategoryNamePart> c,
+ tr1::shared_ptr<PackageNamePart> p,
+ tr1::shared_ptr<VersionRequirements> v,
VersionRequirementsMode m,
- std::tr1::shared_ptr<SlotName> s,
- std::tr1::shared_ptr<RepositoryName> r,
- std::tr1::shared_ptr<UseRequirements> u,
- std::tr1::shared_ptr<const DepTag> t) :
+ tr1::shared_ptr<SlotName> s,
+ tr1::shared_ptr<RepositoryName> r,
+ tr1::shared_ptr<UseRequirements> u,
+ tr1::shared_ptr<const DepTag> t) :
StringDepSpec(""),
PrivateImplementationPattern<PackageDepSpec>(new Implementation<PackageDepSpec>(
q, c, p, v, m, s, r, u, t))
@@ -791,40 +791,40 @@ UseRequirements::state(const UseFlagName & u) const
return i->second;
}
-std::tr1::shared_ptr<PackageDepSpec>
+tr1::shared_ptr<PackageDepSpec>
PackageDepSpec::without_use_requirements() const
{
- std::tr1::shared_ptr<PackageDepSpec> result(new PackageDepSpec(*this));
+ tr1::shared_ptr<PackageDepSpec> result(new PackageDepSpec(*this));
result->_make_unique();
result->_imp->use_requirements.reset();
return result;
}
-std::tr1::shared_ptr<const QualifiedPackageName>
+tr1::shared_ptr<const QualifiedPackageName>
PackageDepSpec::package_ptr() const
{
return _imp->package_ptr;
}
-std::tr1::shared_ptr<const PackageNamePart>
+tr1::shared_ptr<const PackageNamePart>
PackageDepSpec::package_name_part_ptr() const
{
return _imp->package_name_part_ptr;
}
-std::tr1::shared_ptr<const CategoryNamePart>
+tr1::shared_ptr<const CategoryNamePart>
PackageDepSpec::category_name_part_ptr() const
{
return _imp->category_name_part_ptr;
}
-std::tr1::shared_ptr<const VersionRequirements>
+tr1::shared_ptr<const VersionRequirements>
PackageDepSpec::version_requirements_ptr() const
{
return _imp->version_requirements;
}
-std::tr1::shared_ptr<VersionRequirements>
+tr1::shared_ptr<VersionRequirements>
PackageDepSpec::version_requirements_ptr()
{
_make_unique();
@@ -843,32 +843,32 @@ PackageDepSpec::set_version_requirements_mode(const VersionRequirementsMode m)
_imp->version_requirements_mode = m;
}
-std::tr1::shared_ptr<const SlotName>
+tr1::shared_ptr<const SlotName>
PackageDepSpec::slot_ptr() const
{
return _imp->slot;
}
-std::tr1::shared_ptr<const RepositoryName>
+tr1::shared_ptr<const RepositoryName>
PackageDepSpec::repository_ptr() const
{
return _imp->repository;
}
-std::tr1::shared_ptr<const UseRequirements>
+tr1::shared_ptr<const UseRequirements>
PackageDepSpec::use_requirements_ptr() const
{
return _imp->use_requirements;
}
-std::tr1::shared_ptr<const DepTag>
+tr1::shared_ptr<const DepTag>
PackageDepSpec::tag() const
{
return _imp->tag;
}
void
-PackageDepSpec::set_tag(const std::tr1::shared_ptr<const DepTag> & s)
+PackageDepSpec::set_tag(const tr1::shared_ptr<const DepTag> & s)
{
_imp->tag = s;
}
@@ -890,7 +890,7 @@ PackageDepSpec::_make_unique()
if (_imp->version_requirements && ! _imp->version_requirements.unique())
{
- std::tr1::shared_ptr<VersionRequirements> v(new VersionRequirements::Concrete);
+ tr1::shared_ptr<VersionRequirements> v(new VersionRequirements::Concrete);
std::copy(_imp->version_requirements->begin(), _imp->version_requirements->end(), v->inserter());
_imp->version_requirements = v;
}
@@ -907,7 +907,7 @@ PackageDepSpec::_make_unique()
_imp->unique = true;
}
-std::tr1::shared_ptr<const PackageDepSpec>
+tr1::shared_ptr<const PackageDepSpec>
BlockDepSpec::blocked_spec() const
{
return _spec;
diff --git a/paludis/dep_spec.hh b/paludis/dep_spec.hh
index f9e85c2..924447e 100644
--- a/paludis/dep_spec.hh
+++ b/paludis/dep_spec.hh
@@ -32,7 +32,7 @@
#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
/** \file
* Declarations for the DepSpec classes.
@@ -116,14 +116,14 @@ namespace paludis
/**
* Append a child to our collection.
*/
- virtual void add_child(std::tr1::shared_ptr<const DepSpec>);
+ virtual void add_child(tr1::shared_ptr<const DepSpec>);
///\}
///\name Iterate over our children
///\{
- typedef libwrapiter::ForwardIterator<CompositeDepSpec, const std::tr1::shared_ptr<const DepSpec> > Iterator;
+ typedef libwrapiter::ForwardIterator<CompositeDepSpec, const tr1::shared_ptr<const DepSpec> > Iterator;
Iterator begin() const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -326,15 +326,15 @@ namespace paludis
PackageDepSpec(const std::string &, const PackageDepSpecParseMode);
explicit PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName> q = std::tr1::shared_ptr<QualifiedPackageName>(),
- std::tr1::shared_ptr<CategoryNamePart> c = std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart> p = std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements> v = std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<QualifiedPackageName> q = tr1::shared_ptr<QualifiedPackageName>(),
+ tr1::shared_ptr<CategoryNamePart> c = tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart> p = tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements> v = tr1::shared_ptr<VersionRequirements>(),
VersionRequirementsMode m = vr_and,
- std::tr1::shared_ptr<SlotName> s = std::tr1::shared_ptr<SlotName>(),
- std::tr1::shared_ptr<RepositoryName> r = std::tr1::shared_ptr<RepositoryName>(),
- std::tr1::shared_ptr<UseRequirements> u = std::tr1::shared_ptr<UseRequirements>(),
- std::tr1::shared_ptr<const DepTag> t = std::tr1::shared_ptr<const DepTag>());
+ tr1::shared_ptr<SlotName> s = tr1::shared_ptr<SlotName>(),
+ tr1::shared_ptr<RepositoryName> r = tr1::shared_ptr<RepositoryName>(),
+ tr1::shared_ptr<UseRequirements> u = tr1::shared_ptr<UseRequirements>(),
+ tr1::shared_ptr<const DepTag> t = tr1::shared_ptr<const DepTag>());
PackageDepSpec(const PackageDepSpec &);
@@ -345,27 +345,27 @@ namespace paludis
/**
* Fetch the package name.
*/
- std::tr1::shared_ptr<const QualifiedPackageName> package_ptr() const;
+ tr1::shared_ptr<const QualifiedPackageName> package_ptr() const;
/**
* Fetch the package name part, if wildcarded.
*/
- std::tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const;
+ tr1::shared_ptr<const PackageNamePart> package_name_part_ptr() const;
/**
* Fetch the category name part, if wildcarded.
*/
- std::tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const;
+ tr1::shared_ptr<const CategoryNamePart> category_name_part_ptr() const;
/**
* Fetch the version requirements (may be a zero pointer).
*/
- std::tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const;
+ tr1::shared_ptr<const VersionRequirements> version_requirements_ptr() const;
/**
* Fetch the version requirements (may be a zero pointer).
*/
- std::tr1::shared_ptr<VersionRequirements> version_requirements_ptr();
+ tr1::shared_ptr<VersionRequirements> version_requirements_ptr();
/**
* Fetch the version requirements mode.
@@ -380,32 +380,32 @@ namespace paludis
/**
* Fetch the slot name (may be a zero pointer).
*/
- std::tr1::shared_ptr<const SlotName> slot_ptr() const;
+ tr1::shared_ptr<const SlotName> slot_ptr() const;
/**
* Fetch the repo name (may be a zero pointer).
*/
- std::tr1::shared_ptr<const RepositoryName> repository_ptr() const;
+ tr1::shared_ptr<const RepositoryName> repository_ptr() const;
/**
* Fetch the use requirements (may be a zero pointer).
*/
- std::tr1::shared_ptr<const UseRequirements> use_requirements_ptr() const;
+ tr1::shared_ptr<const UseRequirements> use_requirements_ptr() const;
/**
* Fetch our tag.
*/
- std::tr1::shared_ptr<const DepTag> tag() const;
+ tr1::shared_ptr<const DepTag> tag() const;
/**
* Set our tag.
*/
- void set_tag(const std::tr1::shared_ptr<const DepTag> & s);
+ void set_tag(const tr1::shared_ptr<const DepTag> & s);
/**
* Fetch a copy of ourself without the USE requirements.
*/
- std::tr1::shared_ptr<PackageDepSpec> without_use_requirements() const;
+ tr1::shared_ptr<PackageDepSpec> without_use_requirements() const;
virtual const PackageDepSpec * as_package_dep_spec() const;
};
@@ -462,20 +462,20 @@ namespace paludis
public Visitable<BlockDepSpec, DepSpecVisitorTypes>
{
private:
- std::tr1::shared_ptr<const PackageDepSpec> _spec;
+ tr1::shared_ptr<const PackageDepSpec> _spec;
public:
///\name Basic operations
///\{
- BlockDepSpec(std::tr1::shared_ptr<const PackageDepSpec> spec);
+ BlockDepSpec(tr1::shared_ptr<const PackageDepSpec> spec);
///\}
/**
* Fetch the spec we're blocking.
*/
- std::tr1::shared_ptr<const PackageDepSpec> blocked_spec() const;
+ tr1::shared_ptr<const PackageDepSpec> blocked_spec() const;
};
}
diff --git a/paludis/dep_spec_TEST.cc b/paludis/dep_spec_TEST.cc
index ac72c68..872a3fc 100644
--- a/paludis/dep_spec_TEST.cc
+++ b/paludis/dep_spec_TEST.cc
@@ -42,10 +42,10 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<PackageDepSpec> x(new PackageDepSpec("foo/bar", pds_pm_permissive));
+ tr1::shared_ptr<PackageDepSpec> x(new PackageDepSpec("foo/bar", pds_pm_permissive));
TEST_CHECK(0 == x->as_use_dep_spec());
- std::tr1::shared_ptr<UseDepSpec> y(new UseDepSpec(UseFlagName("foo"), x));
+ tr1::shared_ptr<UseDepSpec> y(new UseDepSpec(UseFlagName("foo"), x));
TEST_CHECK(0 != y->as_use_dep_spec());
TEST_CHECK(y.get() == y->as_use_dep_spec());
}
@@ -61,14 +61,14 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<AllDepSpec> x(new AllDepSpec);
+ tr1::shared_ptr<AllDepSpec> x(new AllDepSpec);
TEST_CHECK(x->begin() == x->end());
- x->add_child(std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec("x/y", pds_pm_permissive)));
+ x->add_child(tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec("x/y", pds_pm_permissive)));
TEST_CHECK(x->begin() != x->end());
TEST_CHECK_EQUAL(1, std::distance(x->begin(), x->end()));
- x->add_child(std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec("x/y", pds_pm_permissive)));
+ x->add_child(tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec("x/y", pds_pm_permissive)));
TEST_CHECK(x->begin() != x->end());
TEST_CHECK_EQUAL(2, std::distance(x->begin(), x->end()));
}
diff --git a/paludis/dep_spec_flattener.cc b/paludis/dep_spec_flattener.cc
index 43a1e5c..d7e4c82 100644
--- a/paludis/dep_spec_flattener.cc
+++ b/paludis/dep_spec_flattener.cc
@@ -44,7 +44,7 @@ namespace paludis
const PackageDatabaseEntry * const pkg;
- std::tr1::shared_ptr<const DepSpec> a;
+ tr1::shared_ptr<const DepSpec> a;
mutable std::list<const StringDepSpec *> specs;
@@ -52,7 +52,7 @@ namespace paludis
Implementation(const Environment * const e,
const PackageDatabaseEntry * const p,
- std::tr1::shared_ptr<const DepSpec> aa) :
+ tr1::shared_ptr<const DepSpec> aa) :
env(e),
pkg(p),
a(aa),
@@ -65,7 +65,7 @@ namespace paludis
DepSpecFlattener::DepSpecFlattener(
const Environment * const env,
const PackageDatabaseEntry * const pkg,
- std::tr1::shared_ptr<const DepSpec> a) :
+ tr1::shared_ptr<const DepSpec> a) :
PrivateImplementationPattern<DepSpecFlattener>(new Implementation<DepSpecFlattener>(
env, pkg, a))
{
diff --git a/paludis/dep_spec_flattener.hh b/paludis/dep_spec_flattener.hh
index 17afff6..847741a 100644
--- a/paludis/dep_spec_flattener.hh
+++ b/paludis/dep_spec_flattener.hh
@@ -68,7 +68,7 @@ namespace paludis
DepSpecFlattener(const Environment * const,
const PackageDatabaseEntry * const,
- const std::tr1::shared_ptr<const DepSpec>);
+ const tr1::shared_ptr<const DepSpec>);
~DepSpecFlattener();
diff --git a/paludis/dep_spec_pretty_printer_TEST.cc b/paludis/dep_spec_pretty_printer_TEST.cc
index 61bbcec..ae304f4 100644
--- a/paludis/dep_spec_pretty_printer_TEST.cc
+++ b/paludis/dep_spec_pretty_printer_TEST.cc
@@ -33,25 +33,25 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const DepSpec> s1(PortageDepParser::parse("foo/bar bar/baz",
+ tr1::shared_ptr<const DepSpec> s1(PortageDepParser::parse("foo/bar bar/baz",
PortageDepParser::Policy::text_is_package_dep_spec(true, pds_pm_permissive)));
DepSpecPrettyPrinter p1(0, false);
s1->accept(&p1);
TEST_CHECK_STRINGIFY_EQUAL(p1, "foo/bar bar/baz");
- std::tr1::shared_ptr<const DepSpec> s2(PortageDepParser::parse("foo/bar moo? ( bar/baz )",
+ tr1::shared_ptr<const DepSpec> s2(PortageDepParser::parse("foo/bar moo? ( bar/baz )",
PortageDepParser::Policy::text_is_package_dep_spec(true, pds_pm_permissive)));
DepSpecPrettyPrinter p2(0, false);
s2->accept(&p2);
TEST_CHECK_STRINGIFY_EQUAL(p2, "foo/bar moo? ( bar/baz )");
- std::tr1::shared_ptr<const DepSpec> s3(PortageDepParser::parse("|| ( a/b ( c/d e/f ) )",
+ tr1::shared_ptr<const DepSpec> s3(PortageDepParser::parse("|| ( a/b ( c/d e/f ) )",
PortageDepParser::Policy::text_is_package_dep_spec(true, pds_pm_permissive)));
DepSpecPrettyPrinter p3(0, false);
s3->accept(&p3);
TEST_CHECK_STRINGIFY_EQUAL(p3, "|| ( a/b ( c/d e/f ) )");
- std::tr1::shared_ptr<const DepSpec> s4(PortageDepParser::parse("( ( ( ) a ) b )",
+ tr1::shared_ptr<const DepSpec> s4(PortageDepParser::parse("( ( ( ) a ) b )",
PortageDepParser::Policy::text_is_text_dep_spec(true)));
DepSpecPrettyPrinter p4(0, false);
s4->accept(&p4);
@@ -65,26 +65,26 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const DepSpec> s1(PortageDepParser::parse("foo/bar bar/baz",
+ tr1::shared_ptr<const DepSpec> s1(PortageDepParser::parse("foo/bar bar/baz",
PortageDepParser::Policy::text_is_package_dep_spec(true, pds_pm_permissive)));
DepSpecPrettyPrinter p1(4);
s1->accept(&p1);
TEST_CHECK_STRINGIFY_EQUAL(p1, " foo/bar\n bar/baz\n");
- std::tr1::shared_ptr<const DepSpec> s2(PortageDepParser::parse("foo/bar moo? ( bar/baz )",
+ tr1::shared_ptr<const DepSpec> s2(PortageDepParser::parse("foo/bar moo? ( bar/baz )",
PortageDepParser::Policy::text_is_package_dep_spec(true, pds_pm_permissive)));
DepSpecPrettyPrinter p2(4);
s2->accept(&p2);
TEST_CHECK_STRINGIFY_EQUAL(p2, " foo/bar\n moo? (\n bar/baz\n )\n");
- std::tr1::shared_ptr<const DepSpec> s3(PortageDepParser::parse("|| ( a/b ( c/d e/f ) )",
+ tr1::shared_ptr<const DepSpec> s3(PortageDepParser::parse("|| ( a/b ( c/d e/f ) )",
PortageDepParser::Policy::text_is_package_dep_spec(true, pds_pm_permissive)));
DepSpecPrettyPrinter p3(4);
s3->accept(&p3);
TEST_CHECK_STRINGIFY_EQUAL(p3, " || (\n a/b\n (\n c/d\n"
" e/f\n )\n )\n");
- std::tr1::shared_ptr<const DepSpec> s4(PortageDepParser::parse("( ( ( ) a ) b )",
+ tr1::shared_ptr<const DepSpec> s4(PortageDepParser::parse("( ( ( ) a ) b )",
PortageDepParser::Policy::text_is_text_dep_spec(true)));
DepSpecPrettyPrinter p4(4);
s4->accept(&p4);
diff --git a/paludis/dep_tag.cc b/paludis/dep_tag.cc
index 2b4be1a..e67560f 100644
--- a/paludis/dep_tag.cc
+++ b/paludis/dep_tag.cc
@@ -28,7 +28,7 @@
using namespace paludis;
-template class VirtualConstructor<std::string, std::tr1::shared_ptr<const DepTagCategory> (*) (),
+template class VirtualConstructor<std::string, tr1::shared_ptr<const DepTagCategory> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchDepTagCategory> >;
#include <paludis/dep_tag-sr.cc>
@@ -42,10 +42,10 @@ namespace
*
* \ingroup grpdeptag
*/
- std::tr1::shared_ptr<const DepTagCategory>
+ tr1::shared_ptr<const DepTagCategory>
make_glsa_dep_tag()
{
- return std::tr1::shared_ptr<const DepTagCategory>(new DepTagCategory(
+ return tr1::shared_ptr<const DepTagCategory>(new DepTagCategory(
true,
"glsa",
"Security advisories",
@@ -60,10 +60,10 @@ namespace
*
* \ingroup grpdeptag
*/
- std::tr1::shared_ptr<const DepTagCategory>
+ tr1::shared_ptr<const DepTagCategory>
make_general_set_dep_tag()
{
- return std::tr1::shared_ptr<const DepTagCategory>(new DepTagCategory(
+ return tr1::shared_ptr<const DepTagCategory>(new DepTagCategory(
true,
"general",
"General sets",
@@ -78,10 +78,10 @@ namespace
*
* \ingroup grpdeptag
*/
- std::tr1::shared_ptr<const DepTagCategory>
+ tr1::shared_ptr<const DepTagCategory>
make_dependency_set_dep_tag()
{
- return std::tr1::shared_ptr<const DepTagCategory>(new DepTagCategory(
+ return tr1::shared_ptr<const DepTagCategory>(new DepTagCategory(
false,
"dependency",
"Dependencies",
diff --git a/paludis/dep_tag.hh b/paludis/dep_tag.hh
index 4804bac..adae6e0 100644
--- a/paludis/dep_tag.hh
+++ b/paludis/dep_tag.hh
@@ -36,7 +36,7 @@
#include <paludis/util/operators.hh>
#include <string>
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
namespace paludis
{
@@ -127,7 +127,7 @@ namespace paludis
* \ingroup grpdeptag
*/
class PALUDIS_VISIBLE DepTagCategoryMaker :
- public VirtualConstructor<std::string, std::tr1::shared_ptr<const DepTagCategory> (*) (),
+ public VirtualConstructor<std::string, tr1::shared_ptr<const DepTagCategory> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchDepTagCategory> >,
public InstantiationPolicy<DepTagCategoryMaker, instantiation_method::SingletonTag>
{
diff --git a/paludis/dep_tag.sr b/paludis/dep_tag.sr
index 580dcae..31e1efb 100644
--- a/paludis/dep_tag.sr
+++ b/paludis/dep_tag.sr
@@ -2,7 +2,7 @@ make_class_DepTagEntry()
{
visible
- key tag "std::tr1::shared_ptr<const DepTag>"
+ key tag "tr1::shared_ptr<const DepTag>"
key generation long
allow_named_args
diff --git a/paludis/digests/Makefile.am b/paludis/digests/Makefile.am
index 65c5ae4..fc804ee 100644
--- a/paludis/digests/Makefile.am
+++ b/paludis/digests/Makefile.am
@@ -37,15 +37,15 @@ check_PROGRAMS = $(TESTS)
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
sha256_TEST_SOURCES = sha256_TEST.cc
-sha256_TEST_CXXFLAGS = -I$(top_srcdir)
+sha256_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
sha256_TEST_LDADD = $(top_builddir)/test/libtest.a libpaludisdigests.la
rmd160_TEST_SOURCES = rmd160_TEST.cc
-rmd160_TEST_CXXFLAGS = -I$(top_srcdir)
+rmd160_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
rmd160_TEST_LDADD = $(top_builddir)/test/libtest.a libpaludisdigests.la
md5_TEST_SOURCES = md5_TEST.cc
-md5_TEST_CXXFLAGS = -I$(top_srcdir)
+md5_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
md5_TEST_LDADD = $(top_builddir)/test/libtest.a libpaludisdigests.la
built-sources : $(BUILT_SOURCES)
diff --git a/paludis/eapi.cc b/paludis/eapi.cc
index 2bab4c3..3e7b8da 100644
--- a/paludis/eapi.cc
+++ b/paludis/eapi.cc
@@ -33,16 +33,16 @@ namespace paludis
Implementation()
{
- values.insert(std::make_pair("0", EAPI("0", std::tr1::shared_ptr<SupportedEAPI>(new SupportedEAPI(
+ values.insert(std::make_pair("0", EAPI("0", tr1::shared_ptr<SupportedEAPI>(new SupportedEAPI(
pds_pm_eapi_0, pds_pm_eapi_0_strict, iuse_pm_eapi_0, iuse_pm_eapi_0_strict, false, false)))));
- values.insert(std::make_pair("", EAPI("", std::tr1::shared_ptr<SupportedEAPI>(new SupportedEAPI(
+ values.insert(std::make_pair("", EAPI("", tr1::shared_ptr<SupportedEAPI>(new SupportedEAPI(
pds_pm_eapi_0, pds_pm_eapi_0_strict, iuse_pm_eapi_0, iuse_pm_eapi_0_strict, false, false)))));
- values.insert(std::make_pair("paludis-1", EAPI("paludis-1", std::tr1::shared_ptr<SupportedEAPI>(new SupportedEAPI(
+ values.insert(std::make_pair("paludis-1", EAPI("paludis-1", tr1::shared_ptr<SupportedEAPI>(new SupportedEAPI(
pds_pm_permissive, pds_pm_permissive, iuse_pm_permissive, iuse_pm_permissive, true, true)))));
- values.insert(std::make_pair("CRAN-1", EAPI("CRAN-1", std::tr1::shared_ptr<SupportedEAPI>(new SupportedEAPI(
+ values.insert(std::make_pair("CRAN-1", EAPI("CRAN-1", tr1::shared_ptr<SupportedEAPI>(new SupportedEAPI(
pds_pm_permissive, pds_pm_permissive, iuse_pm_permissive, iuse_pm_permissive, true, false)))));
}
};
@@ -66,12 +66,12 @@ EAPIData::eapi_from_string(const std::string & s) const
if (i != _imp->values.end())
return i->second;
- return EAPI(s, std::tr1::shared_ptr<SupportedEAPI>());
+ return EAPI(s, tr1::shared_ptr<SupportedEAPI>());
}
EAPI
EAPIData::unknown_eapi() const
{
- return EAPI("UNKNOWN", std::tr1::shared_ptr<SupportedEAPI>());
+ return EAPI("UNKNOWN", tr1::shared_ptr<SupportedEAPI>());
}
diff --git a/paludis/eapi.sr b/paludis/eapi.sr
index 14cba9f..09a9d35 100644
--- a/paludis/eapi.sr
+++ b/paludis/eapi.sr
@@ -30,7 +30,7 @@ make_class_EAPI()
visible
key name std::string
- key supported "std::tr1::shared_ptr<const SupportedEAPI>"
+ key supported "tr1::shared_ptr<const SupportedEAPI>"
allow_named_args
diff --git a/paludis/environment.hh b/paludis/environment.hh
index ebddb34..2f6a0cb 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -107,7 +107,7 @@ namespace paludis
* the specified prefix or merely all enabled use flags. It is not safe to assume
* that all flags in the returned value will be enabled for the specified package.
*/
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
+ virtual tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
@@ -140,7 +140,7 @@ namespace paludis
*
* Default behaviour: true if the collection includes "*".
*/
- virtual bool accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
+ virtual bool accept_keywords(tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
///\}
@@ -148,10 +148,10 @@ namespace paludis
///\name Database-related functions
///\{
- virtual std::tr1::shared_ptr<PackageDatabase> package_database()
+ virtual tr1::shared_ptr<PackageDatabase> package_database()
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const
+ virtual tr1::shared_ptr<const PackageDatabase> package_database() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
///\}
@@ -163,25 +163,25 @@ namespace paludis
* Return a collection of bashrc files to be used by the various components
* that are implemented in bash.
*/
- virtual std::tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
+ virtual tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
* Return directories to search for syncer scripts.
*/
- virtual std::tr1::shared_ptr<const FSEntryCollection> syncers_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> syncers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
* Return directories to search for fetcher scripts.
*/
- virtual std::tr1::shared_ptr<const FSEntryCollection> fetchers_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> fetchers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
* Return directories to search for hooks.
*/
- virtual std::tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
@@ -218,7 +218,7 @@ namespace paludis
/**
* Return the mirror URI prefixes for a named mirror.
*/
- virtual std::tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
+ virtual tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
///\}
@@ -229,7 +229,7 @@ namespace paludis
/**
* Return all known named sets.
*/
- virtual std::tr1::shared_ptr<const SetNameCollection> set_names() const
+ virtual tr1::shared_ptr<const SetNameCollection> set_names() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
@@ -237,7 +237,7 @@ namespace paludis
*
* If the named set is not known, returns a zero pointer.
*/
- virtual std::tr1::shared_ptr<DepSpec> set(const SetName &) const
+ virtual tr1::shared_ptr<DepSpec> set(const SetName &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
///\}
@@ -248,7 +248,7 @@ namespace paludis
/**
* Default destination candidates for installing packages.
*/
- virtual std::tr1::shared_ptr<const DestinationsCollection> default_destinations() const
+ virtual tr1::shared_ptr<const DestinationsCollection> default_destinations() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
///\}
diff --git a/paludis/environment_implementation.cc b/paludis/environment_implementation.cc
index c90dfaa..645ef7f 100644
--- a/paludis/environment_implementation.cc
+++ b/paludis/environment_implementation.cc
@@ -102,7 +102,7 @@ EnvironmentImplementation::accept_eapi(const EAPI & e, const PackageDatabaseEntr
}
bool
-EnvironmentImplementation::accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection> k,
+EnvironmentImplementation::accept_keywords(tr1::shared_ptr<const KeywordNameCollection> k,
const PackageDatabaseEntry &) const
{
return k->end() != k->find(KeywordName("*"));
@@ -150,42 +150,42 @@ EnvironmentImplementation::~EnvironmentImplementation()
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
EnvironmentImplementation::known_use_expand_names(const UseFlagName &, const PackageDatabaseEntry &) const
{
- static std::tr1::shared_ptr<const UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
+ static tr1::shared_ptr<const UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
return result;
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
EnvironmentImplementation::bashrc_files() const
{
- static std::tr1::shared_ptr<const FSEntryCollection> result(new FSEntryCollection::Concrete);
+ static tr1::shared_ptr<const FSEntryCollection> result(new FSEntryCollection::Concrete);
return result;
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
EnvironmentImplementation::syncers_dirs() const
{
- std::tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
result->push_back(FSEntry(DATADIR "/paludis/syncers"));
result->push_back(FSEntry(LIBEXECDIR "/paludis/syncers"));
return result;
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
EnvironmentImplementation::fetchers_dirs() const
{
- std::tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
result->push_back(FSEntry(DATADIR "/paludis/fetchers"));
result->push_back(FSEntry(LIBEXECDIR "/paludis/fetchers"));
return result;
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
EnvironmentImplementation::hook_dirs() const
{
- static std::tr1::shared_ptr<const FSEntryCollection> result(new FSEntryCollection::Concrete);
+ static tr1::shared_ptr<const FSEntryCollection> result(new FSEntryCollection::Concrete);
return result;
}
@@ -207,17 +207,17 @@ EnvironmentImplementation::reduced_gid() const
return getgid();
}
-std::tr1::shared_ptr<const MirrorsCollection>
+tr1::shared_ptr<const MirrorsCollection>
EnvironmentImplementation::mirrors(const std::string &) const
{
- static std::tr1::shared_ptr<const MirrorsCollection> result(new MirrorsCollection::Concrete);
+ static tr1::shared_ptr<const MirrorsCollection> result(new MirrorsCollection::Concrete);
return result;
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
EnvironmentImplementation::set_names() const
{
- static std::tr1::shared_ptr<const SetNameCollection> result(new SetNameCollection::Concrete);
+ static tr1::shared_ptr<const SetNameCollection> result(new SetNameCollection::Concrete);
return result;
}
@@ -227,10 +227,10 @@ EnvironmentImplementation::perform_hook(const Hook &) const
return HookResult(0, "");
}
-std::tr1::shared_ptr<const DestinationsCollection>
+tr1::shared_ptr<const DestinationsCollection>
EnvironmentImplementation::default_destinations() const
{
- std::tr1::shared_ptr<DestinationsCollection> result(new DestinationsCollection::Concrete);
+ tr1::shared_ptr<DestinationsCollection> result(new DestinationsCollection::Concrete);
for (PackageDatabase::RepositoryIterator r(package_database()->begin_repositories()),
r_end(package_database()->end_repositories()) ;
@@ -248,7 +248,7 @@ EnvironmentImplementation::mask_reasons(const PackageDatabaseEntry & e, const Ma
Context context("When checking for mask reasons for '" + stringify(e) + "':");
MaskReasons result;
- std::tr1::shared_ptr<const VersionMetadata> metadata(package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> metadata(package_database()->fetch_repository(
e.repository)->version_metadata(e.name, e.version));
if (! accept_eapi(metadata->eapi, e))
@@ -272,14 +272,14 @@ EnvironmentImplementation::mask_reasons(const PackageDatabaseEntry & e, const Ma
if (metadata->ebuild_interface)
{
- std::tr1::shared_ptr<const KeywordNameCollection> keywords(metadata->ebuild_interface->keywords());
+ tr1::shared_ptr<const KeywordNameCollection> keywords(metadata->ebuild_interface->keywords());
if (! accept_keywords(keywords, e))
{
do
{
if (options[mro_override_unkeyworded])
{
- std::tr1::shared_ptr<KeywordNameCollection> minus_keywords(new KeywordNameCollection::Concrete);
+ tr1::shared_ptr<KeywordNameCollection> minus_keywords(new KeywordNameCollection::Concrete);
for (KeywordNameCollection::Iterator k(keywords->begin()), k_end(keywords->end()) ;
k != k_end ; ++k)
if ('-' == stringify(*k).at(0))
@@ -291,7 +291,7 @@ EnvironmentImplementation::mask_reasons(const PackageDatabaseEntry & e, const Ma
if (options[mro_override_tilde_keywords])
{
- std::tr1::shared_ptr<KeywordNameCollection> detildeified_keywords(new KeywordNameCollection::Concrete);
+ tr1::shared_ptr<KeywordNameCollection> detildeified_keywords(new KeywordNameCollection::Concrete);
for (KeywordNameCollection::Iterator k(keywords->begin()), k_end(keywords->end()) ;
k != k_end ; ++k)
{
@@ -322,7 +322,7 @@ EnvironmentImplementation::mask_reasons(const PackageDatabaseEntry & e, const Ma
if (masked_by_user(e))
result += mr_user_mask;
- std::tr1::shared_ptr<const Repository> repo(package_database()->fetch_repository(e.repository));
+ tr1::shared_ptr<const Repository> repo(package_database()->fetch_repository(e.repository));
if (repo->mask_interface)
{
if (repo->mask_interface->query_profile_masks(e.name, e.version))
@@ -336,10 +336,10 @@ EnvironmentImplementation::mask_reasons(const PackageDatabaseEntry & e, const Ma
return result;
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
EnvironmentImplementation::set(const SetName & s) const
{
- std::tr1::shared_ptr<CompositeDepSpec> result(local_set(s));
+ tr1::shared_ptr<CompositeDepSpec> result(local_set(s));
if (result)
return result;
@@ -354,7 +354,7 @@ EnvironmentImplementation::set(const SetName & s) const
if (! (*r)->sets_interface)
continue;
- std::tr1::shared_ptr<DepSpec> add((*r)->sets_interface->package_set(s));
+ tr1::shared_ptr<DepSpec> add((*r)->sets_interface->package_set(s));
if (0 != add)
{
if (! result)
@@ -376,7 +376,7 @@ EnvironmentImplementation::set(const SetName & s) const
bool
EnvironmentImplementation::query_use(const UseFlagName & f, const PackageDatabaseEntry & e) const
{
- std::tr1::shared_ptr<const Repository> repo(package_database()->fetch_repository(e.repository));
+ tr1::shared_ptr<const Repository> repo(package_database()->fetch_repository(e.repository));
if (repo && repo->use_interface)
{
@@ -407,9 +407,9 @@ EnvironmentImplementation::query_use(const UseFlagName & f, const PackageDatabas
return false;
}
-std::tr1::shared_ptr<CompositeDepSpec>
+tr1::shared_ptr<CompositeDepSpec>
EnvironmentImplementation::local_set(const SetName &) const
{
- return std::tr1::shared_ptr<CompositeDepSpec>();
+ return tr1::shared_ptr<CompositeDepSpec>();
}
diff --git a/paludis/environment_implementation.hh b/paludis/environment_implementation.hh
index 88a9895..fd1dab0 100644
--- a/paludis/environment_implementation.hh
+++ b/paludis/environment_implementation.hh
@@ -94,7 +94,7 @@ namespace paludis
/**
* Return the environment-specific named set, or a zero pointer if no such set is available.
*/
- virtual std::tr1::shared_ptr<CompositeDepSpec> local_set(const SetName &) const
+ virtual tr1::shared_ptr<CompositeDepSpec> local_set(const SetName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
public:
@@ -108,7 +108,7 @@ namespace paludis
virtual bool query_use(const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
+ virtual tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -119,19 +119,19 @@ namespace paludis
virtual bool accept_license(const std::string &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
+ virtual bool accept_keywords(tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
+ virtual tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> syncers_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> syncers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> fetchers_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> fetchers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const FSEntry root() const
@@ -143,16 +143,16 @@ namespace paludis
virtual gid_t reduced_gid() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
+ virtual tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const SetNameCollection> set_names() const
+ virtual tr1::shared_ptr<const SetNameCollection> set_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<DepSpec> set(const SetName &) const
+ virtual tr1::shared_ptr<DepSpec> set(const SetName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const DestinationsCollection> default_destinations() const
+ virtual tr1::shared_ptr<const DestinationsCollection> default_destinations() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual HookResult perform_hook(const Hook &) const
diff --git a/paludis/environment_implementation_TEST.cc b/paludis/environment_implementation_TEST.cc
index 327e3bb..4648334 100644
--- a/paludis/environment_implementation_TEST.cc
+++ b/paludis/environment_implementation_TEST.cc
@@ -32,14 +32,14 @@ namespace
public EnvironmentImplementation
{
private:
- std::tr1::shared_ptr<PackageDatabase> _package_database;
+ tr1::shared_ptr<PackageDatabase> _package_database;
public:
EITestEnvironment() :
_package_database(new PackageDatabase(this))
{
- std::tr1::shared_ptr<FakeRepository> repo(new FakeRepository(this, RepositoryName("repo")));
- _package_database->add_repository(1, std::tr1::shared_ptr<Repository>(repo));
+ tr1::shared_ptr<FakeRepository> repo(new FakeRepository(this, RepositoryName("repo")));
+ _package_database->add_repository(1, tr1::shared_ptr<Repository>(repo));
repo->add_version("foo", "one", "0")->ebuild_interface->set_keywords("test foo");
repo->add_version("foo", "two", "0")->ebuild_interface->set_keywords("~test foo");
@@ -51,12 +51,12 @@ namespace
{
}
- std::tr1::shared_ptr<PackageDatabase> package_database()
+ tr1::shared_ptr<PackageDatabase> package_database()
{
return _package_database;
}
- std::tr1::shared_ptr<const PackageDatabase> package_database() const
+ tr1::shared_ptr<const PackageDatabase> package_database() const
{
return _package_database;
}
@@ -70,7 +70,7 @@ namespace
{
}
- bool accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection> k, const PackageDatabaseEntry &) const
+ bool accept_keywords(tr1::shared_ptr<const KeywordNameCollection> k, const PackageDatabaseEntry &) const
{
return k->end() != k->find(KeywordName("test")) || k->end() != k->find(KeywordName("*"));
}
diff --git a/paludis/environments/adapted/adapted_environment.cc b/paludis/environments/adapted/adapted_environment.cc
index 21fad70..8e63e07 100644
--- a/paludis/environments/adapted/adapted_environment.cc
+++ b/paludis/environments/adapted/adapted_environment.cc
@@ -24,24 +24,24 @@
using namespace paludis;
-typedef MakeHashedMultiMap<UseFlagName, std::pair<std::tr1::shared_ptr<const PackageDepSpec>, UseFlagState> >::Type Use;
+typedef MakeHashedMultiMap<UseFlagName, std::pair<tr1::shared_ptr<const PackageDepSpec>, UseFlagState> >::Type Use;
namespace paludis
{
template<>
struct Implementation<AdaptedEnvironment>
{
- std::tr1::shared_ptr<Environment> env;
+ tr1::shared_ptr<Environment> env;
Use use;
- Implementation(std::tr1::shared_ptr<Environment> e) :
+ Implementation(tr1::shared_ptr<Environment> e) :
env(e)
{
}
};
}
-AdaptedEnvironment::AdaptedEnvironment(std::tr1::shared_ptr<Environment> e) :
+AdaptedEnvironment::AdaptedEnvironment(tr1::shared_ptr<Environment> e) :
PrivateImplementationPattern<AdaptedEnvironment>(new Implementation<AdaptedEnvironment>(e))
{
}
@@ -51,7 +51,7 @@ AdaptedEnvironment::~AdaptedEnvironment()
}
void
-AdaptedEnvironment::adapt_use(std::tr1::shared_ptr<const PackageDepSpec> p,
+AdaptedEnvironment::adapt_use(tr1::shared_ptr<const PackageDepSpec> p,
const UseFlagName & u, const UseFlagState s)
{
_imp->use.insert(std::make_pair(u, std::make_pair(p, s)));
@@ -63,13 +63,13 @@ AdaptedEnvironment::clear_adaptions()
_imp.reset(new Implementation<AdaptedEnvironment>(_imp->env));
}
-std::tr1::shared_ptr<PackageDatabase>
+tr1::shared_ptr<PackageDatabase>
AdaptedEnvironment::package_database()
{
return _imp->env->package_database();
}
-std::tr1::shared_ptr<const PackageDatabase>
+tr1::shared_ptr<const PackageDatabase>
AdaptedEnvironment::package_database() const
{
return _imp->env->package_database();
@@ -102,7 +102,7 @@ AdaptedEnvironment::query_use(const UseFlagName & u, const PackageDatabaseEntry
throw InternalError(PALUDIS_HERE, "Bad state");
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
AdaptedEnvironment::known_use_expand_names(const UseFlagName & u, const PackageDatabaseEntry & e) const
{
return _imp->env->known_use_expand_names(u, e);
@@ -121,30 +121,30 @@ AdaptedEnvironment::accept_license(const std::string & l, const PackageDatabaseE
}
bool
-AdaptedEnvironment::accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection> k, const PackageDatabaseEntry & e) const
+AdaptedEnvironment::accept_keywords(tr1::shared_ptr<const KeywordNameCollection> k, const PackageDatabaseEntry & e) const
{
return _imp->env->accept_keywords(k, e);
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
AdaptedEnvironment::bashrc_files() const
{
return _imp->env->bashrc_files();
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
AdaptedEnvironment::syncers_dirs() const
{
return _imp->env->syncers_dirs();
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
AdaptedEnvironment::fetchers_dirs() const
{
return _imp->env->fetchers_dirs();
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
AdaptedEnvironment::hook_dirs() const
{
return _imp->env->hook_dirs();
@@ -180,25 +180,25 @@ AdaptedEnvironment::reduced_gid() const
return _imp->env->reduced_gid();
}
-std::tr1::shared_ptr<const MirrorsCollection>
+tr1::shared_ptr<const MirrorsCollection>
AdaptedEnvironment::mirrors(const std::string & m) const
{
return _imp->env->mirrors(m);
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
AdaptedEnvironment::set_names() const
{
return _imp->env->set_names();
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
AdaptedEnvironment::set(const SetName & s) const
{
return _imp->env->set(s);
}
-std::tr1::shared_ptr<const DestinationsCollection>
+tr1::shared_ptr<const DestinationsCollection>
AdaptedEnvironment::default_destinations() const
{
return _imp->env->default_destinations();
diff --git a/paludis/environments/adapted/adapted_environment.hh b/paludis/environments/adapted/adapted_environment.hh
index 0ee5dda..49779cd 100644
--- a/paludis/environments/adapted/adapted_environment.hh
+++ b/paludis/environments/adapted/adapted_environment.hh
@@ -39,7 +39,7 @@ namespace paludis
private PrivateImplementationPattern<AdaptedEnvironment>
{
public:
- AdaptedEnvironment(std::tr1::shared_ptr<Environment>);
+ AdaptedEnvironment(tr1::shared_ptr<Environment>);
~AdaptedEnvironment();
///\name Adapting methods
@@ -48,7 +48,7 @@ namespace paludis
/**
* Set the state of a USE flag for the given PackageDepSpec.
*/
- void adapt_use(std::tr1::shared_ptr<const PackageDepSpec>, const UseFlagName &, const UseFlagState);
+ void adapt_use(tr1::shared_ptr<const PackageDepSpec>, const UseFlagName &, const UseFlagState);
/**
* Clear all adaptions from this Environemnt.
@@ -60,7 +60,7 @@ namespace paludis
virtual bool query_use(const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
+ virtual tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -71,25 +71,25 @@ namespace paludis
virtual bool accept_license(const std::string &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
+ virtual bool accept_keywords(tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<PackageDatabase> package_database()
+ virtual tr1::shared_ptr<PackageDatabase> package_database()
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const
+ virtual tr1::shared_ptr<const PackageDatabase> package_database() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
+ virtual tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> syncers_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> syncers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> fetchers_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> fetchers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string paludis_command() const
@@ -103,16 +103,16 @@ namespace paludis
virtual gid_t reduced_gid() const;
- virtual std::tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
+ virtual tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const SetNameCollection> set_names() const
+ virtual tr1::shared_ptr<const SetNameCollection> set_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<DepSpec> set(const SetName &) const
+ virtual tr1::shared_ptr<DepSpec> set(const SetName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const DestinationsCollection> default_destinations() const
+ virtual tr1::shared_ptr<const DestinationsCollection> default_destinations() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual HookResult perform_hook(const Hook &) const
diff --git a/paludis/environments/adapted/adapted_environment_TEST.cc b/paludis/environments/adapted/adapted_environment_TEST.cc
index e83e43c..d439942 100644
--- a/paludis/environments/adapted/adapted_environment_TEST.cc
+++ b/paludis/environments/adapted/adapted_environment_TEST.cc
@@ -33,7 +33,7 @@ namespace test_cases
void run()
{
- AdaptedEnvironment e(std::tr1::shared_ptr<TestEnvironment>(new TestEnvironment));
+ AdaptedEnvironment e(tr1::shared_ptr<TestEnvironment>(new TestEnvironment));
}
} test_adapted_environment;
}
diff --git a/paludis/environments/environment_maker.cc b/paludis/environments/environment_maker.cc
index f7e5a67..28dc960 100644
--- a/paludis/environments/environment_maker.cc
+++ b/paludis/environments/environment_maker.cc
@@ -32,7 +32,7 @@
using namespace paludis;
template class VirtualConstructor<std::string,
- std::tr1::shared_ptr<Environment> (*) (const std::string &),
+ tr1::shared_ptr<Environment> (*) (const std::string &),
virtual_constructor_not_found::ThrowException<NoSuchEnvironmentTypeError> >;
NoSuchEnvironmentTypeError::NoSuchEnvironmentTypeError(const std::string & format) throw ():
@@ -128,7 +128,7 @@ EnvironmentMaker::~EnvironmentMaker()
{
}
-std::tr1::shared_ptr<Environment>
+tr1::shared_ptr<Environment>
EnvironmentMaker::make_from_spec(const std::string & s) const
{
Context context("When making environment from specification '" + s + "':");
diff --git a/paludis/environments/environment_maker.hh b/paludis/environments/environment_maker.hh
index 11cb915..5eaa2fb 100644
--- a/paludis/environments/environment_maker.hh
+++ b/paludis/environments/environment_maker.hh
@@ -111,7 +111,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE EnvironmentMaker :
public VirtualConstructor<std::string,
- std::tr1::shared_ptr<Environment> (*) (const std::string &),
+ tr1::shared_ptr<Environment> (*) (const std::string &),
virtual_constructor_not_found::ThrowException<NoSuchEnvironmentTypeError> >,
public InstantiationPolicy<EnvironmentMaker, instantiation_method::SingletonTag>,
private PrivateImplementationPattern<EnvironmentMaker>
@@ -150,7 +150,7 @@ namespace paludis
* \see Environment
* \ingroup grpenvironment
*/
- std::tr1::shared_ptr<Environment> make_from_spec(const std::string & spec) const;
+ tr1::shared_ptr<Environment> make_from_spec(const std::string & spec) const;
};
}
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 64c4b32..f6fc31b 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -43,12 +43,12 @@ namespace paludis
bool accept_unstable;
bool is_vdb;
- std::tr1::shared_ptr<Repository> main_repo;
- std::tr1::shared_ptr<Repository> master_repo;
+ tr1::shared_ptr<Repository> main_repo;
+ tr1::shared_ptr<Repository> master_repo;
std::string paludis_command;
- std::tr1::shared_ptr<PackageDatabase> package_database;
+ tr1::shared_ptr<PackageDatabase> package_database;
Implementation(NoConfigEnvironment * const env, const NoConfigEnvironmentParams & params);
void initialise(NoConfigEnvironment * const env);
@@ -134,7 +134,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
{
if (FSEntry("/var/empty") != params.master_repository_dir)
{
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
@@ -147,7 +147,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
RepositoryMaker::get_instance()->find_maker("ebuild")(env, keys))));
}
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
@@ -161,13 +161,13 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
package_database->add_repository(2, ((main_repo =
RepositoryMaker::get_instance()->find_maker("ebuild")(env, keys))));
package_database->add_repository(-2, RepositoryMaker::get_instance()->find_maker("virtuals")(env,
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> >()));
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> >()));
}
else
{
Log::get_instance()->message(ll_debug, lc_context, "VDB, using vdb_db");
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
@@ -177,7 +177,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
package_database->add_repository(1, RepositoryMaker::get_instance()->find_maker("vdb")(env, keys));
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > iv_keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > iv_keys(
new AssociativeCollection<std::string, std::string>::Concrete);
iv_keys->insert("root", "/");
package_database->add_repository(-2, RepositoryMaker::get_instance()->find_maker("installed_virtuals")(env,
@@ -218,37 +218,37 @@ NoConfigEnvironment::set_accept_unstable(const bool value)
_imp->accept_unstable = value;
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
NoConfigEnvironment::main_repository()
{
return _imp->main_repo;
}
-std::tr1::shared_ptr<const Repository>
+tr1::shared_ptr<const Repository>
NoConfigEnvironment::main_repository() const
{
return _imp->main_repo;
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
NoConfigEnvironment::master_repository()
{
return _imp->master_repo;
}
-std::tr1::shared_ptr<const Repository>
+tr1::shared_ptr<const Repository>
NoConfigEnvironment::master_repository() const
{
return _imp->master_repo;
}
-std::tr1::shared_ptr<PackageDatabase>
+tr1::shared_ptr<PackageDatabase>
NoConfigEnvironment::package_database()
{
return _imp->package_database;
}
-std::tr1::shared_ptr<const PackageDatabase>
+tr1::shared_ptr<const PackageDatabase>
NoConfigEnvironment::package_database() const
{
return _imp->package_database;
@@ -267,7 +267,7 @@ NoConfigEnvironment::set_paludis_command(const std::string & s)
}
bool
-NoConfigEnvironment::accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection> keywords,
+NoConfigEnvironment::accept_keywords(tr1::shared_ptr<const KeywordNameCollection> keywords,
const PackageDatabaseEntry &) const
{
if (_imp->is_vdb)
diff --git a/paludis/environments/no_config/no_config_environment.hh b/paludis/environments/no_config/no_config_environment.hh
index 3366bae..74a4fa5 100644
--- a/paludis/environments/no_config/no_config_environment.hh
+++ b/paludis/environments/no_config/no_config_environment.hh
@@ -54,7 +54,7 @@ namespace paludis
private InstantiationPolicy<NoConfigEnvironment, instantiation_method::NonCopyableTag>
{
protected:
- virtual bool accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
+ virtual bool accept_keywords(tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
public:
@@ -88,29 +88,29 @@ namespace paludis
/**
* Fetch our 'main' repository.
*/
- std::tr1::shared_ptr<Repository> main_repository();
+ tr1::shared_ptr<Repository> main_repository();
/**
* Fetch our 'main' repository.
*/
- std::tr1::shared_ptr<const Repository> main_repository() const;
+ tr1::shared_ptr<const Repository> main_repository() const;
/**
* Fetch our 'master' repository (may be zero).
*/
- std::tr1::shared_ptr<Repository> master_repository();
+ tr1::shared_ptr<Repository> master_repository();
/**
* Fetch our 'master' repository (may be zero).
*/
- std::tr1::shared_ptr<const Repository> master_repository() const;
+ tr1::shared_ptr<const Repository> master_repository() const;
///\}
- virtual std::tr1::shared_ptr<PackageDatabase> package_database()
+ virtual tr1::shared_ptr<PackageDatabase> package_database()
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const
+ virtual tr1::shared_ptr<const PackageDatabase> package_database() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string paludis_command() const
diff --git a/paludis/environments/paludis/bashable_conf.cc b/paludis/environments/paludis/bashable_conf.cc
index 89c6143..e5a5d9f 100644
--- a/paludis/environments/paludis/bashable_conf.cc
+++ b/paludis/environments/paludis/bashable_conf.cc
@@ -26,12 +26,12 @@
using namespace paludis;
-std::tr1::shared_ptr<LineConfigFile>
+tr1::shared_ptr<LineConfigFile>
paludis::make_bashable_conf(const FSEntry & f)
{
Context context("When making a config file out of '" + stringify(f) + "':");
- std::tr1::shared_ptr<LineConfigFile> result;
+ tr1::shared_ptr<LineConfigFile> result;
if (is_file_with_extension(f, ".bash", IsFileWithOptions()))
{
diff --git a/paludis/environments/paludis/bashable_conf.hh b/paludis/environments/paludis/bashable_conf.hh
index f17730c..defe703 100644
--- a/paludis/environments/paludis/bashable_conf.hh
+++ b/paludis/environments/paludis/bashable_conf.hh
@@ -20,14 +20,14 @@
#ifndef PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_BASHABLE_CONF_HH
#define PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PALUDIS_BASHABLE_CONF_HH 1
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
namespace paludis
{
class LineConfigFile;
class FSEntry;
- std::tr1::shared_ptr<LineConfigFile> make_bashable_conf(const FSEntry &);
+ tr1::shared_ptr<LineConfigFile> make_bashable_conf(const FSEntry &);
}
#endif
diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc
index baae078..c234426 100644
--- a/paludis/environments/paludis/keywords_conf.cc
+++ b/paludis/environments/paludis/keywords_conf.cc
@@ -35,8 +35,8 @@
using namespace paludis;
typedef std::list<KeywordName> KeywordsList;
-typedef std::map<std::tr1::shared_ptr<const PackageDepSpec>, KeywordsList> PDSToKeywordsList;
-typedef std::pair<std::tr1::shared_ptr<const DepSpec>, KeywordsList> SetNameEntry;
+typedef std::map<tr1::shared_ptr<const PackageDepSpec>, KeywordsList> PDSToKeywordsList;
+typedef std::pair<tr1::shared_ptr<const DepSpec>, KeywordsList> SetNameEntry;
typedef MakeHashedMap<QualifiedPackageName, PDSToKeywordsList>::Type SpecificMap;
typedef PDSToKeywordsList UnspecificMap;
@@ -74,7 +74,7 @@ KeywordsConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a keywords file:");
- std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
+ tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
if (! f)
return;
@@ -96,7 +96,7 @@ KeywordsConf::add(const FSEntry & filename)
if (std::string::npos == tokens.at(0).find("/"))
{
NamedSetMap::iterator i(_imp->set.insert(std::make_pair(SetName(tokens.at(0)), std::make_pair(
- std::tr1::shared_ptr<DepSpec>(), KeywordsList()))).first);
+ tr1::shared_ptr<DepSpec>(), KeywordsList()))).first);
for (std::vector<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
t != t_end ; ++t)
@@ -104,7 +104,7 @@ KeywordsConf::add(const FSEntry & filename)
}
else
{
- std::tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
+ tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
if (d->package_ptr())
{
KeywordsList & k(_imp->qualified[*d->package_ptr()][d]);
@@ -124,7 +124,7 @@ KeywordsConf::add(const FSEntry & filename)
}
bool
-KeywordsConf::query(std::tr1::shared_ptr<const KeywordNameCollection> k, const PackageDatabaseEntry & e) const
+KeywordsConf::query(tr1::shared_ptr<const KeywordNameCollection> k, const PackageDatabaseEntry & e) const
{
static const KeywordName star_keyword("*");
static const KeywordName minus_star_keyword("-*");
diff --git a/paludis/environments/paludis/keywords_conf.hh b/paludis/environments/paludis/keywords_conf.hh
index 0274e78..b720bd0 100644
--- a/paludis/environments/paludis/keywords_conf.hh
+++ b/paludis/environments/paludis/keywords_conf.hh
@@ -40,7 +40,7 @@ namespace paludis
void add(const FSEntry &);
- bool query(std::tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const;
+ bool query(tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const;
};
}
diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc
index c8761f8..90687a8 100644
--- a/paludis/environments/paludis/licenses_conf.cc
+++ b/paludis/environments/paludis/licenses_conf.cc
@@ -35,8 +35,8 @@
using namespace paludis;
typedef std::list<std::string> LicensesList;
-typedef std::map<std::tr1::shared_ptr<const PackageDepSpec>, LicensesList> PDSToLicensesList;
-typedef std::pair<std::tr1::shared_ptr<const DepSpec>, LicensesList> SetNameEntry;
+typedef std::map<tr1::shared_ptr<const PackageDepSpec>, LicensesList> PDSToLicensesList;
+typedef std::pair<tr1::shared_ptr<const DepSpec>, LicensesList> SetNameEntry;
typedef MakeHashedMap<QualifiedPackageName, PDSToLicensesList>::Type SpecificMap;
typedef PDSToLicensesList UnspecificMap;
@@ -74,7 +74,7 @@ LicensesConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a licenses file:");
- std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
+ tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
if (! f)
return;
@@ -96,7 +96,7 @@ LicensesConf::add(const FSEntry & filename)
if (std::string::npos == tokens.at(0).find("/"))
{
NamedSetMap::iterator i(_imp->set.insert(std::make_pair(SetName(tokens.at(0)), std::make_pair(
- std::tr1::shared_ptr<DepSpec>(), LicensesList()))).first);
+ tr1::shared_ptr<DepSpec>(), LicensesList()))).first);
for (std::vector<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
t != t_end ; ++t)
@@ -104,7 +104,7 @@ LicensesConf::add(const FSEntry & filename)
}
else
{
- std::tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
+ tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
if (d->package_ptr())
{
LicensesList & k(_imp->qualified[*d->package_ptr()][d]);
diff --git a/paludis/environments/paludis/mirrors_conf.cc b/paludis/environments/paludis/mirrors_conf.cc
index 2b9eca4..f0d6089 100644
--- a/paludis/environments/paludis/mirrors_conf.cc
+++ b/paludis/environments/paludis/mirrors_conf.cc
@@ -62,7 +62,7 @@ MirrorsConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a mirrors file:");
- std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
+ tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
if (! f)
return;
@@ -81,10 +81,10 @@ MirrorsConf::add(const FSEntry & filename)
}
}
-std::tr1::shared_ptr<const MirrorsCollection>
+tr1::shared_ptr<const MirrorsCollection>
MirrorsConf::query(const std::string & m) const
{
- std::tr1::shared_ptr<MirrorsCollection> result(new MirrorsCollection::Concrete);
+ tr1::shared_ptr<MirrorsCollection> result(new MirrorsCollection::Concrete);
std::pair<Mirrors::const_iterator, Mirrors::const_iterator> p(_imp->mirrors.equal_range(m));
std::copy(p.first, p.second, transform_inserter(result->inserter(), SelectSecond<std::string, std::string>()));
return result;
diff --git a/paludis/environments/paludis/mirrors_conf.hh b/paludis/environments/paludis/mirrors_conf.hh
index 0d9dcb7..1847119 100644
--- a/paludis/environments/paludis/mirrors_conf.hh
+++ b/paludis/environments/paludis/mirrors_conf.hh
@@ -41,7 +41,7 @@ namespace paludis
void add(const FSEntry &);
- std::tr1::shared_ptr<const MirrorsCollection> query(const std::string &) const
+ tr1::shared_ptr<const MirrorsCollection> query(const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc
index 6216b8f..860791e 100644
--- a/paludis/environments/paludis/package_mask_conf.cc
+++ b/paludis/environments/paludis/package_mask_conf.cc
@@ -30,7 +30,7 @@
#include <paludis/util/tokeniser.hh>
#include <list>
#include <algorithm>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
using namespace paludis;
@@ -40,7 +40,7 @@ namespace paludis
struct Implementation<PackageMaskConf>
{
const PaludisEnvironment * const env;
- std::list<std::tr1::shared_ptr<const PackageDepSpec> > masks;
+ std::list<tr1::shared_ptr<const PackageDepSpec> > masks;
Implementation(const PaludisEnvironment * const e) :
env(e)
@@ -63,22 +63,22 @@ PackageMaskConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a package mask or unmask file:");
- std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
+ tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
if (! f)
return;
for (LineConfigFile::Iterator line(f->begin()), line_end(f->end()) ;
line != line_end ; ++line)
- _imp->masks.push_back(std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(*line, pds_pm_unspecific)));
+ _imp->masks.push_back(tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(*line, pds_pm_unspecific)));
}
bool
PackageMaskConf::query(const PackageDatabaseEntry & e) const
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
return indirect_iterator(_imp->masks.end()) != std::find_if(
indirect_iterator(_imp->masks.begin()),
indirect_iterator(_imp->masks.end()),
- std::tr1::bind(&match_package, std::tr1::ref(*_imp->env), _1, e));
+ tr1::bind(&match_package, tr1::ref(*_imp->env), _1, e));
}
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index ac5c200..55e3bd6 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -39,7 +39,7 @@
#include <paludis/util/system.hh>
#include <paludis/util/tokeniser.hh>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
#include <fstream>
#include <algorithm>
#include <sstream>
@@ -77,19 +77,19 @@ namespace paludis
std::string paludis_command;
std::string root;
std::string config_dir;
- std::tr1::shared_ptr<FSEntryCollection> bashrc_files;
+ tr1::shared_ptr<FSEntryCollection> bashrc_files;
std::list<RepositoryConfigEntry> repos;
- std::tr1::shared_ptr<KeywordsConf> keywords_conf;
- std::tr1::shared_ptr<UseConf> use_conf;
- std::tr1::shared_ptr<LicensesConf> licenses_conf;
- std::tr1::shared_ptr<PackageMaskConf> package_mask_conf;
- std::tr1::shared_ptr<PackageMaskConf> package_unmask_conf;
- std::tr1::shared_ptr<MirrorsConf> mirrors_conf;
+ tr1::shared_ptr<KeywordsConf> keywords_conf;
+ tr1::shared_ptr<UseConf> use_conf;
+ tr1::shared_ptr<LicensesConf> licenses_conf;
+ tr1::shared_ptr<PackageMaskConf> package_mask_conf;
+ tr1::shared_ptr<PackageMaskConf> package_unmask_conf;
+ tr1::shared_ptr<MirrorsConf> mirrors_conf;
- mutable std::tr1::shared_ptr<uid_t> reduced_uid;
- mutable std::tr1::shared_ptr<gid_t> reduced_gid;
+ mutable tr1::shared_ptr<uid_t> reduced_uid;
+ mutable tr1::shared_ptr<gid_t> reduced_gid;
mutable bool has_environment_conf;
mutable bool accept_breaks_portage;
@@ -125,7 +125,7 @@ namespace paludis
Context context("When loading environment.conf:");
- std::tr1::shared_ptr<KeyValueConfigFile> kv;
+ tr1::shared_ptr<KeyValueConfigFile> kv;
if ((FSEntry(config_dir) / "environment.conf").exists())
kv.reset(new KeyValueConfigFile(FSEntry(config_dir) / "environment.conf", KeyValueConfigFileOptions()));
@@ -181,7 +181,7 @@ PaludisConfigNoDirectoryError::PaludisConfigNoDirectoryError(const std::string &
PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & suffix) :
PrivateImplementationPattern<PaludisConfig>(new Implementation<PaludisConfig>(e))
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
Context context("When loading paludis configuration:");
@@ -241,7 +241,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
}
}
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > conf_vars(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > conf_vars(
new AssociativeCollection<std::string, std::string>::Concrete);
conf_vars->insert("ROOT", root_prefix);
@@ -253,13 +253,13 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
{
/* add virtuals repositories */
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > iv_keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > iv_keys(
new AssociativeCollection<std::string, std::string>::Concrete);
iv_keys->insert("root", root_prefix.empty() ? "/" : root_prefix);
_imp->repos.push_back(RepositoryConfigEntry("installed_virtuals", -1, iv_keys));
_imp->repos.push_back(RepositoryConfigEntry("virtuals", -2,
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> >()));
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> >()));
/* add normal repositories */
@@ -290,18 +290,18 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
continue;
std::copy(DirIterator(*dir), DirIterator(),
- filter_inserter(std::back_inserter(repo_files), std::tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(repo_files), tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::copy(DirIterator(*dir), DirIterator(),
- filter_inserter(std::back_inserter(repo_files), std::tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(repo_files), tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
}
- std::list<std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > > later_keys;
+ std::list<tr1::shared_ptr<AssociativeCollection<std::string, std::string> > > later_keys;
for (std::list<FSEntry>::const_iterator repo_file(repo_files.begin()), repo_file_end(repo_files.end()) ;
repo_file != repo_file_end ; ++repo_file)
{
Context local_context("When reading repository file '" + stringify(*repo_file) + "':");
- std::tr1::shared_ptr<KeyValueConfigFile> kv;
+ tr1::shared_ptr<KeyValueConfigFile> kv;
if (is_file_with_extension(*repo_file, ".bash", IsFileWithOptions()))
{
Command cmd(Command("bash '" + stringify(*repo_file) + "'")
@@ -332,7 +332,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
if (! kv->get("importance").empty())
importance = destringify<int>(kv->get("importance"));
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete(kv->begin(), kv->end()));
keys->erase("importance");
@@ -357,7 +357,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
}
}
- for (std::list<std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > >::const_iterator
+ for (std::list<tr1::shared_ptr<AssociativeCollection<std::string, std::string> > >::const_iterator
k(later_keys.begin()), k_end(later_keys.end()) ; k != k_end ; ++k)
_imp->repos.push_back(RepositoryConfigEntry((*k)->find("format")->second,
destringify<int>((*k)->find("importance")->second), *k));
@@ -374,9 +374,9 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
if ((local_config_dir / "keywords.conf.d").exists())
{
std::copy(DirIterator(local_config_dir / "keywords.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::copy(DirIterator(local_config_dir / "keywords.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
}
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
@@ -399,9 +399,9 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
if ((local_config_dir / "use.conf.d").exists())
{
std::copy(DirIterator(local_config_dir / "use.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::copy(DirIterator(local_config_dir / "use.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
}
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
@@ -424,9 +424,9 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
if ((local_config_dir / "licenses.conf.d").exists())
{
std::copy(DirIterator(local_config_dir / "licenses.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::copy(DirIterator(local_config_dir / "licenses.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
}
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
@@ -449,9 +449,9 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
if ((local_config_dir / "package_mask.conf.d").exists())
{
std::copy(DirIterator(local_config_dir / "package_mask.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::copy(DirIterator(local_config_dir / "package_mask.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
}
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
@@ -474,9 +474,9 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
if ((local_config_dir / "package_unmask.conf.d").exists())
{
std::copy(DirIterator(local_config_dir / "package_unmask.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::copy(DirIterator(local_config_dir / "package_unmask.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
}
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
@@ -499,9 +499,9 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
if ((local_config_dir / "mirrors.conf.d").exists())
{
std::copy(DirIterator(local_config_dir / "mirrors.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::copy(DirIterator(local_config_dir / "mirrors.conf.d"), DirIterator(),
- filter_inserter(std::back_inserter(files), std::tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(files), tr1::bind(&is_file_with_extension, _1, ".bash", IsFileWithOptions())));
}
for (std::list<FSEntry>::const_iterator file(files.begin()), file_end(files.end()) ;
@@ -523,7 +523,7 @@ PaludisConfig::~PaludisConfig()
{
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
PaludisConfig::bashrc_files() const
{
return _imp->bashrc_files;
@@ -626,37 +626,37 @@ PaludisConfig::accept_breaks_portage() const
return _imp->accept_breaks_portage;
}
-std::tr1::shared_ptr<const KeywordsConf>
+tr1::shared_ptr<const KeywordsConf>
PaludisConfig::keywords_conf() const
{
return _imp->keywords_conf;
}
-std::tr1::shared_ptr<const UseConf>
+tr1::shared_ptr<const UseConf>
PaludisConfig::use_conf() const
{
return _imp->use_conf;
}
-std::tr1::shared_ptr<const LicensesConf>
+tr1::shared_ptr<const LicensesConf>
PaludisConfig::licenses_conf() const
{
return _imp->licenses_conf;
}
-std::tr1::shared_ptr<const PackageMaskConf>
+tr1::shared_ptr<const PackageMaskConf>
PaludisConfig::package_mask_conf() const
{
return _imp->package_mask_conf;
}
-std::tr1::shared_ptr<const PackageMaskConf>
+tr1::shared_ptr<const PackageMaskConf>
PaludisConfig::package_unmask_conf() const
{
return _imp->package_unmask_conf;
}
-std::tr1::shared_ptr<const MirrorsConf>
+tr1::shared_ptr<const MirrorsConf>
PaludisConfig::mirrors_conf() const
{
return _imp->mirrors_conf;
diff --git a/paludis/environments/paludis/paludis_config.hh b/paludis/environments/paludis/paludis_config.hh
index c685d42..5a92251 100644
--- a/paludis/environments/paludis/paludis_config.hh
+++ b/paludis/environments/paludis/paludis_config.hh
@@ -118,12 +118,12 @@ namespace paludis
///\name Config files
///\{
- std::tr1::shared_ptr<const KeywordsConf> keywords_conf() const;
- std::tr1::shared_ptr<const UseConf> use_conf() const;
- std::tr1::shared_ptr<const LicensesConf> licenses_conf() const;
- std::tr1::shared_ptr<const PackageMaskConf> package_mask_conf() const;
- std::tr1::shared_ptr<const PackageMaskConf> package_unmask_conf() const;
- std::tr1::shared_ptr<const MirrorsConf> mirrors_conf() const;
+ tr1::shared_ptr<const KeywordsConf> keywords_conf() const;
+ tr1::shared_ptr<const UseConf> use_conf() const;
+ tr1::shared_ptr<const LicensesConf> licenses_conf() const;
+ tr1::shared_ptr<const PackageMaskConf> package_mask_conf() const;
+ tr1::shared_ptr<const PackageMaskConf> package_unmask_conf() const;
+ tr1::shared_ptr<const MirrorsConf> mirrors_conf() const;
///\}
@@ -141,7 +141,7 @@ namespace paludis
/**
* Our bashrc files.
*/
- std::tr1::shared_ptr<const FSEntryCollection> bashrc_files() const;
+ tr1::shared_ptr<const FSEntryCollection> bashrc_files() const;
/**
* The ROOT.
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 62b46e1..ba69f3c 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -37,7 +37,7 @@
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/strip.hh>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
#include <functional>
#include <algorithm>
#include <list>
@@ -50,16 +50,16 @@ namespace paludis
struct Implementation<PaludisEnvironment>
{
mutable bool done_hooks;
- mutable std::tr1::shared_ptr<Hooker> hooker;
+ mutable tr1::shared_ptr<Hooker> hooker;
mutable std::list<std::pair<FSEntry, bool> > hook_dirs;
- std::tr1::shared_ptr<PaludisConfig> config;
+ tr1::shared_ptr<PaludisConfig> config;
std::string paludis_command;
std::list<UseConfigEntry> forced_use;
- std::tr1::shared_ptr<PackageDatabase> package_database;
+ tr1::shared_ptr<PackageDatabase> package_database;
- Implementation(PaludisEnvironment * const e, std::tr1::shared_ptr<PaludisConfig> c) :
+ Implementation(PaludisEnvironment * const e, tr1::shared_ptr<PaludisConfig> c) :
done_hooks(false),
config(c),
paludis_command("paludis"),
@@ -107,7 +107,7 @@ namespace paludis
PaludisEnvironment::PaludisEnvironment(const std::string & s) :
PrivateImplementationPattern<PaludisEnvironment>(new Implementation<PaludisEnvironment>(
- this, std::tr1::shared_ptr<PaludisConfig>(new PaludisConfig(this, s))))
+ this, tr1::shared_ptr<PaludisConfig>(new PaludisConfig(this, s))))
{
Context context("When loading paludis environment:");
@@ -158,7 +158,7 @@ PaludisEnvironment::query_use(const UseFlagName & f, const PackageDatabaseEntry
Save<bool> save_recursive(&recursive, true);
/* first check package database use masks... */
- std::tr1::shared_ptr<const Repository> repo(package_database()->fetch_repository(e.repository));
+ tr1::shared_ptr<const Repository> repo(package_database()->fetch_repository(e.repository));
if (repo->use_interface)
{
@@ -217,7 +217,7 @@ PaludisEnvironment::accept_breaks_portage(const PackageDatabaseEntry &) const
}
bool
-PaludisEnvironment::accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection> k,
+PaludisEnvironment::accept_keywords(tr1::shared_ptr<const KeywordNameCollection> k,
const PackageDatabaseEntry & e) const
{
return _imp->config->keywords_conf()->query(k, e);
@@ -248,7 +248,7 @@ PaludisEnvironment::unmasked_by_user(const PackageDatabaseEntry & d) const
return _imp->config->package_unmask_conf()->query(d);
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
PaludisEnvironment::bashrc_files() const
{
return _imp->config->bashrc_files();
@@ -281,57 +281,57 @@ PaludisEnvironment::perform_hook(const Hook & hook) const
return _imp->hooker->perform_hook(hook);
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
PaludisEnvironment::hook_dirs() const
{
_imp->need_hook_dirs(_imp->config->config_dir());
- std::tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
std::copy(_imp->hook_dirs.begin(), _imp->hook_dirs.end(),
transform_inserter(result->inserter(), SelectFirst<FSEntry, bool>()));
return result;
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
PaludisEnvironment::fetchers_dirs() const
{
- std::tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
result->push_back(FSEntry(_imp->config->config_dir()) / "fetchers");
if (getenv_with_default("PALUDIS_NO_GLOBAL_FETCHERS", "").empty())
{
- std::tr1::shared_ptr<const FSEntryCollection> r(EnvironmentImplementation::fetchers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> r(EnvironmentImplementation::fetchers_dirs());
std::copy(r->begin(), r->end(), result->inserter());
}
return result;
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
PaludisEnvironment::syncers_dirs() const
{
- std::tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
result->push_back(FSEntry(_imp->config->config_dir()) / "syncers");
if (getenv_with_default("PALUDIS_NO_GLOBAL_SYNCERS", "").empty())
{
- std::tr1::shared_ptr<const FSEntryCollection> r(EnvironmentImplementation::syncers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> r(EnvironmentImplementation::syncers_dirs());
std::copy(r->begin(), r->end(), result->inserter());
}
return result;
}
-std::tr1::shared_ptr<CompositeDepSpec>
+tr1::shared_ptr<CompositeDepSpec>
PaludisEnvironment::local_set(const SetName & s) const
{
Context context("When looking for package set '" + stringify(s) + "' in paludis environment:");
FSEntry dir(FSEntry(_imp->config->config_dir()) / "sets");
- std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(s, stringify(s) + ".conf"));
+ tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(s, stringify(s) + ".conf"));
if ((dir / (stringify(s) + ".bash")).exists())
{
@@ -354,13 +354,13 @@ PaludisEnvironment::local_set(const SetName & s) const
return f.contents();
}
else
- return std::tr1::shared_ptr<AllDepSpec>();
+ return tr1::shared_ptr<AllDepSpec>();
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
PaludisEnvironment::set_names() const
{
- std::tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
+ tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
if ((FSEntry(_imp->config->config_dir()) / "sets").exists())
for (DirIterator d(FSEntry(_imp->config->config_dir()) / "sets"), d_end ;
@@ -375,13 +375,13 @@ PaludisEnvironment::set_names() const
return result;
}
-std::tr1::shared_ptr<const MirrorsCollection>
+tr1::shared_ptr<const MirrorsCollection>
PaludisEnvironment::mirrors(const std::string & m) const
{
return _imp->config->mirrors_conf()->query(m);
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
PaludisEnvironment::known_use_expand_names(const UseFlagName & prefix, const PackageDatabaseEntry & e) const
{
return _imp->config->use_conf()->known_use_expand_names(prefix, e);
@@ -419,13 +419,13 @@ PaludisEnvironment::config_dir() const
return _imp->config->config_dir();
}
-std::tr1::shared_ptr<PackageDatabase>
+tr1::shared_ptr<PackageDatabase>
PaludisEnvironment::package_database()
{
return _imp->package_database;
}
-std::tr1::shared_ptr<const PackageDatabase>
+tr1::shared_ptr<const PackageDatabase>
PaludisEnvironment::package_database() const
{
return _imp->package_database;
diff --git a/paludis/environments/paludis/paludis_environment.hh b/paludis/environments/paludis/paludis_environment.hh
index d1954c3..baf7451 100644
--- a/paludis/environments/paludis/paludis_environment.hh
+++ b/paludis/environments/paludis/paludis_environment.hh
@@ -45,7 +45,7 @@ namespace paludis
private PrivateImplementationPattern<PaludisEnvironment>
{
protected:
- virtual bool accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
+ virtual bool accept_keywords(tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool accept_license(const std::string &, const PackageDatabaseEntry &) const
@@ -60,7 +60,7 @@ namespace paludis
virtual bool unmasked_by_user(const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<CompositeDepSpec> local_set(const SetName &) const
+ virtual tr1::shared_ptr<CompositeDepSpec> local_set(const SetName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
public:
@@ -86,20 +86,20 @@ namespace paludis
virtual bool query_use(const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
+ virtual tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
+ virtual tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> syncers_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> syncers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> fetchers_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> fetchers_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const FSEntry root() const
@@ -111,10 +111,10 @@ namespace paludis
virtual gid_t reduced_gid() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
+ virtual tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const SetNameCollection> set_names() const
+ virtual tr1::shared_ptr<const SetNameCollection> set_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual HookResult perform_hook(const Hook &) const
@@ -125,10 +125,10 @@ namespace paludis
virtual void set_paludis_command(const std::string &);
- virtual std::tr1::shared_ptr<PackageDatabase> package_database()
+ virtual tr1::shared_ptr<PackageDatabase> package_database()
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const
+ virtual tr1::shared_ptr<const PackageDatabase> package_database() const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/environments/paludis/paludis_environment_TEST.cc b/paludis/environments/paludis/paludis_environment_TEST.cc
index 479ff84..e62acd1 100644
--- a/paludis/environments/paludis/paludis_environment_TEST.cc
+++ b/paludis/environments/paludis/paludis_environment_TEST.cc
@@ -38,7 +38,7 @@ namespace test_cases
setenv("PALUDIS_HOME", stringify(FSEntry::cwd() / "paludis_environment_TEST_dir" / "home1").c_str(), 1);
unsetenv("PALUDIS_SKIP_CONFIG");
- std::tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
+ tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
PackageDatabaseEntry x(QualifiedPackageName("x/x"), VersionSpec("0"), RepositoryName("foo"));
TEST_CHECK(env->query_use(UseFlagName("foo"), x));
@@ -70,10 +70,10 @@ namespace test_cases
setenv("PALUDIS_HOME", stringify(FSEntry::cwd() / "paludis_environment_TEST_dir" / "home5").c_str(), 1);
unsetenv("PALUDIS_SKIP_CONFIG");
- std::tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
+ tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
PackageDatabaseEntry pde1(QualifiedPackageName("cat/one"), VersionSpec("1"), RepositoryName("foo"));
- std::tr1::shared_ptr<const UseFlagNameCollection> k1(env->known_use_expand_names(UseFlagName("foo_cards"), pde1));
+ tr1::shared_ptr<const UseFlagNameCollection> k1(env->known_use_expand_names(UseFlagName("foo_cards"), pde1));
TEST_CHECK_EQUAL(join(k1->begin(), k1->end(), " "), "foo_cards_one foo_cards_three foo_cards_two");
}
} paludis_environment_use_test_known;
@@ -87,7 +87,7 @@ namespace test_cases
setenv("PALUDIS_HOME", stringify(FSEntry::cwd() / "paludis_environment_TEST_dir" / "home2").c_str(), 1);
unsetenv("PALUDIS_SKIP_CONFIG");
- std::tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
+ tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
PackageDatabaseEntry x(QualifiedPackageName("x/x"), VersionSpec("0"), RepositoryName("foo"));
TEST_CHECK(env->query_use(UseFlagName("foo"), x));
@@ -119,7 +119,7 @@ namespace test_cases
setenv("PALUDIS_HOME", stringify(FSEntry::cwd() / "paludis_environment_TEST_dir" / "home3").c_str(), 1);
unsetenv("PALUDIS_SKIP_CONFIG");
- std::tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
+ tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
PackageDatabaseEntry x(QualifiedPackageName("x/x"), VersionSpec("0"), RepositoryName("foo"));
TEST_CHECK(env->query_use(UseFlagName("foo"), x));
@@ -151,7 +151,7 @@ namespace test_cases
setenv("PALUDIS_HOME", stringify(FSEntry::cwd() / "paludis_environment_TEST_dir" / "home4").c_str(), 1);
unsetenv("PALUDIS_SKIP_CONFIG");
- std::tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
+ tr1::shared_ptr<Environment> env(new PaludisEnvironment(""));
TEST_CHECK(env->package_database()->fetch_repository(RepositoryName("first")));
TEST_CHECK(env->package_database()->fetch_repository(RepositoryName("second")));
diff --git a/paludis/environments/paludis/registration.cc b/paludis/environments/paludis/registration.cc
index eba6dcc..7729db6 100644
--- a/paludis/environments/paludis/registration.cc
+++ b/paludis/environments/paludis/registration.cc
@@ -24,10 +24,10 @@ using namespace paludis;
namespace
{
- std::tr1::shared_ptr<Environment>
+ tr1::shared_ptr<Environment>
make_paludis_environment(const std::string & s)
{
- return std::tr1::shared_ptr<Environment>(new PaludisEnvironment(s));
+ return tr1::shared_ptr<Environment>(new PaludisEnvironment(s));
}
}
diff --git a/paludis/environments/paludis/repository_config_entry.sr b/paludis/environments/paludis/repository_config_entry.sr
index 56a5223..24972c7 100644
--- a/paludis/environments/paludis/repository_config_entry.sr
+++ b/paludis/environments/paludis/repository_config_entry.sr
@@ -5,7 +5,7 @@ make_class_RepositoryConfigEntry()
{
key format std::string
key importance int
- key keys "std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> >"
+ key keys "tr1::shared_ptr<AssociativeCollection<std::string, std::string> >"
doxygen_comment << "END"
/**
diff --git a/paludis/environments/paludis/use_conf.cc b/paludis/environments/paludis/use_conf.cc
index 995be1f..b9cc469 100644
--- a/paludis/environments/paludis/use_conf.cc
+++ b/paludis/environments/paludis/use_conf.cc
@@ -39,8 +39,8 @@ using namespace paludis;
typedef MakeHashedMap<UseFlagName, UseFlagState>::Type UseFlagWithStateMap;
typedef std::list<std::string> MinusStarPrefixList;
typedef std::pair<UseFlagWithStateMap, MinusStarPrefixList> UseInfo;
-typedef std::pair<std::tr1::shared_ptr<const PackageDepSpec>, UseInfo> PDSWithUseInfo;
-typedef std::pair<std::tr1::shared_ptr<const DepSpec>, UseInfo> DSWithUseInfo;
+typedef std::pair<tr1::shared_ptr<const PackageDepSpec>, UseInfo> PDSWithUseInfo;
+typedef std::pair<tr1::shared_ptr<const DepSpec>, UseInfo> DSWithUseInfo;
typedef std::list<PDSWithUseInfo> PDSWithUseInfoList;
typedef MakeHashedMap<QualifiedPackageName, PDSWithUseInfoList>::Type Qualified;
typedef std::list<PDSWithUseInfo> Unqualified;
@@ -77,7 +77,7 @@ UseConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a use file:");
- std::tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
+ tr1::shared_ptr<LineConfigFile> f(make_bashable_conf(filename));
if (! f)
return;
@@ -122,7 +122,7 @@ UseConf::add(const FSEntry & filename)
}
else
{
- std::tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
+ tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
if (d->use_requirements_ptr())
{
@@ -192,10 +192,10 @@ UseConf::query(const UseFlagName & f, const PackageDatabaseEntry & e) const
UseFlagState result(use_unspecified);
bool ignore_empty_minus_star(false);
- std::tr1::shared_ptr<const Repository> repo(_imp->env->package_database()->fetch_repository(e.repository));
+ tr1::shared_ptr<const Repository> repo(_imp->env->package_database()->fetch_repository(e.repository));
if (repo->use_interface)
{
- std::tr1::shared_ptr<const UseFlagNameCollection> prefixes(repo->use_interface->use_expand_prefixes());
+ tr1::shared_ptr<const UseFlagNameCollection> prefixes(repo->use_interface->use_expand_prefixes());
for (UseFlagNameCollection::Iterator p(prefixes->begin()), p_end(prefixes->end()) ;
p != p_end ; ++p)
if (0 == p->data().compare(0, p->data().length(), stringify(f), 0, p->data().length()))
@@ -305,12 +305,12 @@ UseConf::query(const UseFlagName & f, const PackageDatabaseEntry & e) const
return result;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
UseConf::known_use_expand_names(const UseFlagName & prefix, const PackageDatabaseEntry & e) const
{
Context context("When loading known use expand names for prefix '" + stringify(prefix) + ":");
- std::tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
+ tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
std::string prefix_lower;
std::transform(prefix.data().begin(), prefix.data().end(), std::back_inserter(prefix_lower), &::tolower);
prefix_lower.append("_");
diff --git a/paludis/environments/paludis/use_conf.hh b/paludis/environments/paludis/use_conf.hh
index f4c1f94..0af8a6b 100644
--- a/paludis/environments/paludis/use_conf.hh
+++ b/paludis/environments/paludis/use_conf.hh
@@ -43,7 +43,7 @@ namespace paludis
UseFlagState query(const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- std::tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
+ tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
diff --git a/paludis/environments/paludis/use_config_entry.sr b/paludis/environments/paludis/use_config_entry.sr
index 046c045..d623abf 100644
--- a/paludis/environments/paludis/use_config_entry.sr
+++ b/paludis/environments/paludis/use_config_entry.sr
@@ -3,7 +3,7 @@
make_class_UseConfigEntry()
{
- key dep_spec "std::tr1::shared_ptr<const PackageDepSpec>"
+ key dep_spec "tr1::shared_ptr<const PackageDepSpec>"
key flag_name UseFlagName
key flag_state UseFlagState
@@ -20,8 +20,8 @@ END
make_class_SetUseConfigEntry()
{
- key set_name "std::tr1::shared_ptr<const SetName>"
- key dep_spec "std::tr1::shared_ptr<const DepSpec>"
+ key set_name "tr1::shared_ptr<const SetName>"
+ key dep_spec "tr1::shared_ptr<const DepSpec>"
key flag_name UseFlagName
key flag_state UseFlagState
@@ -38,8 +38,8 @@ END
make_class_SetUseConfigMinusStarEntry()
{
- key set_name "std::tr1::shared_ptr<const SetName>"
- key dep_spec "std::tr1::shared_ptr<const DepSpec>"
+ key set_name "tr1::shared_ptr<const SetName>"
+ key dep_spec "tr1::shared_ptr<const DepSpec>"
key prefix std::string
doxygen_comment << "END"
@@ -55,8 +55,8 @@ END
make_class_SetKeywordConfigEntry()
{
- key set_name "std::tr1::shared_ptr<const SetName>"
- key dep_spec "std::tr1::shared_ptr<const DepSpec>"
+ key set_name "tr1::shared_ptr<const SetName>"
+ key dep_spec "tr1::shared_ptr<const DepSpec>"
key keyword KeywordName
doxygen_comment << "END"
@@ -72,8 +72,8 @@ END
make_class_SetLicenseConfigEntry()
{
- key set_name "std::tr1::shared_ptr<const SetName>"
- key dep_spec "std::tr1::shared_ptr<const DepSpec>"
+ key set_name "tr1::shared_ptr<const SetName>"
+ key dep_spec "tr1::shared_ptr<const DepSpec>"
key license std::string
doxygen_comment << "END"
@@ -89,8 +89,8 @@ END
make_class_SetMaskConfigEntry()
{
- key set_name "std::tr1::shared_ptr<const SetName>"
- key dep_spec "std::tr1::shared_ptr<const DepSpec>"
+ key set_name "tr1::shared_ptr<const SetName>"
+ key dep_spec "tr1::shared_ptr<const DepSpec>"
doxygen_comment << "END"
/**
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 7c9a5e4..7b3faff 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -31,7 +31,7 @@
#include <paludis/match_package.hh>
#include <paludis/package_database.hh>
#include <algorithm>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
#include <functional>
#include <set>
#include <map>
@@ -39,10 +39,10 @@
using namespace paludis;
-typedef std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, std::string> > PackageUse;
-typedef std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, std::string> > PackageKeywords;
-typedef std::list<std::tr1::shared_ptr<const PackageDepSpec> > PackageMask;
-typedef std::list<std::tr1::shared_ptr<const PackageDepSpec> > PackageUnmask;
+typedef std::list<std::pair<tr1::shared_ptr<const PackageDepSpec>, std::string> > PackageUse;
+typedef std::list<std::pair<tr1::shared_ptr<const PackageDepSpec>, std::string> > PackageKeywords;
+typedef std::list<tr1::shared_ptr<const PackageDepSpec> > PackageMask;
+typedef std::list<tr1::shared_ptr<const PackageDepSpec> > PackageUnmask;
PortageEnvironmentConfigurationError::PortageEnvironmentConfigurationError(const std::string & s) throw () :
ConfigurationError(s)
@@ -57,7 +57,7 @@ namespace paludis
const FSEntry conf_dir;
std::string paludis_command;
- std::tr1::shared_ptr<KeyValueConfigFile> vars;
+ tr1::shared_ptr<KeyValueConfigFile> vars;
std::set<std::string> use_with_expands;
std::set<std::string> use_expand;
@@ -70,12 +70,12 @@ namespace paludis
PackageUnmask package_unmask;
mutable bool done_hooks;
- mutable std::tr1::shared_ptr<Hooker> hooker;
+ mutable tr1::shared_ptr<Hooker> hooker;
mutable std::list<FSEntry> hook_dirs;
int overlay_importance;
- std::tr1::shared_ptr<PackageDatabase> package_database;
+ tr1::shared_ptr<PackageDatabase> package_database;
Implementation(Environment * const e, const std::string & s) :
conf_dir(FSEntry(s.empty() ? "/" : s) / SYSCONFDIR),
@@ -149,7 +149,7 @@ namespace
PortageEnvironment::PortageEnvironment(const std::string & s) :
PrivateImplementationPattern<PortageEnvironment>(new Implementation<PortageEnvironment>(this, s))
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
Context context("When creating PortageEnvironment using config root '" + s + "':");
@@ -181,7 +181,7 @@ PortageEnvironment::PortageEnvironment(const std::string & s) :
WhitespaceTokeniser::get_instance()->tokenise(_imp->vars->get("PORTDIR_OVERLAY"),
create_inserter<FSEntry>(std::back_inserter(portdir_overlay)));
std::for_each(portdir_overlay.begin(), portdir_overlay.end(),
- std::tr1::bind(std::tr1::mem_fn(&PortageEnvironment::_add_portdir_overlay_repository), this, _1));
+ tr1::bind(tr1::mem_fn(&PortageEnvironment::_add_portdir_overlay_repository), this, _1));
/* use etc */
@@ -246,7 +246,7 @@ template<typename I_>
void
PortageEnvironment::_load_atom_file(const FSEntry & f, I_ i, const std::string & def_value)
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
Context context("When loading '" + stringify(f) + "':");
@@ -255,7 +255,7 @@ PortageEnvironment::_load_atom_file(const FSEntry & f, I_ i, const std::string &
if (f.is_directory())
{
- std::for_each(DirIterator(f), DirIterator(), std::tr1::bind(std::tr1::mem_fn(
+ std::for_each(DirIterator(f), DirIterator(), tr1::bind(tr1::mem_fn(
&PortageEnvironment::_load_atom_file<I_>), this, _1, i, def_value));
}
else
@@ -270,7 +270,7 @@ PortageEnvironment::_load_atom_file(const FSEntry & f, I_ i, const std::string &
if (tokens.empty())
continue;
- std::tr1::shared_ptr<PackageDepSpec> p(new PackageDepSpec(tokens.at(0), pds_pm_permissive));
+ tr1::shared_ptr<PackageDepSpec> p(new PackageDepSpec(tokens.at(0), pds_pm_permissive));
if (1 == tokens.size())
{
if (! def_value.empty())
@@ -290,7 +290,7 @@ template<typename I_>
void
PortageEnvironment::_load_lined_file(const FSEntry & f, I_ i)
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
Context context("When loading '" + stringify(f) + "':");
@@ -299,7 +299,7 @@ PortageEnvironment::_load_lined_file(const FSEntry & f, I_ i)
if (f.is_directory())
{
- std::for_each(DirIterator(f), DirIterator(), std::tr1::bind(std::tr1::mem_fn(
+ std::for_each(DirIterator(f), DirIterator(), tr1::bind(tr1::mem_fn(
&PortageEnvironment::_load_lined_file<I_>), this, _1, i));
}
else
@@ -307,7 +307,7 @@ PortageEnvironment::_load_lined_file(const FSEntry & f, I_ i)
LineConfigFile file(f, LineConfigFileOptions());
for (LineConfigFile::Iterator line(file.begin()), line_end(file.end()) ;
line != line_end ; ++line)
- *i++ = std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
+ *i++ = tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
strip_trailing(strip_leading(*line, " \t"), " \t"), pds_pm_permissive));
}
}
@@ -334,7 +334,7 @@ PortageEnvironment::_load_profile(const FSEntry & d)
void
PortageEnvironment::_add_virtuals_repository()
{
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
package_database()->add_repository(-2,
RepositoryMaker::get_instance()->find_maker("virtuals")(this, keys));
@@ -343,7 +343,7 @@ PortageEnvironment::_add_virtuals_repository()
void
PortageEnvironment::_add_installed_virtuals_repository()
{
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("root", stringify(root()));
package_database()->add_repository(-1,
@@ -361,7 +361,7 @@ void
PortageEnvironment::_add_ebuild_repository(const FSEntry & portdir, const std::string & master,
const std::string & sync, int importance)
{
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("root", stringify(root()));
keys->insert("location", stringify(portdir));
@@ -394,7 +394,7 @@ PortageEnvironment::_add_vdb_repository()
{
Context context("When creating vdb repository:");
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("root", stringify(root()));
keys->insert("location", stringify(root() / "/var/db/pkg"));
@@ -430,7 +430,7 @@ PortageEnvironment::query_use(const UseFlagName & f, const PackageDatabaseEntry
Save<bool> save_recursive(&recursive, true);
/* first check package database use masks... */
- std::tr1::shared_ptr<const Repository> repo(package_database()->fetch_repository(e.repository));
+ tr1::shared_ptr<const Repository> repo(package_database()->fetch_repository(e.repository));
if (repo->use_interface)
{
@@ -493,7 +493,7 @@ PortageEnvironment::set_paludis_command(const std::string & s)
}
bool
-PortageEnvironment::accept_keywords(std::tr1::shared_ptr <const KeywordNameCollection> keywords,
+PortageEnvironment::accept_keywords(tr1::shared_ptr <const KeywordNameCollection> keywords,
const PackageDatabaseEntry & d) const
{
bool result(false);
@@ -562,13 +562,13 @@ PortageEnvironment::unmasked_by_user(const PackageDatabaseEntry & e) const
return false;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
PortageEnvironment::known_use_expand_names(const UseFlagName & prefix,
const PackageDatabaseEntry & pde) const
{
Context context("When loading known use expand names for prefix '" + stringify(prefix) + ":");
- std::tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
+ tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
std::string prefix_lower;
std::transform(prefix.data().begin(), prefix.data().end(), std::back_inserter(prefix_lower), &::tolower);
prefix_lower.append("_");
@@ -597,32 +597,32 @@ PortageEnvironment::known_use_expand_names(const UseFlagName & prefix,
HookResult
PortageEnvironment::perform_hook(const Hook & hook) const
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
if (! _imp->hooker)
{
_imp->need_hook_dirs();
_imp->hooker.reset(new Hooker(this));
std::for_each(_imp->hook_dirs.begin(), _imp->hook_dirs.end(),
- std::tr1::bind(std::tr1::mem_fn(&Hooker::add_dir), _imp->hooker.get(), _1, false));
+ tr1::bind(tr1::mem_fn(&Hooker::add_dir), _imp->hooker.get(), _1, false));
}
return _imp->hooker->perform_hook(hook);
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
PortageEnvironment::hook_dirs() const
{
_imp->need_hook_dirs();
- std::tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
std::copy(_imp->hook_dirs.begin(), _imp->hook_dirs.end(), result->inserter());
return result;
}
-std::tr1::shared_ptr<const FSEntryCollection>
+tr1::shared_ptr<const FSEntryCollection>
PortageEnvironment::bashrc_files() const
{
- std::tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> result(new FSEntryCollection::Concrete);
result->push_back(_imp->conf_dir / "make.globals");
result->push_back(_imp->conf_dir / "make.conf");
result->push_back(FSEntry(LIBEXECDIR) / "paludis" / "environments" / "portage" / "bashrc");
@@ -635,24 +635,24 @@ PortageEnvironment::accept_breaks_portage(const PackageDatabaseEntry &) const
return false;
}
-std::tr1::shared_ptr<PackageDatabase>
+tr1::shared_ptr<PackageDatabase>
PortageEnvironment::package_database()
{
return _imp->package_database;
}
-std::tr1::shared_ptr<const PackageDatabase>
+tr1::shared_ptr<const PackageDatabase>
PortageEnvironment::package_database() const
{
return _imp->package_database;
}
-std::tr1::shared_ptr<const MirrorsCollection>
+tr1::shared_ptr<const MirrorsCollection>
PortageEnvironment::mirrors(const std::string & m) const
{
std::pair<std::multimap<std::string, std::string>::const_iterator, std::multimap<std::string, std::string>::const_iterator>
p(_imp->mirrors.equal_range(m));
- std::tr1::shared_ptr<MirrorsCollection> result(new MirrorsCollection::Concrete);
+ tr1::shared_ptr<MirrorsCollection> result(new MirrorsCollection::Concrete);
std::copy(p.first, p.second, transform_inserter(result->inserter(), SelectSecond<std::string, std::string>()));
return result;
}
diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh
index 95635b7..40dd406 100644
--- a/paludis/environments/portage/portage_environment.hh
+++ b/paludis/environments/portage/portage_environment.hh
@@ -70,7 +70,7 @@ namespace paludis
void _load_atom_file(const FSEntry &, I_, const std::string &);
protected:
- virtual bool accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
+ virtual bool accept_keywords(tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool accept_breaks_portage(const PackageDatabaseEntry &) const
@@ -94,29 +94,29 @@ namespace paludis
virtual bool query_use(const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
+ virtual tr1::shared_ptr<const UseFlagNameCollection> known_use_expand_names(
const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
+ virtual tr1::shared_ptr<const FSEntryCollection> bashrc_files() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
+ virtual tr1::shared_ptr<const FSEntryCollection> hook_dirs() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const FSEntry root() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
+ virtual tr1::shared_ptr<const MirrorsCollection> mirrors(const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual HookResult perform_hook(const Hook &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<PackageDatabase> package_database()
+ virtual tr1::shared_ptr<PackageDatabase> package_database()
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const
+ virtual tr1::shared_ptr<const PackageDatabase> package_database() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string paludis_command() const
diff --git a/paludis/environments/portage/portage_environment_TEST.cc b/paludis/environments/portage/portage_environment_TEST.cc
index 9007afa..0609098 100644
--- a/paludis/environments/portage/portage_environment_TEST.cc
+++ b/paludis/environments/portage/portage_environment_TEST.cc
@@ -44,7 +44,7 @@ namespace
bool accept_keyword(const TestPortageEnvironment & env,
const KeywordName & k, const PackageDatabaseEntry & e)
{
- std::tr1::shared_ptr<KeywordNameCollection> kk(new KeywordNameCollection::Concrete);
+ tr1::shared_ptr<KeywordNameCollection> kk(new KeywordNameCollection::Concrete);
kk->insert(k);
return env.accept_keywords(kk, e);
}
@@ -88,7 +88,7 @@ namespace test_cases
PortageEnvironment env("portage_environment_TEST_dir/known_use_expand_names");
PackageDatabaseEntry pde1(QualifiedPackageName("app/one"), VersionSpec("1"), RepositoryName("foo"));
- std::tr1::shared_ptr<const UseFlagNameCollection> k1(env.known_use_expand_names(UseFlagName("foo_cards"), pde1));
+ tr1::shared_ptr<const UseFlagNameCollection> k1(env.known_use_expand_names(UseFlagName("foo_cards"), pde1));
TEST_CHECK_EQUAL(join(k1->begin(), k1->end(), " "), "foo_cards_one foo_cards_three");
}
} test_known_use_expand;
diff --git a/paludis/environments/portage/registration.cc b/paludis/environments/portage/registration.cc
index 904308c..50452a0 100644
--- a/paludis/environments/portage/registration.cc
+++ b/paludis/environments/portage/registration.cc
@@ -24,10 +24,10 @@ using namespace paludis;
namespace
{
- std::tr1::shared_ptr<Environment>
+ tr1::shared_ptr<Environment>
make_portage_environment(const std::string & s)
{
- return std::tr1::shared_ptr<Environment>(new PortageEnvironment(s));
+ return tr1::shared_ptr<Environment>(new PortageEnvironment(s));
}
}
diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc
index e8ad882..81f13e9 100644
--- a/paludis/environments/test/test_environment.cc
+++ b/paludis/environments/test/test_environment.cc
@@ -29,7 +29,7 @@ namespace paludis
template<>
struct Implementation<TestEnvironment>
{
- std::tr1::shared_ptr<PackageDatabase> package_database;
+ tr1::shared_ptr<PackageDatabase> package_database;
std::string paludis_command;
Implementation(Environment * const e) :
@@ -56,18 +56,18 @@ TestEnvironment::query_use(const UseFlagName & u, const PackageDatabaseEntry &)
}
bool
-TestEnvironment::accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection> k, const PackageDatabaseEntry &) const
+TestEnvironment::accept_keywords(tr1::shared_ptr<const KeywordNameCollection> k, const PackageDatabaseEntry &) const
{
return k->end() != k->find(KeywordName("test")) || k->end() != k->find(KeywordName("*"));
}
-std::tr1::shared_ptr<PackageDatabase>
+tr1::shared_ptr<PackageDatabase>
TestEnvironment::package_database()
{
return _imp->package_database;
}
-std::tr1::shared_ptr<const PackageDatabase>
+tr1::shared_ptr<const PackageDatabase>
TestEnvironment::package_database() const
{
return _imp->package_database;
diff --git a/paludis/environments/test/test_environment.hh b/paludis/environments/test/test_environment.hh
index ff9d11a..620ba80 100644
--- a/paludis/environments/test/test_environment.hh
+++ b/paludis/environments/test/test_environment.hh
@@ -44,7 +44,7 @@ namespace paludis
public EnvironmentImplementation
{
protected:
- virtual bool accept_keywords(std::tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
+ virtual bool accept_keywords(tr1::shared_ptr<const KeywordNameCollection>, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
public:
@@ -60,10 +60,10 @@ namespace paludis
virtual bool query_use(const UseFlagName &, const PackageDatabaseEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<PackageDatabase> package_database()
+ virtual tr1::shared_ptr<PackageDatabase> package_database()
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const
+ virtual tr1::shared_ptr<const PackageDatabase> package_database() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string paludis_command() const
diff --git a/paludis/hooker.cc b/paludis/hooker.cc
index 86ff5cf..b18a1a3 100644
--- a/paludis/hooker.cc
+++ b/paludis/hooker.cc
@@ -361,7 +361,7 @@ namespace paludis
{
const Environment * const env;
std::list<std::pair<FSEntry, bool> > dirs;
- mutable std::map<std::string, std::list<std::tr1::shared_ptr<HookFile> > > hook_files;
+ mutable std::map<std::string, std::list<tr1::shared_ptr<HookFile> > > hook_files;
Implementation(const Environment * const e) :
env(e)
@@ -440,13 +440,13 @@ Hooker::perform_hook(const Hook & hook) const
/* file hooks, but only if necessary */
- std::map<std::string, std::list<std::tr1::shared_ptr<HookFile> > >::iterator h(_imp->hook_files.find(hook.name()));
+ std::map<std::string, std::list<tr1::shared_ptr<HookFile> > >::iterator h(_imp->hook_files.find(hook.name()));
if (h == _imp->hook_files.end())
{
- h = _imp->hook_files.insert(std::make_pair(hook.name(), std::list<std::tr1::shared_ptr<HookFile> >())).first;
+ h = _imp->hook_files.insert(std::make_pair(hook.name(), std::list<tr1::shared_ptr<HookFile> >())).first;
- std::map<std::string, std::tr1::shared_ptr<HookFile> > hook_files;
+ std::map<std::string, tr1::shared_ptr<HookFile> > hook_files;
for (std::list<std::pair<FSEntry, bool> >::const_iterator d(_imp->dirs.begin()), d_end(_imp->dirs.end()) ;
d != d_end ; ++d)
@@ -458,14 +458,14 @@ Hooker::perform_hook(const Hook & hook) const
{
if (is_file_with_extension(*e, ".bash", IsFileWithOptions()))
if (! hook_files.insert(std::make_pair(strip_trailing_string(e->basename(), ".bash"),
- std::tr1::shared_ptr<HookFile>(new BashHookFile(*e, d->second, _imp->env)))).second)
+ tr1::shared_ptr<HookFile>(new BashHookFile(*e, d->second, _imp->env)))).second)
Log::get_instance()->message(ll_warning, lc_context, "Discarding hook file '" + stringify(*e)
+ "' because of naming conflict with '" + stringify(
hook_files.find(stringify(strip_trailing_string(e->basename(), ".bash")))->second->file_name()) + "'");
if (is_file_with_extension(*e, ".hook", IsFileWithOptions()))
if (! hook_files.insert(std::make_pair(strip_trailing_string(e->basename(), ".hook"),
- std::tr1::shared_ptr<HookFile>(new FancyHookFile(*e, d->second, _imp->env)))).second)
+ tr1::shared_ptr<HookFile>(new FancyHookFile(*e, d->second, _imp->env)))).second)
Log::get_instance()->message(ll_warning, lc_context, "Discarding hook file '" + stringify(*e)
+ "' because of naming conflict with '" + stringify(
hook_files.find(stringify(strip_trailing_string(e->basename(), ".hook")))->second->file_name()) + "'");
@@ -473,7 +473,7 @@ Hooker::perform_hook(const Hook & hook) const
std::string so_suffix(".so." + stringify(100 * PALUDIS_VERSION_MAJOR + PALUDIS_VERSION_MINOR));
if (is_file_with_extension(*e, so_suffix, IsFileWithOptions()))
if (! hook_files.insert(std::make_pair(strip_trailing_string(e->basename(), so_suffix),
- std::tr1::shared_ptr<HookFile>(new SoHookFile(*e, d->second, _imp->env)))).second)
+ tr1::shared_ptr<HookFile>(new SoHookFile(*e, d->second, _imp->env)))).second)
Log::get_instance()->message(ll_warning, lc_context, "Discarding hook file '" + stringify(*e)
+ "' because of naming conflict with '" + stringify(
hook_files.find(stringify(strip_trailing_string(e->basename(), so_suffix)))->second->file_name()) + "'");
@@ -484,11 +484,11 @@ Hooker::perform_hook(const Hook & hook) const
DirectedGraph<std::string, int> hook_deps;
{
Context context_local("When determining hook dependencies for '" + hook.name() + "':");
- for (std::map<std::string, std::tr1::shared_ptr<HookFile> >::const_iterator f(hook_files.begin()), f_end(hook_files.end()) ;
+ for (std::map<std::string, tr1::shared_ptr<HookFile> >::const_iterator f(hook_files.begin()), f_end(hook_files.end()) ;
f != f_end ; ++f)
hook_deps.add_node(f->first);
- for (std::map<std::string, std::tr1::shared_ptr<HookFile> >::const_iterator f(hook_files.begin()), f_end(hook_files.end()) ;
+ for (std::map<std::string, tr1::shared_ptr<HookFile> >::const_iterator f(hook_files.begin()), f_end(hook_files.end()) ;
f != f_end ; ++f)
f->second->add_dependencies(hook, hook_deps);
}
@@ -521,13 +521,13 @@ Hooker::perform_hook(const Hook & hook) const
switch (hook.output_dest)
{
case hod_stdout:
- for (std::list<std::tr1::shared_ptr<HookFile> >::const_iterator f(h->second.begin()),
+ for (std::list<tr1::shared_ptr<HookFile> >::const_iterator f(h->second.begin()),
f_end(h->second.end()) ; f != f_end ; ++f)
result.max_exit_status = std::max(result.max_exit_status, (*f)->run(hook).max_exit_status);
continue;
case hod_grab:
- for (std::list<std::tr1::shared_ptr<HookFile> >::const_iterator f(h->second.begin()),
+ for (std::list<tr1::shared_ptr<HookFile> >::const_iterator f(h->second.begin()),
f_end(h->second.end()) ; f != f_end ; ++f)
{
HookResult tmp((*f)->run(hook));
diff --git a/paludis/match_package.cc b/paludis/match_package.cc
index cd7b57f..b0497af 100644
--- a/paludis/match_package.cc
+++ b/paludis/match_package.cc
@@ -77,7 +77,7 @@ paludis::match_package(
if (spec.slot_ptr() || spec.use_requirements_ptr())
{
- std::tr1::shared_ptr<const VersionMetadata> metadata(env.package_database()->fetch_repository(
+ tr1::shared_ptr<const VersionMetadata> metadata(env.package_database()->fetch_repository(
entry.repository)->version_metadata(
entry.name, entry.version));
diff --git a/paludis/package_database.cc b/paludis/package_database.cc
index bee0f94..84f4a83 100644
--- a/paludis/package_database.cc
+++ b/paludis/package_database.cc
@@ -157,12 +157,12 @@ namespace paludis
/**
* Our Repository instances.
*/
- std::list<std::tr1::shared_ptr<Repository> > repositories;
+ std::list<tr1::shared_ptr<Repository> > repositories;
/**
* Repository importances.
*/
- std::multimap<int, std::list<std::tr1::shared_ptr<Repository> >::iterator> repository_importances;
+ std::multimap<int, std::list<tr1::shared_ptr<Repository> >::iterator> repository_importances;
/// Our environment.
const Environment * environment;
@@ -180,7 +180,7 @@ PackageDatabase::~PackageDatabase()
}
void
-PackageDatabase::add_repository(int i, const std::tr1::shared_ptr<Repository> r)
+PackageDatabase::add_repository(int i, const tr1::shared_ptr<Repository> r)
{
Context c("When adding a repository named '" + stringify(r->name()) + "':");
@@ -189,8 +189,8 @@ PackageDatabase::add_repository(int i, const std::tr1::shared_ptr<Repository> r)
if (r_c->name() == r->name())
throw DuplicateRepositoryError(stringify(r->name()));
- std::list<std::tr1::shared_ptr<Repository> >::iterator q(_imp->repositories.end());
- for (std::multimap<int, std::list<std::tr1::shared_ptr<Repository> >::iterator>::iterator
+ std::list<tr1::shared_ptr<Repository> >::iterator q(_imp->repositories.end());
+ for (std::multimap<int, std::list<tr1::shared_ptr<Repository> >::iterator>::iterator
p(_imp->repository_importances.begin()), p_end(_imp->repository_importances.end()) ;
p != p_end ; ++p)
if (p->first > i)
@@ -208,14 +208,14 @@ PackageDatabase::fetch_unique_qualified_package_name(
{
Context context("When disambiguating package name '" + stringify(p) + "':");
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
for (IndirectIterator<RepositoryIterator> r(begin_repositories()), r_end(end_repositories()) ;
r != r_end ; ++r)
{
Context local_context("When looking in repository '" + stringify(r->name()) + "':");
- std::tr1::shared_ptr<const CategoryNamePartCollection> cats(r->category_names_containing_package(p));
+ tr1::shared_ptr<const CategoryNamePartCollection> cats(r->category_names_containing_package(p));
for (CategoryNamePartCollection::Iterator c(cats->begin()), c_end(cats->end()) ;
c != c_end ; ++c)
result->insert(*c + p);
@@ -229,7 +229,7 @@ PackageDatabase::fetch_unique_qualified_package_name(
return *(result->begin());
}
-std::tr1::shared_ptr<PackageDatabaseEntryCollection>
+tr1::shared_ptr<PackageDatabaseEntryCollection>
PackageDatabase::query(const PackageDepSpec & a, const InstallState installed_state,
const QueryOrder query_order) const
{
@@ -272,7 +272,7 @@ namespace
if (a.name != b.name)
return false;
- std::tr1::shared_ptr<const VersionMetadata>
+ tr1::shared_ptr<const VersionMetadata>
ma(db->fetch_repository(a.repository)->version_metadata(a.name, a.version)),
mb(db->fetch_repository(b.repository)->version_metadata(b.name, b.version));
@@ -281,12 +281,12 @@ namespace
};
}
-std::tr1::shared_ptr<PackageDatabaseEntryCollection>
+tr1::shared_ptr<PackageDatabaseEntryCollection>
PackageDatabase::query(const Query & q, const QueryOrder query_order) const
{
- std::tr1::shared_ptr<PackageDatabaseEntryCollection::Concrete> result(new PackageDatabaseEntryCollection::Concrete);
+ tr1::shared_ptr<PackageDatabaseEntryCollection::Concrete> result(new PackageDatabaseEntryCollection::Concrete);
- std::tr1::shared_ptr<RepositoryNameCollection> repos(q.repositories(*_imp->environment));
+ tr1::shared_ptr<RepositoryNameCollection> repos(q.repositories(*_imp->environment));
if (! repos)
{
repos.reset(new RepositoryNameCollection::Concrete);
@@ -297,21 +297,21 @@ PackageDatabase::query(const Query & q, const QueryOrder query_order) const
if (repos->empty())
return result;
- std::tr1::shared_ptr<CategoryNamePartCollection> cats(q.categories(*_imp->environment, repos));
+ tr1::shared_ptr<CategoryNamePartCollection> cats(q.categories(*_imp->environment, repos));
if (! cats)
{
cats.reset(new CategoryNamePartCollection::Concrete);
for (RepositoryNameCollection::Iterator r(repos->begin()), r_end(repos->end()) ;
r != r_end ; ++r)
{
- std::tr1::shared_ptr<const CategoryNamePartCollection> local_cats(fetch_repository(*r)->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> local_cats(fetch_repository(*r)->category_names());
std::copy(local_cats->begin(), local_cats->end(), cats->inserter());
}
}
if (cats->empty())
return result;
- std::tr1::shared_ptr<QualifiedPackageNameCollection> pkgs(q.packages(*_imp->environment, repos, cats));
+ tr1::shared_ptr<QualifiedPackageNameCollection> pkgs(q.packages(*_imp->environment, repos, cats));
if (! pkgs)
{
pkgs.reset(new QualifiedPackageNameCollection::Concrete);
@@ -320,14 +320,14 @@ PackageDatabase::query(const Query & q, const QueryOrder query_order) const
for (CategoryNamePartCollection::Iterator c(cats->begin()), c_end(cats->end()) ;
c != c_end ; ++c)
{
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> local_pkgs(fetch_repository(*r)->package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> local_pkgs(fetch_repository(*r)->package_names(*c));
std::copy(local_pkgs->begin(), local_pkgs->end(), pkgs->inserter());
}
}
if (pkgs->empty())
return result;
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> pdes(q.versions(*_imp->environment, repos, pkgs));
+ tr1::shared_ptr<PackageDatabaseEntryCollection> pdes(q.versions(*_imp->environment, repos, pkgs));
if (! pdes)
{
for (RepositoryNameCollection::Iterator r(repos->begin()), r_end(repos->end()) ;
@@ -335,7 +335,7 @@ PackageDatabase::query(const Query & q, const QueryOrder query_order) const
for (QualifiedPackageNameCollection::Iterator p(pkgs->begin()), p_end(pkgs->end()) ;
p != p_end ; ++p)
{
- std::tr1::shared_ptr<const VersionSpecCollection> local_vers(fetch_repository(*r)->version_specs(*p));
+ tr1::shared_ptr<const VersionSpecCollection> local_vers(fetch_repository(*r)->version_specs(*p));
for (VersionSpecCollection::Iterator v(local_vers->begin()), v_end(local_vers->end()) ;
v != v_end ; ++v)
result->push_back(PackageDatabaseEntry(*p, *v, *r));
@@ -399,7 +399,7 @@ PackageDatabase::query(const Query & q, const QueryOrder query_order) const
}
-std::tr1::shared_ptr<const Repository>
+tr1::shared_ptr<const Repository>
PackageDatabase::fetch_repository(const RepositoryName & n) const
{
for (RepositoryIterator r(begin_repositories()), r_end(end_repositories()) ;
@@ -410,7 +410,7 @@ PackageDatabase::fetch_repository(const RepositoryName & n) const
throw NoSuchRepositoryError(n);
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
PackageDatabase::fetch_repository(const RepositoryName & n)
{
for (RepositoryIterator r(begin_repositories()), r_end(end_repositories()) ;
diff --git a/paludis/package_database.hh b/paludis/package_database.hh
index bc479a4..f183d88 100644
--- a/paludis/package_database.hh
+++ b/paludis/package_database.hh
@@ -263,18 +263,18 @@ namespace paludis
* same name as the new Repository already exists in our
* collection.
*/
- void add_repository(int importance, const std::tr1::shared_ptr<Repository>);
+ void add_repository(int importance, const tr1::shared_ptr<Repository>);
/**
* Fetch a named repository.
*/
- std::tr1::shared_ptr<const Repository> fetch_repository(const RepositoryName &) const
+ tr1::shared_ptr<const Repository> fetch_repository(const RepositoryName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
/**
* Fetch a named repository.
*/
- std::tr1::shared_ptr<Repository> fetch_repository(const RepositoryName &)
+ tr1::shared_ptr<Repository> fetch_repository(const RepositoryName &)
PALUDIS_ATTRIBUTE((warn_unused_result));
/**
@@ -306,7 +306,7 @@ namespace paludis
*
* \deprecated use the Query form
*/
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> query(
+ tr1::shared_ptr<PackageDatabaseEntryCollection> query(
const PackageDepSpec & a,
const InstallState,
const QueryOrder) const
@@ -315,7 +315,7 @@ namespace paludis
/**
* Query the repository.
*/
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> query(
+ tr1::shared_ptr<PackageDatabaseEntryCollection> query(
const Query &, const QueryOrder) const
PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -328,7 +328,7 @@ namespace paludis
///\name Iterate over our repositories
///\{
- typedef libwrapiter::ForwardIterator<PackageDatabase, const std::tr1::shared_ptr<Repository> > RepositoryIterator;
+ typedef libwrapiter::ForwardIterator<PackageDatabase, const tr1::shared_ptr<Repository> > RepositoryIterator;
RepositoryIterator begin_repositories() const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/package_database_TEST.cc b/paludis/package_database_TEST.cc
index fd35f34..05692d3 100644
--- a/paludis/package_database_TEST.cc
+++ b/paludis/package_database_TEST.cc
@@ -46,8 +46,8 @@ namespace test_cases
TestEnvironment e;
PackageDatabase & p(*e.package_database());
- std::tr1::shared_ptr<FakeRepository> r1(new FakeRepository(&e, RepositoryName("repo1")));
- std::tr1::shared_ptr<FakeRepository> r2(new FakeRepository(&e, RepositoryName("repo2")));
+ tr1::shared_ptr<FakeRepository> r1(new FakeRepository(&e, RepositoryName("repo1")));
+ tr1::shared_ptr<FakeRepository> r2(new FakeRepository(&e, RepositoryName("repo2")));
TEST_CHECK_THROWS(p.fetch_repository(RepositoryName("repo1")), NoSuchRepositoryError);
TEST_CHECK_THROWS(p.fetch_repository(RepositoryName("repo2")), NoSuchRepositoryError);
@@ -98,7 +98,7 @@ namespace test_cases
TestEnvironment e;
PackageDatabase & p(*e.package_database());
- std::tr1::shared_ptr<FakeRepository> r1(new FakeRepository(&e, RepositoryName("repo1")));
+ tr1::shared_ptr<FakeRepository> r1(new FakeRepository(&e, RepositoryName("repo1")));
r1->add_version("r1c1", "r1c1p1", "1");
r1->add_version("r1c1", "r1c1p2", "1");
r1->add_version("r1c1", "r1c1p2", "2");
@@ -107,49 +107,49 @@ namespace test_cases
p.add_repository(11, r1);
TEST_CHECK(true);
- std::tr1::shared_ptr<FakeRepository> r2(new FakeRepository(&e, RepositoryName("repo2")));
+ tr1::shared_ptr<FakeRepository> r2(new FakeRepository(&e, RepositoryName("repo2")));
r2->add_version("rac1", "rac1pa", "1");
r2->add_version("rac1", "rac1pa", "3");
p.add_repository(10, r2);
TEST_CHECK(true);
PackageDepSpec d1("r1c1/r1c1p1", pds_pm_permissive);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q1(p.query(
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q1(p.query(
query::Matches(d1), qo_order_by_version));
TEST_CHECK_EQUAL(std::distance(q1->begin(), q1->end()), 1);
PackageDepSpec d2("r1c1/r1c1p2", pds_pm_permissive);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q2(p.query(
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q2(p.query(
query::Matches(d2), qo_order_by_version));
TEST_CHECK_EQUAL(std::distance(q2->begin(), q2->end()), 2);
PackageDepSpec d3(">=r1c1/r1c1p2-1", pds_pm_permissive);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q3(p.query(
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q3(p.query(
query::Matches(d3), qo_order_by_version));
TEST_CHECK_EQUAL(std::distance(q3->begin(), q3->end()), 2);
PackageDepSpec d4(">=r1c1/r1c1p2-2", pds_pm_permissive);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q4(p.query(
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q4(p.query(
query::Matches(d4), qo_order_by_version));
TEST_CHECK_EQUAL(std::distance(q4->begin(), q4->end()), 1);
PackageDepSpec d5(">=r1c1/r1c1p2-3", pds_pm_permissive);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q5(p.query(
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q5(p.query(
query::Matches(d5), qo_order_by_version));
TEST_CHECK_EQUAL(std::distance(q5->begin(), q5->end()), 0);
PackageDepSpec d6("<r1c1/r1c1p2-3", pds_pm_permissive);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q6(p.query(
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q6(p.query(
query::Matches(d6), qo_order_by_version));
TEST_CHECK_EQUAL(std::distance(q6->begin(), q6->end()), 2);
PackageDepSpec d7("rac1/rac1pa", pds_pm_permissive);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q7(p.query(
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q7(p.query(
query::Matches(d7), qo_order_by_version));
TEST_CHECK_EQUAL(std::distance(q7->begin(), q7->end()), 4);
PackageDepSpec d8("foo/bar", pds_pm_permissive);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q8(p.query(
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q8(p.query(
query::Matches(d8), qo_order_by_version));
TEST_CHECK_EQUAL(std::distance(q8->begin(), q8->end()), 0);
}
@@ -164,7 +164,7 @@ namespace test_cases
TestEnvironment e;
PackageDatabase & p(*e.package_database());
- std::tr1::shared_ptr<FakeRepository> r1(new FakeRepository(&e, RepositoryName("repo1")));
+ tr1::shared_ptr<FakeRepository> r1(new FakeRepository(&e, RepositoryName("repo1")));
r1->add_version("cat", "pkg", "1")->slot = SlotName("a");
r1->add_version("cat", "pkg", "2")->slot = SlotName("c");
r1->add_version("cat", "pkg", "3")->slot = SlotName("c");
@@ -172,7 +172,7 @@ namespace test_cases
p.add_repository(10, r1);
TEST_CHECK(true);
- std::tr1::shared_ptr<FakeRepository> r2(new FakeRepository(&e, RepositoryName("repo2")));
+ tr1::shared_ptr<FakeRepository> r2(new FakeRepository(&e, RepositoryName("repo2")));
r2->add_version("cat", "pkg", "1")->slot = SlotName("a");
r2->add_version("cat", "pkg", "3")->slot = SlotName("b");
p.add_repository(5, r2);
@@ -180,42 +180,42 @@ namespace test_cases
PackageDepSpec d("cat/pkg", pds_pm_permissive);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q1(p.query(d, is_any, qo_order_by_version));
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q1(p.query(d, is_any, qo_order_by_version));
TEST_CHECK_EQUAL(join(q1->begin(), q1->end(), " "),
"cat/pkg-1::repo2 cat/pkg-1::repo1 cat/pkg-2::repo1 cat/pkg-3::repo2 cat/pkg-3::repo1 cat/pkg-4::repo1");
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q2(p.query(d, is_any, qo_group_by_slot));
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q2(p.query(d, is_any, qo_group_by_slot));
TEST_CHECK_EQUAL(join(q2->begin(), q2->end(), " "),
"cat/pkg-3::repo2 cat/pkg-2::repo1 cat/pkg-3::repo1 cat/pkg-1::repo2 cat/pkg-1::repo1 cat/pkg-4::repo1");
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q3(p.query(d, is_any, qo_best_version_only));
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q3(p.query(d, is_any, qo_best_version_only));
TEST_CHECK_EQUAL(join(q3->begin(), q3->end(), " "),
"cat/pkg-4::repo1");
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q4(p.query(d, is_any, qo_best_version_in_slot_only));
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q4(p.query(d, is_any, qo_best_version_in_slot_only));
TEST_CHECK_EQUAL(join(q4->begin(), q4->end(), " "),
"cat/pkg-3::repo2 cat/pkg-3::repo1 cat/pkg-4::repo1");
- std::tr1::shared_ptr<FakeRepository> r3(new FakeRepository(&e, RepositoryName("repo3")));
+ tr1::shared_ptr<FakeRepository> r3(new FakeRepository(&e, RepositoryName("repo3")));
r3->add_version("cat", "other", "1")->slot = SlotName("a");
p.add_repository(5, r3);
TEST_CHECK(true);
PackageDepSpec c("cat/*", pds_pm_unspecific);
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q5(p.query(c, is_any, qo_order_by_version));
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q5(p.query(c, is_any, qo_order_by_version));
TEST_CHECK_EQUAL(join(q5->begin(), q5->end(), " "),
"cat/other-1::repo3 cat/pkg-1::repo2 cat/pkg-1::repo1 cat/pkg-2::repo1 cat/pkg-3::repo2 cat/pkg-3::repo1 cat/pkg-4::repo1");
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q6(p.query(c, is_any, qo_group_by_slot));
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q6(p.query(c, is_any, qo_group_by_slot));
TEST_CHECK_EQUAL(join(q6->begin(), q6->end(), " "),
"cat/other-1::repo3 cat/pkg-3::repo2 cat/pkg-2::repo1 cat/pkg-3::repo1 cat/pkg-1::repo2 cat/pkg-1::repo1 cat/pkg-4::repo1");
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q7(p.query(c, is_any, qo_best_version_only));
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q7(p.query(c, is_any, qo_best_version_only));
TEST_CHECK_EQUAL(join(q7->begin(), q7->end(), " "),
"cat/other-1::repo3 cat/pkg-4::repo1");
- const std::tr1::shared_ptr<PackageDatabaseEntryCollection> q8(p.query(c, is_any, qo_best_version_in_slot_only));
+ const tr1::shared_ptr<PackageDatabaseEntryCollection> q8(p.query(c, is_any, qo_best_version_in_slot_only));
TEST_CHECK_EQUAL(join(q8->begin(), q8->end(), " "),
"cat/other-1::repo3 cat/pkg-3::repo2 cat/pkg-3::repo1 cat/pkg-4::repo1");
}
@@ -234,7 +234,7 @@ namespace test_cases
TestEnvironment e;
PackageDatabase & p(*e.package_database());
- std::tr1::shared_ptr<FakeRepository> r1(new FakeRepository(&e, RepositoryName("repo1")));
+ tr1::shared_ptr<FakeRepository> r1(new FakeRepository(&e, RepositoryName("repo1")));
r1->add_package(CategoryNamePart("cat-one") + PackageNamePart("pkg-one"));
r1->add_package(CategoryNamePart("cat-one") + PackageNamePart("pkg-two"));
r1->add_package(CategoryNamePart("cat-two") + PackageNamePart("pkg-two"));
@@ -242,7 +242,7 @@ namespace test_cases
p.add_repository(10, r1);
TEST_CHECK(true);
- std::tr1::shared_ptr<FakeRepository> r2(new FakeRepository(&e, RepositoryName("repo2")));
+ tr1::shared_ptr<FakeRepository> r2(new FakeRepository(&e, RepositoryName("repo2")));
r1->add_package(CategoryNamePart("cat-three") + PackageNamePart("pkg-three"));
r1->add_package(CategoryNamePart("cat-three") + PackageNamePart("pkg-four"));
p.add_repository(10, r2);
diff --git a/paludis/portage_dep_parser.cc b/paludis/portage_dep_parser.cc
index 86f95eb..d71f0bd 100644
--- a/paludis/portage_dep_parser.cc
+++ b/paludis/portage_dep_parser.cc
@@ -61,13 +61,13 @@ namespace
};
}
-std::tr1::shared_ptr<CompositeDepSpec>
+tr1::shared_ptr<CompositeDepSpec>
PortageDepParser::parse(const std::string & s, const Policy & policy)
{
Context context("When parsing dependency string '" + s + "':");
- std::stack<std::tr1::shared_ptr<CompositeDepSpec> > stack;
- stack.push(std::tr1::shared_ptr<CompositeDepSpec>(new AllDepSpec));
+ std::stack<tr1::shared_ptr<CompositeDepSpec> > stack;
+ stack.push(tr1::shared_ptr<CompositeDepSpec>(new AllDepSpec));
PortageDepParserState state(dps_initial);
PortageDepLexer lexer(s);
@@ -99,7 +99,7 @@ PortageDepParser::parse(const std::string & s, const Policy & policy)
case dpl_open_paren:
{
- std::tr1::shared_ptr<CompositeDepSpec> a(new AllDepSpec);
+ tr1::shared_ptr<CompositeDepSpec> a(new AllDepSpec);
stack.top()->add_child(a);
stack.push(a);
state = dps_had_paren;
@@ -118,7 +118,7 @@ PortageDepParser::parse(const std::string & s, const Policy & policy)
case dpl_double_bar:
if (policy.permit_any_deps())
{
- std::tr1::shared_ptr<CompositeDepSpec> a(new AnyDepSpec);
+ tr1::shared_ptr<CompositeDepSpec> a(new AnyDepSpec);
stack.top()->add_child(a);
stack.push(a);
state = dps_had_double_bar;
@@ -143,7 +143,7 @@ PortageDepParser::parse(const std::string & s, const Policy & policy)
"Use flag name '" + i->second + "' missing '?'");
f.erase(f.length() - 1);
- std::tr1::shared_ptr<CompositeDepSpec> a(
+ tr1::shared_ptr<CompositeDepSpec> a(
new UseDepSpec(UseFlagName(f), inv));
stack.top()->add_child(a);
stack.push(a);
@@ -272,47 +272,47 @@ PortageDepParser::parse(const std::string & s, const Policy & policy)
if (stack.empty())
throw DepStringNestingError(s);
- std::tr1::shared_ptr<CompositeDepSpec> result(stack.top());
+ tr1::shared_ptr<CompositeDepSpec> result(stack.top());
stack.pop();
if (! stack.empty())
throw DepStringNestingError(s);
return result;
}
-std::tr1::shared_ptr<const CompositeDepSpec>
+tr1::shared_ptr<const CompositeDepSpec>
PortageDepParser::parse_depend(const std::string & s, const PackageDepSpecParseMode mode)
{
return PortageDepParser::parse(s, Policy::text_is_package_dep_spec(true, mode));
}
-std::tr1::shared_ptr<const CompositeDepSpec>
+tr1::shared_ptr<const CompositeDepSpec>
PortageDepParser::parse_license(const std::string & s)
{
return PortageDepParser::parse(s, Policy::text_is_text_dep_spec(true));
}
PortageDepParser::Policy::Policy(const bool p, const PackageDepSpecParseMode m,
- std::tr1::shared_ptr<StringDepSpec> (Policy::* const f) (const std::string &) const) :
+ tr1::shared_ptr<StringDepSpec> (Policy::* const f) (const std::string &) const) :
_permit_any_deps(p),
_parse_mode(m),
_create_func(f)
{
}
-std::tr1::shared_ptr<StringDepSpec>
+tr1::shared_ptr<StringDepSpec>
PortageDepParser::Policy::_create_text_dep_spec(const std::string & s) const
{
- return std::tr1::shared_ptr<StringDepSpec>(new PlainTextDepSpec(s));
+ return tr1::shared_ptr<StringDepSpec>(new PlainTextDepSpec(s));
}
-std::tr1::shared_ptr<StringDepSpec>
+tr1::shared_ptr<StringDepSpec>
PortageDepParser::Policy::_create_package_dep_spec(const std::string & s) const
{
if (s.empty() || '!' != s.at(0))
- return std::tr1::shared_ptr<StringDepSpec>(new PackageDepSpec(s, _parse_mode));
+ return tr1::shared_ptr<StringDepSpec>(new PackageDepSpec(s, _parse_mode));
else
- return std::tr1::shared_ptr<StringDepSpec>(new BlockDepSpec(
- std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(s.substr(1), _parse_mode))));
+ return tr1::shared_ptr<StringDepSpec>(new BlockDepSpec(
+ tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(s.substr(1), _parse_mode))));
}
PortageDepParser::Policy
@@ -327,7 +327,7 @@ PortageDepParser::Policy::text_is_package_dep_spec(bool permit_any_deps, Package
return Policy(permit_any_deps, mode, &Policy::_create_package_dep_spec);
}
-std::tr1::shared_ptr<StringDepSpec>
+tr1::shared_ptr<StringDepSpec>
PortageDepParser::Policy::create(const std::string & s) const
{
return (this->*_create_func)(s);
diff --git a/paludis/portage_dep_parser.hh b/paludis/portage_dep_parser.hh
index 9e0ff2a..912d030 100644
--- a/paludis/portage_dep_parser.hh
+++ b/paludis/portage_dep_parser.hh
@@ -79,7 +79,7 @@ namespace paludis
/**
* Create a new text spec from the provided string.
*/
- virtual std::tr1::shared_ptr<DepSpec> new_text_spec(const std::string &) const = 0;
+ virtual tr1::shared_ptr<DepSpec> new_text_spec(const std::string &) const = 0;
/**
* Are || ( ) deps permitted?
@@ -116,13 +116,13 @@ namespace paludis
private:
const bool _permit_any_deps;
const PackageDepSpecParseMode _parse_mode;
- std::tr1::shared_ptr<StringDepSpec> (Policy::* const _create_func) (const std::string &) const;
+ tr1::shared_ptr<StringDepSpec> (Policy::* const _create_func) (const std::string &) const;
- std::tr1::shared_ptr<StringDepSpec> _create_text_dep_spec(const std::string &) const;
- std::tr1::shared_ptr<StringDepSpec> _create_package_dep_spec(const std::string &) const;
+ tr1::shared_ptr<StringDepSpec> _create_text_dep_spec(const std::string &) const;
+ tr1::shared_ptr<StringDepSpec> _create_package_dep_spec(const std::string &) const;
Policy(const bool, const PackageDepSpecParseMode,
- std::tr1::shared_ptr<StringDepSpec> (Policy::* const) (const std::string &) const);
+ tr1::shared_ptr<StringDepSpec> (Policy::* const) (const std::string &) const);
public:
/**
@@ -140,7 +140,7 @@ namespace paludis
/**
* Create a text dep spec.
*/
- std::tr1::shared_ptr<StringDepSpec> create(const std::string &) const;
+ tr1::shared_ptr<StringDepSpec> create(const std::string &) const;
/**
* Whether any deps are permitted.
@@ -152,19 +152,19 @@ namespace paludis
* Parse a given dependency string, and return an appropriate
* DepSpec tree.
*/
- static std::tr1::shared_ptr<CompositeDepSpec> parse(const std::string & s,
+ static tr1::shared_ptr<CompositeDepSpec> parse(const std::string & s,
const Policy &);
/**
* Convenience wrapper for parse for depend strings, for VersionMetadata.
*/
- static std::tr1::shared_ptr<const CompositeDepSpec> parse_depend(const std::string & s,
+ static tr1::shared_ptr<const CompositeDepSpec> parse_depend(const std::string & s,
const PackageDepSpecParseMode);
/**
* Convenience wrapper for parse for license strings, for VersionMetadata.
*/
- static std::tr1::shared_ptr<const CompositeDepSpec> parse_license(const std::string & s);
+ static tr1::shared_ptr<const CompositeDepSpec> parse_license(const std::string & s);
};
}
diff --git a/paludis/qa/create_metadata_check.cc b/paludis/qa/create_metadata_check.cc
index 7148ed3..2d164ff 100644
--- a/paludis/qa/create_metadata_check.cc
+++ b/paludis/qa/create_metadata_check.cc
@@ -39,7 +39,7 @@ CreateMetadataCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
if (! metadata->eapi.supported)
diff --git a/paludis/qa/dep_any_check.cc b/paludis/qa/dep_any_check.cc
index dba8cbf..12c32cb 100644
--- a/paludis/qa/dep_any_check.cc
+++ b/paludis/qa/dep_any_check.cc
@@ -108,7 +108,7 @@ DepAnyCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
if (metadata->deps_interface)
diff --git a/paludis/qa/dep_flags_check.cc b/paludis/qa/dep_flags_check.cc
index 7d1c819..054074f 100644
--- a/paludis/qa/dep_flags_check.cc
+++ b/paludis/qa/dep_flags_check.cc
@@ -61,7 +61,7 @@ namespace
void visit(const UseDepSpec * const u)
{
- std::tr1::shared_ptr<const Repository> r(env->package_database()->fetch_repository(env->package_database()->
+ tr1::shared_ptr<const Repository> r(env->package_database()->fetch_repository(env->package_database()->
favourite_repository()));
if (! r->use_interface)
@@ -84,7 +84,7 @@ namespace
do
{
bool found_match(false);
- std::tr1::shared_ptr<const UseFlagNameCollection> c(r->use_interface->use_expand_prefixes());
+ tr1::shared_ptr<const UseFlagNameCollection> c(r->use_interface->use_expand_prefixes());
for (UseFlagNameCollection::Iterator i(c->begin()), i_end(c->end()) ;
i != i_end ; ++i)
@@ -133,7 +133,7 @@ DepFlagsCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
if (metadata->ebuild_interface == 0)
diff --git a/paludis/qa/dep_packages_check.cc b/paludis/qa/dep_packages_check.cc
index a4dab6c..fa38ca1 100644
--- a/paludis/qa/dep_packages_check.cc
+++ b/paludis/qa/dep_packages_check.cc
@@ -87,7 +87,7 @@ DepPackagesCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
static std::set<QualifiedPackageName> suspicious_depend;
diff --git a/paludis/qa/deps_exist_check.cc b/paludis/qa/deps_exist_check.cc
index b08e776..b690c41 100644
--- a/paludis/qa/deps_exist_check.cc
+++ b/paludis/qa/deps_exist_check.cc
@@ -104,7 +104,7 @@ DepsExistCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
Checker depend_checker(result, "DEPEND", e.environment);
diff --git a/paludis/qa/deps_visible_check.cc b/paludis/qa/deps_visible_check.cc
index d2bd552..e1e2067 100644
--- a/paludis/qa/deps_visible_check.cc
+++ b/paludis/qa/deps_visible_check.cc
@@ -65,7 +65,7 @@ namespace
return false;
/* arch flags aren't necessarily use masked. stupid! */
- std::tr1::shared_ptr<const UseFlagNameCollection> arch_flags(i->arch_flags());
+ tr1::shared_ptr<const UseFlagNameCollection> arch_flags(i->arch_flags());
if (stringify(u->flag()) != env->main_repository()->portage_interface->profile_variable("ARCH"))
if (arch_flags->end() != arch_flags->find(u->flag()))
return u->inverse();
@@ -103,7 +103,7 @@ namespace
{
bool found(false);
std::string candidates;
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> matches(env->package_database()->query(
+ tr1::shared_ptr<PackageDatabaseEntryCollection> matches(env->package_database()->query(
query::Matches(*p), qo_order_by_version));
for (PackageDatabaseEntryCollection::ReverseIterator m(matches->rbegin()),
m_end(matches->rend()) ; m != m_end ; ++m)
@@ -134,7 +134,7 @@ namespace
void visit(const AnyDepSpec * const a)
{
- std::list<std::tr1::shared_ptr<const DepSpec> > viable_children;
+ std::list<tr1::shared_ptr<const DepSpec> > viable_children;
std::copy(a->begin(), a->end(), filter_inserter(std::back_inserter(viable_children),
IsViableAnyDepSpecChild(env, pde)));
@@ -142,7 +142,7 @@ namespace
return;
bool found(false);
- for (std::list<std::tr1::shared_ptr<const DepSpec> >::const_iterator c(viable_children.begin()),
+ for (std::list<tr1::shared_ptr<const DepSpec> >::const_iterator c(viable_children.begin()),
c_end(viable_children.end()) ; c != c_end && ! found ; ++c)
{
Save<CheckResult> save_result(&result);
@@ -197,7 +197,7 @@ DepsVisibleCheck::operator() (const PerProfileEbuildCheckData & e) const
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
bool unstable(false);
diff --git a/paludis/qa/description_check.cc b/paludis/qa/description_check.cc
index ff65acf..77dcd6a 100644
--- a/paludis/qa/description_check.cc
+++ b/paludis/qa/description_check.cc
@@ -40,7 +40,7 @@ DescriptionCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
const std::string::size_type length(metadata->description.length());
diff --git a/paludis/qa/ebuild_check.cc b/paludis/qa/ebuild_check.cc
index 912cc3f..20d5bb3 100644
--- a/paludis/qa/ebuild_check.cc
+++ b/paludis/qa/ebuild_check.cc
@@ -41,7 +41,7 @@
using namespace paludis;
using namespace paludis::qa;
-template class VirtualConstructor<std::string, std::tr1::shared_ptr<EbuildCheck> (*) (),
+template class VirtualConstructor<std::string, tr1::shared_ptr<EbuildCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchEbuildCheckTypeError> >;
#include <paludis/qa/ebuild_check-sr.cc>
diff --git a/paludis/qa/ebuild_check.hh b/paludis/qa/ebuild_check.hh
index b3bf7cc..2b6ee88 100644
--- a/paludis/qa/ebuild_check.hh
+++ b/paludis/qa/ebuild_check.hh
@@ -73,10 +73,10 @@ namespace paludis
template <typename T_>
struct MakeEbuildCheck
{
- static std::tr1::shared_ptr<EbuildCheck>
+ static tr1::shared_ptr<EbuildCheck>
make_ebuild_check()
{
- return std::tr1::shared_ptr<EbuildCheck>(new T_);
+ return tr1::shared_ptr<EbuildCheck>(new T_);
}
};
@@ -86,7 +86,7 @@ namespace paludis
* \ingroup grpqa
*/
class PALUDIS_VISIBLE EbuildCheckMaker :
- public VirtualConstructor<std::string, std::tr1::shared_ptr<EbuildCheck> (*) (),
+ public VirtualConstructor<std::string, tr1::shared_ptr<EbuildCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchEbuildCheckTypeError> >,
public InstantiationPolicy<EbuildCheckMaker, instantiation_method::SingletonTag>
{
diff --git a/paludis/qa/ebuild_count_check.cc b/paludis/qa/ebuild_count_check.cc
index b9c69f6..cf5ebd0 100644
--- a/paludis/qa/ebuild_count_check.cc
+++ b/paludis/qa/ebuild_count_check.cc
@@ -21,7 +21,7 @@
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <algorithm>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
using namespace paludis;
using namespace paludis::qa;
@@ -33,12 +33,12 @@ EbuildCountCheck::EbuildCountCheck()
CheckResult
EbuildCountCheck::operator() (const FSEntry & d) const
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
CheckResult result(d, identifier());
std::size_t count(std::count_if(DirIterator(d), DirIterator(),
- std::tr1::bind(&is_file_with_extension, _1, ".ebuild", IsFileWithOptions())));
+ tr1::bind(&is_file_with_extension, _1, ".ebuild", IsFileWithOptions())));
if (count > 20)
result << Message(qal_minor, "Found " + stringify(count) +
" ebuilds, which is too many to count on both hands and both feet");
diff --git a/paludis/qa/extract_check.cc b/paludis/qa/extract_check.cc
index 36d773f..925d69f 100644
--- a/paludis/qa/extract_check.cc
+++ b/paludis/qa/extract_check.cc
@@ -85,7 +85,7 @@ ExtractCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
Checker checker;
diff --git a/paludis/qa/file_check.cc b/paludis/qa/file_check.cc
index 82b1d3e..4308a43 100644
--- a/paludis/qa/file_check.cc
+++ b/paludis/qa/file_check.cc
@@ -39,7 +39,7 @@
using namespace paludis;
using namespace paludis::qa;
-template class VirtualConstructor<std::string, std::tr1::shared_ptr<FileCheck> (*) (),
+template class VirtualConstructor<std::string, tr1::shared_ptr<FileCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchFileCheckTypeError> >;
FileCheck::FileCheck()
diff --git a/paludis/qa/file_check.hh b/paludis/qa/file_check.hh
index 02db64e..4af3f18 100644
--- a/paludis/qa/file_check.hh
+++ b/paludis/qa/file_check.hh
@@ -73,7 +73,7 @@ namespace paludis
template <typename T_>
struct MakeFileCheck
{
- static std::tr1::shared_ptr<FileCheck> make_file_check();
+ static tr1::shared_ptr<FileCheck> make_file_check();
};
/**
@@ -82,7 +82,7 @@ namespace paludis
* \ingroup grpqa
*/
class PALUDIS_VISIBLE FileCheckMaker :
- public VirtualConstructor<std::string, std::tr1::shared_ptr<FileCheck> (*) (),
+ public VirtualConstructor<std::string, tr1::shared_ptr<FileCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchFileCheckTypeError> >,
public InstantiationPolicy<FileCheckMaker, instantiation_method::SingletonTag>
{
@@ -96,10 +96,10 @@ namespace paludis
}
template <typename T_>
-std::tr1::shared_ptr<paludis::qa::FileCheck>
+paludis::tr1::shared_ptr<paludis::qa::FileCheck>
paludis::qa::MakeFileCheck<T_>::make_file_check()
{
- return std::tr1::shared_ptr<paludis::qa::FileCheck>(new T_);
+ return tr1::shared_ptr<paludis::qa::FileCheck>(new T_);
}
#endif
diff --git a/paludis/qa/has_ebuilds_check.cc b/paludis/qa/has_ebuilds_check.cc
index 991a23a..014f96b 100644
--- a/paludis/qa/has_ebuilds_check.cc
+++ b/paludis/qa/has_ebuilds_check.cc
@@ -21,7 +21,7 @@
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <algorithm>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
using namespace paludis;
using namespace paludis::qa;
@@ -35,10 +35,10 @@ HasEbuildsCheck::operator() (const FSEntry & d) const
{
CheckResult result(d, identifier());
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
if (DirIterator() == std::find_if(DirIterator(d), DirIterator(),
- std::tr1::bind(&is_file_with_prefix_extension, _1, d.basename() + "-", ".ebuild", IsFileWithOptions())))
+ tr1::bind(&is_file_with_prefix_extension, _1, d.basename() + "-", ".ebuild", IsFileWithOptions())))
result << Message(qal_fatal, "No ebuilds found");
return result;
diff --git a/paludis/qa/homepage_check.cc b/paludis/qa/homepage_check.cc
index c865fd0..c81ffb2 100644
--- a/paludis/qa/homepage_check.cc
+++ b/paludis/qa/homepage_check.cc
@@ -90,7 +90,7 @@ HomepageCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
Checker c(result);
diff --git a/paludis/qa/inherits_check.cc b/paludis/qa/inherits_check.cc
index 5e89aba..5ad939c 100644
--- a/paludis/qa/inherits_check.cc
+++ b/paludis/qa/inherits_check.cc
@@ -47,7 +47,7 @@ InheritsCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
static std::set<std::string> inherits_blacklist;
diff --git a/paludis/qa/iuse_check.cc b/paludis/qa/iuse_check.cc
index 3c7210e..6c4d450 100644
--- a/paludis/qa/iuse_check.cc
+++ b/paludis/qa/iuse_check.cc
@@ -51,7 +51,7 @@ IuseCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->
version_metadata(ee.name, ee.version));
diff --git a/paludis/qa/keywords_check.cc b/paludis/qa/keywords_check.cc
index 10a06f5..f3fdba5 100644
--- a/paludis/qa/keywords_check.cc
+++ b/paludis/qa/keywords_check.cc
@@ -41,7 +41,7 @@ KeywordsCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
try
diff --git a/paludis/qa/license_check.cc b/paludis/qa/license_check.cc
index c32b374..8115406 100644
--- a/paludis/qa/license_check.cc
+++ b/paludis/qa/license_check.cc
@@ -92,7 +92,7 @@ LicenseCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
diff --git a/paludis/qa/metadata_check.cc b/paludis/qa/metadata_check.cc
index f084ec0..fe55c11 100644
--- a/paludis/qa/metadata_check.cc
+++ b/paludis/qa/metadata_check.cc
@@ -81,21 +81,21 @@ MetadataCheck::operator() (const FSEntry & f) const
"' -- you should remove this file manually before continuing");
}
- std::tr1::shared_ptr<xmlParserCtxt> xml_parser_context(xmlNewParserCtxt(), &xmlFreeParserCtxt);
- std::tr1::shared_ptr<xmlDtd> xml_dtd(
+ tr1::shared_ptr<xmlParserCtxt> xml_parser_context(xmlNewParserCtxt(), &xmlFreeParserCtxt);
+ tr1::shared_ptr<xmlDtd> xml_dtd(
xmlParseDTD(0, reinterpret_cast<const xmlChar *>(stringify(dtd).c_str())), &xmlFreeDtd);
if (! xml_dtd)
result << Message(qal_major, "Unable to parse DTD '" + stringify(dtd) + "'");
else
{
- std::tr1::shared_ptr<xmlDoc> xml_doc(xmlCtxtReadFile(
+ tr1::shared_ptr<xmlDoc> xml_doc(xmlCtxtReadFile(
xml_parser_context.get(), stringify(f).c_str(), 0, XML_PARSE_NONET), &xmlFreeDoc);
if (! xml_doc)
result << Message(qal_major, "Unable to parse '" + stringify(f) + "'");
else
{
- std::tr1::shared_ptr<xmlValidCtxt> xml_valid_context(xmlNewValidCtxt(), &xmlFreeValidCtxt);
+ tr1::shared_ptr<xmlValidCtxt> xml_valid_context(xmlNewValidCtxt(), &xmlFreeValidCtxt);
if (! xmlValidateDtd(xml_valid_context.get(), xml_doc.get(), xml_dtd.get()))
result << Message(qal_major, "Validation of '" + stringify(f) + "' against '"
+ stringify(dtd) + "' failed");
diff --git a/paludis/qa/metadata_file.cc b/paludis/qa/metadata_file.cc
index 848a0b6..b8db0e7 100644
--- a/paludis/qa/metadata_file.cc
+++ b/paludis/qa/metadata_file.cc
@@ -94,7 +94,7 @@ namespace paludis
MetadataFile::MetadataFile(const FSEntry & f) :
PrivateImplementationPattern<MetadataFile>(new Implementation<MetadataFile>)
{
- std::tr1::shared_ptr<xmlDoc> xml_doc(xmlReadFile(stringify(f).c_str(), 0, 0), &xmlFreeDoc);
+ tr1::shared_ptr<xmlDoc> xml_doc(xmlReadFile(stringify(f).c_str(), 0, 0), &xmlFreeDoc);
if (! xml_doc)
{
Log::get_instance()->message(ll_warning, lc_no_context, "Couldn't parse xml file '" +
@@ -108,7 +108,7 @@ MetadataFile::MetadataFile(const FSEntry & f) :
MetadataFile::MetadataFile(const std::string & text) :
PrivateImplementationPattern<MetadataFile>(new Implementation<MetadataFile>)
{
- std::tr1::shared_ptr<xmlDoc> xml_doc(xmlReadDoc(reinterpret_cast<const xmlChar *>(text.c_str()),
+ tr1::shared_ptr<xmlDoc> xml_doc(xmlReadDoc(reinterpret_cast<const xmlChar *>(text.c_str()),
"file:///var/empty/", 0, 0), &xmlFreeDoc);
if (! xml_doc)
{
diff --git a/paludis/qa/package_dir_check.cc b/paludis/qa/package_dir_check.cc
index bc55ec8..d84eb67 100644
--- a/paludis/qa/package_dir_check.cc
+++ b/paludis/qa/package_dir_check.cc
@@ -31,7 +31,7 @@
using namespace paludis;
using namespace paludis::qa;
-template class VirtualConstructor<std::string, std::tr1::shared_ptr<PackageDirCheck> (*) (),
+template class VirtualConstructor<std::string, tr1::shared_ptr<PackageDirCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchPackageDirCheckTypeError> >;
PackageDirCheck::PackageDirCheck()
diff --git a/paludis/qa/package_dir_check.hh b/paludis/qa/package_dir_check.hh
index 50872e8..9128b51 100644
--- a/paludis/qa/package_dir_check.hh
+++ b/paludis/qa/package_dir_check.hh
@@ -73,10 +73,10 @@ namespace paludis
template <typename T_>
struct MakePackageDirCheck
{
- static std::tr1::shared_ptr<PackageDirCheck>
+ static tr1::shared_ptr<PackageDirCheck>
make_package_dir_check()
{
- return std::tr1::shared_ptr<PackageDirCheck>(new T_);
+ return tr1::shared_ptr<PackageDirCheck>(new T_);
}
};
@@ -86,7 +86,7 @@ namespace paludis
* \ingroup grpqa
*/
class PALUDIS_VISIBLE PackageDirCheckMaker :
- public VirtualConstructor<std::string, std::tr1::shared_ptr<PackageDirCheck> (*) (),
+ public VirtualConstructor<std::string, tr1::shared_ptr<PackageDirCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchPackageDirCheckTypeError> >,
public InstantiationPolicy<PackageDirCheckMaker, instantiation_method::SingletonTag>
{
diff --git a/paludis/qa/parse_deps_check.cc b/paludis/qa/parse_deps_check.cc
index 79f51fd..6be79bd 100644
--- a/paludis/qa/parse_deps_check.cc
+++ b/paludis/qa/parse_deps_check.cc
@@ -40,7 +40,7 @@ ParseDepsCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
try
diff --git a/paludis/qa/pdepend_overlap_check.cc b/paludis/qa/pdepend_overlap_check.cc
index b7caade..33e636d 100644
--- a/paludis/qa/pdepend_overlap_check.cc
+++ b/paludis/qa/pdepend_overlap_check.cc
@@ -79,7 +79,7 @@ PdependOverlapCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
Collector pdepend_collector;
diff --git a/paludis/qa/per_profile_ebuild_check.cc b/paludis/qa/per_profile_ebuild_check.cc
index 6dc48ad..c78e0ad 100644
--- a/paludis/qa/per_profile_ebuild_check.cc
+++ b/paludis/qa/per_profile_ebuild_check.cc
@@ -24,7 +24,7 @@
using namespace paludis;
using namespace paludis::qa;
-template class VirtualConstructor<std::string, std::tr1::shared_ptr<PerProfileEbuildCheck> (*) (),
+template class VirtualConstructor<std::string, tr1::shared_ptr<PerProfileEbuildCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchPerProfileEbuildCheckTypeError> >;
#include <paludis/qa/per_profile_ebuild_check-sr.cc>
diff --git a/paludis/qa/per_profile_ebuild_check.hh b/paludis/qa/per_profile_ebuild_check.hh
index b0030f0..bf43283 100644
--- a/paludis/qa/per_profile_ebuild_check.hh
+++ b/paludis/qa/per_profile_ebuild_check.hh
@@ -73,10 +73,10 @@ namespace paludis
template <typename T_>
struct MakePerProfileEbuildCheck
{
- static std::tr1::shared_ptr<PerProfileEbuildCheck>
+ static tr1::shared_ptr<PerProfileEbuildCheck>
make_per_profile_ebuild_check()
{
- return std::tr1::shared_ptr<PerProfileEbuildCheck>(new T_);
+ return tr1::shared_ptr<PerProfileEbuildCheck>(new T_);
}
};
@@ -86,7 +86,7 @@ namespace paludis
* \ingroup grpqa
*/
class PALUDIS_VISIBLE PerProfileEbuildCheckMaker :
- public VirtualConstructor<std::string, std::tr1::shared_ptr<PerProfileEbuildCheck> (*) (),
+ public VirtualConstructor<std::string, tr1::shared_ptr<PerProfileEbuildCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchPerProfileEbuildCheckTypeError> >,
public InstantiationPolicy<PerProfileEbuildCheckMaker, instantiation_method::SingletonTag>
{
diff --git a/paludis/qa/profile_check.cc b/paludis/qa/profile_check.cc
index d99f5b7..0e5e7b7 100644
--- a/paludis/qa/profile_check.cc
+++ b/paludis/qa/profile_check.cc
@@ -25,7 +25,7 @@
using namespace paludis;
using namespace paludis::qa;
-template class VirtualConstructor<std::string, std::tr1::shared_ptr<ProfileCheck> (*) (),
+template class VirtualConstructor<std::string, tr1::shared_ptr<ProfileCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchProfileCheckTypeError> >;
#include <paludis/qa/profile_check-sr.cc>
diff --git a/paludis/qa/profile_check.hh b/paludis/qa/profile_check.hh
index 5ad2c85..ff3ddb4 100644
--- a/paludis/qa/profile_check.hh
+++ b/paludis/qa/profile_check.hh
@@ -77,7 +77,7 @@ namespace paludis
template <typename T_>
struct MakeProfileCheck
{
- static std::tr1::shared_ptr<ProfileCheck> make_profile_check();
+ static tr1::shared_ptr<ProfileCheck> make_profile_check();
};
/**
@@ -86,7 +86,7 @@ namespace paludis
* \ingroup grpqa
*/
class PALUDIS_VISIBLE ProfileCheckMaker :
- public VirtualConstructor<std::string, std::tr1::shared_ptr<ProfileCheck> (*) (),
+ public VirtualConstructor<std::string, tr1::shared_ptr<ProfileCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchProfileCheckTypeError> >,
public InstantiationPolicy<ProfileCheckMaker, instantiation_method::SingletonTag>
{
@@ -100,10 +100,10 @@ namespace paludis
}
template <typename T_>
-std::tr1::shared_ptr<paludis::qa::ProfileCheck>
+paludis::tr1::shared_ptr<paludis::qa::ProfileCheck>
paludis::qa::MakeProfileCheck<T_>::make_profile_check()
{
- return std::tr1::shared_ptr<paludis::qa::ProfileCheck>(new T_);
+ return tr1::shared_ptr<paludis::qa::ProfileCheck>(new T_);
}
#endif
diff --git a/paludis/qa/profiles_check.cc b/paludis/qa/profiles_check.cc
index 2424971..363b96a 100644
--- a/paludis/qa/profiles_check.cc
+++ b/paludis/qa/profiles_check.cc
@@ -25,7 +25,7 @@
using namespace paludis;
using namespace paludis::qa;
-template class VirtualConstructor<std::string, std::tr1::shared_ptr<ProfilesCheck> (*) (),
+template class VirtualConstructor<std::string, tr1::shared_ptr<ProfilesCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchProfilesCheckTypeError> >;
ProfilesCheck::ProfilesCheck()
diff --git a/paludis/qa/profiles_check.hh b/paludis/qa/profiles_check.hh
index 33f4329..1b8ae86 100644
--- a/paludis/qa/profiles_check.hh
+++ b/paludis/qa/profiles_check.hh
@@ -73,7 +73,7 @@ namespace paludis
template <typename T_>
struct MakeProfilesCheck
{
- static std::tr1::shared_ptr<ProfilesCheck> make_profiles_check();
+ static tr1::shared_ptr<ProfilesCheck> make_profiles_check();
};
/**
@@ -82,7 +82,7 @@ namespace paludis
* \ingroup grpqa
*/
class PALUDIS_VISIBLE ProfilesCheckMaker :
- public VirtualConstructor<std::string, std::tr1::shared_ptr<ProfilesCheck> (*) (),
+ public VirtualConstructor<std::string, tr1::shared_ptr<ProfilesCheck> (*) (),
virtual_constructor_not_found::ThrowException<NoSuchProfilesCheckTypeError> >,
public InstantiationPolicy<ProfilesCheckMaker, instantiation_method::SingletonTag>
{
@@ -96,10 +96,10 @@ namespace paludis
}
template <typename T_>
-std::tr1::shared_ptr<paludis::qa::ProfilesCheck>
+paludis::tr1::shared_ptr<paludis::qa::ProfilesCheck>
paludis::qa::MakeProfilesCheck<T_>::make_profiles_check()
{
- return std::tr1::shared_ptr<paludis::qa::ProfilesCheck>(new T_);
+ return tr1::shared_ptr<paludis::qa::ProfilesCheck>(new T_);
}
#endif
diff --git a/paludis/qa/qa_environment.cc b/paludis/qa/qa_environment.cc
index 21ef0a1..ba9ae10 100644
--- a/paludis/qa/qa_environment.cc
+++ b/paludis/qa/qa_environment.cc
@@ -85,7 +85,7 @@ QAEnvironment::clear_forced_use()
}
void
-QAEnvironment::force_use(std::tr1::shared_ptr<const PackageDepSpec>,
+QAEnvironment::force_use(tr1::shared_ptr<const PackageDepSpec>,
const UseFlagName &, const UseFlagState)
{
throw InternalError(PALUDIS_HERE, "force_use not currently available for QAEnvironment");
diff --git a/paludis/qa/qa_environment.hh b/paludis/qa/qa_environment.hh
index 1d24078..81d37e5 100644
--- a/paludis/qa/qa_environment.hh
+++ b/paludis/qa/qa_environment.hh
@@ -64,7 +64,7 @@ namespace paludis
virtual std::string paludis_command() const;
virtual void set_paludis_command(const std::string &);
- virtual void force_use(std::tr1::shared_ptr<const PackageDepSpec>, const UseFlagName &,
+ virtual void force_use(tr1::shared_ptr<const PackageDepSpec>, const UseFlagName &,
const UseFlagState) PALUDIS_ATTRIBUTE((noreturn));
virtual void clear_forced_use();
diff --git a/paludis/qa/qa_environment.sr b/paludis/qa/qa_environment.sr
index 41f13ad..7b41068 100644
--- a/paludis/qa/qa_environment.sr
+++ b/paludis/qa/qa_environment.sr
@@ -8,7 +8,7 @@ make_class_PackageDatabasesEntry()
key arch UseFlagName
key location FSEntry
key status std::string
- key package_database "std::tr1::shared_ptr<PackageDatabase>"
+ key package_database "tr1::shared_ptr<PackageDatabase>"
allow_named_args
diff --git a/paludis/qa/restrict_check.cc b/paludis/qa/restrict_check.cc
index 9ce083e..3d2931f 100644
--- a/paludis/qa/restrict_check.cc
+++ b/paludis/qa/restrict_check.cc
@@ -87,7 +87,7 @@ RestrictCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
static std::set<std::string> allowed_restricts;
diff --git a/paludis/qa/slot_check.cc b/paludis/qa/slot_check.cc
index d5683e2..c554ff4 100644
--- a/paludis/qa/slot_check.cc
+++ b/paludis/qa/slot_check.cc
@@ -39,7 +39,7 @@ SlotCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
try
diff --git a/paludis/qa/src_uri_check.cc b/paludis/qa/src_uri_check.cc
index 633038c..2803185 100644
--- a/paludis/qa/src_uri_check.cc
+++ b/paludis/qa/src_uri_check.cc
@@ -135,7 +135,7 @@ SrcUriCheck::operator() (const EbuildCheckData & e) const
{
PackageDatabaseEntry ee(e.name, e.version,
e.environment->main_repository()->name());
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
e.environment->package_database()->fetch_repository(ee.repository)->version_metadata(ee.name, ee.version));
try
diff --git a/paludis/query.cc b/paludis/query.cc
index aeb76c3..6c8142f 100644
--- a/paludis/query.cc
+++ b/paludis/query.cc
@@ -36,33 +36,33 @@ QueryDelegate::~QueryDelegate()
{
}
-std::tr1::shared_ptr<RepositoryNameCollection>
+tr1::shared_ptr<RepositoryNameCollection>
QueryDelegate::repositories(const Environment &) const
{
- return std::tr1::shared_ptr<RepositoryNameCollection>();
+ return tr1::shared_ptr<RepositoryNameCollection>();
}
-std::tr1::shared_ptr<CategoryNamePartCollection>
-QueryDelegate::categories(const Environment &, std::tr1::shared_ptr<const RepositoryNameCollection>) const
+tr1::shared_ptr<CategoryNamePartCollection>
+QueryDelegate::categories(const Environment &, tr1::shared_ptr<const RepositoryNameCollection>) const
{
- return std::tr1::shared_ptr<CategoryNamePartCollection>();
+ return tr1::shared_ptr<CategoryNamePartCollection>();
}
-std::tr1::shared_ptr<QualifiedPackageNameCollection>
-QueryDelegate::packages(const Environment &, std::tr1::shared_ptr<const RepositoryNameCollection>,
- std::tr1::shared_ptr<const CategoryNamePartCollection>) const
+tr1::shared_ptr<QualifiedPackageNameCollection>
+QueryDelegate::packages(const Environment &, tr1::shared_ptr<const RepositoryNameCollection>,
+ tr1::shared_ptr<const CategoryNamePartCollection>) const
{
- return std::tr1::shared_ptr<QualifiedPackageNameCollection>();
+ return tr1::shared_ptr<QualifiedPackageNameCollection>();
}
-std::tr1::shared_ptr<PackageDatabaseEntryCollection>
-QueryDelegate::versions(const Environment &, std::tr1::shared_ptr<const RepositoryNameCollection>,
- std::tr1::shared_ptr<const QualifiedPackageNameCollection>) const
+tr1::shared_ptr<PackageDatabaseEntryCollection>
+QueryDelegate::versions(const Environment &, tr1::shared_ptr<const RepositoryNameCollection>,
+ tr1::shared_ptr<const QualifiedPackageNameCollection>) const
{
- return std::tr1::shared_ptr<PackageDatabaseEntryCollection>();
+ return tr1::shared_ptr<PackageDatabaseEntryCollection>();
}
-Query::Query(std::tr1::shared_ptr<const QueryDelegate> d) :
+Query::Query(tr1::shared_ptr<const QueryDelegate> d) :
_d(d)
{
}
@@ -83,12 +83,12 @@ namespace
{
}
- std::tr1::shared_ptr<RepositoryNameCollection>
+ tr1::shared_ptr<RepositoryNameCollection>
repositories(const Environment & e) const
{
if (spec.repository_ptr())
{
- std::tr1::shared_ptr<RepositoryNameCollection> result(new RepositoryNameCollection::Concrete);
+ tr1::shared_ptr<RepositoryNameCollection> result(new RepositoryNameCollection::Concrete);
for (PackageDatabase::RepositoryIterator i(e.package_database()->begin_repositories()),
i_end(e.package_database()->end_repositories()) ; i != i_end ; ++i)
@@ -104,19 +104,19 @@ namespace
return QueryDelegate::repositories(e);
}
- std::tr1::shared_ptr<CategoryNamePartCollection>
+ tr1::shared_ptr<CategoryNamePartCollection>
categories(const Environment & e,
- std::tr1::shared_ptr<const RepositoryNameCollection> r) const
+ tr1::shared_ptr<const RepositoryNameCollection> r) const
{
if (spec.package_ptr())
{
- std::tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
+ tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
result->insert(spec.package_ptr()->category);
return result;
}
else if (spec.category_name_part_ptr())
{
- std::tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
+ tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
result->insert(*spec.category_name_part_ptr());
return result;
}
@@ -124,21 +124,21 @@ namespace
return QueryDelegate::categories(e, r);
}
- std::tr1::shared_ptr<QualifiedPackageNameCollection>
+ tr1::shared_ptr<QualifiedPackageNameCollection>
packages(const Environment & e,
- std::tr1::shared_ptr<const RepositoryNameCollection> repos,
- std::tr1::shared_ptr<const CategoryNamePartCollection> cats) const
+ tr1::shared_ptr<const RepositoryNameCollection> repos,
+ tr1::shared_ptr<const CategoryNamePartCollection> cats) const
{
if (spec.package_ptr())
{
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(
new QualifiedPackageNameCollection::Concrete);
result->insert(*spec.package_ptr());
return result;
}
else if (spec.package_name_part_ptr())
{
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(
new QualifiedPackageNameCollection::Concrete);
for (RepositoryNameCollection::Iterator r(repos->begin()), r_end(repos->end()) ;
r != r_end ; ++r)
@@ -153,21 +153,21 @@ namespace
return QueryDelegate::packages(e, repos, cats);
}
- std::tr1::shared_ptr<PackageDatabaseEntryCollection>
+ tr1::shared_ptr<PackageDatabaseEntryCollection>
versions(const Environment & e,
- std::tr1::shared_ptr<const RepositoryNameCollection> repos,
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs) const
+ tr1::shared_ptr<const RepositoryNameCollection> repos,
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs) const
{
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> result(new PackageDatabaseEntryCollection::Concrete);
+ tr1::shared_ptr<PackageDatabaseEntryCollection> result(new PackageDatabaseEntryCollection::Concrete);
for (RepositoryNameCollection::Iterator r(repos->begin()), r_end(repos->end()) ;
r != r_end ; ++r)
{
- std::tr1::shared_ptr<const Repository> repo(e.package_database()->fetch_repository(*r));
+ tr1::shared_ptr<const Repository> repo(e.package_database()->fetch_repository(*r));
for (QualifiedPackageNameCollection::Iterator p(pkgs->begin()), p_end(pkgs->end()) ;
p != p_end ; ++p)
{
- std::tr1::shared_ptr<const VersionSpecCollection> vers(repo->version_specs(*p));
+ tr1::shared_ptr<const VersionSpecCollection> vers(repo->version_specs(*p));
for (VersionSpecCollection::Iterator v(vers->begin()), v_end(vers->end()) ;
v != v_end ; ++v)
{
@@ -184,32 +184,32 @@ namespace
}
query::Matches::Matches(const PackageDepSpec & a) :
- Query(std::tr1::shared_ptr<QueryDelegate>(new MatchesDelegate(a)))
+ Query(tr1::shared_ptr<QueryDelegate>(new MatchesDelegate(a)))
{
}
query::Package::Package(const QualifiedPackageName & a) :
- Query(std::tr1::shared_ptr<QueryDelegate>(new MatchesDelegate(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(a))))))
+ Query(tr1::shared_ptr<QueryDelegate>(new MatchesDelegate(PackageDepSpec(
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(a))))))
{
}
query::Repository::Repository(const RepositoryName & a) :
- Query(std::tr1::shared_ptr<QueryDelegate>(new MatchesDelegate(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ Query(tr1::shared_ptr<QueryDelegate>(new MatchesDelegate(PackageDepSpec(
+ tr1::shared_ptr<QualifiedPackageName>(),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(),
- std::tr1::shared_ptr<RepositoryName>(new RepositoryName(a))))))
+ tr1::shared_ptr<SlotName>(),
+ tr1::shared_ptr<RepositoryName>(new RepositoryName(a))))))
{
}
query::Category::Category(const CategoryNamePart & a) :
- Query(std::tr1::shared_ptr<QueryDelegate>(new MatchesDelegate(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(),
- std::tr1::shared_ptr<CategoryNamePart>(new CategoryNamePart(a))))))
+ Query(tr1::shared_ptr<QueryDelegate>(new MatchesDelegate(PackageDepSpec(
+ tr1::shared_ptr<QualifiedPackageName>(),
+ tr1::shared_ptr<CategoryNamePart>(new CategoryNamePart(a))))))
{
}
@@ -218,21 +218,21 @@ namespace
struct NotMaskedDelegate :
QueryDelegate
{
- std::tr1::shared_ptr<PackageDatabaseEntryCollection>
+ tr1::shared_ptr<PackageDatabaseEntryCollection>
versions(const Environment & e,
- std::tr1::shared_ptr<const RepositoryNameCollection> repos,
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs) const
+ tr1::shared_ptr<const RepositoryNameCollection> repos,
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs) const
{
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> result(new PackageDatabaseEntryCollection::Concrete);
+ tr1::shared_ptr<PackageDatabaseEntryCollection> result(new PackageDatabaseEntryCollection::Concrete);
for (RepositoryNameCollection::Iterator r(repos->begin()), r_end(repos->end()) ;
r != r_end ; ++r)
{
- std::tr1::shared_ptr<const Repository> repo(e.package_database()->fetch_repository(*r));
+ tr1::shared_ptr<const Repository> repo(e.package_database()->fetch_repository(*r));
for (QualifiedPackageNameCollection::Iterator p(pkgs->begin()), p_end(pkgs->end()) ;
p != p_end ; ++p)
{
- std::tr1::shared_ptr<const VersionSpecCollection> vers(repo->version_specs(*p));
+ tr1::shared_ptr<const VersionSpecCollection> vers(repo->version_specs(*p));
for (VersionSpecCollection::Iterator v(vers->begin()), v_end(vers->end()) ;
v != v_end ; ++v)
{
@@ -249,7 +249,7 @@ namespace
}
query::NotMasked::NotMasked() :
- Query(std::tr1::shared_ptr<QueryDelegate>(new NotMaskedDelegate))
+ Query(tr1::shared_ptr<QueryDelegate>(new NotMaskedDelegate))
{
}
@@ -259,10 +259,10 @@ namespace
struct RepositoryHasDelegate :
QueryDelegate
{
- std::tr1::shared_ptr<RepositoryNameCollection>
+ tr1::shared_ptr<RepositoryNameCollection>
repositories(const Environment & e) const
{
- std::tr1::shared_ptr<RepositoryNameCollection> result(new RepositoryNameCollection::Concrete);
+ tr1::shared_ptr<RepositoryNameCollection> result(new RepositoryNameCollection::Concrete);
for (PackageDatabase::RepositoryIterator i(e.package_database()->begin_repositories()),
i_end(e.package_database()->end_repositories()) ; i != i_end ; ++i)
@@ -275,19 +275,19 @@ namespace
}
query::RepositoryHasInstalledInterface::RepositoryHasInstalledInterface() :
- Query(std::tr1::shared_ptr<QueryDelegate>(
+ Query(tr1::shared_ptr<QueryDelegate>(
new RepositoryHasDelegate<RepositoryInstalledInterface, &RepositoryCapabilities::installed_interface>))
{
}
query::RepositoryHasInstallableInterface::RepositoryHasInstallableInterface() :
- Query(std::tr1::shared_ptr<QueryDelegate>(
+ Query(tr1::shared_ptr<QueryDelegate>(
new RepositoryHasDelegate<RepositoryInstallableInterface, &RepositoryCapabilities::installable_interface>))
{
}
query::RepositoryHasUninstallableInterface::RepositoryHasUninstallableInterface() :
- Query(std::tr1::shared_ptr<QueryDelegate>(
+ Query(tr1::shared_ptr<QueryDelegate>(
new RepositoryHasDelegate<RepositoryUninstallableInterface, &RepositoryCapabilities::uninstallable_interface>))
{
}
@@ -304,10 +304,10 @@ namespace
{
}
- std::tr1::shared_ptr<RepositoryNameCollection>
+ tr1::shared_ptr<RepositoryNameCollection>
repositories(const Environment & e) const
{
- std::tr1::shared_ptr<RepositoryNameCollection> result(new RepositoryNameCollection::Concrete);
+ tr1::shared_ptr<RepositoryNameCollection> result(new RepositoryNameCollection::Concrete);
for (PackageDatabase::RepositoryIterator i(e.package_database()->begin_repositories()),
i_end(e.package_database()->end_repositories()) ; i != i_end ; ++i)
@@ -321,7 +321,7 @@ namespace
}
query::InstalledAtRoot::InstalledAtRoot(const FSEntry & r) :
- Query(std::tr1::shared_ptr<QueryDelegate>(
+ Query(tr1::shared_ptr<QueryDelegate>(
new InstalledAtRootDelegate(r)))
{
}
@@ -339,24 +339,24 @@ namespace
struct AndQueryDelegate :
QueryDelegate
{
- std::tr1::shared_ptr<const QueryDelegate> q1, q2;
+ tr1::shared_ptr<const QueryDelegate> q1, q2;
- AndQueryDelegate(std::tr1::shared_ptr<const QueryDelegate> qq1,
- std::tr1::shared_ptr<const QueryDelegate> qq2) :
+ AndQueryDelegate(tr1::shared_ptr<const QueryDelegate> qq1,
+ tr1::shared_ptr<const QueryDelegate> qq2) :
q1(qq1),
q2(qq2)
{
}
- std::tr1::shared_ptr<RepositoryNameCollection>
+ tr1::shared_ptr<RepositoryNameCollection>
repositories(const Environment & e) const
{
- std::tr1::shared_ptr<RepositoryNameCollection> r1(q1->repositories(e)), r2(q2->repositories(e));
+ tr1::shared_ptr<RepositoryNameCollection> r1(q1->repositories(e)), r2(q2->repositories(e));
if (r1 && r2)
{
std::set<RepositoryName, RepositoryNameComparator> s1(r1->begin(), r1->end()), s2(r2->begin(), r2->end());
- std::tr1::shared_ptr<RepositoryNameCollection> result(new RepositoryNameCollection::Concrete);
+ tr1::shared_ptr<RepositoryNameCollection> result(new RepositoryNameCollection::Concrete);
std::set_intersection(s1.begin(), s1.end(), s2.begin(), s2.end(), result->inserter(),
RepositoryNameComparator());
return result;
@@ -367,14 +367,14 @@ namespace
return r2;
}
- std::tr1::shared_ptr<CategoryNamePartCollection>
- categories(const Environment & e, std::tr1::shared_ptr<const RepositoryNameCollection> r) const
+ tr1::shared_ptr<CategoryNamePartCollection>
+ categories(const Environment & e, tr1::shared_ptr<const RepositoryNameCollection> r) const
{
- std::tr1::shared_ptr<CategoryNamePartCollection> r1(q1->categories(e, r)), r2(q2->categories(e, r));
+ tr1::shared_ptr<CategoryNamePartCollection> r1(q1->categories(e, r)), r2(q2->categories(e, r));
if (r1 && r2)
{
- std::tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
+ tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
std::set_intersection(r1->begin(), r1->end(), r2->begin(), r2->end(), result->inserter());
return result;
}
@@ -384,15 +384,15 @@ namespace
return r2;
}
- std::tr1::shared_ptr<QualifiedPackageNameCollection>
- packages(const Environment & e, std::tr1::shared_ptr<const RepositoryNameCollection> r,
- std::tr1::shared_ptr<const CategoryNamePartCollection> c) const
+ tr1::shared_ptr<QualifiedPackageNameCollection>
+ packages(const Environment & e, tr1::shared_ptr<const RepositoryNameCollection> r,
+ tr1::shared_ptr<const CategoryNamePartCollection> c) const
{
- std::tr1::shared_ptr<QualifiedPackageNameCollection> r1(q1->packages(e, r, c)), r2(q2->packages(e, r, c));
+ tr1::shared_ptr<QualifiedPackageNameCollection> r1(q1->packages(e, r, c)), r2(q2->packages(e, r, c));
if (r1 && r2)
{
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
std::set_intersection(r1->begin(), r1->end(), r2->begin(), r2->end(), result->inserter());
return result;
}
@@ -402,17 +402,17 @@ namespace
return r2;
}
- std::tr1::shared_ptr<PackageDatabaseEntryCollection>
- versions(const Environment & e, std::tr1::shared_ptr<const RepositoryNameCollection> r,
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> q) const
+ tr1::shared_ptr<PackageDatabaseEntryCollection>
+ versions(const Environment & e, tr1::shared_ptr<const RepositoryNameCollection> r,
+ tr1::shared_ptr<const QualifiedPackageNameCollection> q) const
{
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> r1(q1->versions(e, r, q)), r2(q2->versions(e, r, q));
+ tr1::shared_ptr<PackageDatabaseEntryCollection> r1(q1->versions(e, r, q)), r2(q2->versions(e, r, q));
if (r1 && r2)
{
std::set<PackageDatabaseEntry, ArbitrarilyOrderedPackageDatabaseEntryCollectionComparator>
s1(r1->begin(), r1->end()), s2(r2->begin(), r2->end());
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> result(new PackageDatabaseEntryCollection::Concrete);
+ tr1::shared_ptr<PackageDatabaseEntryCollection> result(new PackageDatabaseEntryCollection::Concrete);
std::set_intersection(s1.begin(), s1.end(), s2.begin(), s2.end(), result->inserter(),
ArbitrarilyOrderedPackageDatabaseEntryCollectionComparator());
return result;
@@ -428,7 +428,7 @@ namespace
Query
paludis::operator& (const Query & q1, const Query & q2)
{
- return Query(std::tr1::shared_ptr<QueryDelegate>(new AndQueryDelegate(q1._d, q2._d)));
+ return Query(tr1::shared_ptr<QueryDelegate>(new AndQueryDelegate(q1._d, q2._d)));
}
namespace
@@ -443,7 +443,7 @@ namespace
}
query::All::All() :
- Query(std::tr1::shared_ptr<QueryDelegate>(
+ Query(tr1::shared_ptr<QueryDelegate>(
new AllDelegate))
{
}
diff --git a/paludis/query.hh b/paludis/query.hh
index 95a71f7..f497474 100644
--- a/paludis/query.hh
+++ b/paludis/query.hh
@@ -62,7 +62,7 @@ namespace paludis
*
* Default behaviour: return all repositories.
*/
- virtual std::tr1::shared_ptr<RepositoryNameCollection> repositories(const Environment &) const;
+ virtual tr1::shared_ptr<RepositoryNameCollection> repositories(const Environment &) const;
/**
* Fetch the names of categories potentially containing matches.
@@ -70,8 +70,8 @@ namespace paludis
* Default behaviour: return all categories in the provided
* repository collection.
*/
- virtual std::tr1::shared_ptr<CategoryNamePartCollection> categories(const Environment &,
- std::tr1::shared_ptr<const RepositoryNameCollection>) const;
+ virtual tr1::shared_ptr<CategoryNamePartCollection> categories(const Environment &,
+ tr1::shared_ptr<const RepositoryNameCollection>) const;
/**
* Fetch the names of packages potentially containing matches.
@@ -82,9 +82,9 @@ namespace paludis
* Note that some entries in the categories collection (but not in
* the repositories collection) may not exist.
*/
- virtual std::tr1::shared_ptr<QualifiedPackageNameCollection> packages(const Environment &,
- std::tr1::shared_ptr<const RepositoryNameCollection>,
- std::tr1::shared_ptr<const CategoryNamePartCollection>) const;
+ virtual tr1::shared_ptr<QualifiedPackageNameCollection> packages(const Environment &,
+ tr1::shared_ptr<const RepositoryNameCollection>,
+ tr1::shared_ptr<const CategoryNamePartCollection>) const;
/**
* Fetch the versions of matching packages.
@@ -94,9 +94,9 @@ namespace paludis
* Note that some entries in the qualified package name collection
* (but not in the repositories collection) may not exist.
*/
- virtual std::tr1::shared_ptr<PackageDatabaseEntryCollection> versions(const Environment &,
- std::tr1::shared_ptr<const RepositoryNameCollection>,
- std::tr1::shared_ptr<const QualifiedPackageNameCollection>) const;
+ virtual tr1::shared_ptr<PackageDatabaseEntryCollection> versions(const Environment &,
+ tr1::shared_ptr<const RepositoryNameCollection>,
+ tr1::shared_ptr<const QualifiedPackageNameCollection>) const;
};
/**
@@ -115,13 +115,13 @@ namespace paludis
friend Query operator& (const Query &, const Query &);
private:
- std::tr1::shared_ptr<const QueryDelegate> _d;
+ tr1::shared_ptr<const QueryDelegate> _d;
protected:
///\name Basic operations
///\{
- Query(std::tr1::shared_ptr<const QueryDelegate>);
+ Query(tr1::shared_ptr<const QueryDelegate>);
public:
~Query();
@@ -131,27 +131,27 @@ namespace paludis
///\name Delegate-implemented functions
///\{
- std::tr1::shared_ptr<RepositoryNameCollection> repositories(const Environment & e) const
+ tr1::shared_ptr<RepositoryNameCollection> repositories(const Environment & e) const
{
return _d->repositories(e);
}
- std::tr1::shared_ptr<CategoryNamePartCollection> categories(const Environment & e,
- std::tr1::shared_ptr<const RepositoryNameCollection> r) const
+ tr1::shared_ptr<CategoryNamePartCollection> categories(const Environment & e,
+ tr1::shared_ptr<const RepositoryNameCollection> r) const
{
return _d->categories(e, r);
}
- std::tr1::shared_ptr<QualifiedPackageNameCollection> packages(const Environment & e,
- std::tr1::shared_ptr<const RepositoryNameCollection> r,
- std::tr1::shared_ptr<const CategoryNamePartCollection> c) const
+ tr1::shared_ptr<QualifiedPackageNameCollection> packages(const Environment & e,
+ tr1::shared_ptr<const RepositoryNameCollection> r,
+ tr1::shared_ptr<const CategoryNamePartCollection> c) const
{
return _d->packages(e, r, c);
}
- std::tr1::shared_ptr<PackageDatabaseEntryCollection> versions(const Environment & e,
- std::tr1::shared_ptr<const RepositoryNameCollection> r,
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> q) const
+ tr1::shared_ptr<PackageDatabaseEntryCollection> versions(const Environment & e,
+ tr1::shared_ptr<const RepositoryNameCollection> r,
+ tr1::shared_ptr<const QualifiedPackageNameCollection> q) const
{
return _d->versions(e, r, q);
}
diff --git a/paludis/repositories/cran/cran_dep_parser.cc b/paludis/repositories/cran/cran_dep_parser.cc
index 94c47e4..59cc06d 100644
--- a/paludis/repositories/cran/cran_dep_parser.cc
+++ b/paludis/repositories/cran/cran_dep_parser.cc
@@ -9,12 +9,12 @@
using namespace paludis;
-std::tr1::shared_ptr<const CompositeDepSpec>
+tr1::shared_ptr<const CompositeDepSpec>
CRANDepParser::parse(const std::string & s, const PackageDepSpecParseMode mode)
{
Context context("When parsing CRAN 'Depends:' string: '" + s + "':");
- std::tr1::shared_ptr<CompositeDepSpec> result(new AllDepSpec);
+ tr1::shared_ptr<CompositeDepSpec> result(new AllDepSpec);
Tokeniser<delim_kind::AnyOfTag, delim_mode::DelimiterTag> spec_tokeniser(",");
std::list<std::string> specs;
@@ -53,7 +53,7 @@ CRANDepParser::parse(const std::string & s, const PackageDepSpecParseMode mode)
spec_string = name;
else
spec_string = range + name + "-" + version;
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(spec_string, mode));
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(spec_string, mode));
result->add_child(spec);
}
diff --git a/paludis/repositories/cran/cran_dep_parser.hh b/paludis/repositories/cran/cran_dep_parser.hh
index a4d133e..a3fb007 100644
--- a/paludis/repositories/cran/cran_dep_parser.hh
+++ b/paludis/repositories/cran/cran_dep_parser.hh
@@ -17,7 +17,7 @@ namespace paludis
/**
* Parse function.
*/
- static std::tr1::shared_ptr<const CompositeDepSpec> parse(const std::string & s,
+ static tr1::shared_ptr<const CompositeDepSpec> parse(const std::string & s,
const PackageDepSpecParseMode);
};
}
diff --git a/paludis/repositories/cran/cran_description.cc b/paludis/repositories/cran/cran_description.cc
index 0c0fbc5..7e7ad23 100644
--- a/paludis/repositories/cran/cran_description.cc
+++ b/paludis/repositories/cran/cran_description.cc
@@ -26,29 +26,29 @@
#include <paludis/util/strip.hh>
#include <string>
#include <algorithm>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
using namespace paludis;
void
CRANDescription::normalise_name(std::string & s)
{
- using namespace std::tr1::placeholders;
- std::replace_if(s.begin(), s.end(), std::tr1::bind(std::equal_to<char>(), _1, '.'), '-');
+ using namespace tr1::placeholders;
+ std::replace_if(s.begin(), s.end(), tr1::bind(std::equal_to<char>(), _1, '.'), '-');
}
void
CRANDescription::denormalise_name(std::string & s)
{
- using namespace std::tr1::placeholders;
- std::replace_if(s.begin(), s.end(), std::tr1::bind(std::equal_to<char>(), _1, '-'), '.');
+ using namespace tr1::placeholders;
+ std::replace_if(s.begin(), s.end(), tr1::bind(std::equal_to<char>(), _1, '-'), '.');
}
void
CRANDescription::normalise_version(std::string & s)
{
- using namespace std::tr1::placeholders;
- std::replace_if(s.begin(), s.end(), std::tr1::bind(std::equal_to<char>(), _1, '-'), '.');
+ using namespace tr1::placeholders;
+ std::replace_if(s.begin(), s.end(), tr1::bind(std::equal_to<char>(), _1, '-'), '.');
}
CRANDescription::CRANDescription(const std::string & n, const FSEntry & f, bool installed) :
diff --git a/paludis/repositories/cran/cran_description.hh b/paludis/repositories/cran/cran_description.hh
index ea9c05a..37d53f6 100644
--- a/paludis/repositories/cran/cran_description.hh
+++ b/paludis/repositories/cran/cran_description.hh
@@ -39,7 +39,7 @@ namespace paludis
VersionSpec version;
/// Our metadata, may be zero.
- std::tr1::shared_ptr<VersionMetadata> metadata;
+ tr1::shared_ptr<VersionMetadata> metadata;
/// Our installed date.
time_t installed_time;
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index 6af8664..37f7657 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -49,7 +49,7 @@ using namespace paludis;
namespace paludis
{
/// Map for metadata.
- typedef MakeHashedMap<std::pair<QualifiedPackageName, VersionSpec>, std::tr1::shared_ptr<VersionMetadata> >::Type MetadataMap;
+ typedef MakeHashedMap<std::pair<QualifiedPackageName, VersionSpec>, tr1::shared_ptr<VersionMetadata> >::Type MetadataMap;
template <>
struct Implementation<CRANInstalledRepository>
@@ -193,7 +193,7 @@ CRANInstalledRepository::CRANInstalledRepository(const CRANInstalledRepositoryPa
"cran_installed"),
PrivateImplementationPattern<CRANInstalledRepository>(new Implementation<CRANInstalledRepository>(p))
{
- std::tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
+ tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
config_info->add_kv("location", stringify(_imp->location));
config_info->add_kv("root", stringify(_imp->root));
@@ -231,18 +231,18 @@ CRANInstalledRepository::do_has_package_named(const QualifiedPackageName & q) co
return r.first != r.second;
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
CRANInstalledRepository::do_category_names() const
{
if (! _imp->entries_valid)
_imp->load_entries();
- std::tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
+ tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
result->insert(CategoryNamePart("cran"));
return result;
}
-std::tr1::shared_ptr<const QualifiedPackageNameCollection>
+tr1::shared_ptr<const QualifiedPackageNameCollection>
CRANInstalledRepository::do_package_names(const CategoryNamePart & c) const
{
Context context("When fetching package names in category '" + stringify(c)
@@ -251,7 +251,7 @@ CRANInstalledRepository::do_package_names(const CategoryNamePart & c) const
if (! _imp->entries_valid)
_imp->load_entries();
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
if (! do_has_category_named(c))
return result;
@@ -262,13 +262,13 @@ CRANInstalledRepository::do_package_names(const CategoryNamePart & c) const
return result;
}
-std::tr1::shared_ptr<const VersionSpecCollection>
+tr1::shared_ptr<const VersionSpecCollection>
CRANInstalledRepository::do_version_specs(const QualifiedPackageName & n) const
{
Context context("When fetching versions of '" + stringify(n) + "' in "
+ stringify(name()) + ":");
- std::tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
+ tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
if (! _imp->entries_valid)
_imp->load_entries();
@@ -288,7 +288,7 @@ CRANInstalledRepository::do_has_version(const QualifiedPackageName & q,
Context context("When checking for version '" + stringify(v) + "' in '"
+ stringify(q) + "' in " + stringify(name()) + ":");
- std::tr1::shared_ptr<const VersionSpecCollection> versions(do_version_specs(q));
+ tr1::shared_ptr<const VersionSpecCollection> versions(do_version_specs(q));
return versions->end() != versions->find(v);
}
@@ -318,7 +318,7 @@ namespace
}
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
CRANInstalledRepository::do_version_metadata(
const QualifiedPackageName & q, const VersionSpec & v) const
{
@@ -332,7 +332,7 @@ CRANInstalledRepository::do_version_metadata(
if (! has_version(q, v))
throw NoSuchPackageError(stringify(PackageDatabaseEntry(q, v, name())));
- std::tr1::shared_ptr<VersionMetadata> result;
+ tr1::shared_ptr<VersionMetadata> result;
FSEntry d(_imp->location);
d /= stringify(q.package);
@@ -362,14 +362,14 @@ CRANInstalledRepository::do_version_metadata(
return result;
}
-std::tr1::shared_ptr<const Contents>
+tr1::shared_ptr<const Contents>
CRANInstalledRepository::do_contents(
const QualifiedPackageName & q, const VersionSpec & v) const
{
Context context("When fetching contents for " + stringify(q) +
"-" + stringify(v));
- std::tr1::shared_ptr<Contents> result(new Contents);
+ tr1::shared_ptr<Contents> result(new Contents);
if (! _imp->entries_valid)
_imp->load_entries();
@@ -414,11 +414,11 @@ CRANInstalledRepository::do_contents(
}
if ("obj" == tokens.at(0))
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsFileEntry(tokens.at(1))));
+ result->add(tr1::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(tr1::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(tr1::shared_ptr<ContentsEntry>(new ContentsMiscEntry(tokens.at(1))));
else if ("sym" == tokens.at(0))
{
if (tokens.size() < 4)
@@ -430,7 +430,7 @@ CRANInstalledRepository::do_contents(
continue;
}
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsSymEntry(
+ result->add(tr1::shared_ptr<ContentsEntry>(new ContentsSymEntry(
tokens.at(1), tokens.at(3))));
}
}
@@ -480,10 +480,10 @@ CRANInstalledRepository::do_installed_time(const QualifiedPackageName & q,
}
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
CRANInstalledRepository::make_cran_installed_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
{
Context context("When making CRAN installed repository from repo_file '" +
(m->end() == m->find("repo_file") ? std::string("?") : m->find("repo_file")->second) + "':");
@@ -500,7 +500,7 @@ CRANInstalledRepository::make_cran_installed_repository(
if (m->end() == m->find("world") || ((world = m->find("world")->second)).empty())
world = location + "/world";
- return std::tr1::shared_ptr<Repository>(new CRANInstalledRepository(CRANInstalledRepositoryParams::create()
+ return tr1::shared_ptr<Repository>(new CRANInstalledRepository(CRANInstalledRepositoryParams::create()
.environment(env)
.location(location)
.root(root)
@@ -524,8 +524,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());
+ tr1::shared_ptr<const VersionMetadata> vm(do_version_metadata(q, v));
+ tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->env->bashrc_files());
Command cmd(Command(LIBEXECDIR "/paludis/cran.bash unmerge")
.with_setenv("PN", vm->cran_interface->package)
@@ -538,7 +538,7 @@ CRANInstalledRepository::do_uninstall(const QualifiedPackageName & q, const Vers
throw PackageUninstallActionError("Couldn't unmerge '" + stringify(q) + "-" + stringify(v) + "'");
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
CRANInstalledRepository::do_package_set(const SetName & s) const
{
Context context("When fetching package set '" + stringify(s) + "' from '" +
@@ -546,14 +546,14 @@ CRANInstalledRepository::do_package_set(const SetName & s) const
if ("everything" == s.data())
{
- std::tr1::shared_ptr<AllDepSpec> result(new AllDepSpec);
+ tr1::shared_ptr<AllDepSpec> result(new AllDepSpec);
if (! _imp->entries_valid)
_imp->load_entries();
for (std::vector<CRANDescription>::const_iterator p(_imp->entries.begin()),
p_end(_imp->entries.end()) ; p != p_end ; ++p)
{
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(std::tr1::shared_ptr<QualifiedPackageName>(
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(tr1::shared_ptr<QualifiedPackageName>(
new QualifiedPackageName(p->name))));
result->add_child(spec);
}
@@ -562,7 +562,7 @@ CRANInstalledRepository::do_package_set(const SetName & s) const
}
else if ("world" == s.data())
{
- std::tr1::shared_ptr<AllDepSpec> result(new AllDepSpec);
+ tr1::shared_ptr<AllDepSpec> result(new AllDepSpec);
if (_imp->world_file.exists())
{
@@ -575,7 +575,7 @@ CRANInstalledRepository::do_package_set(const SetName & s) const
{
if (std::string::npos == line->find('/'))
{
- std::tr1::shared_ptr<DepSpec> spec(_imp->env->set(SetName(*line)));
+ tr1::shared_ptr<DepSpec> spec(_imp->env->set(SetName(*line)));
if (spec)
result->add_child(spec);
else
@@ -585,7 +585,7 @@ CRANInstalledRepository::do_package_set(const SetName & s) const
}
else
{
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(*line, pds_pm_unspecific));
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(*line, pds_pm_unspecific));
result->add_child(spec);
}
}
@@ -604,15 +604,15 @@ CRANInstalledRepository::do_package_set(const SetName & s) const
return result;
}
else
- return std::tr1::shared_ptr<DepSpec>();
+ return tr1::shared_ptr<DepSpec>();
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
CRANInstalledRepository::sets_list() const
{
Context context("While generating the list of sets:");
- std::tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
+ tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
result->insert(SetName("everything"));
result->insert(SetName("world"));
return result;
@@ -744,7 +744,7 @@ CRANInstalledRepository::want_pre_post_phases() const
void
CRANInstalledRepository::merge(const MergeOptions & m)
{
- std::tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->env->bashrc_files());
+ tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->env->bashrc_files());
Command cmd = Command(LIBEXECDIR "/paludis/cran.bash merge")
.with_setenv("IMAGE", stringify(m.image_dir))
diff --git a/paludis/repositories/cran/cran_installed_repository.hh b/paludis/repositories/cran/cran_installed_repository.hh
index 3890640..2ea3dc3 100644
--- a/paludis/repositories/cran/cran_installed_repository.hh
+++ b/paludis/repositories/cran/cran_installed_repository.hh
@@ -58,22 +58,22 @@ namespace paludis
virtual bool do_has_package_named(const QualifiedPackageName &) const;
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
- virtual std::tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
+ virtual tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
const CategoryNamePart &) const;
- virtual std::tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
+ virtual tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
const QualifiedPackageName &) const;
virtual bool do_has_version(const QualifiedPackageName &,
const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const VersionMetadata> do_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> do_version_metadata(
const QualifiedPackageName &,
const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const Contents> do_contents(
+ virtual tr1::shared_ptr<const Contents> do_contents(
const QualifiedPackageName &,
const VersionSpec &) const;
@@ -84,9 +84,9 @@ namespace paludis
virtual void do_uninstall(const QualifiedPackageName &, const VersionSpec &,
const UninstallOptions &) const;
- virtual std::tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
+ virtual tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
- virtual std::tr1::shared_ptr<const SetNameCollection> sets_list() const;
+ virtual tr1::shared_ptr<const SetNameCollection> sets_list() const;
/**
* Add a string to world.
@@ -107,9 +107,9 @@ namespace paludis
/**
* Virtual constructor.
*/
- static std::tr1::shared_ptr<Repository> make_cran_installed_repository(
+ static tr1::shared_ptr<Repository> make_cran_installed_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
/**
* Destructor.
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 2c05a31..2a09d8b 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -79,7 +79,7 @@ namespace paludis
typedef MakeHashedMap<std::string, std::list<std::string> >::Type MirrorMap;
/// Map for metadata.
- typedef MakeHashedMap<std::pair<QualifiedPackageName, VersionSpec>, std::tr1::shared_ptr<VersionMetadata> >::Type MetadataMap;
+ typedef MakeHashedMap<std::pair<QualifiedPackageName, VersionSpec>, tr1::shared_ptr<VersionMetadata> >::Type MetadataMap;
/**
* Implementation data for a CRANRepository.
@@ -186,7 +186,7 @@ CRANRepository::CRANRepository(const CRANRepositoryParams & p) :
"cran"),
PrivateImplementationPattern<CRANRepository>(new Implementation<CRANRepository>(p))
{
- std::tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
+ tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
config_info->add_kv("location", stringify(_imp->location));
config_info->add_kv("distdir", stringify(_imp->distdir));
@@ -225,18 +225,18 @@ CRANRepository::do_has_package_named(const QualifiedPackageName & q) const
return _imp->package_names.end() != _imp->package_names.find(q);
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
CRANRepository::do_category_names() const
{
Context context("When fetching category names in " + stringify(name()) + ":");
- std::tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
+ tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
result->insert(CategoryNamePart("cran"));
return result;
}
-std::tr1::shared_ptr<const QualifiedPackageNameCollection>
+tr1::shared_ptr<const QualifiedPackageNameCollection>
CRANRepository::do_package_names(const CategoryNamePart & c) const
{
Context context("When fetching package names in category '" + stringify(c)
@@ -244,7 +244,7 @@ CRANRepository::do_package_names(const CategoryNamePart & c) const
need_packages();
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
if (! do_has_category_named(c))
return result;
@@ -255,7 +255,7 @@ CRANRepository::do_package_names(const CategoryNamePart & c) const
return result;
}
-std::tr1::shared_ptr<const VersionSpecCollection>
+tr1::shared_ptr<const VersionSpecCollection>
CRANRepository::do_version_specs(const QualifiedPackageName & n) const
{
Context context("When fetching versions of '" + stringify(n) + "' in "
@@ -263,7 +263,7 @@ CRANRepository::do_version_specs(const QualifiedPackageName & n) const
need_packages();
- std::tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
+ tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
if (_imp->version_specs.end() != _imp->version_specs.find(n))
result->insert(_imp->version_specs.find(n)->second);
@@ -382,7 +382,7 @@ CRANRepository::fetch_repo_name(const std::string & location)
return RepositoryName("cran-" + modified_location);
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
CRANRepository::do_version_metadata(
const QualifiedPackageName & q, const VersionSpec & v) const
{
@@ -396,7 +396,7 @@ CRANRepository::do_version_metadata(
if (! has_version(q, v))
throw NoSuchPackageError(stringify(PackageDatabaseEntry(q, v, name())));
- std::tr1::shared_ptr<VersionMetadata> result(new CRANVersionMetadata(false));
+ tr1::shared_ptr<VersionMetadata> result(new CRANVersionMetadata(false));
FSEntry d(_imp->location);
PackageNamePart p(q.package);
@@ -422,10 +422,10 @@ CRANRepository::do_version_metadata(
return result;
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
CRANRepository::make_cran_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
{
Context context("When making CRAN repository from repo_file '" +
(m->end() == m->find("repo_file") ? std::string("?") : m->find("repo_file")->second) + "':");
@@ -454,7 +454,7 @@ CRANRepository::make_cran_repository(
if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
buildroot = "/var/tmp/paludis";
- return std::tr1::shared_ptr<Repository>(new CRANRepository(CRANRepositoryParams::create()
+ return tr1::shared_ptr<Repository>(new CRANRepository(CRANRepositoryParams::create()
.environment(env)
.location(location)
.distdir(distdir)
@@ -473,7 +473,7 @@ CRANRepositoryConfigurationError::CRANRepositoryConfigurationError(
namespace
{
FSEntry
- get_root(std::tr1::shared_ptr<const DestinationsCollection> destinations)
+ get_root(tr1::shared_ptr<const DestinationsCollection> destinations)
{
if (destinations)
for (DestinationsCollection::Iterator d(destinations->begin()), d_end(destinations->end()) ;
@@ -491,7 +491,7 @@ CRANRepository::do_install(const QualifiedPackageName &q, const VersionSpec &vn,
{
PackageNamePart pn(q.package);
CategoryNamePart c("cran");
- std::tr1::shared_ptr<const VersionMetadata> vm(do_version_metadata(q, vn));
+ tr1::shared_ptr<const VersionMetadata> vm(do_version_metadata(q, vn));
if (vm->cran_interface->is_bundle_member)
return;
@@ -499,7 +499,7 @@ CRANRepository::do_install(const QualifiedPackageName &q, const VersionSpec &vn,
std::string p(vm->cran_interface->package);
std::string v(vm->cran_interface->version);
- std::tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->env->bashrc_files());
+ tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->env->bashrc_files());
Command cmd(Command(LIBEXECDIR "/paludis/cran.bash fetch")
.with_setenv("CATEGORY", "cran")
@@ -580,7 +580,7 @@ CRANRepository::do_install(const QualifiedPackageName &q, const VersionSpec &vn,
return;
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
CRANRepository::do_package_set(const SetName & s) const
{
if ("base" == s.data())
@@ -589,18 +589,18 @@ CRANRepository::do_package_set(const SetName & s) const
* \todo Implement system as all package which are installed
* by dev-lang/R by default.
*/
- return std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec);
+ return tr1::shared_ptr<AllDepSpec>(new AllDepSpec);
}
else
- return std::tr1::shared_ptr<DepSpec>();
+ return tr1::shared_ptr<DepSpec>();
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
CRANRepository::sets_list() const
{
Context context("While generating the list of sets:");
- std::tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
+ tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
result->insert(SetName("base"));
return result;
}
diff --git a/paludis/repositories/cran/cran_repository.hh b/paludis/repositories/cran/cran_repository.hh
index bad1925..64fc482 100644
--- a/paludis/repositories/cran/cran_repository.hh
+++ b/paludis/repositories/cran/cran_repository.hh
@@ -65,27 +65,27 @@ namespace paludis
virtual bool do_has_package_named(const QualifiedPackageName &) const;
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
- virtual std::tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
+ virtual tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
const CategoryNamePart &) const;
- virtual std::tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
+ virtual tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
const QualifiedPackageName &) const;
virtual bool do_has_version(const QualifiedPackageName &,
const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const VersionMetadata> do_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> do_version_metadata(
const QualifiedPackageName &,
const VersionSpec &) const;
virtual void do_install(const QualifiedPackageName &, const VersionSpec &,
const InstallOptions &) const;
- virtual std::tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
+ virtual tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
- virtual std::tr1::shared_ptr<const SetNameCollection> sets_list() const;
+ virtual tr1::shared_ptr<const SetNameCollection> sets_list() const;
virtual bool do_sync() const;
@@ -98,9 +98,9 @@ namespace paludis
/**
* Virtual constructor.
*/
- static std::tr1::shared_ptr<Repository> make_cran_repository(
+ static tr1::shared_ptr<Repository> make_cran_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
/**
* Destructor.
diff --git a/paludis/repositories/cran/cran_repository_TEST.cc b/paludis/repositories/cran/cran_repository_TEST.cc
index 109269e..64100bb 100644
--- a/paludis/repositories/cran/cran_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_repository_TEST.cc
@@ -51,13 +51,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "cran");
keys->insert("library", "cran_repository_TEST_dir/library");
keys->insert("location", "cran_repository_TEST_dir/repo1");
keys->insert("buildroot", "cran_repository_TEST_dir/tmp");
- std::tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
+ tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
&env, keys));
TEST_CHECK(repo->has_category_named(CategoryNamePart("cran")));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/testpackage1")));
@@ -77,13 +77,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "cran");
keys->insert("library", "cran_repository_TEST_dir/library");
keys->insert("location", "cran_repository_TEST_dir/repo2");
keys->insert("buildroot", "cran_repository_TEST_dir/tmp");
- std::tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
+ tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
&env, keys));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/testbundle")));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/bundlepkg1")));
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index 2a07eb9..2630abf 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -56,28 +56,28 @@ FakeInstalledRepository::is_suitable_destination_for(const PackageDatabaseEntry
return true;
}
-std::tr1::shared_ptr<const FakeInstalledRepository::ProvidesCollection>
+tr1::shared_ptr<const FakeInstalledRepository::ProvidesCollection>
FakeInstalledRepository::provided_packages() const
{
- std::tr1::shared_ptr<ProvidesCollection> result(new ProvidesCollection::Concrete);
+ tr1::shared_ptr<ProvidesCollection> result(new ProvidesCollection::Concrete);
- std::tr1::shared_ptr<const CategoryNamePartCollection> cats(category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> cats(category_names());
for (CategoryNamePartCollection::Iterator c(cats->begin()), c_end(cats->end()) ;
c != c_end ; ++c)
{
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs(package_names(*c));
+ tr1::shared_ptr<const QualifiedPackageNameCollection> pkgs(package_names(*c));
for (QualifiedPackageNameCollection::Iterator p(pkgs->begin()), p_end(pkgs->end()) ;
p != p_end ; ++p)
{
- std::tr1::shared_ptr<const VersionSpecCollection> vers(version_specs(*p));
+ tr1::shared_ptr<const VersionSpecCollection> vers(version_specs(*p));
for (VersionSpecCollection::Iterator v(vers->begin()), v_end(vers->end()) ;
v != v_end ; ++v)
{
- std::tr1::shared_ptr<const VersionMetadata> m(version_metadata(*p, *v));
+ tr1::shared_ptr<const VersionMetadata> m(version_metadata(*p, *v));
if (! m->ebuild_interface)
continue;
- std::tr1::shared_ptr<const DepSpec> provide(m->ebuild_interface->provide());
+ tr1::shared_ptr<const DepSpec> provide(m->ebuild_interface->provide());
PackageDatabaseEntry dbe(*p, *v, name());
DepSpecFlattener f(environment(), &dbe, provide);
@@ -93,11 +93,11 @@ FakeInstalledRepository::provided_packages() const
return result;
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
FakeInstalledRepository::provided_package_version_metadata(const RepositoryProvidesEntry & p) const
{
- std::tr1::shared_ptr<const VersionMetadata> m(version_metadata(p.provided_by_name, p.version));
- std::tr1::shared_ptr<FakeVirtualVersionMetadata> result(new FakeVirtualVersionMetadata(
+ tr1::shared_ptr<const VersionMetadata> m(version_metadata(p.provided_by_name, p.version));
+ tr1::shared_ptr<FakeVirtualVersionMetadata> result(new FakeVirtualVersionMetadata(
m->slot, PackageDatabaseEntry(p.provided_by_name, p.version, name())));
result->eapi = m->eapi;
diff --git a/paludis/repositories/fake/fake_installed_repository.hh b/paludis/repositories/fake/fake_installed_repository.hh
index f9e6cae..982b658 100644
--- a/paludis/repositories/fake/fake_installed_repository.hh
+++ b/paludis/repositories/fake/fake_installed_repository.hh
@@ -36,9 +36,9 @@ namespace paludis
public RepositoryProvidesInterface
{
protected:
- virtual std::tr1::shared_ptr<const ProvidesCollection> provided_packages() const;
+ virtual tr1::shared_ptr<const ProvidesCollection> provided_packages() const;
- virtual std::tr1::shared_ptr<const VersionMetadata> provided_package_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> provided_package_version_metadata(
const RepositoryProvidesEntry &) const;
public:
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index 9786ac3..cee51fa 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -55,13 +55,13 @@ FakeRepository::do_install(const QualifiedPackageName &, const VersionSpec &,
{
}
-std::tr1::shared_ptr<const FakeRepository::VirtualsCollection>
+tr1::shared_ptr<const FakeRepository::VirtualsCollection>
FakeRepository::virtual_packages() const
{
return _virtual_packages;
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
FakeRepository::virtual_package_version_metadata(
const RepositoryVirtualsEntry & p, const VersionSpec & v) const
{
@@ -71,8 +71,8 @@ FakeRepository::virtual_package_version_metadata(
if (! p.provided_by_spec->package_ptr())
throw ConfigurationError("Virtual provider atom does not specify an unambiguous package");
- std::tr1::shared_ptr<const VersionMetadata> m(version_metadata(*p.provided_by_spec->package_ptr(), v));
- std::tr1::shared_ptr<FakeVirtualVersionMetadata> result(new FakeVirtualVersionMetadata(
+ tr1::shared_ptr<const VersionMetadata> m(version_metadata(*p.provided_by_spec->package_ptr(), v));
+ tr1::shared_ptr<FakeVirtualVersionMetadata> result(new FakeVirtualVersionMetadata(
m->slot, PackageDatabaseEntry(*p.provided_by_spec->package_ptr(), v, name())));
result->eapi = m->eapi;
@@ -85,7 +85,7 @@ FakeRepository::virtual_package_version_metadata(
}
void
-FakeRepository::add_virtual_package(const QualifiedPackageName & q, std::tr1::shared_ptr<const PackageDepSpec> p)
+FakeRepository::add_virtual_package(const QualifiedPackageName & q, tr1::shared_ptr<const PackageDepSpec> p)
{
_virtual_packages->insert(RepositoryVirtualsEntry(q, p));
}
diff --git a/paludis/repositories/fake/fake_repository.hh b/paludis/repositories/fake/fake_repository.hh
index b050a35..565a4c9 100644
--- a/paludis/repositories/fake/fake_repository.hh
+++ b/paludis/repositories/fake/fake_repository.hh
@@ -35,15 +35,15 @@ namespace paludis
public RepositoryVirtualsInterface
{
private:
- std::tr1::shared_ptr<VirtualsCollection> _virtual_packages;
+ tr1::shared_ptr<VirtualsCollection> _virtual_packages;
protected:
virtual void do_install(const QualifiedPackageName &, const VersionSpec &,
const InstallOptions &) const;
- virtual std::tr1::shared_ptr<const VirtualsCollection> virtual_packages() const;
+ virtual tr1::shared_ptr<const VirtualsCollection> virtual_packages() const;
- virtual std::tr1::shared_ptr<const VersionMetadata> virtual_package_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> virtual_package_version_metadata(
const RepositoryVirtualsEntry &, const VersionSpec & v) const;
public:
@@ -57,7 +57,7 @@ namespace paludis
/**
* Add a virtual package.
*/
- void add_virtual_package(const QualifiedPackageName &, std::tr1::shared_ptr<const PackageDepSpec>);
+ void add_virtual_package(const QualifiedPackageName &, tr1::shared_ptr<const PackageDepSpec>);
};
}
diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc
index d9410b5..5e562ef 100644
--- a/paludis/repositories/fake/fake_repository_base.cc
+++ b/paludis/repositories/fake/fake_repository_base.cc
@@ -45,19 +45,19 @@ namespace paludis
private InstantiationPolicy<Implementation<FakeRepositoryBase>, instantiation_method::NonCopyableTag>
{
/// Our category names.
- std::tr1::shared_ptr<CategoryNamePartCollection> category_names;
+ tr1::shared_ptr<CategoryNamePartCollection> category_names;
/// Our package names.
- std::map<CategoryNamePart, std::tr1::shared_ptr<PackageNamePartCollection> > package_names;
+ std::map<CategoryNamePart, tr1::shared_ptr<PackageNamePartCollection> > package_names;
/// Our versions.
- std::map<QualifiedPackageName, std::tr1::shared_ptr<VersionSpecCollection> > versions;
+ std::map<QualifiedPackageName, tr1::shared_ptr<VersionSpecCollection> > versions;
/// Our metadata.
- std::map<std::string, std::tr1::shared_ptr<VersionMetadata> > metadata;
+ std::map<std::string, tr1::shared_ptr<VersionMetadata> > metadata;
/// Our sets.
- std::map<SetName, std::tr1::shared_ptr<DepSpec> > sets;
+ std::map<SetName, tr1::shared_ptr<DepSpec> > sets;
/// (Empty) provides map.
const std::map<QualifiedPackageName, QualifiedPackageName> provide_map;
@@ -83,7 +83,7 @@ FakeRepositoryBase::FakeRepositoryBase(const Environment * const e,
RepositoryUseInterface(),
PrivateImplementationPattern<FakeRepositoryBase>(new Implementation<FakeRepositoryBase>(e))
{
- std::tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
+ tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
config_info->add_kv("format", "fake");
_info->add_section(config_info);
@@ -107,16 +107,16 @@ FakeRepositoryBase::do_has_package_named(const QualifiedPackageName & q) const
_imp->package_names.find(q.category)->second->find(q.package));
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
FakeRepositoryBase::do_category_names() const
{
return _imp->category_names;
}
-std::tr1::shared_ptr<const QualifiedPackageNameCollection>
+tr1::shared_ptr<const QualifiedPackageNameCollection>
FakeRepositoryBase::do_package_names(const CategoryNamePart & c) const
{
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
if (! has_category_named(c))
return result;
@@ -127,13 +127,13 @@ FakeRepositoryBase::do_package_names(const CategoryNamePart & c) const
return result;
}
-std::tr1::shared_ptr<const VersionSpecCollection>
+tr1::shared_ptr<const VersionSpecCollection>
FakeRepositoryBase::do_version_specs(const QualifiedPackageName & n) const
{
if (! has_category_named(n.category))
- return std::tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
+ return tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
if (! has_package_named(n))
- return std::tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
+ return tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
return _imp->versions.find(n)->second;
}
@@ -163,21 +163,21 @@ FakeRepositoryBase::add_package(const QualifiedPackageName & q)
_imp->versions.insert(std::make_pair(q, new VersionSpecCollection::Concrete));
}
-std::tr1::shared_ptr<VersionMetadata>
+tr1::shared_ptr<VersionMetadata>
FakeRepositoryBase::add_version(const QualifiedPackageName & q, const VersionSpec & v)
{
add_package(q);
_imp->versions.find(q)->second->insert(v);
_imp->metadata.insert(
std::make_pair(stringify(q) + "-" + stringify(v),
- std::tr1::shared_ptr<VersionMetadata>(new FakeVersionMetadata)));
- std::tr1::shared_ptr<VersionMetadata> r(_imp->metadata.find(stringify(q) + "-" + stringify(v))->second);
+ tr1::shared_ptr<VersionMetadata>(new FakeVersionMetadata)));
+ tr1::shared_ptr<VersionMetadata> r(_imp->metadata.find(stringify(q) + "-" + stringify(v))->second);
r->slot = SlotName("0");
r->eapi = EAPIData::get_instance()->eapi_from_string("0");
return r;
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
FakeRepositoryBase::do_version_metadata(
const QualifiedPackageName & q, const VersionSpec & v) const
{
@@ -217,10 +217,10 @@ FakeRepositoryBase::do_query_use_force(const UseFlagName &, const PackageDatabas
return false;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
FakeRepositoryBase::do_arch_flags() const
{
- return std::tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
+ return tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
}
void
@@ -228,46 +228,46 @@ FakeRepositoryBase::invalidate()
{
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
FakeRepositoryBase::do_use_expand_flags() const
{
- return std::tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
+ return tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
FakeRepositoryBase::do_use_expand_hidden_prefixes() const
{
- return std::tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
+ return tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
FakeRepositoryBase::do_use_expand_prefixes() const
{
- return std::tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
+ return tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
}
void
-FakeRepositoryBase::add_package_set(const SetName & n, std::tr1::shared_ptr<DepSpec> s)
+FakeRepositoryBase::add_package_set(const SetName & n, tr1::shared_ptr<DepSpec> s)
{
_imp->sets.insert(std::make_pair(n, s));
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
FakeRepositoryBase::do_package_set(const SetName & id) const
{
- std::map<SetName, std::tr1::shared_ptr<DepSpec> >::const_iterator i(_imp->sets.find(id));
+ std::map<SetName, tr1::shared_ptr<DepSpec> >::const_iterator i(_imp->sets.find(id));
if (_imp->sets.end() == i)
- return std::tr1::shared_ptr<DepSpec>();
+ return tr1::shared_ptr<DepSpec>();
else
return i->second;
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
FakeRepositoryBase::sets_list() const
{
- std::tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
+ tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
std::copy(_imp->sets.begin(), _imp->sets.end(),
- transform_inserter(result->inserter(), SelectFirst<SetName, std::tr1::shared_ptr<DepSpec> >()));
+ transform_inserter(result->inserter(), SelectFirst<SetName, tr1::shared_ptr<DepSpec> >()));
return result;
}
diff --git a/paludis/repositories/fake/fake_repository_base.hh b/paludis/repositories/fake/fake_repository_base.hh
index 0bf423f..b0244ec 100644
--- a/paludis/repositories/fake/fake_repository_base.hh
+++ b/paludis/repositories/fake/fake_repository_base.hh
@@ -105,10 +105,10 @@ namespace paludis
virtual UseFlagState do_query_use(const UseFlagName &, const PackageDatabaseEntry &) const;
virtual bool do_query_use_mask(const UseFlagName &, const PackageDatabaseEntry &) const;
virtual bool do_query_use_force(const UseFlagName &, const PackageDatabaseEntry &) const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_arch_flags() const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_flags() const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_hidden_prefixes() const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_prefixes() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_arch_flags() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_flags() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_hidden_prefixes() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_prefixes() const;
virtual std::string do_describe_use_flag(const UseFlagName &, const PackageDatabaseEntry &) const;
/* end of RepositoryUseInterface */
@@ -117,18 +117,18 @@ namespace paludis
virtual bool do_has_package_named(const QualifiedPackageName &) const;
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
- virtual std::tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
+ virtual tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
const CategoryNamePart &) const;
- virtual std::tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
+ virtual tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
const QualifiedPackageName &) const;
virtual bool do_has_version(const QualifiedPackageName &,
const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const VersionMetadata> do_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> do_version_metadata(
const QualifiedPackageName &,
const VersionSpec &) const;
@@ -138,8 +138,8 @@ namespace paludis
virtual bool do_query_profile_masks(const QualifiedPackageName &,
const VersionSpec &) const;
- virtual std::tr1::shared_ptr<DepSpec> do_package_set(const SetName & id) const;
- virtual std::tr1::shared_ptr<const SetNameCollection> sets_list() const;
+ virtual tr1::shared_ptr<DepSpec> do_package_set(const SetName & id) const;
+ virtual tr1::shared_ptr<const SetNameCollection> sets_list() const;
protected:
/**
@@ -169,7 +169,7 @@ namespace paludis
* Add a version, and a package and category if necessary, and set some
* default values for its metadata, and return said metadata.
*/
- std::tr1::shared_ptr<VersionMetadata> add_version(
+ tr1::shared_ptr<VersionMetadata> add_version(
const QualifiedPackageName &, const VersionSpec &);
/**
@@ -177,7 +177,7 @@ namespace paludis
* default values for its metadata, and return said metadata (convenience
* overload taking strings).
*/
- std::tr1::shared_ptr<VersionMetadata> add_version(
+ tr1::shared_ptr<VersionMetadata> add_version(
const std::string & c, const std::string & p, const std::string & v)
{
return add_version(CategoryNamePart(c) + PackageNamePart(p), VersionSpec(v));
@@ -186,7 +186,7 @@ namespace paludis
/**
* Add a package set.
*/
- void add_package_set(const SetName &, std::tr1::shared_ptr<DepSpec>);
+ void add_package_set(const SetName &, tr1::shared_ptr<DepSpec>);
virtual void invalidate();
diff --git a/paludis/repositories/gems/cache.cc b/paludis/repositories/gems/cache.cc
index a36ad5e..5448783 100644
--- a/paludis/repositories/gems/cache.cc
+++ b/paludis/repositories/gems/cache.cc
@@ -72,7 +72,7 @@ namespace
};
std::string
- as_string(std::tr1::shared_ptr<const YamlNode> n, const std::string & join = "")
+ as_string(tr1::shared_ptr<const YamlNode> n, const std::string & join = "")
{
AsStringVisitor v;
v.join = join;
@@ -107,13 +107,13 @@ namespace
struct RequirementsVisitor :
YamlNodeVisitorTypes::ConstVisitor
{
- std::tr1::shared_ptr<VersionRequirements> r;
+ tr1::shared_ptr<VersionRequirements> r;
bool top_level;
std::string op;
std::string v;
- RequirementsVisitor(std::tr1::shared_ptr<VersionRequirements> rr) :
+ RequirementsVisitor(tr1::shared_ptr<VersionRequirements> rr) :
r(rr),
top_level(true)
{
@@ -190,7 +190,7 @@ namespace
std::string summary;
std::string description;
std::string homepage;
- std::tr1::shared_ptr<VersionRequirements> required_ruby_version;
+ tr1::shared_ptr<VersionRequirements> required_ruby_version;
EntryVisitor(const std::string & _id) :
id(_id),
@@ -210,9 +210,9 @@ namespace
.description(description)
.homepage(homepage)
.required_ruby_version(required_ruby_version)
- .authors(std::tr1::shared_ptr<SequentialCollection<std::string> >())
- .dependencies(std::tr1::shared_ptr<SequentialCollection<std::string> >())
- .requirements(std::tr1::shared_ptr<SequentialCollection<std::string> >());
+ .authors(tr1::shared_ptr<SequentialCollection<std::string> >())
+ .dependencies(tr1::shared_ptr<SequentialCollection<std::string> >())
+ .requirements(tr1::shared_ptr<SequentialCollection<std::string> >());
}
void visit(const YamlSequenceNode *) PALUDIS_ATTRIBUTE((noreturn))
diff --git a/paludis/repositories/gems/cache.sr b/paludis/repositories/gems/cache.sr
index cae95a0..fe3bafa 100644
--- a/paludis/repositories/gems/cache.sr
+++ b/paludis/repositories/gems/cache.sr
@@ -8,10 +8,10 @@ make_class_GemsCacheEntry()
key summary std::string
key description std::string
key homepage std::string
- key required_ruby_version "std::tr1::shared_ptr<VersionRequirements>"
- key authors "std::tr1::shared_ptr<SequentialCollection<std::string> >"
- key dependencies "std::tr1::shared_ptr<SequentialCollection<std::string> >"
- key requirements "std::tr1::shared_ptr<SequentialCollection<std::string> >"
+ key required_ruby_version "tr1::shared_ptr<VersionRequirements>"
+ key authors "tr1::shared_ptr<SequentialCollection<std::string> >"
+ key dependencies "tr1::shared_ptr<SequentialCollection<std::string> >"
+ key requirements "tr1::shared_ptr<SequentialCollection<std::string> >"
allow_named_args
}
diff --git a/paludis/repositories/gems/gems_repository.cc b/paludis/repositories/gems/gems_repository.cc
index 25dc302..57314ad 100644
--- a/paludis/repositories/gems/gems_repository.cc
+++ b/paludis/repositories/gems/gems_repository.cc
@@ -69,7 +69,7 @@ namespace paludis
for (GemsCache::Iterator g(cache.begin()), g_end(cache.end()) ;
g != g_end ; ++g)
{
- std::tr1::shared_ptr<VersionMetadata> m(new GemsVersionMetadata(g->version));
+ tr1::shared_ptr<VersionMetadata> m(new GemsVersionMetadata(g->version));
m->set_homepage(g->homepage);
if (g->description.empty())
m->description = g->summary;
@@ -102,25 +102,25 @@ GemsRepository::do_has_package_named(const QualifiedPackageName & c) const
return false;
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
GemsRepository::do_category_names() const
{
- static std::tr1::shared_ptr<CategoryNamePartCollection> names(new CategoryNamePartCollection::Concrete);
+ static tr1::shared_ptr<CategoryNamePartCollection> names(new CategoryNamePartCollection::Concrete);
if (names->empty())
names->insert(CategoryNamePart("gems"));
return names;
}
-std::tr1::shared_ptr<const QualifiedPackageNameCollection>
+tr1::shared_ptr<const QualifiedPackageNameCollection>
GemsRepository::do_package_names(const CategoryNamePart & c) const
{
if (! has_category_named(c))
- return std::tr1::shared_ptr<const QualifiedPackageNameCollection>(new QualifiedPackageNameCollection::Concrete);
+ return tr1::shared_ptr<const QualifiedPackageNameCollection>(new QualifiedPackageNameCollection::Concrete);
_imp->need_entries();
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
for (Packages::const_iterator i(_imp->packages.begin()), i_end(_imp->packages.end()) ;
i != i_end ; ++i)
result->insert(c + i->first);
@@ -128,15 +128,15 @@ GemsRepository::do_package_names(const CategoryNamePart & c) const
return result;
}
-std::tr1::shared_ptr<const VersionSpecCollection>
+tr1::shared_ptr<const VersionSpecCollection>
GemsRepository::do_version_specs(const QualifiedPackageName & p) const
{
if (! has_category_named(p.category))
- return std::tr1::shared_ptr<const VersionSpecCollection>(new VersionSpecCollection::Concrete);
+ return tr1::shared_ptr<const VersionSpecCollection>(new VersionSpecCollection::Concrete);
_imp->need_entries();
- std::tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
+ tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
Packages::const_iterator i(_imp->packages.find(p.package));
if (i != _imp->packages.end())
std::copy(i->second.begin(), i->second.end(), transform_inserter(
@@ -156,7 +156,7 @@ GemsRepository::do_has_version(const QualifiedPackageName & q, const VersionSpec
return false;
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
GemsRepository::do_version_metadata(const QualifiedPackageName & q, const VersionSpec & v) const
{
if (! has_category_named(q.category))
@@ -180,16 +180,16 @@ GemsRepository::do_install(const QualifiedPackageName &, const VersionSpec &, co
{
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
GemsRepository::do_package_set(const SetName &) const
{
- return std::tr1::shared_ptr<DepSpec>();
+ return tr1::shared_ptr<DepSpec>();
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
GemsRepository::sets_list() const
{
- return std::tr1::shared_ptr<SetNameCollection>(new SetNameCollection::Concrete);
+ return tr1::shared_ptr<SetNameCollection>(new SetNameCollection::Concrete);
}
bool
@@ -211,7 +211,7 @@ GemsRepository::do_sync() const
FSEntry fetcher("/var/empty");
bool ok(false);
- std::tr1::shared_ptr<const FSEntryCollection> fetchers_dirs(_imp->params.environment->fetchers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> fetchers_dirs(_imp->params.environment->fetchers_dirs());
for (FSEntryCollection::Iterator d(fetchers_dirs->begin()),
d_end(fetchers_dirs->end()) ; d != d_end && ! ok; ++d)
{
@@ -276,9 +276,9 @@ GemsRepository::regenerate_cache() const
{
}
-std::tr1::shared_ptr<const RepositoryInfo>
+tr1::shared_ptr<const RepositoryInfo>
GemsRepository::info(bool) const
{
- return std::tr1::shared_ptr<RepositoryInfo>(new RepositoryInfo);
+ return tr1::shared_ptr<RepositoryInfo>(new RepositoryInfo);
}
diff --git a/paludis/repositories/gems/gems_repository.hh b/paludis/repositories/gems/gems_repository.hh
index 1cb9460..73fa810 100644
--- a/paludis/repositories/gems/gems_repository.hh
+++ b/paludis/repositories/gems/gems_repository.hh
@@ -26,31 +26,31 @@ namespace paludis
virtual bool do_has_package_named(const QualifiedPackageName &) const;
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
- virtual std::tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
+ virtual tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
const CategoryNamePart &) const;
- virtual std::tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
+ virtual tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
const QualifiedPackageName &) const;
virtual bool do_has_version(const QualifiedPackageName &, const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const VersionMetadata> do_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> do_version_metadata(
const QualifiedPackageName &,
const VersionSpec &) const;
virtual void do_install(const QualifiedPackageName &, const VersionSpec &,
const InstallOptions &) const;
- virtual std::tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
+ virtual tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
- virtual std::tr1::shared_ptr<const SetNameCollection> sets_list() const;
+ virtual tr1::shared_ptr<const SetNameCollection> sets_list() const;
virtual bool do_sync() const;
public:
- virtual std::tr1::shared_ptr<const RepositoryInfo> info(bool verbose) const;
+ virtual tr1::shared_ptr<const RepositoryInfo> info(bool verbose) const;
GemsRepository(const GemsRepositoryParams &);
~GemsRepository();
diff --git a/paludis/repositories/gems/gems_repository.sr b/paludis/repositories/gems/gems_repository.sr
index f05f195..d22fe76 100644
--- a/paludis/repositories/gems/gems_repository.sr
+++ b/paludis/repositories/gems/gems_repository.sr
@@ -18,6 +18,6 @@ make_class_GemsRepositoryEntry()
{
visible
- key metadata "std::tr1::shared_ptr<VersionMetadata>"
+ key metadata "tr1::shared_ptr<VersionMetadata>"
}
diff --git a/paludis/repositories/gems/gems_repository_TEST.cc b/paludis/repositories/gems/gems_repository_TEST.cc
index c407b1c..7cd220d 100644
--- a/paludis/repositories/gems/gems_repository_TEST.cc
+++ b/paludis/repositories/gems/gems_repository_TEST.cc
@@ -37,11 +37,11 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "gems");
keys->insert("location", "gems_repository_TEST_dir/repo1");
- std::tr1::shared_ptr<Repository> repo(make_gems_repository(
+ tr1::shared_ptr<Repository> repo(make_gems_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "gems");
}
diff --git a/paludis/repositories/gems/make_gems_repository.cc b/paludis/repositories/gems/make_gems_repository.cc
index de3e78b..aa844b5 100644
--- a/paludis/repositories/gems/make_gems_repository.cc
+++ b/paludis/repositories/gems/make_gems_repository.cc
@@ -22,9 +22,9 @@
using namespace paludis;
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
paludis::make_gems_repository(Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
{
std::string repo_file(m->end() == m->find("repo_file") ? std::string("?") :
m->find("repo_file")->second);
@@ -47,7 +47,7 @@ paludis::make_gems_repository(Environment * const env,
if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
buildroot = "/var/tmp/paludis";
- return std::tr1::shared_ptr<Repository>(new GemsRepository(GemsRepositoryParams::create()
+ return tr1::shared_ptr<Repository>(new GemsRepository(GemsRepositoryParams::create()
.environment(env)
.location(location)
.distdir(distdir)
diff --git a/paludis/repositories/gems/make_gems_repository.hh b/paludis/repositories/gems/make_gems_repository.hh
index 154e446..d0a9d33 100644
--- a/paludis/repositories/gems/make_gems_repository.hh
+++ b/paludis/repositories/gems/make_gems_repository.hh
@@ -24,9 +24,9 @@
namespace paludis
{
- std::tr1::shared_ptr<Repository>
+ tr1::shared_ptr<Repository>
make_gems_repository(Environment * const,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >) PALUDIS_VISIBLE;
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >) PALUDIS_VISIBLE;
}
#endif
diff --git a/paludis/repositories/gems/yaml.cc b/paludis/repositories/gems/yaml.cc
index 0a09e50..c426b7f 100644
--- a/paludis/repositories/gems/yaml.cc
+++ b/paludis/repositories/gems/yaml.cc
@@ -44,13 +44,13 @@ namespace paludis
template<>
struct Implementation<YamlMappingNode>
{
- std::list<std::pair<std::tr1::shared_ptr<YamlScalarNode>, std::tr1::shared_ptr<YamlNode> > > nodes;
+ std::list<std::pair<tr1::shared_ptr<YamlScalarNode>, tr1::shared_ptr<YamlNode> > > nodes;
};
template<>
struct Implementation<YamlSequenceNode>
{
- std::list<std::tr1::shared_ptr<YamlNode> > nodes;
+ std::list<tr1::shared_ptr<YamlNode> > nodes;
};
}
@@ -72,7 +72,7 @@ YamlMappingNode::end() const
return Iterator(_imp->nodes.end());
}
-std::pair<std::tr1::shared_ptr<YamlScalarNode>, std::tr1::shared_ptr<YamlNode> > &
+std::pair<tr1::shared_ptr<YamlScalarNode>, tr1::shared_ptr<YamlNode> > &
YamlMappingNode::back()
{
return _imp->nodes.back();
@@ -96,13 +96,13 @@ YamlSequenceNode::end() const
}
void
-YamlSequenceNode::add(std::tr1::shared_ptr<YamlNode> node)
+YamlSequenceNode::add(tr1::shared_ptr<YamlNode> node)
{
_imp->nodes.push_back(node);
}
void
-YamlMappingNode::add(std::tr1::shared_ptr<YamlScalarNode> a, std::tr1::shared_ptr<YamlNode> b)
+YamlMappingNode::add(tr1::shared_ptr<YamlScalarNode> a, tr1::shared_ptr<YamlNode> b)
{
_imp->nodes.push_back(std::make_pair(a, b));
}
@@ -112,10 +112,10 @@ namespace paludis
template<>
struct Implementation<YamlDocument>
{
- std::tr1::shared_ptr<YamlSequenceNode> top;
+ tr1::shared_ptr<YamlSequenceNode> top;
void parse(yaml_parser_t * parser);
- std::tr1::shared_ptr<YamlScalarNode> parse_scalar(yaml_parser_t * parser);
+ tr1::shared_ptr<YamlScalarNode> parse_scalar(yaml_parser_t * parser);
Implementation() :
top(new YamlSequenceNode)
@@ -164,9 +164,9 @@ namespace
struct ScalarAdder :
YamlNodeVisitorTypes::Visitor
{
- std::tr1::shared_ptr<YamlScalarNode> a;
+ tr1::shared_ptr<YamlScalarNode> a;
- ScalarAdder(std::tr1::shared_ptr<YamlScalarNode> aa) :
+ ScalarAdder(tr1::shared_ptr<YamlScalarNode> aa) :
a(aa)
{
}
@@ -174,7 +174,7 @@ namespace
void visit(YamlMappingNode * n)
{
if (n->empty() || n->back().second)
- n->add(a, std::tr1::shared_ptr<YamlNode>());
+ n->add(a, tr1::shared_ptr<YamlNode>());
else
n->back().second = a;
}
@@ -193,9 +193,9 @@ namespace
struct NonScalarAdder :
YamlNodeVisitorTypes::Visitor
{
- std::tr1::shared_ptr<YamlNode> a;
+ tr1::shared_ptr<YamlNode> a;
- NonScalarAdder(std::tr1::shared_ptr<YamlNode> aa) :
+ NonScalarAdder(tr1::shared_ptr<YamlNode> aa) :
a(aa)
{
}
@@ -256,7 +256,7 @@ YamlDocument::YamlDocument(const FSEntry & loc) :
void
Implementation<YamlDocument>::parse(yaml_parser_t * parser)
{
- std::list<std::tr1::shared_ptr<YamlNode> > stack;
+ std::list<tr1::shared_ptr<YamlNode> > stack;
stack.push_back(top);
bool done(false);
@@ -281,7 +281,7 @@ Implementation<YamlDocument>::parse(yaml_parser_t * parser)
case YAML_MAPPING_START_EVENT:
{
- std::tr1::shared_ptr<YamlMappingNode> node(new YamlMappingNode);
+ tr1::shared_ptr<YamlMappingNode> node(new YamlMappingNode);
if (stack.empty())
throw YamlError("Error building tree: stack empty on YAML_SEQUENCE_START_EVENT");
@@ -305,7 +305,7 @@ Implementation<YamlDocument>::parse(yaml_parser_t * parser)
case YAML_SEQUENCE_START_EVENT:
{
- std::tr1::shared_ptr<YamlSequenceNode> node(new YamlSequenceNode);
+ tr1::shared_ptr<YamlSequenceNode> node(new YamlSequenceNode);
if (stack.empty())
throw YamlError("Error building tree: stack empty on YAML_SEQUENCE_START_EVENT");
if (stack.back())
@@ -323,7 +323,7 @@ Implementation<YamlDocument>::parse(yaml_parser_t * parser)
{
if (stack.empty())
throw YamlError("Error building tree: stack empty on YAML_SCALAR_EVENT");
- std::tr1::shared_ptr<YamlScalarNode> node(new YamlScalarNode(
+ tr1::shared_ptr<YamlScalarNode> node(new YamlScalarNode(
event->data.scalar.value ? reinterpret_cast<const char *>(event->data.scalar.value) : "",
event->data.scalar.tag ? reinterpret_cast<const char *>(event->data.scalar.tag) : ""));
if (stack.back())
@@ -355,7 +355,7 @@ YamlDocument::~YamlDocument()
{
}
-std::tr1::shared_ptr<const YamlNode>
+tr1::shared_ptr<const YamlNode>
YamlDocument::top() const
{
return _imp->top;
diff --git a/paludis/repositories/gems/yaml.hh b/paludis/repositories/gems/yaml.hh
index 47bed60..d459189 100644
--- a/paludis/repositories/gems/yaml.hh
+++ b/paludis/repositories/gems/yaml.hh
@@ -23,7 +23,7 @@
#include <paludis/util/visitor.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
namespace paludis
{
@@ -84,14 +84,14 @@ namespace paludis
public:
YamlMappingNode();
- void add(std::tr1::shared_ptr<YamlScalarNode>, std::tr1::shared_ptr<YamlNode>);
+ void add(tr1::shared_ptr<YamlScalarNode>, tr1::shared_ptr<YamlNode>);
typedef libwrapiter::ForwardIterator<YamlMappingNode,
- const std::pair<std::tr1::shared_ptr<YamlScalarNode>, std::tr1::shared_ptr<YamlNode> > > Iterator;
+ const std::pair<tr1::shared_ptr<YamlScalarNode>, tr1::shared_ptr<YamlNode> > > Iterator;
Iterator begin() const;
Iterator end() const;
- std::pair<std::tr1::shared_ptr<YamlScalarNode>, std::tr1::shared_ptr<YamlNode> > & back();
+ std::pair<tr1::shared_ptr<YamlScalarNode>, tr1::shared_ptr<YamlNode> > & back();
bool empty() const
{
@@ -107,11 +107,11 @@ namespace paludis
public:
YamlSequenceNode();
- typedef libwrapiter::ForwardIterator<YamlSequenceNode, const std::tr1::shared_ptr<YamlNode> > Iterator;
+ typedef libwrapiter::ForwardIterator<YamlSequenceNode, const tr1::shared_ptr<YamlNode> > Iterator;
Iterator begin() const;
Iterator end() const;
- void add(std::tr1::shared_ptr<YamlNode>);
+ void add(tr1::shared_ptr<YamlNode>);
};
class PALUDIS_VISIBLE YamlDocument :
@@ -123,7 +123,7 @@ namespace paludis
YamlDocument(const FSEntry &);
~YamlDocument();
- std::tr1::shared_ptr<const YamlNode> top() const;
+ tr1::shared_ptr<const YamlNode> top() const;
};
}
diff --git a/paludis/repositories/gentoo/ebin.cc b/paludis/repositories/gentoo/ebin.cc
index f566032..70aa00c 100644
--- a/paludis/repositories/gentoo/ebin.cc
+++ b/paludis/repositories/gentoo/ebin.cc
@@ -95,10 +95,10 @@ EbinCommand::operator() ()
if (use_sandbox())
cmd.with_sandbox();
- std::tr1::shared_ptr<const FSEntryCollection> syncers_dirs(params.environment->syncers_dirs());
- std::tr1::shared_ptr<const FSEntryCollection> bashrc_files(params.environment->bashrc_files());
- std::tr1::shared_ptr<const FSEntryCollection> fetchers_dirs(params.environment->fetchers_dirs());
- std::tr1::shared_ptr<const FSEntryCollection> hook_dirs(params.environment->hook_dirs());
+ tr1::shared_ptr<const FSEntryCollection> syncers_dirs(params.environment->syncers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> bashrc_files(params.environment->bashrc_files());
+ tr1::shared_ptr<const FSEntryCollection> fetchers_dirs(params.environment->fetchers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> hook_dirs(params.environment->hook_dirs());
cmd = extend_command(cmd
.with_setenv("P", stringify(params.db_entry->name.package) + "-" +
diff --git a/paludis/repositories/gentoo/ebin_entries.cc b/paludis/repositories/gentoo/ebin_entries.cc
index 1e48efa..90274ce 100644
--- a/paludis/repositories/gentoo/ebin_entries.cc
+++ b/paludis/repositories/gentoo/ebin_entries.cc
@@ -64,13 +64,13 @@ EbinEntries::~EbinEntries()
{
}
-std::tr1::shared_ptr<VersionMetadata>
+tr1::shared_ptr<VersionMetadata>
EbinEntries::generate_version_metadata(const QualifiedPackageName & q,
const VersionSpec & v) const
{
Context context("When generating version metadata for '" + stringify(q) + "-" + stringify(v) + "':");
- std::tr1::shared_ptr<EbinVersionMetadata> result(new EbinVersionMetadata(SlotName("unset")));
+ tr1::shared_ptr<EbinVersionMetadata> result(new EbinVersionMetadata(SlotName("unset")));
KeyValueConfigFile f(_imp->params.location / stringify(q.category) /
stringify(q.package) / (stringify(q.package) + "-" + stringify(v) + ".ebin"),
@@ -106,7 +106,7 @@ EbinEntries::generate_version_metadata(const QualifiedPackageName & q,
namespace
{
FSEntry
- get_root(std::tr1::shared_ptr<const DestinationsCollection> destinations)
+ get_root(tr1::shared_ptr<const DestinationsCollection> destinations)
{
if (destinations)
for (DestinationsCollection::Iterator d(destinations->begin()), d_end(destinations->end()) ;
@@ -120,13 +120,13 @@ namespace
void
EbinEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
- const InstallOptions & o, std::tr1::shared_ptr<const PortageRepositoryProfile>) const
+ const InstallOptions & o, tr1::shared_ptr<const PortageRepositoryProfile>) const
{
if (! _imp->portage_repository->has_version(q, v))
throw PackageInstallActionError("Can't install '" + stringify(q) + "-"
+ stringify(v) + "' since has_version failed");
- std::tr1::shared_ptr<const VersionMetadata> metadata(_imp->portage_repository->version_metadata(q, v));
+ tr1::shared_ptr<const VersionMetadata> metadata(_imp->portage_repository->version_metadata(q, v));
PackageDatabaseEntry e(q, v, _imp->portage_repository->name());
std::string binaries, flat_bin_uri;
@@ -134,7 +134,7 @@ EbinEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
std::set<std::string> already_in_binaries;
/* make B and FLAT_BIN_URI */
- std::tr1::shared_ptr<const DepSpec> b_spec(metadata->ebin_interface->bin_uri());
+ tr1::shared_ptr<const DepSpec> b_spec(metadata->ebin_interface->bin_uri());
DepSpecFlattener f(_imp->params.environment, &e, b_spec);
for (DepSpecFlattener::Iterator ff(f.begin()), ff_end(f.end()) ; ff != ff_end ; ++ff)
@@ -159,7 +159,7 @@ EbinEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
binaries.append(" ");
/* add * mirror entries */
- std::tr1::shared_ptr<const MirrorsCollection> star_mirrors(_imp->params.environment->mirrors("*"));
+ tr1::shared_ptr<const MirrorsCollection> star_mirrors(_imp->params.environment->mirrors("*"));
for (MirrorsCollection::Iterator m(star_mirrors->begin()), m_end(star_mirrors->end()) ; m != m_end ; ++m)
flat_bin_uri.append(*m + "/" + (*ff)->text().substr(pos + 1) + " ");
@@ -172,7 +172,7 @@ EbinEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
throw PackageInstallActionError("Can't install '" + stringify(q) + "-"
+ stringify(v) + "' since BIN_URI is broken");
- std::tr1::shared_ptr<const MirrorsCollection> mirrors(_imp->params.environment->mirrors(mirror.substr(0, spos)));
+ tr1::shared_ptr<const MirrorsCollection> mirrors(_imp->params.environment->mirrors(mirror.substr(0, spos)));
if (! _imp->portage_repository->is_mirror(mirror.substr(0, spos)) &&
mirrors->empty())
throw PackageInstallActionError("Can't install '" + stringify(q) + "-"
@@ -196,7 +196,7 @@ EbinEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
std::string master_mirror(strip_trailing_string(stringify(_imp->portage_repository->name()), "x-"));
if (_imp->portage_repository->is_mirror(master_mirror))
{
- std::tr1::shared_ptr<const MirrorsCollection> repo_mirrors(_imp->params.environment->mirrors(master_mirror));
+ tr1::shared_ptr<const MirrorsCollection> repo_mirrors(_imp->params.environment->mirrors(master_mirror));
for (MirrorsCollection::Iterator m(repo_mirrors->begin()), m_end(repo_mirrors->end()) ; m != m_end ; ++m)
flat_bin_uri.append(*m + "/" + (*ff)->text().substr(pos + 1) + " ");
@@ -330,16 +330,16 @@ EbinEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
tidyup_cmd();
}
-std::tr1::shared_ptr<PortageRepositoryEntries>
+tr1::shared_ptr<PortageRepositoryEntries>
EbinEntries::make_ebin_entries(
const Environment * const e, PortageRepository * const r, const PortageRepositoryParams & p)
{
- return std::tr1::shared_ptr<PortageRepositoryEntries>(new EbinEntries(e, r, p));
+ return tr1::shared_ptr<PortageRepositoryEntries>(new EbinEntries(e, r, p));
}
std::string
EbinEntries::get_environment_variable(const QualifiedPackageName & q,
- const VersionSpec & v, const std::string & var, std::tr1::shared_ptr<const PortageRepositoryProfile>) const
+ const VersionSpec & v, const std::string & var, tr1::shared_ptr<const PortageRepositoryProfile>) const
{
PackageDatabaseEntry for_package(q, v, _imp->portage_repository->name());
@@ -367,7 +367,7 @@ EbinEntries::merge(const MergeOptions & m)
if (! ebin_file)
throw PackageInstallActionError("Cannot write to '" + stringify(ebin_file_name) + "'");
- std::tr1::shared_ptr<const VersionMetadata> metadata(
+ tr1::shared_ptr<const VersionMetadata> metadata(
_imp->params.environment->package_database()->fetch_repository(m.package.repository)->
version_metadata(m.package.name, m.package.version));
@@ -462,7 +462,7 @@ EbinEntries::extract_package_file_version(const QualifiedPackageName & n, const
bool
EbinEntries::pretend(const QualifiedPackageName &, const VersionSpec &,
- std::tr1::shared_ptr<const PortageRepositoryProfile>) const
+ tr1::shared_ptr<const PortageRepositoryProfile>) const
{
return true;
}
diff --git a/paludis/repositories/gentoo/ebin_entries.hh b/paludis/repositories/gentoo/ebin_entries.hh
index e713254..93c1813 100644
--- a/paludis/repositories/gentoo/ebin_entries.hh
+++ b/paludis/repositories/gentoo/ebin_entries.hh
@@ -42,7 +42,7 @@ namespace paludis
/**
* Create an EbinEntries instance.
*/
- static std::tr1::shared_ptr<PortageRepositoryEntries> make_ebin_entries(const Environment * const,
+ static tr1::shared_ptr<PortageRepositoryEntries> make_ebin_entries(const Environment * const,
PortageRepository * const, const PortageRepositoryParams &);
///\name Basic operations
@@ -56,21 +56,21 @@ namespace paludis
///\}
- virtual std::tr1::shared_ptr<VersionMetadata> generate_version_metadata(const QualifiedPackageName &,
+ virtual tr1::shared_ptr<VersionMetadata> generate_version_metadata(const QualifiedPackageName &,
const VersionSpec &) const;
virtual std::string get_environment_variable(const QualifiedPackageName &,
const VersionSpec &, const std::string & var,
- std::tr1::shared_ptr<const PortageRepositoryProfile>) const
+ tr1::shared_ptr<const PortageRepositoryProfile>) const
PALUDIS_ATTRIBUTE((noreturn));
virtual void install(const QualifiedPackageName &, const VersionSpec &,
- const InstallOptions &, std::tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ const InstallOptions &, tr1::shared_ptr<const PortageRepositoryProfile>) const;
virtual void merge(const MergeOptions &);
virtual bool pretend(const QualifiedPackageName &, const VersionSpec &,
- std::tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ tr1::shared_ptr<const PortageRepositoryProfile>) const;
virtual bool is_package_file(const QualifiedPackageName &, const FSEntry &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/gentoo/ebuild.cc b/paludis/repositories/gentoo/ebuild.cc
index 62669c7..6f16a95 100644
--- a/paludis/repositories/gentoo/ebuild.cc
+++ b/paludis/repositories/gentoo/ebuild.cc
@@ -78,10 +78,10 @@ EbuildCommand::operator() ()
if (use_sandbox())
cmd.with_sandbox();
- std::tr1::shared_ptr<const FSEntryCollection> syncers_dirs(params.environment->syncers_dirs());
- std::tr1::shared_ptr<const FSEntryCollection> bashrc_files(params.environment->bashrc_files());
- std::tr1::shared_ptr<const FSEntryCollection> fetchers_dirs(params.environment->fetchers_dirs());
- std::tr1::shared_ptr<const FSEntryCollection> hook_dirs(params.environment->hook_dirs());
+ tr1::shared_ptr<const FSEntryCollection> syncers_dirs(params.environment->syncers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> bashrc_files(params.environment->bashrc_files());
+ tr1::shared_ptr<const FSEntryCollection> fetchers_dirs(params.environment->fetchers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> hook_dirs(params.environment->hook_dirs());
cmd = extend_command(cmd
.with_setenv("P", stringify(params.db_entry->name.package) + "-" +
@@ -552,10 +552,10 @@ WriteVDBEntryCommand::operator() ()
stringify(params.output_directory) + "' '" +
stringify(params.environment_file) + "'");
- std::tr1::shared_ptr<const FSEntryCollection> syncers_dirs(params.environment->syncers_dirs());
- std::tr1::shared_ptr<const FSEntryCollection> bashrc_files(params.environment->bashrc_files());
- std::tr1::shared_ptr<const FSEntryCollection> fetchers_dirs(params.environment->fetchers_dirs());
- std::tr1::shared_ptr<const FSEntryCollection> hook_dirs(params.environment->hook_dirs());
+ tr1::shared_ptr<const FSEntryCollection> syncers_dirs(params.environment->syncers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> bashrc_files(params.environment->bashrc_files());
+ tr1::shared_ptr<const FSEntryCollection> fetchers_dirs(params.environment->fetchers_dirs());
+ tr1::shared_ptr<const FSEntryCollection> hook_dirs(params.environment->hook_dirs());
Command cmd(Command(ebuild_cmd)
.with_setenv("PKGMANAGER", PALUDIS_PACKAGE "-" + stringify(PALUDIS_VERSION_MAJOR) + "." +
diff --git a/paludis/repositories/gentoo/ebuild.hh b/paludis/repositories/gentoo/ebuild.hh
index aefaf05..4db24dc 100644
--- a/paludis/repositories/gentoo/ebuild.hh
+++ b/paludis/repositories/gentoo/ebuild.hh
@@ -182,7 +182,7 @@ namespace paludis
public EbuildCommand
{
private:
- std::tr1::shared_ptr<EbuildVersionMetadata> _metadata;
+ tr1::shared_ptr<EbuildVersionMetadata> _metadata;
protected:
virtual std::string commands() const;
@@ -203,7 +203,7 @@ namespace paludis
* Return a pointer to our generated metadata. If operator() has not
* yet been called, will be a zero pointer.
*/
- std::tr1::shared_ptr<EbuildVersionMetadata> metadata() const
+ tr1::shared_ptr<EbuildVersionMetadata> metadata() const
{
return _metadata;
}
diff --git a/paludis/repositories/gentoo/ebuild.sr b/paludis/repositories/gentoo/ebuild.sr
index 6a0afbc..70e8418 100644
--- a/paludis/repositories/gentoo/ebuild.sr
+++ b/paludis/repositories/gentoo/ebuild.sr
@@ -7,7 +7,7 @@ make_class_EbuildCommandParams()
key db_entry "const PackageDatabaseEntry *"
key ebuild_dir FSEntry
key files_dir FSEntry
- key eclassdirs "std::tr1::shared_ptr<const FSEntryCollection>"
+ key eclassdirs "tr1::shared_ptr<const FSEntryCollection>"
key portdir FSEntry
key distdir FSEntry
key buildroot FSEntry
@@ -33,8 +33,8 @@ make_class_EbuildFetchCommandParams()
key use_expand std::string
key flat_src_uri std::string
key root std::string
- key profiles "std::tr1::shared_ptr<const FSEntryCollection>"
- key expand_vars "std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >"
+ key profiles "tr1::shared_ptr<const FSEntryCollection>"
+ key expand_vars "tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >"
key no_fetch bool
key safe_resume bool
key userpriv bool
@@ -59,8 +59,8 @@ make_class_EbuildInstallCommandParams()
key use std::string
key use_expand std::string
key root std::string
- key profiles "std::tr1::shared_ptr<const FSEntryCollection>"
- key expand_vars "std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >"
+ key profiles "tr1::shared_ptr<const FSEntryCollection>"
+ key expand_vars "tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >"
key disable_cfgpro bool
key userpriv bool
key debug_build InstallDebugOption
@@ -88,8 +88,8 @@ make_class_EbuildPretendCommandParams()
key use std::string
key use_expand std::string
key root std::string
- key profiles "std::tr1::shared_ptr<const FSEntryCollection>"
- key expand_vars "std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >"
+ key profiles "tr1::shared_ptr<const FSEntryCollection>"
+ key expand_vars "tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >"
doxygen_comment << "END"
/**
diff --git a/paludis/repositories/gentoo/ebuild/merge.cc b/paludis/repositories/gentoo/ebuild/merge.cc
index 2908205..77e78bf 100644
--- a/paludis/repositories/gentoo/ebuild/merge.cc
+++ b/paludis/repositories/gentoo/ebuild/merge.cc
@@ -142,7 +142,7 @@ namespace
mode_t mode(src_dir.permissions());
//#ifdef HAVE_SELINUX
- std::tr1::shared_ptr<FSCreateCon> createcon;
+ tr1::shared_ptr<FSCreateCon> createcon;
if (MatchPathCon::get_instance()->good())
{
FSCreateCon *p = new FSCreateCon(MatchPathCon::get_instance()->match(dst_dir_str.substr(root_str.length()),
@@ -247,7 +247,7 @@ namespace
* disk write may not have synced. */
{
//#ifdef HAVE_SELINUX
- std::tr1::shared_ptr<FSCreateCon> createcon;
+ tr1::shared_ptr<FSCreateCon> createcon;
if (MatchPathCon::get_instance()->good())
createcon.reset(new
FSCreateCon(MatchPathCon::get_instance()->match(dst_dir_str.substr(root_str.length()) + "/"
@@ -328,7 +328,7 @@ namespace
//#ifdef HAVE_SELINUX
// permissions() on a symlink does weird things, but matchpathcon only cares about the file type,
// so just pass S_IFLNK.
- std::tr1::shared_ptr<FSCreateCon> createcon;
+ tr1::shared_ptr<FSCreateCon> createcon;
if (MatchPathCon::get_instance()->good())
createcon.reset(new
FSCreateCon(MatchPathCon::get_instance()->match(dst_dir_str.substr(root_str.length()) + "/"
diff --git a/paludis/repositories/gentoo/ebuild_entries.cc b/paludis/repositories/gentoo/ebuild_entries.cc
index d46c2f0..aae35b7 100644
--- a/paludis/repositories/gentoo/ebuild_entries.cc
+++ b/paludis/repositories/gentoo/ebuild_entries.cc
@@ -39,7 +39,7 @@
#include <set>
#include <sys/types.h>
#include <grp.h>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
#include <functional>
using namespace paludis;
@@ -58,7 +58,7 @@ namespace paludis
PortageRepository * const portage_repository;
const PortageRepositoryParams params;
- std::tr1::shared_ptr<EclassMtimes> eclass_mtimes;
+ tr1::shared_ptr<EclassMtimes> eclass_mtimes;
time_t master_mtime;
Implementation(const Environment * const e, PortageRepository * const p,
@@ -86,13 +86,13 @@ EbuildEntries::~EbuildEntries()
{
}
-std::tr1::shared_ptr<VersionMetadata>
+tr1::shared_ptr<VersionMetadata>
EbuildEntries::generate_version_metadata(const QualifiedPackageName & q,
const VersionSpec & v) const
{
Context context("When generating version metadata for '" + stringify(q) + "-" + stringify(v) + "':");
- std::tr1::shared_ptr<EbuildVersionMetadata> result(new EbuildVersionMetadata);
+ tr1::shared_ptr<EbuildVersionMetadata> result(new EbuildVersionMetadata);
FSEntry ebuild_file(_imp->params.location / stringify(q.category) /
stringify(q.package) / (stringify(q.package) + "-" + stringify(v) + ".ebuild"));
@@ -209,7 +209,7 @@ namespace
}
public:
- AAFinder(const std::tr1::shared_ptr<const DepSpec> a)
+ AAFinder(const tr1::shared_ptr<const DepSpec> a)
{
a->accept(static_cast<DepSpecVisitorTypes::ConstVisitor *>(this));
}
@@ -232,7 +232,7 @@ namespace
namespace
{
FSEntry
- get_root(std::tr1::shared_ptr<const DestinationsCollection> destinations)
+ get_root(tr1::shared_ptr<const DestinationsCollection> destinations)
{
if (destinations)
for (DestinationsCollection::Iterator d(destinations->begin()), d_end(destinations->end()) ;
@@ -245,8 +245,8 @@ namespace
std::string make_use(const Environment * const env,
const PackageDatabaseEntry & pde,
- std::tr1::shared_ptr<const VersionMetadata> metadata,
- std::tr1::shared_ptr<const PortageRepositoryProfile> profile)
+ tr1::shared_ptr<const VersionMetadata> metadata,
+ tr1::shared_ptr<const PortageRepositoryProfile> profile)
{
std::string use;
@@ -260,13 +260,13 @@ namespace
return use;
}
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> >
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> >
make_expand(const Environment * const env,
const PackageDatabaseEntry & e,
- std::tr1::shared_ptr<const PortageRepositoryProfile> profile,
+ tr1::shared_ptr<const PortageRepositoryProfile> profile,
std::string & use)
{
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > expand_vars(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > expand_vars(
new AssociativeCollection<std::string, std::string>::Concrete);
for (PortageRepositoryProfile::UseExpandIterator x(profile->begin_use_expand()),
@@ -283,7 +283,7 @@ namespace
create_inserter<UseFlagName>(std::inserter(possible_values, possible_values.end())));
/* possible values from environment */
- std::tr1::shared_ptr<const UseFlagNameCollection> possible_values_from_env(
+ tr1::shared_ptr<const UseFlagNameCollection> possible_values_from_env(
env->known_use_expand_names(*x, e));
for (UseFlagNameCollection::Iterator i(possible_values_from_env->begin()),
i_end(possible_values_from_env->end()) ; i != i_end ; ++i)
@@ -317,9 +317,9 @@ namespace
void
EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
- const InstallOptions & o, std::tr1::shared_ptr<const PortageRepositoryProfile> p) const
+ const InstallOptions & o, tr1::shared_ptr<const PortageRepositoryProfile> p) const
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
Context context("When installing '" + stringify(q) + "-" + stringify(v) + "':");
@@ -329,7 +329,7 @@ EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
+ stringify(v) + "' since has_version failed");
}
- std::tr1::shared_ptr<const VersionMetadata> metadata(_imp->portage_repository->version_metadata(q, v));
+ tr1::shared_ptr<const VersionMetadata> metadata(_imp->portage_repository->version_metadata(q, v));
PackageDatabaseEntry e(q, v, _imp->portage_repository->name());
@@ -338,21 +338,21 @@ EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
DepSpecFlattener restricts(_imp->params.environment, &e, metadata->ebuild_interface->restrictions());
fetch_restrict =
restricts.end() != std::find_if(restricts.begin(), restricts.end(),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "fetch")) ||
+ tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "fetch")) ||
restricts.end() != std::find_if(restricts.begin(), restricts.end(),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nofetch"));
+ tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "nofetch"));
userpriv_restrict =
restricts.end() != std::find_if(restricts.begin(), restricts.end(),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
+ tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "userpriv")) ||
restricts.end() != std::find_if(restricts.begin(), restricts.end(),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
+ tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "nouserpriv"));
no_mirror =
restricts.end() != std::find_if(restricts.begin(), restricts.end(),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "mirror")) ||
+ tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "mirror")) ||
restricts.end() != std::find_if(restricts.begin(), restricts.end(),
- std::tr1::bind(std::equal_to<std::string>(), std::tr1::bind(std::tr1::mem_fn(&StringDepSpec::text), _1), "nomirror"));
+ tr1::bind(std::equal_to<std::string>(), tr1::bind(tr1::mem_fn(&StringDepSpec::text), _1), "nomirror"));
}
std::string archives, all_archives, flat_src_uri;
@@ -360,7 +360,7 @@ EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
std::set<std::string> already_in_archives;
/* make A and FLAT_SRC_URI */
- std::tr1::shared_ptr<const DepSpec> f_spec(metadata->ebuild_interface->src_uri());
+ tr1::shared_ptr<const DepSpec> f_spec(metadata->ebuild_interface->src_uri());
DepSpecFlattener f(_imp->params.environment, &e, f_spec);
for (DepSpecFlattener::Iterator ff(f.begin()), ff_end(f.end()) ; ff != ff_end ; ++ff)
@@ -385,7 +385,7 @@ EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
archives.append(" ");
/* add * mirror entries */
- std::tr1::shared_ptr<const MirrorsCollection> star_mirrors(_imp->params.environment->mirrors("*"));
+ tr1::shared_ptr<const MirrorsCollection> star_mirrors(_imp->params.environment->mirrors("*"));
for (MirrorsCollection::Iterator m(star_mirrors->begin()), m_end(star_mirrors->end()) ; m != m_end ; ++m)
flat_src_uri.append(*m + "/" + (*ff)->text().substr(pos + 1) + " ");
@@ -398,7 +398,7 @@ EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
throw PackageInstallActionError("Can't install '" + stringify(q) + "-"
+ stringify(v) + "' since SRC_URI is broken");
- std::tr1::shared_ptr<const MirrorsCollection> mirrors(_imp->params.environment->mirrors(mirror.substr(0, spos)));
+ tr1::shared_ptr<const MirrorsCollection> mirrors(_imp->params.environment->mirrors(mirror.substr(0, spos)));
if (! _imp->portage_repository->is_mirror(mirror.substr(0, spos)) &&
mirrors->empty())
throw PackageInstallActionError("Can't install '" + stringify(q) + "-"
@@ -422,7 +422,7 @@ EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
std::string master_mirror(strip_trailing_string(stringify(_imp->portage_repository->name()), "x-"));
if (! no_mirror && _imp->portage_repository->is_mirror(master_mirror))
{
- std::tr1::shared_ptr<const MirrorsCollection> repo_mirrors(_imp->params.environment->mirrors(master_mirror));
+ tr1::shared_ptr<const MirrorsCollection> repo_mirrors(_imp->params.environment->mirrors(master_mirror));
for (MirrorsCollection::Iterator m(repo_mirrors->begin()), m_end(repo_mirrors->end()) ; m != m_end ; ++m)
flat_src_uri.append(*m + "/" + (*ff)->text().substr(pos + 1) + " ");
@@ -436,7 +436,7 @@ EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
}
/* make AA */
- std::tr1::shared_ptr<const DepSpec> g_spec(metadata->ebuild_interface->src_uri());
+ tr1::shared_ptr<const DepSpec> g_spec(metadata->ebuild_interface->src_uri());
AAFinder g(g_spec);
std::set<std::string> already_in_all_archives;
@@ -475,7 +475,7 @@ EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
/* add expand to use (iuse isn't reliable for use_expand things), and make the expand
* environment variables */
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > expand_vars(make_expand(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment, e, p, use));
EbuildCommandParams command_params(EbuildCommandParams::create()
@@ -649,7 +649,7 @@ EbuildEntries::install(const QualifiedPackageName & q, const VersionSpec & v,
std::string
EbuildEntries::get_environment_variable(const QualifiedPackageName & q,
const VersionSpec & v, const std::string & var,
- std::tr1::shared_ptr<const PortageRepositoryProfile>) const
+ tr1::shared_ptr<const PortageRepositoryProfile>) const
{
PackageDatabaseEntry for_package(q, v, _imp->portage_repository->name());
@@ -675,11 +675,11 @@ EbuildEntries::get_environment_variable(const QualifiedPackageName & q,
return cmd.result();
}
-std::tr1::shared_ptr<PortageRepositoryEntries>
+tr1::shared_ptr<PortageRepositoryEntries>
EbuildEntries::make_ebuild_entries(
const Environment * const e, PortageRepository * const r, const PortageRepositoryParams & p)
{
- return std::tr1::shared_ptr<PortageRepositoryEntries>(new EbuildEntries(e, r, p));
+ return tr1::shared_ptr<PortageRepositoryEntries>(new EbuildEntries(e, r, p));
}
void
@@ -703,9 +703,9 @@ EbuildEntries::extract_package_file_version(const QualifiedPackageName & n, cons
bool
EbuildEntries::pretend(const QualifiedPackageName & q, const VersionSpec & v,
- std::tr1::shared_ptr<const PortageRepositoryProfile> p) const
+ tr1::shared_ptr<const PortageRepositoryProfile> p) const
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
Context context("When running pretend for '" + stringify(q) + "-" + stringify(v) + "':");
@@ -715,7 +715,7 @@ EbuildEntries::pretend(const QualifiedPackageName & q, const VersionSpec & v,
+ stringify(v) + "' since has_version failed");
}
- std::tr1::shared_ptr<const VersionMetadata> metadata(_imp->portage_repository->version_metadata(q, v));
+ tr1::shared_ptr<const VersionMetadata> metadata(_imp->portage_repository->version_metadata(q, v));
if (! metadata->eapi.supported)
return true;
@@ -725,7 +725,7 @@ EbuildEntries::pretend(const QualifiedPackageName & q, const VersionSpec & v,
PackageDatabaseEntry e(q, v, _imp->portage_repository->name());
std::string use(make_use(_imp->params.environment, e, metadata, p));
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > expand_vars(make_expand(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment, e, p, use));
EbuildCommandParams command_params(EbuildCommandParams::create()
diff --git a/paludis/repositories/gentoo/ebuild_entries.hh b/paludis/repositories/gentoo/ebuild_entries.hh
index 854f1b2..533d8e0 100644
--- a/paludis/repositories/gentoo/ebuild_entries.hh
+++ b/paludis/repositories/gentoo/ebuild_entries.hh
@@ -48,7 +48,7 @@ namespace paludis
/**
* Create an EbuildEntries instance.
*/
- static std::tr1::shared_ptr<PortageRepositoryEntries> make_ebuild_entries(const Environment * const,
+ static tr1::shared_ptr<PortageRepositoryEntries> make_ebuild_entries(const Environment * const,
PortageRepository * const, const PortageRepositoryParams &);
///\name Basic operations
@@ -62,18 +62,18 @@ namespace paludis
///\}
- virtual std::tr1::shared_ptr<VersionMetadata> generate_version_metadata(const QualifiedPackageName &,
+ virtual tr1::shared_ptr<VersionMetadata> generate_version_metadata(const QualifiedPackageName &,
const VersionSpec &) const;
virtual std::string get_environment_variable(const QualifiedPackageName &,
const VersionSpec &, const std::string & var,
- std::tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ tr1::shared_ptr<const PortageRepositoryProfile>) const;
virtual void install(const QualifiedPackageName &, const VersionSpec &,
- const InstallOptions &, std::tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ const InstallOptions &, tr1::shared_ptr<const PortageRepositoryProfile>) const;
virtual bool pretend(const QualifiedPackageName &, const VersionSpec &,
- std::tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ tr1::shared_ptr<const PortageRepositoryProfile>) const;
virtual void merge(const MergeOptions &) PALUDIS_ATTRIBUTE((noreturn));
diff --git a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc
index 51debe9..48ec3d7 100644
--- a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc
@@ -25,14 +25,14 @@
#include <fstream>
#include <set>
#include <list>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
#include <functional>
#include <algorithm>
using namespace paludis;
EbuildFlatMetadataCache::EbuildFlatMetadataCache(const FSEntry & f,
- const FSEntry & e, time_t t, std::tr1::shared_ptr<const EclassMtimes> m, bool s) :
+ const FSEntry & e, time_t t, tr1::shared_ptr<const EclassMtimes> m, bool s) :
_filename(f),
_ebuild(e),
_master_mtime(t),
@@ -42,9 +42,9 @@ EbuildFlatMetadataCache::EbuildFlatMetadataCache(const FSEntry & f,
}
bool
-EbuildFlatMetadataCache::load(std::tr1::shared_ptr<EbuildVersionMetadata> result)
+EbuildFlatMetadataCache::load(tr1::shared_ptr<EbuildVersionMetadata> result)
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
Context context("When loading version metadata to '" + stringify(_filename) + "':");
@@ -73,8 +73,8 @@ EbuildFlatMetadataCache::load(std::tr1::shared_ptr<EbuildVersionMetadata> result
time_t cache_time(std::max(_master_mtime, _filename.mtime()));
bool ok = _ebuild.mtime() <= cache_time &&
result->inherited()->end() == std::find_if(result->inherited()->begin(), result->inherited()->end(),
- std::tr1::bind(std::greater<time_t>(), std::tr1::bind(
- std::tr1::mem_fn(&EclassMtimes::mtime), _eclass_mtimes.get(), _1), cache_time));
+ tr1::bind(std::greater<time_t>(), tr1::bind(
+ tr1::mem_fn(&EclassMtimes::mtime), _eclass_mtimes.get(), _1), cache_time));
if (! ok)
Log::get_instance()->message(ll_warning, lc_no_context, "Stale cache file at '"
@@ -100,7 +100,7 @@ namespace
return join(tokens.begin(), tokens.end(), " ");
}
- std::string normalise(std::tr1::shared_ptr<const DepSpec> d)
+ std::string normalise(tr1::shared_ptr<const DepSpec> d)
{
DepSpecPrettyPrinter p(0, false);
d->accept(&p);
@@ -109,7 +109,7 @@ namespace
}
void
-EbuildFlatMetadataCache::save(std::tr1::shared_ptr<const EbuildVersionMetadata> v)
+EbuildFlatMetadataCache::save(tr1::shared_ptr<const EbuildVersionMetadata> v)
{
Context context("When saving version metadata to '" + stringify(_filename) + "':");
diff --git a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh
index d6e97f9..e737e76 100644
--- a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh
+++ b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh
@@ -42,7 +42,7 @@ namespace paludis
const FSEntry & _filename;
const FSEntry & _ebuild;
time_t _master_mtime;
- std::tr1::shared_ptr<const EclassMtimes> _eclass_mtimes;
+ tr1::shared_ptr<const EclassMtimes> _eclass_mtimes;
bool _silent;
public:
@@ -50,15 +50,15 @@ namespace paludis
///\{
EbuildFlatMetadataCache(const FSEntry & filename, const FSEntry & ebuild,
- time_t master_mtime, std::tr1::shared_ptr<const EclassMtimes> eclass_mtimes, bool silent);
+ time_t master_mtime, tr1::shared_ptr<const EclassMtimes> eclass_mtimes, bool silent);
///\}
///\name Cache operations
///\{
- bool load(std::tr1::shared_ptr<EbuildVersionMetadata>);
- void save(std::tr1::shared_ptr<const EbuildVersionMetadata>);
+ bool load(tr1::shared_ptr<EbuildVersionMetadata>);
+ void save(tr1::shared_ptr<const EbuildVersionMetadata>);
///\}
};
diff --git a/paludis/repositories/gentoo/eclass_mtimes.cc b/paludis/repositories/gentoo/eclass_mtimes.cc
index abc7e20..50e12ed 100644
--- a/paludis/repositories/gentoo/eclass_mtimes.cc
+++ b/paludis/repositories/gentoo/eclass_mtimes.cc
@@ -27,17 +27,17 @@ namespace paludis
template<>
struct Implementation<EclassMtimes>
{
- std::tr1::shared_ptr<const FSEntryCollection> eclass_dirs;
+ tr1::shared_ptr<const FSEntryCollection> eclass_dirs;
mutable MakeHashedMap<std::string, time_t>::Type eclass_mtimes;
- Implementation(std::tr1::shared_ptr<const FSEntryCollection> d) :
+ Implementation(tr1::shared_ptr<const FSEntryCollection> d) :
eclass_dirs(d)
{
}
};
}
-EclassMtimes::EclassMtimes(std::tr1::shared_ptr<const FSEntryCollection> d) :
+EclassMtimes::EclassMtimes(tr1::shared_ptr<const FSEntryCollection> d) :
PrivateImplementationPattern<EclassMtimes>(new Implementation<EclassMtimes>(d))
{
}
diff --git a/paludis/repositories/gentoo/eclass_mtimes.hh b/paludis/repositories/gentoo/eclass_mtimes.hh
index 1bfdc46..4fd49c0 100644
--- a/paludis/repositories/gentoo/eclass_mtimes.hh
+++ b/paludis/repositories/gentoo/eclass_mtimes.hh
@@ -40,7 +40,7 @@ namespace paludis
///\name Basic operations
///\{
- EclassMtimes(std::tr1::shared_ptr<const FSEntryCollection>);
+ EclassMtimes(tr1::shared_ptr<const FSEntryCollection>);
~EclassMtimes();
///\}
diff --git a/paludis/repositories/gentoo/glsa.cc b/paludis/repositories/gentoo/glsa.cc
index fba4f42..7727065 100644
--- a/paludis/repositories/gentoo/glsa.cc
+++ b/paludis/repositories/gentoo/glsa.cc
@@ -56,7 +56,7 @@ namespace paludis
{
std::string id;
std::string title;
- std::list<std::tr1::shared_ptr<const GLSAPackage> > packages;
+ std::list<tr1::shared_ptr<const GLSAPackage> > packages;
};
}
@@ -151,7 +151,7 @@ GLSA::end_packages() const
}
void
-GLSA::add_package(std::tr1::shared_ptr<const GLSAPackage> p)
+GLSA::add_package(tr1::shared_ptr<const GLSAPackage> p)
{
_imp->packages.push_back(p);
}
@@ -187,7 +187,7 @@ namespace
struct LibXMLHandle
{
void * handle;
- std::tr1::shared_ptr<GLSA> (* create_glsa_from_xml_file_handle)(const std::string &);
+ tr1::shared_ptr<GLSA> (* create_glsa_from_xml_file_handle)(const std::string &);
LibXMLHandle() :
handle(0),
@@ -206,7 +206,7 @@ namespace
#endif
-std::tr1::shared_ptr<GLSA>
+tr1::shared_ptr<GLSA>
GLSA::create_from_xml_file(const std::string & filename)
{
#if ENABLE_GLSA
@@ -221,7 +221,7 @@ GLSA::create_from_xml_file(const std::string & filename)
+ stringify(dlerror()) + "' when dlopen(libpaludisgentoorepositoryxmlthings.so)");
if (0 == libxmlhandle.create_glsa_from_xml_file_handle)
- libxmlhandle.create_glsa_from_xml_file_handle = STUPID_CAST(std::tr1::shared_ptr<GLSA> (*)(const std::string &),
+ libxmlhandle.create_glsa_from_xml_file_handle = STUPID_CAST(tr1::shared_ptr<GLSA> (*)(const std::string &),
dlsym(libxmlhandle.handle, "create_glsa_from_xml_file"));
if (0 == libxmlhandle.create_glsa_from_xml_file_handle)
throw NotAvailableError("Cannot create GLSA from XML file '" + filename + "' due to error '"
diff --git a/paludis/repositories/gentoo/glsa.hh b/paludis/repositories/gentoo/glsa.hh
index 16a0a0c..2ab7907 100644
--- a/paludis/repositories/gentoo/glsa.hh
+++ b/paludis/repositories/gentoo/glsa.hh
@@ -133,7 +133,7 @@ namespace paludis
/**
* Create a GLSA from an XML file.
*/
- static std::tr1::shared_ptr<GLSA> create_from_xml_file(const std::string & filename);
+ static tr1::shared_ptr<GLSA> create_from_xml_file(const std::string & filename);
///\name Iterate over our packages.
///\{
@@ -147,7 +147,7 @@ namespace paludis
/**
* Add a package.
*/
- void add_package(std::tr1::shared_ptr<const GLSAPackage>);
+ void add_package(tr1::shared_ptr<const GLSAPackage>);
/**
* Set our ID.
diff --git a/paludis/repositories/gentoo/layout.cc b/paludis/repositories/gentoo/layout.cc
index e284586..4fa33b6 100644
--- a/paludis/repositories/gentoo/layout.cc
+++ b/paludis/repositories/gentoo/layout.cc
@@ -27,8 +27,8 @@
using namespace paludis;
template class VirtualConstructor<std::string,
- std::tr1::shared_ptr<Layout> (*) (const RepositoryName &, const FSEntry &,
- std::tr1::shared_ptr<const PortageRepositoryEntries>),
+ tr1::shared_ptr<Layout> (*) (const RepositoryName &, const FSEntry &,
+ tr1::shared_ptr<const PortageRepositoryEntries>),
virtual_constructor_not_found::ThrowException<NoSuchLayoutType> >;
Layout::Layout() :
@@ -61,11 +61,11 @@ Layout::add_profiles_dir(const FSEntry & f)
namespace
{
template <typename T_>
- std::tr1::shared_ptr<Layout>
+ tr1::shared_ptr<Layout>
make_layout(const RepositoryName & n, const FSEntry & b,
- std::tr1::shared_ptr<const PortageRepositoryEntries> e)
+ tr1::shared_ptr<const PortageRepositoryEntries> e)
{
- return std::tr1::shared_ptr<Layout>(new T_(n, b, e));
+ return tr1::shared_ptr<Layout>(new T_(n, b, e));
}
}
diff --git a/paludis/repositories/gentoo/layout.hh b/paludis/repositories/gentoo/layout.hh
index 277054f..ddf8a62 100644
--- a/paludis/repositories/gentoo/layout.hh
+++ b/paludis/repositories/gentoo/layout.hh
@@ -28,7 +28,7 @@
#include <paludis/util/exception.hh>
#include <paludis/util/virtual_constructor.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <tr1/memory>
+#include <paludis/util/tr1_memory.hh>
namespace paludis
{
@@ -37,7 +37,7 @@ namespace paludis
class PALUDIS_VISIBLE Layout
{
private:
- std::tr1::shared_ptr<FSEntryCollection> _profiles_dirs;
+ tr1::shared_ptr<FSEntryCollection> _profiles_dirs;
protected:
Layout();
@@ -70,14 +70,14 @@ namespace paludis
virtual bool has_package_named(const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> category_names() const
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual std::tr1::shared_ptr<const QualifiedPackageNameCollection> package_names(
+ virtual tr1::shared_ptr<const QualifiedPackageNameCollection> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual std::tr1::shared_ptr<const VersionSpecCollection> version_specs(
+ virtual tr1::shared_ptr<const VersionSpecCollection> version_specs(
const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
@@ -126,8 +126,8 @@ namespace paludis
*/
class PALUDIS_VISIBLE LayoutMaker :
public VirtualConstructor<std::string,
- std::tr1::shared_ptr<Layout> (*) (const RepositoryName &, const FSEntry &,
- std::tr1::shared_ptr<const PortageRepositoryEntries>),
+ tr1::shared_ptr<Layout> (*) (const RepositoryName &, const FSEntry &,
+ tr1::shared_ptr<const PortageRepositoryEntries>),
virtual_constructor_not_found::ThrowException<NoSuchLayoutType> >,
public InstantiationPolicy<LayoutMaker, instantiation_method::SingletonTag>
{
diff --git a/paludis/repositories/gentoo/make_ebin_repository.cc b/paludis/repositories/gentoo/make_ebin_repository.cc
index 4b4ab06..83dd9a3 100644
--- a/paludis/repositories/gentoo/make_ebin_repository.cc
+++ b/paludis/repositories/gentoo/make_ebin_repository.cc
@@ -26,10 +26,10 @@
using namespace paludis;
-std::tr1::shared_ptr<PortageRepository>
+tr1::shared_ptr<PortageRepository>
paludis::make_ebin_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
{
std::string repo_file(m->end() == m->find("repo_file") ? std::string("?") :
m->find("repo_file")->second);
@@ -40,8 +40,8 @@ paludis::make_ebin_repository(
if (m->end() == m->find("location") || ((location = m->find("location")->second)).empty())
throw PortageRepositoryConfigurationError("Key 'location' not specified or empty");
- std::tr1::shared_ptr<const RepositoryName> master_repository_name;
- std::tr1::shared_ptr<const PortageRepository> master_repository;
+ tr1::shared_ptr<const RepositoryName> master_repository_name;
+ tr1::shared_ptr<const PortageRepository> master_repository;
if (m->end() != m->find("master_repository") && ! m->find("master_repository")->second.empty())
{
Context context_local("When finding configuration information for master_repository '"
@@ -49,14 +49,14 @@ paludis::make_ebin_repository(
master_repository_name.reset(new RepositoryName(m->find("master_repository")->second));
- std::tr1::shared_ptr<const Repository> master_repository_uncasted(
+ tr1::shared_ptr<const Repository> master_repository_uncasted(
env->package_database()->fetch_repository(*master_repository_name));
if (master_repository_uncasted->format() != "ebuild" && master_repository_uncasted->format() != "ebin")
throw PortageRepositoryConfigurationError("Master repository format is '" +
stringify(master_repository_uncasted->format()) + "', not 'ebuild' or 'ebin'");
- master_repository = std::tr1::static_pointer_cast<const PortageRepository>(master_repository_uncasted);
+ master_repository = tr1::static_pointer_cast<const PortageRepository>(master_repository_uncasted);
if (master_repository->params().master_repository)
throw PortageRepositoryConfigurationError("Requested master repository has a master_repository of '" +
@@ -64,7 +64,7 @@ paludis::make_ebin_repository(
"be used as a master repository");
}
- std::tr1::shared_ptr<FSEntryCollection> profiles(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> profiles(new FSEntryCollection::Concrete);
if (m->end() != m->find("profiles"))
WhitespaceTokeniser::get_instance()->tokenise(m->find("profiles")->second,
create_inserter<FSEntry>(std::back_inserter(*profiles)));
@@ -78,7 +78,7 @@ paludis::make_ebin_repository(
throw PortageRepositoryConfigurationError("No profiles have been specified");
}
- std::tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
std::string pkgdir;
if (m->end() == m->find("pkgdir") || ((pkgdir = m->find("pkgdir")->second)).empty())
@@ -141,7 +141,7 @@ paludis::make_ebin_repository(
if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
buildroot = "/var/tmp/paludis";
- return std::tr1::shared_ptr<PortageRepository>(new PortageRepository(PortageRepositoryParams::create()
+ return tr1::shared_ptr<PortageRepository>(new PortageRepository(PortageRepositoryParams::create()
.entry_format("ebin")
.layout(layout)
.environment(env)
@@ -150,7 +150,7 @@ paludis::make_ebin_repository(
.cache(FSEntry("/var/empty"))
.write_cache(FSEntry("/var/empty"))
.names_cache(names_cache)
- .eclassdirs(std::tr1::shared_ptr<const FSEntryCollection>(new FSEntryCollection::Concrete))
+ .eclassdirs(tr1::shared_ptr<const FSEntryCollection>(new FSEntryCollection::Concrete))
.distdir(FSEntry("/var/empty"))
.pkgdir(pkgdir)
.securitydir(securitydir)
@@ -164,10 +164,10 @@ paludis::make_ebin_repository(
.buildroot(buildroot)));
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
paludis::make_ebin_repository_wrapped(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
{
return make_ebin_repository(env, m);
}
diff --git a/paludis/repositories/gentoo/make_ebin_repository.hh b/paludis/repositories/gentoo/make_ebin_repository.hh
index 41d38a2..e4e03b4 100644
--- a/paludis/repositories/gentoo/make_ebin_repository.hh
+++ b/paludis/repositories/gentoo/make_ebin_repository.hh
@@ -30,10 +30,10 @@ namespace paludis
* \see PortageRepository
* \ingroup grpportagerepository
*/
- std::tr1::shared_ptr<PortageRepository>
+ tr1::shared_ptr<PortageRepository>
make_ebin_repository(
Environment * const,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >) PALUDIS_VISIBLE;
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >) PALUDIS_VISIBLE;
/**
* Create an ebin format repository (wrapper for our virtual constructor).
@@ -41,10 +41,10 @@ namespace paludis
* \see PortageRepository
* \ingroup grpportagerepository
*/
- std::tr1::shared_ptr<Repository>
+ tr1::shared_ptr<Repository>
make_ebin_repository_wrapped(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
}
diff --git a/paludis/repositories/gentoo/make_ebuild_repository.cc b/paludis/repositories/gentoo/make_ebuild_repository.cc
index f4c9742..44522ec 100644
--- a/paludis/repositories/gentoo/make_ebuild_repository.cc
+++ b/paludis/repositories/gentoo/make_ebuild_repository.cc
@@ -26,10 +26,10 @@
using namespace paludis;
-std::tr1::shared_ptr<PortageRepository>
+tr1::shared_ptr<PortageRepository>
paludis::make_ebuild_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
{
std::string repo_file(m->end() == m->find("repo_file") ? std::string("?") :
m->find("repo_file")->second);
@@ -40,8 +40,8 @@ paludis::make_ebuild_repository(
if (m->end() == m->find("location") || ((location = m->find("location")->second)).empty())
throw PortageRepositoryConfigurationError("Key 'location' not specified or empty");
- std::tr1::shared_ptr<const RepositoryName> master_repository_name;
- std::tr1::shared_ptr<const PortageRepository> master_repository;
+ tr1::shared_ptr<const RepositoryName> master_repository_name;
+ tr1::shared_ptr<const PortageRepository> master_repository;
if (m->end() != m->find("master_repository") && ! m->find("master_repository")->second.empty())
{
Context context_local("When finding configuration information for master_repository '"
@@ -49,14 +49,14 @@ paludis::make_ebuild_repository(
master_repository_name.reset(new RepositoryName(m->find("master_repository")->second));
- std::tr1::shared_ptr<const Repository> master_repository_uncasted(
+ tr1::shared_ptr<const Repository> master_repository_uncasted(
env->package_database()->fetch_repository(*master_repository_name));
if (master_repository_uncasted->format() != "ebuild")
throw PortageRepositoryConfigurationError("Master repository format is '" +
stringify(master_repository_uncasted->format()) + "', not 'ebuild'");
- master_repository = std::tr1::static_pointer_cast<const PortageRepository>(master_repository_uncasted);
+ master_repository = tr1::static_pointer_cast<const PortageRepository>(master_repository_uncasted);
if (master_repository->params().master_repository)
throw PortageRepositoryConfigurationError("Requested master repository has a master_repository of '" +
@@ -64,7 +64,7 @@ paludis::make_ebuild_repository(
"be used as a master repository");
}
- std::tr1::shared_ptr<FSEntryCollection> profiles(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> profiles(new FSEntryCollection::Concrete);
if (m->end() != m->find("profiles"))
WhitespaceTokeniser::get_instance()->tokenise(m->find("profiles")->second,
create_inserter<FSEntry>(std::back_inserter(*profiles)));
@@ -78,7 +78,7 @@ paludis::make_ebuild_repository(
throw PortageRepositoryConfigurationError("No profiles have been specified");
}
- std::tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
if (m->end() != m->find("eclassdirs"))
WhitespaceTokeniser::get_instance()->tokenise(m->find("eclassdirs")->second,
@@ -169,7 +169,7 @@ paludis::make_ebuild_repository(
if (m->end() == m->find("layout") || ((layout = m->find("layout")->second)).empty())
layout = "traditional";
- return std::tr1::shared_ptr<PortageRepository>(new PortageRepository(PortageRepositoryParams::create()
+ return tr1::shared_ptr<PortageRepository>(new PortageRepository(PortageRepositoryParams::create()
.entry_format("ebuild")
.layout(layout)
.environment(env)
@@ -192,10 +192,10 @@ paludis::make_ebuild_repository(
.buildroot(buildroot)));
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
paludis::make_ebuild_repository_wrapped(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
{
return make_ebuild_repository(env, m);
}
diff --git a/paludis/repositories/gentoo/make_ebuild_repository.hh b/paludis/repositories/gentoo/make_ebuild_repository.hh
index 2e26850..dfbcf3e 100644
--- a/paludis/repositories/gentoo/make_ebuild_repository.hh
+++ b/paludis/repositories/gentoo/make_ebuild_repository.hh
@@ -30,10 +30,10 @@ namespace paludis
* \see PortageRepository
* \ingroup grpportagerepository
*/
- std::tr1::shared_ptr<PortageRepository>
+ tr1::shared_ptr<PortageRepository>
make_ebuild_repository(
Environment * const,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >) PALUDIS_VISIBLE;
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >) PALUDIS_VISIBLE;
/**
* Create an ebuild format repository (wrapper for our virtual constructor).
@@ -41,10 +41,10 @@ namespace paludis
* \see PortageRepository
* \ingroup grpportagerepository
*/
- std::tr1::shared_ptr<Repository>
+ tr1::shared_ptr<Repository>
make_ebuild_repository_wrapped(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
}
#endif
diff --git a/paludis/repositories/gentoo/portage_repository.cc b/paludis/repositories/gentoo/portage_repository.cc
index 824050b..98b1b20 100644
--- a/paludis/repositories/gentoo/portage_repository.cc
+++ b/paludis/repositories/gentoo/portage_repository.cc
@@ -63,7 +63,7 @@
#include <algorithm>
#include <vector>
#include <limits>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
#include <strings.h>
#include <ctype.h>
@@ -76,12 +76,12 @@
using namespace paludis;
-typedef MakeHashedMap<QualifiedPackageName, std::list<std::tr1::shared_ptr<const PackageDepSpec> > >::Type RepositoryMaskMap;
+typedef MakeHashedMap<QualifiedPackageName, std::list<tr1::shared_ptr<const PackageDepSpec> > >::Type RepositoryMaskMap;
typedef MakeHashedMap<QualifiedPackageName, bool>::Type PackagesMap;
typedef MakeHashedMultiMap<std::string, std::string>::Type MirrorMap;
typedef MakeHashedMap<std::pair<QualifiedPackageName, VersionSpec>,
- std::tr1::shared_ptr<VersionMetadata> >::Type MetadataMap;
-typedef MakeHashedMap<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> >::Type VirtualsMap;
+ tr1::shared_ptr<VersionMetadata> >::Type MetadataMap;
+typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> >::Type VirtualsMap;
typedef std::list<RepositoryPortageInterface::ProfilesDescLine> ProfilesDesc;
namespace paludis
@@ -98,7 +98,7 @@ namespace paludis
const PortageRepositoryParams params;
mutable MetadataMap metadata;
- std::tr1::shared_ptr<RepositoryNameCache> names_cache;
+ tr1::shared_ptr<RepositoryNameCache> names_cache;
mutable RepositoryMaskMap repo_mask;
mutable bool has_repo_mask;
@@ -106,20 +106,20 @@ namespace paludis
mutable VirtualsMap our_virtuals;
const std::map<QualifiedPackageName, QualifiedPackageName> provide_map;
- mutable std::tr1::shared_ptr<UseFlagNameCollection> arch_flags;
+ mutable tr1::shared_ptr<UseFlagNameCollection> arch_flags;
mutable bool has_mirrors;
mutable MirrorMap mirrors;
mutable bool has_profiles_desc;
mutable ProfilesDesc profiles_desc;
- mutable std::list<std::tr1::shared_ptr<UseDesc> > use_desc;
+ mutable std::list<tr1::shared_ptr<UseDesc> > use_desc;
- mutable std::tr1::shared_ptr<PortageRepositoryProfile> profile_ptr;
- mutable std::tr1::shared_ptr<PortageRepositoryNews> news_ptr;
- mutable std::tr1::shared_ptr<PortageRepositorySets> sets_ptr;
- mutable std::tr1::shared_ptr<PortageRepositoryEntries> entries_ptr;
- mutable std::tr1::shared_ptr<Layout> layout;
+ mutable tr1::shared_ptr<PortageRepositoryProfile> profile_ptr;
+ mutable tr1::shared_ptr<PortageRepositoryNews> news_ptr;
+ mutable tr1::shared_ptr<PortageRepositorySets> sets_ptr;
+ mutable tr1::shared_ptr<PortageRepositoryEntries> entries_ptr;
+ mutable tr1::shared_ptr<Layout> layout;
Implementation(PortageRepository * const, const PortageRepositoryParams &);
~Implementation();
@@ -195,7 +195,7 @@ namespace paludis
.arch(tokens.at(0))
.path(*profiles.begin())
.status(tokens.at(2))
- .profile(std::tr1::shared_ptr<PortageRepositoryProfile>(new PortageRepositoryProfile(
+ .profile(tr1::shared_ptr<PortageRepositoryProfile>(new PortageRepositoryProfile(
params.environment, repo, repo->name(), profiles))));
}
}
@@ -272,7 +272,7 @@ PortageRepository::PortageRepository(const PortageRepositoryParams & p) :
{
// the info_vars and info_pkgs info is only added on demand, since it's
// fairly slow to calculate.
- std::tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
+ tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
config_info->add_kv("location", stringify(_imp->params.location));
config_info->add_kv("profiles", join(_imp->params.profiles->begin(),
@@ -341,19 +341,19 @@ namespace
};
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
PortageRepository::do_category_names() const
{
return _imp->layout->category_names();
}
-std::tr1::shared_ptr<const QualifiedPackageNameCollection>
+tr1::shared_ptr<const QualifiedPackageNameCollection>
PortageRepository::do_package_names(const CategoryNamePart & c) const
{
return _imp->layout->package_names(c);
}
-std::tr1::shared_ptr<const VersionSpecCollection>
+tr1::shared_ptr<const VersionSpecCollection>
PortageRepository::do_version_specs(const QualifiedPackageName & n) const
{
return _imp->layout->version_specs(n);
@@ -366,7 +366,7 @@ PortageRepository::do_has_version(const QualifiedPackageName & q,
return _imp->layout->has_version(q, v);
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
PortageRepository::do_version_metadata(
const QualifiedPackageName & q, const VersionSpec & v) const
{
@@ -378,7 +378,7 @@ PortageRepository::do_version_metadata(
if (! has_version(q, v))
throw NoSuchPackageError(stringify(PackageDatabaseEntry(q, v, name())));
- std::tr1::shared_ptr<VersionMetadata> result(_imp->entries_ptr->generate_version_metadata(q, v));
+ tr1::shared_ptr<VersionMetadata> result(_imp->entries_ptr->generate_version_metadata(q, v));
_imp->metadata.insert(std::make_pair(std::make_pair(q, v), result));
return result;
}
@@ -405,7 +405,7 @@ PortageRepository::do_query_repository_masks(const QualifiedPackageName & q, con
{
try
{
- std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(*line, pds_pm_eapi_0));
+ tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(*line, pds_pm_eapi_0));
if (a->package_ptr())
_imp->repo_mask[*a->package_ptr()].push_back(a);
else
@@ -430,7 +430,7 @@ PortageRepository::do_query_repository_masks(const QualifiedPackageName & q, con
if (_imp->repo_mask.end() == r)
return false;
else
- for (IndirectIterator<std::list<std::tr1::shared_ptr<const PackageDepSpec> >::const_iterator, const PackageDepSpec>
+ for (IndirectIterator<std::list<tr1::shared_ptr<const PackageDepSpec> >::const_iterator, const PackageDepSpec>
k(r->second.begin()), k_end(r->second.end()) ; k != k_end ; ++k)
if (match_package(*_imp->params.environment, *k, PackageDatabaseEntry(q, v, name())))
return true;
@@ -468,7 +468,7 @@ PortageRepository::do_query_use_force(const UseFlagName & u, const PackageDataba
return _imp->profile_ptr->use_forced(u, e);
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
PortageRepository::do_arch_flags() const
{
if (! _imp->arch_flags)
@@ -499,10 +499,10 @@ PortageRepository::do_arch_flags() const
return _imp->arch_flags;
}
-std::tr1::shared_ptr<FSEntry>
+tr1::shared_ptr<FSEntry>
PortageRepository::do_license_exists(const std::string & license) const
{
- std::tr1::shared_ptr<FSEntry> p;
+ tr1::shared_ptr<FSEntry> p;
if (_imp->params.master_repository)
{
@@ -576,7 +576,7 @@ PortageRepository::do_pretend(const QualifiedPackageName & q, const VersionSpec
return _imp->entries_ptr->pretend(q, v, _imp->profile_ptr);
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
PortageRepository::do_package_set(const SetName & s) const
{
if (s.data() == "system")
@@ -588,7 +588,7 @@ PortageRepository::do_package_set(const SetName & s) const
return _imp->sets_ptr->package_set(s);
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
PortageRepository::sets_list() const
{
return _imp->sets_ptr->sets_list();
@@ -662,14 +662,14 @@ PortageRepository::get_environment_variable(
for_package.version, var, _imp->profile_ptr);
}
-std::tr1::shared_ptr<const RepositoryInfo>
+tr1::shared_ptr<const RepositoryInfo>
PortageRepository::info(bool verbose) const
{
- std::tr1::shared_ptr<const RepositoryInfo> result_non_verbose(Repository::info(verbose));
+ tr1::shared_ptr<const RepositoryInfo> result_non_verbose(Repository::info(verbose));
if (! verbose)
return result_non_verbose;
- std::tr1::shared_ptr<RepositoryInfo> result(new RepositoryInfo);
+ tr1::shared_ptr<RepositoryInfo> result(new RepositoryInfo);
for (RepositoryInfo::SectionIterator s(result_non_verbose->begin_sections()),
s_end(result_non_verbose->end_sections()) ; s != s_end ; ++s)
@@ -685,11 +685,11 @@ PortageRepository::info(bool verbose) const
if (! info_pkgs.empty())
{
- std::tr1::shared_ptr<RepositoryInfoSection> package_info(new RepositoryInfoSection("Package information"));
+ tr1::shared_ptr<RepositoryInfoSection> package_info(new RepositoryInfoSection("Package information"));
for (std::set<std::string>::const_iterator i(info_pkgs.begin()),
i_end(info_pkgs.end()) ; i != i_end ; ++i)
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> q(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> q(
_imp->params.environment->package_database()->query(
query::Matches(PackageDepSpec(*i, pds_pm_eapi_0)) &
query::InstalledAtRoot(_imp->params.environment->root()),
@@ -724,7 +724,7 @@ PortageRepository::info(bool verbose) const
PackageDatabaseEntry e(QualifiedPackageName(*info_pkgs.begin()),
*version_specs(QualifiedPackageName(*info_pkgs.begin()))->last(),
name());
- std::tr1::shared_ptr<RepositoryInfoSection> variable_info(new RepositoryInfoSection("Variable information"));
+ tr1::shared_ptr<RepositoryInfoSection> variable_info(new RepositoryInfoSection("Variable information"));
for (std::set<std::string>::const_iterator i(info_vars.begin()),
i_end(info_vars.end()) ; i != i_end ; ++i)
variable_info->add_kv(*i, get_environment_variable(e, *i));
@@ -761,7 +761,7 @@ PortageRepository::end_mirrors(const std::string & s) const
return MirrorsIterator(_imp->mirrors.equal_range(s).second);
}
-std::tr1::shared_ptr<const PortageRepository::VirtualsCollection>
+tr1::shared_ptr<const PortageRepository::VirtualsCollection>
PortageRepository::virtual_packages() const
{
Context context("When loading virtual packages for repository '" +
@@ -772,7 +772,7 @@ PortageRepository::virtual_packages() const
_imp->need_profiles();
- std::tr1::shared_ptr<VirtualsCollection> result(new VirtualsCollection::Concrete);
+ tr1::shared_ptr<VirtualsCollection> result(new VirtualsCollection::Concrete);
for (PortageRepositoryProfile::VirtualsIterator i(_imp->profile_ptr->begin_virtuals()),
i_end(_imp->profile_ptr->end_virtuals()) ; i != i_end ; ++i)
@@ -786,7 +786,7 @@ PortageRepository::virtual_packages() const
return result;
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
PortageRepository::virtual_package_version_metadata(const RepositoryVirtualsEntry & p,
const VersionSpec & v) const
{
@@ -796,8 +796,8 @@ PortageRepository::virtual_package_version_metadata(const RepositoryVirtualsEntr
if (! p.provided_by_spec->package_ptr())
throw ConfigurationError("Virtual provider atom does not specify an unambiguous package");
- std::tr1::shared_ptr<const VersionMetadata> m(version_metadata(*p.provided_by_spec->package_ptr(), v));
- std::tr1::shared_ptr<PortageVirtualVersionMetadata> result(new PortageVirtualVersionMetadata(
+ tr1::shared_ptr<const VersionMetadata> m(version_metadata(*p.provided_by_spec->package_ptr(), v));
+ tr1::shared_ptr<PortageVirtualVersionMetadata> result(new PortageVirtualVersionMetadata(
m->slot, PackageDatabaseEntry(*p.provided_by_spec->package_ptr(), v, name())));
result->eapi = m->eapi;
@@ -808,12 +808,12 @@ PortageRepository::virtual_package_version_metadata(const RepositoryVirtualsEntr
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
PortageRepository::do_use_expand_flags() const
{
_imp->need_profiles();
- std::tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
+ tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
for (PortageRepositoryProfile::UseExpandIterator i(_imp->profile_ptr->begin_use_expand()),
i_end(_imp->profile_ptr->end_use_expand()) ; i != i_end ; ++i)
{
@@ -832,12 +832,12 @@ PortageRepository::do_use_expand_flags() const
return result;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
PortageRepository::do_use_expand_prefixes() const
{
_imp->need_profiles();
- std::tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
+ tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
for (PortageRepositoryProfile::UseExpandIterator i(_imp->profile_ptr->begin_use_expand()),
i_end(_imp->profile_ptr->end_use_expand()) ; i != i_end ; ++i)
{
@@ -849,12 +849,12 @@ PortageRepository::do_use_expand_prefixes() const
return result;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
PortageRepository::do_use_expand_hidden_prefixes() const
{
_imp->need_profiles();
- std::tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
+ tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
for (PortageRepositoryProfile::UseExpandIterator i(_imp->profile_ptr->begin_use_expand_hidden()),
i_end(_imp->profile_ptr->end_use_expand_hidden()) ; i != i_end ; ++i)
{
@@ -872,13 +872,13 @@ PortageRepository::regenerate_cache() const
_imp->names_cache->regenerate_cache();
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
PortageRepository::do_category_names_containing_package(const PackageNamePart & p) const
{
if (! _imp->names_cache->usable())
return Repository::do_category_names_containing_package(p);
- std::tr1::shared_ptr<const CategoryNamePartCollection> result(
+ tr1::shared_ptr<const CategoryNamePartCollection> result(
_imp->names_cache->category_names_containing_package(p));
return result ? result : Repository::do_category_names_containing_package(p);
@@ -950,10 +950,10 @@ PortageRepository::do_describe_use_flag(const UseFlagName & f,
if (_imp->use_desc.empty())
for (Layout::ProfilesDirsIterator p(_imp->layout->begin_profiles_dirs()), p_end(_imp->layout->end_profiles_dirs()) ;
p != p_end ; ++p)
- _imp->use_desc.push_back(std::tr1::shared_ptr<UseDesc>(new UseDesc(*p)));
+ _imp->use_desc.push_back(tr1::shared_ptr<UseDesc>(new UseDesc(*p)));
std::string result;
- for (std::list<std::tr1::shared_ptr<UseDesc> >::const_iterator i(_imp->use_desc.begin()),
+ for (std::list<tr1::shared_ptr<UseDesc> >::const_iterator i(_imp->use_desc.begin()),
i_end(_imp->use_desc.end()) ; i != i_end ; ++i)
{
std::string new_result((*i)->describe(f, e));
diff --git a/paludis/repositories/gentoo/portage_repository.hh b/paludis/repositories/gentoo/portage_repository.hh
index b2c5a66..4573e15 100644
--- a/paludis/repositories/gentoo/portage_repository.hh
+++ b/paludis/repositories/gentoo/portage_repository.hh
@@ -73,20 +73,20 @@ namespace paludis
virtual bool do_has_package_named(const QualifiedPackageName &) const;
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
- std::tr1::shared_ptr<const CategoryNamePartCollection> do_category_names_containing_package(
+ tr1::shared_ptr<const CategoryNamePartCollection> do_category_names_containing_package(
const PackageNamePart & p) const;
- virtual std::tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
+ virtual tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
const CategoryNamePart &) const;
- virtual std::tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
+ virtual tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
const QualifiedPackageName &) const;
virtual bool do_has_version(const QualifiedPackageName &, const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const VersionMetadata> do_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> do_version_metadata(
const QualifiedPackageName &,
const VersionSpec &) const;
@@ -96,23 +96,23 @@ namespace paludis
virtual bool do_query_profile_masks(const QualifiedPackageName &,
const VersionSpec &) const;
- virtual std::tr1::shared_ptr<FSEntry> do_license_exists(
+ virtual tr1::shared_ptr<FSEntry> do_license_exists(
const std::string & license) const;
virtual void do_install(const QualifiedPackageName &, const VersionSpec &,
const InstallOptions &) const;
- virtual std::tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
+ virtual tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
- virtual std::tr1::shared_ptr<const SetNameCollection> sets_list() const;
+ virtual tr1::shared_ptr<const SetNameCollection> sets_list() const;
virtual bool do_sync() const;
virtual bool do_pretend(const QualifiedPackageName &, const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const VirtualsCollection> virtual_packages() const;
+ virtual tr1::shared_ptr<const VirtualsCollection> virtual_packages() const;
- virtual std::tr1::shared_ptr<const VersionMetadata> virtual_package_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> virtual_package_version_metadata(
const RepositoryVirtualsEntry &, const VersionSpec & v) const;
/* RepositoryUseInterface */
@@ -120,10 +120,10 @@ namespace paludis
virtual UseFlagState do_query_use(const UseFlagName &, const PackageDatabaseEntry &) const;
virtual bool do_query_use_mask(const UseFlagName &, const PackageDatabaseEntry &) const;
virtual bool do_query_use_force(const UseFlagName &, const PackageDatabaseEntry &) const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_arch_flags() const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_flags() const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_hidden_prefixes() const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_prefixes() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_arch_flags() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_flags() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_hidden_prefixes() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_prefixes() const;
virtual std::string do_describe_use_flag(const UseFlagName &, const PackageDatabaseEntry &) const;
/* end of RepositoryUseInterface */
@@ -138,7 +138,7 @@ namespace paludis
/* end of RepositoryDestinationInterface */
public:
- virtual std::tr1::shared_ptr<const RepositoryInfo> info(bool verbose) const;
+ virtual tr1::shared_ptr<const RepositoryInfo> info(bool verbose) const;
/**
* Constructor.
diff --git a/paludis/repositories/gentoo/portage_repository_TEST.cc b/paludis/repositories/gentoo/portage_repository_TEST.cc
index c1bab26..aa9849d 100644
--- a/paludis/repositories/gentoo/portage_repository_TEST.cc
+++ b/paludis/repositories/gentoo/portage_repository_TEST.cc
@@ -46,13 +46,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo1");
keys->insert("profiles", "portage_repository_TEST_dir/repo1/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "test-repo-1");
}
@@ -69,13 +69,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo2");
keys->insert("profiles", "portage_repository_TEST_dir/repo2/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "x-repo2");
}
@@ -92,13 +92,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo3");
keys->insert("profiles", "portage_repository_TEST_dir/repo3/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "x-repo3");
}
@@ -115,13 +115,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo1");
keys->insert("profiles", "portage_repository_TEST_dir/repo1/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -147,20 +147,20 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo1");
keys->insert("profiles", "portage_repository_TEST_dir/repo1/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- std::tr1::shared_ptr<const CategoryNamePartCollection> c(repo->category_names());
+ tr1::shared_ptr<const CategoryNamePartCollection> 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")));
@@ -181,13 +181,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profiles", "portage_repository_TEST_dir/repo4/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -221,13 +221,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profiles", "portage_repository_TEST_dir/repo4/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
repo->package_names(CategoryNamePart("cat-one"));
@@ -265,16 +265,16 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profiles", "portage_repository_TEST_dir/repo4/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> names;
+ tr1::shared_ptr<const QualifiedPackageNameCollection> names;
for (int pass = 1 ; pass <= 2 ; ++pass)
{
@@ -318,16 +318,16 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo5");
keys->insert("profiles", "portage_repository_TEST_dir/repo5/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
- std::tr1::shared_ptr<const QualifiedPackageNameCollection> names;
+ tr1::shared_ptr<const QualifiedPackageNameCollection> names;
for (int pass = 1 ; pass <= 2 ; ++pass)
{
@@ -352,13 +352,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profiles", "portage_repository_TEST_dir/repo4/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -396,20 +396,20 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profiles", "portage_repository_TEST_dir/repo4/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- std::tr1::shared_ptr<const VersionSpecCollection> versions;
+ tr1::shared_ptr<const VersionSpecCollection> versions;
versions = repo->version_specs(QualifiedPackageName("cat-one/pkg-one"));
TEST_CHECK(! versions->empty());
@@ -439,20 +439,20 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo8");
keys->insert("profiles", "portage_repository_TEST_dir/repo8/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- std::tr1::shared_ptr<const VersionSpecCollection> versions;
+ tr1::shared_ptr<const VersionSpecCollection> versions;
versions = repo->version_specs(QualifiedPackageName("cat-one/pkg-one"));
TEST_CHECK(! versions->empty());
@@ -482,19 +482,19 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo6");
keys->insert("profiles", "portage_repository_TEST_dir/repo6/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- std::tr1::shared_ptr<const VersionMetadata> m;
+ tr1::shared_ptr<const VersionMetadata> m;
m = repo->version_metadata(QualifiedPackageName("cat-one/pkg-one"), VersionSpec("1"));
TEST_CHECK_EQUAL(m->description, "the-description");
@@ -527,20 +527,20 @@ namespace test_cases
TestMessageSuffix opass_suffix("opass=" + stringify(opass), true);
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("write_cache", "portage_repository_TEST_dir/repo7/metadata/cache");
keys->insert("location", "portage_repository_TEST_dir/repo7");
keys->insert("profiles", "portage_repository_TEST_dir/repo7/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 3 ; ++pass)
{
TestMessageSuffix pass_suffix("pass=" + stringify(pass), true);
- std::tr1::shared_ptr<const VersionMetadata> m;
+ tr1::shared_ptr<const VersionMetadata> m;
m = repo->version_metadata(QualifiedPackageName("cat-one/pkg-one"), VersionSpec("1"));
TEST_CHECK_EQUAL(m->description, "The Description");
@@ -572,19 +572,19 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo7");
keys->insert("profiles", "portage_repository_TEST_dir/repo7/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
{
TestMessageSuffix pass_suffix(stringify(pass), true);
- std::tr1::shared_ptr<const VersionMetadata> m;
+ tr1::shared_ptr<const VersionMetadata> m;
m = repo->version_metadata(QualifiedPackageName("cat-one/pkg-two"), VersionSpec("1"));
TEST_CHECK_EQUAL(m->eapi.name, "UNKNOWN");
@@ -604,13 +604,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo9");
keys->insert("profiles", "portage_repository_TEST_dir/repo9/profiles/profile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -652,13 +652,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo10");
keys->insert("profiles", "portage_repository_TEST_dir/repo10/profiles/profile/subprofile");
- std::tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
diff --git a/paludis/repositories/gentoo/portage_repository_entries.cc b/paludis/repositories/gentoo/portage_repository_entries.cc
index 75a58ab..eaa083b 100644
--- a/paludis/repositories/gentoo/portage_repository_entries.cc
+++ b/paludis/repositories/gentoo/portage_repository_entries.cc
@@ -25,7 +25,7 @@
using namespace paludis;
template class VirtualConstructor<std::string,
- std::tr1::shared_ptr<PortageRepositoryEntries> (*) (const Environment * const, PortageRepository * const,
+ tr1::shared_ptr<PortageRepositoryEntries> (*) (const Environment * const, PortageRepository * const,
const PortageRepositoryParams &),
virtual_constructor_not_found::ThrowException<NoSuchPortageRepositoryEntriesType> >;
diff --git a/paludis/repositories/gentoo/portage_repository_entries.hh b/paludis/repositories/gentoo/portage_repository_entries.hh
index 97524d4..c1338c4 100644
--- a/paludis/repositories/gentoo/portage_repository_entries.hh
+++ b/paludis/repositories/gentoo/portage_repository_entries.hh
@@ -66,7 +66,7 @@ namespace paludis
/**
* Generate version metadata.
*/
- virtual std::tr1::shared_ptr<VersionMetadata> generate_version_metadata(const QualifiedPackageName &,
+ virtual tr1::shared_ptr<VersionMetadata> generate_version_metadata(const QualifiedPackageName &,
const VersionSpec &) const = 0;
/**
@@ -74,19 +74,19 @@ namespace paludis
*/
virtual std::string get_environment_variable(const QualifiedPackageName &,
const VersionSpec &, const std::string & var,
- std::tr1::shared_ptr<const PortageRepositoryProfile>) const = 0;
+ tr1::shared_ptr<const PortageRepositoryProfile>) const = 0;
/**
* Handle an install.
*/
virtual void install(const QualifiedPackageName &, const VersionSpec &,
- const InstallOptions &, std::tr1::shared_ptr<const PortageRepositoryProfile>) const = 0;
+ const InstallOptions &, tr1::shared_ptr<const PortageRepositoryProfile>) const = 0;
/**
* Handle a pretend.
*/
virtual bool pretend(const QualifiedPackageName &, const VersionSpec &,
- std::tr1::shared_ptr<const PortageRepositoryProfile>) const = 0;
+ tr1::shared_ptr<const PortageRepositoryProfile>) const = 0;
/**
* Handle a merge.
@@ -117,7 +117,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE PortageRepositoryEntriesMaker :
public VirtualConstructor<std::string,
- std::tr1::shared_ptr<PortageRepositoryEntries> (*) (const Environment * const, PortageRepository * const,
+ tr1::shared_ptr<PortageRepositoryEntries> (*) (const Environment * const, PortageRepository * const,
const PortageRepositoryParams &),
virtual_constructor_not_found::ThrowException<NoSuchPortageRepositoryEntriesType> >,
public InstantiationPolicy<PortageRepositoryEntriesMaker, instantiation_method::SingletonTag>
diff --git a/paludis/repositories/gentoo/portage_repository_news.cc b/paludis/repositories/gentoo/portage_repository_news.cc
index 5cabee2..45a77bd 100644
--- a/paludis/repositories/gentoo/portage_repository_news.cc
+++ b/paludis/repositories/gentoo/portage_repository_news.cc
@@ -146,7 +146,7 @@ PortageRepositoryNews::update_news() const
if (news.begin_display_if_profile() != news.end_display_if_profile())
{
bool local_show(false);
- std::tr1::shared_ptr<const FSEntryCollection> c(_imp->params.profiles);
+ tr1::shared_ptr<const FSEntryCollection> c(_imp->params.profiles);
for (FSEntryCollection::Iterator 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/gentoo/portage_repository_params.sr b/paludis/repositories/gentoo/portage_repository_params.sr
index 9b9bb84..60acd42 100644
--- a/paludis/repositories/gentoo/portage_repository_params.sr
+++ b/paludis/repositories/gentoo/portage_repository_params.sr
@@ -9,20 +9,20 @@ make_class_PortageRepositoryParams()
key layout std::string
key environment "Environment *"
key location FSEntry
- key profiles "std::tr1::shared_ptr<const FSEntryCollection>"
+ key profiles "tr1::shared_ptr<const FSEntryCollection>"
key cache FSEntry
key write_cache FSEntry
key names_cache FSEntry
key distdir FSEntry
key pkgdir FSEntry
- key eclassdirs "std::tr1::shared_ptr<const FSEntryCollection>"
+ key eclassdirs "tr1::shared_ptr<const FSEntryCollection>"
key setsdir FSEntry
key securitydir FSEntry
key newsdir FSEntry
key sync std::string
key sync_options std::string
key buildroot FSEntry
- key master_repository "std::tr1::shared_ptr<const PortageRepository>"
+ key master_repository "tr1::shared_ptr<const PortageRepository>"
key enable_destinations bool
key write_bin_uri_prefix std::string
diff --git a/paludis/repositories/gentoo/portage_repository_profile.cc b/paludis/repositories/gentoo/portage_repository_profile.cc
index 82854da..fbefa31 100644
--- a/paludis/repositories/gentoo/portage_repository_profile.cc
+++ b/paludis/repositories/gentoo/portage_repository_profile.cc
@@ -47,11 +47,11 @@ namespace
{
typedef MakeHashedSet<UseFlagName>::Type UseFlagSet;
typedef MakeHashedMap<std::string, std::string>::Type EnvironmentVariablesMap;
- typedef MakeHashedMap<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> >::Type VirtualsMap;
- typedef MakeHashedMap<QualifiedPackageName, std::list<std::tr1::shared_ptr<const PackageDepSpec> > >::Type PackageMaskMap;
+ typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> >::Type VirtualsMap;
+ typedef MakeHashedMap<QualifiedPackageName, std::list<tr1::shared_ptr<const PackageDepSpec> > >::Type PackageMaskMap;
typedef MakeHashedMap<UseFlagName, bool>::Type FlagStatusMap;
- typedef std::list<std::pair<std::tr1::shared_ptr<const PackageDepSpec>, FlagStatusMap> > PackageFlagStatusMapList;
+ typedef std::list<std::pair<tr1::shared_ptr<const PackageDepSpec>, FlagStatusMap> > PackageFlagStatusMapList;
struct StackedValues
{
@@ -123,8 +123,8 @@ namespace paludis
///\name System package set
///\{
- std::tr1::shared_ptr<AllDepSpec> system_packages;
- std::tr1::shared_ptr<GeneralSetDepTag> system_tag;
+ tr1::shared_ptr<AllDepSpec> system_packages;
+ tr1::shared_ptr<GeneralSetDepTag> system_tag;
///\}
@@ -384,7 +384,7 @@ Implementation<PortageRepositoryProfile>::make_vars_from_file_vars()
continue;
Context context_spec("When parsing '" + *i + "':");
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(i->substr(1), pds_pm_eapi_0));
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(i->substr(1), pds_pm_eapi_0));
spec->set_tag(system_tag);
system_packages->add_child(spec);
}
@@ -407,7 +407,7 @@ Implementation<PortageRepositoryProfile>::make_vars_from_file_vars()
QualifiedPackageName v(tokens[0]);
virtuals.erase(v);
- virtuals.insert(std::make_pair(v, std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(tokens[1],
+ virtuals.insert(std::make_pair(v, tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(tokens[1],
pds_pm_eapi_0))));
}
}
@@ -425,7 +425,7 @@ Implementation<PortageRepositoryProfile>::make_vars_from_file_vars()
try
{
- std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(*line, pds_pm_eapi_0));
+ tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(*line, pds_pm_eapi_0));
if (a->package_ptr())
package_mask[*a->package_ptr()].push_back(a);
else
@@ -496,7 +496,7 @@ Implementation<PortageRepositoryProfile>::load_spec_use_file(const FSEntry & fil
try
{
- std::tr1::shared_ptr<const PackageDepSpec> spec(new PackageDepSpec(*tokens.begin(), pds_pm_eapi_0));
+ tr1::shared_ptr<const PackageDepSpec> spec(new PackageDepSpec(*tokens.begin(), pds_pm_eapi_0));
PackageFlagStatusMapList::iterator n(m.insert(m.end(), std::make_pair(spec, FlagStatusMap())));
for (std::list<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
@@ -662,7 +662,7 @@ PortageRepositoryProfile::use_state_ignoring_masks(const UseFlagName & u,
if (use_unspecified == result && _imp->repository->has_version(e.name, e.version))
{
- std::tr1::shared_ptr<const VersionMetadata> m(_imp->repository->version_metadata(e.name, e.version));
+ tr1::shared_ptr<const VersionMetadata> m(_imp->repository->version_metadata(e.name, e.version));
if (m->ebuild_interface)
{
IUseFlagCollection::Iterator i(m->ebuild_interface->iuse()->find(IUseFlag(u, use_unspecified)));
@@ -684,7 +684,7 @@ PortageRepositoryProfile::environment_variable(const std::string & s) const
return i->second;
}
-std::tr1::shared_ptr<AllDepSpec>
+tr1::shared_ptr<AllDepSpec>
PortageRepositoryProfile::system_packages() const
{
return _imp->system_packages;
@@ -736,7 +736,7 @@ PortageRepositoryProfile::profile_masked(const QualifiedPackageName & n,
else
{
PackageDatabaseEntry dbe(n, v, r);
- for (std::list<std::tr1::shared_ptr<const PackageDepSpec> >::const_iterator k(rr->second.begin()),
+ for (std::list<tr1::shared_ptr<const PackageDepSpec> >::const_iterator k(rr->second.begin()),
k_end(rr->second.end()) ; k != k_end ; ++k)
if (match_package(*_imp->env, **k, dbe))
return true;
diff --git a/paludis/repositories/gentoo/portage_repository_profile.hh b/paludis/repositories/gentoo/portage_repository_profile.hh
index 9d2f861..3832719 100644
--- a/paludis/repositories/gentoo/portage_repository_profile.hh
+++ b/paludis/repositories/gentoo/portage_repository_profile.hh
@@ -108,7 +108,7 @@ namespace paludis
///\name System package set
///\{
- std::tr1::shared_ptr<AllDepSpec> system_packages() const;
+ tr1::shared_ptr<AllDepSpec> system_packages() const;
///\}
@@ -116,7 +116,7 @@ namespace paludis
///\{
typedef libwrapiter::ForwardIterator<PortageRepositoryProfile,
- const std::pair<const QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > > VirtualsIterator;
+ const std::pair<const QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > > VirtualsIterator;
VirtualsIterator begin_virtuals() const;
VirtualsIterator end_virtuals() const;
diff --git a/paludis/repositories/gentoo/portage_repository_sets.cc b/paludis/repositories/gentoo/portage_repository_sets.cc
index 6bc9039..93e2bbc 100644
--- a/paludis/repositories/gentoo/portage_repository_sets.cc
+++ b/paludis/repositories/gentoo/portage_repository_sets.cc
@@ -35,7 +35,7 @@
#include <paludis/util/tokeniser.hh>
#include <list>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
#include <set>
#include "config.h"
@@ -77,7 +77,7 @@ PortageRepositorySets::~PortageRepositorySets()
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
PortageRepositorySets::package_set(const SetName & s) const
{
if ("system" == s.data())
@@ -88,7 +88,7 @@ PortageRepositorySets::package_set(const SetName & s) const
return security_set(true);
else if ((_imp->params.setsdir / (stringify(s) + ".conf")).exists())
{
- std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(s, stringify(_imp->portage_repository->name())));
+ tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(s, stringify(_imp->portage_repository->name())));
FSEntry ff(_imp->params.setsdir / (stringify(s) + ".conf"));
Context context("When loading package set '" + stringify(s) + "' from '" + stringify(ff) + "':");
@@ -104,26 +104,26 @@ PortageRepositorySets::package_set(const SetName & s) const
return f.contents();
}
else
- return std::tr1::shared_ptr<DepSpec>();
+ return tr1::shared_ptr<DepSpec>();
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
PortageRepositorySets::sets_list() const
{
Context context("While generating the list of sets:");
- std::tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
+ tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
result->insert(SetName("insecurity"));
result->insert(SetName("security"));
result->insert(SetName("system"));
try
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
std::list<FSEntry> repo_sets;
std::copy(DirIterator(_imp->params.setsdir), DirIterator(),
- filter_inserter(std::back_inserter(repo_sets), std::tr1::bind(is_file_with_extension, _1, ".conf", IsFileWithOptions())));
+ filter_inserter(std::back_inserter(repo_sets), tr1::bind(is_file_with_extension, _1, ".conf", IsFileWithOptions())));
std::list<FSEntry>::const_iterator f(repo_sets.begin()),
f_end(repo_sets.end());
@@ -233,16 +233,16 @@ namespace
}
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
PortageRepositorySets::security_set(bool insecurity) const
{
Context context("When building security or insecurity package set:");
- std::tr1::shared_ptr<AllDepSpec> security_packages(new AllDepSpec);
+ tr1::shared_ptr<AllDepSpec> security_packages(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, tr1::shared_ptr<GLSADepTag> > glsa_tags;
for (DirIterator f(_imp->params.securitydir), f_end ; f != f_end; ++f)
{
@@ -253,14 +253,14 @@ PortageRepositorySets::security_set(bool insecurity) const
try
{
- std::tr1::shared_ptr<const GLSA> glsa(GLSA::create_from_xml_file(stringify(*f)));
+ tr1::shared_ptr<const GLSA> glsa(GLSA::create_from_xml_file(stringify(*f)));
Context local_local_context("When handling GLSA '" + glsa->id() + "' from '" +
stringify(*f) + "':");
for (GLSA::PackagesIterator glsa_pkg(glsa->begin_packages()),
glsa_pkg_end(glsa->end_packages()) ; glsa_pkg != glsa_pkg_end ; ++glsa_pkg)
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> candidates;
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> candidates;
if (insecurity)
candidates = _imp->environment->package_database()->query(query::Package(glsa_pkg->name()), qo_order_by_version);
else
@@ -274,20 +274,20 @@ PortageRepositorySets::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(), tr1::shared_ptr<GLSADepTag>(
new GLSADepTag(glsa->id(), glsa->title()))));
if (insecurity)
{
- std::tr1::shared_ptr<VersionRequirements> v(new VersionRequirements::Concrete);
+ tr1::shared_ptr<VersionRequirements> v(new VersionRequirements::Concrete);
v->push_back(VersionRequirement(vo_equal, c->version));
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(c->name)),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(c->name)),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
v, vr_and,
- std::tr1::shared_ptr<SlotName>(),
- std::tr1::shared_ptr<RepositoryName>(new RepositoryName(c->repository))));
+ tr1::shared_ptr<SlotName>(),
+ tr1::shared_ptr<RepositoryName>(new RepositoryName(c->repository))));
spec->set_tag(glsa_tags.find(glsa->id())->second);
security_packages->add_child(spec);
}
@@ -298,16 +298,16 @@ PortageRepositorySets::security_set(bool insecurity) const
bool ok(false);
SlotName wanted_slot(_imp->environment->package_database()->fetch_repository(
c->repository)->version_metadata(c->name, c->version)->slot);
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> available(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> available(
_imp->environment->package_database()->query(
query::Matches(PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(
glsa_pkg->name())),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
- std::tr1::shared_ptr<VersionRequirements>(),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<VersionRequirements>(),
vr_and,
- std::tr1::shared_ptr<SlotName>(new SlotName(wanted_slot)))) &
+ tr1::shared_ptr<SlotName>(new SlotName(wanted_slot)))) &
query::RepositoryHasInstallableInterface() &
query::NotMasked(),
qo_order_by_version));
@@ -322,15 +322,15 @@ PortageRepositorySets::security_set(bool insecurity) const
continue;
}
- std::tr1::shared_ptr<VersionRequirements> v(new VersionRequirements::Concrete);
+ tr1::shared_ptr<VersionRequirements> v(new VersionRequirements::Concrete);
v->push_back(VersionRequirement(vo_equal, r->version));
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(r->name)),
- std::tr1::shared_ptr<CategoryNamePart>(),
- std::tr1::shared_ptr<PackageNamePart>(),
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(r->name)),
+ tr1::shared_ptr<CategoryNamePart>(),
+ tr1::shared_ptr<PackageNamePart>(),
v, vr_and,
- std::tr1::shared_ptr<SlotName>(),
- std::tr1::shared_ptr<RepositoryName>(new RepositoryName(r->repository))));
+ tr1::shared_ptr<SlotName>(),
+ tr1::shared_ptr<RepositoryName>(new RepositoryName(r->repository))));
spec->set_tag(glsa_tags.find(glsa->id())->second);
security_packages->add_child(spec);
ok = true;
diff --git a/paludis/repositories/gentoo/portage_repository_sets.hh b/paludis/repositories/gentoo/portage_repository_sets.hh
index e93662b..7e19294 100644
--- a/paludis/repositories/gentoo/portage_repository_sets.hh
+++ b/paludis/repositories/gentoo/portage_repository_sets.hh
@@ -62,17 +62,17 @@ namespace paludis
/**
* Fetch a package set other than system.
*/
- std::tr1::shared_ptr<DepSpec> package_set(const SetName & s) const;
+ tr1::shared_ptr<DepSpec> package_set(const SetName & s) const;
/**
* Fetch the security or insecurity set.
*/
- std::tr1::shared_ptr<DepSpec> security_set(bool insecure) const;
+ tr1::shared_ptr<DepSpec> security_set(bool insecure) const;
/**
* Give a list of all the sets in this repo.
*/
- std::tr1::shared_ptr<const SetNameCollection> sets_list() const;
+ tr1::shared_ptr<const SetNameCollection> sets_list() const;
};
}
diff --git a/paludis/repositories/gentoo/registration.cc b/paludis/repositories/gentoo/registration.cc
index 2ae8d43..7e27cbd 100644
--- a/paludis/repositories/gentoo/registration.cc
+++ b/paludis/repositories/gentoo/registration.cc
@@ -35,10 +35,10 @@ extern "C"
namespace
{
- std::tr1::shared_ptr<Repository>
+ tr1::shared_ptr<Repository>
make_portage_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
{
std::string repo_file = "?";
if (m->end() != m->find("repo_file"))
diff --git a/paludis/repositories/gentoo/traditional_layout.cc b/paludis/repositories/gentoo/traditional_layout.cc
index 626ed4a..2d94118 100644
--- a/paludis/repositories/gentoo/traditional_layout.cc
+++ b/paludis/repositories/gentoo/traditional_layout.cc
@@ -30,7 +30,7 @@
#include <paludis/util/iterator.hh>
#include <paludis/util/strip.hh>
-#include <tr1/functional>
+#include <paludis/util/tr1_functional.hh>
#include <functional>
#include <algorithm>
@@ -38,7 +38,7 @@ using namespace paludis;
typedef MakeHashedMap<CategoryNamePart, bool>::Type CategoryMap;
typedef MakeHashedMap<QualifiedPackageName, bool>::Type PackagesMap;
-typedef MakeHashedMap<QualifiedPackageName, std::tr1::shared_ptr<VersionSpecCollection> >::Type VersionsMap;
+typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<VersionSpecCollection> >::Type VersionsMap;
namespace paludis
{
@@ -53,11 +53,11 @@ namespace paludis
mutable PackagesMap package_names;
mutable VersionsMap version_specs;
- mutable std::tr1::shared_ptr<CategoryNamePartCollection> category_names_collection;
- std::tr1::shared_ptr<const PortageRepositoryEntries> entries;
+ mutable tr1::shared_ptr<CategoryNamePartCollection> category_names_collection;
+ tr1::shared_ptr<const PortageRepositoryEntries> entries;
Implementation(const RepositoryName & n, const FSEntry & t,
- std::tr1::shared_ptr<const PortageRepositoryEntries> e) :
+ tr1::shared_ptr<const PortageRepositoryEntries> e) :
name(n),
tree_root(t),
has_category_names(false),
@@ -68,7 +68,7 @@ namespace paludis
}
TraditionalLayout::TraditionalLayout(const RepositoryName & name, const FSEntry & tree_root,
- std::tr1::shared_ptr<const PortageRepositoryEntries> e) :
+ tr1::shared_ptr<const PortageRepositoryEntries> e) :
PrivateImplementationPattern<TraditionalLayout>(new Implementation<TraditionalLayout>(name, tree_root, e))
{
}
@@ -151,7 +151,7 @@ TraditionalLayout::need_version_specs(const QualifiedPackageName & n) const
Context context("When loading versions for '" + stringify(n) + "' in "
+ stringify(_imp->name) + ":");
- std::tr1::shared_ptr<VersionSpecCollection> v(new VersionSpecCollection::Concrete);
+ tr1::shared_ptr<VersionSpecCollection> v(new VersionSpecCollection::Concrete);
FSEntry path(_imp->tree_root / stringify(n.category) / stringify(n.package));
@@ -236,7 +236,7 @@ TraditionalLayout::need_category_names_collection() const
SelectFirst<const CategoryNamePart, bool>()));
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
TraditionalLayout::category_names() const
{
Context context("When fetching category names in " + stringify(stringify(_imp->name)) + ":");
@@ -245,10 +245,10 @@ TraditionalLayout::category_names() const
return _imp->category_names_collection;
}
-std::tr1::shared_ptr<const QualifiedPackageNameCollection>
+tr1::shared_ptr<const QualifiedPackageNameCollection>
TraditionalLayout::package_names(const CategoryNamePart & c) const
{
- using namespace std::tr1::placeholders;
+ using namespace tr1::placeholders;
/* this isn't particularly fast because it isn't called very often. avoid
* changing the data structures used to make this faster at the expense of
@@ -260,7 +260,7 @@ TraditionalLayout::package_names(const CategoryNamePart & c) const
need_category_names();
if (_imp->category_names.end() == _imp->category_names.find(c))
- return std::tr1::shared_ptr<QualifiedPackageNameCollection>(new QualifiedPackageNameCollection::Concrete);
+ return tr1::shared_ptr<QualifiedPackageNameCollection>(new QualifiedPackageNameCollection::Concrete);
if ((_imp->tree_root / stringify(c)).is_directory_or_symlink_to_directory())
for (DirIterator d(_imp->tree_root / stringify(c)), d_end ; d != d_end ; ++d)
@@ -271,7 +271,7 @@ TraditionalLayout::package_names(const CategoryNamePart & c) const
continue;
if (DirIterator() == std::find_if(DirIterator(*d), DirIterator(),
- std::tr1::bind(&PortageRepositoryEntries::is_package_file, _imp->entries.get(),
+ tr1::bind(&PortageRepositoryEntries::is_package_file, _imp->entries.get(),
c + PackageNamePart(d->basename()), _1)))
continue;
@@ -287,18 +287,18 @@ TraditionalLayout::package_names(const CategoryNamePart & c) const
_imp->category_names[c] = true;
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
std::copy(_imp->package_names.begin(), _imp->package_names.end(),
transform_inserter(filter_inserter(result->inserter(),
- std::tr1::bind(std::equal_to<CategoryNamePart>(), c,
- std::tr1::bind(SelectMember<const QualifiedPackageName, CategoryNamePart, &QualifiedPackageName::category>(), _1))),
+ tr1::bind(std::equal_to<CategoryNamePart>(), c,
+ tr1::bind(SelectMember<const QualifiedPackageName, CategoryNamePart, &QualifiedPackageName::category>(), _1))),
SelectFirst<const QualifiedPackageName, bool>()));
return result;
}
-std::tr1::shared_ptr<const VersionSpecCollection>
+tr1::shared_ptr<const VersionSpecCollection>
TraditionalLayout::version_specs(const QualifiedPackageName & n) const
{
Context context("When fetching versions of '" + stringify(n) + "' in " + stringify(_imp->name) + ":");
@@ -309,7 +309,7 @@ TraditionalLayout::version_specs(const QualifiedPackageName & n) const
return _imp->version_specs.find(n)->second;
}
else
- return std::tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
+ return tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
}
bool
@@ -321,7 +321,7 @@ TraditionalLayout::has_version(const QualifiedPackageName & q, const VersionSpec
if (has_package_named(q))
{
need_version_specs(q);
- std::tr1::shared_ptr<VersionSpecCollection> vv(_imp->version_specs.find(q)->second);
+ tr1::shared_ptr<VersionSpecCollection> vv(_imp->version_specs.find(q)->second);
return vv->end() != vv->find(v);
}
else
diff --git a/paludis/repositories/gentoo/traditional_layout.hh b/paludis/repositories/gentoo/traditional_layout.hh
index df9ade6..43cae02 100644
--- a/paludis/repositories/gentoo/traditional_layout.hh
+++ b/paludis/repositories/gentoo/traditional_layout.hh
@@ -39,7 +39,7 @@ namespace paludis
public:
TraditionalLayout(const RepositoryName &, const FSEntry &,
- std::tr1::shared_ptr<const PortageRepositoryEntries>);
+ tr1::shared_ptr<const PortageRepositoryEntries>);
virtual ~TraditionalLayout();
@@ -49,14 +49,14 @@ namespace paludis
virtual bool has_package_named(const QualifiedPackageName &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> category_names() const
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> category_names() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const QualifiedPackageNameCollection> package_names(
+ virtual tr1::shared_ptr<const QualifiedPackageNameCollection> package_names(
const CategoryNamePart &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::tr1::shared_ptr<const VersionSpecCollection> version_specs(
+ virtual tr1::shared_ptr<const VersionSpecCollection> version_specs(
const QualifiedPackageName & n) const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/gentoo/vdb_merger.cc b/paludis/repositories/gentoo/vdb_merger.cc
index dc69565..ccac35f 100644
--- a/paludis/repositories/gentoo/vdb_merger.cc
+++ b/paludis/repositories/gentoo/vdb_merger.cc
@@ -42,7 +42,7 @@ namespace paludis
struct Implementation<VDBMerger>
{
VDBMergerOptions options;
- std::tr1::shared_ptr<std::ofstream> contents_file;
+ tr1::shared_ptr<std::ofstream> contents_file;
std::list<std::string> config_protect;
std::list<std::string> config_protect_mask;
@@ -84,7 +84,7 @@ VDBMerger::extend_hook(const Hook & h)
_imp->options.environment->package_database()->fetch_repository(
pde->repository)->version_metadata(pde->name, pde->version)->slot));
- std::tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->options.environment->bashrc_files());
+ tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->options.environment->bashrc_files());
return Merger::extend_hook(h)
("P", pn + "-" + pv)
diff --git a/paludis/repositories/gentoo/vdb_repository.cc b/paludis/repositories/gentoo/vdb_repository.cc
index 79b1032..74bd3cf 100644
--- a/paludis/repositories/gentoo/vdb_repository.cc
+++ b/paludis/repositories/gentoo/vdb_repository.cc
@@ -78,7 +78,7 @@ namespace
VersionSpec version;
/// Our metadata, may be zero.
- std::tr1::shared_ptr<VDBVersionMetadata> metadata;
+ tr1::shared_ptr<VDBVersionMetadata> metadata;
/// Our built USE flags.
std::set<UseFlagName> use;
@@ -299,11 +299,11 @@ namespace paludis
void load_entry(std::vector<VDBEntry>::iterator) const;
/// Provieds data
- mutable std::tr1::shared_ptr<RepositoryProvidesInterface::ProvidesCollection> provides;
+ mutable tr1::shared_ptr<RepositoryProvidesInterface::ProvidesCollection> provides;
const FSEntry names_cache_dir;
- std::tr1::shared_ptr<RepositoryNameCache> names_cache;
+ tr1::shared_ptr<RepositoryNameCache> names_cache;
/// Constructor.
Implementation(const VDBRepository * const, const VDBRepositoryParams &);
@@ -429,7 +429,7 @@ namespace paludis
+ "-" + stringify(p->version) + "' from '" + stringify(location) + "':");
- p->metadata = std::tr1::shared_ptr<VDBVersionMetadata>(new VDBVersionMetadata);
+ p->metadata = tr1::shared_ptr<VDBVersionMetadata>(new VDBVersionMetadata);
{
Context local_context("When loading key 'DEPEND':");
@@ -535,7 +535,7 @@ VDBRepository::VDBRepository(const VDBRepositoryParams & p) :
"vdb"),
PrivateImplementationPattern<VDBRepository>(new Implementation<VDBRepository>(this, p))
{
- std::tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
+ tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
config_info->add_kv("location", stringify(_imp->location));
config_info->add_kv("root", stringify(_imp->root));
@@ -582,7 +582,7 @@ VDBRepository::do_has_package_named(const QualifiedPackageName & q) const
return r.first != r.second;
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
VDBRepository::do_category_names() const
{
Context context("When fetching category names in " + stringify(name()) + ":");
@@ -590,7 +590,7 @@ VDBRepository::do_category_names() const
if (! _imp->entries_valid)
_imp->load_entries();
- std::tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
+ tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
fast_unique_copy(_imp->entries.begin(), _imp->entries.end(),
transform_inserter(result->inserter(), VDBEntry::ExtractCategory()),
@@ -599,7 +599,7 @@ VDBRepository::do_category_names() const
return result;
}
-std::tr1::shared_ptr<const QualifiedPackageNameCollection>
+tr1::shared_ptr<const QualifiedPackageNameCollection>
VDBRepository::do_package_names(const CategoryNamePart & c) const
{
/* this isn't particularly fast because it isn't called very often. avoid
@@ -609,7 +609,7 @@ VDBRepository::do_package_names(const CategoryNamePart & c) const
Context context("When fetching package names in category '" + stringify(c)
+ "' in " + stringify(name()) + ":");
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
std::pair<std::vector<VDBEntry>::const_iterator, std::vector<VDBEntry>::const_iterator>
r(std::equal_range(_imp->entries.begin(), _imp->entries.end(), c,
@@ -621,7 +621,7 @@ VDBRepository::do_package_names(const CategoryNamePart & c) const
return result;
}
-std::tr1::shared_ptr<const VersionSpecCollection>
+tr1::shared_ptr<const VersionSpecCollection>
VDBRepository::do_version_specs(const QualifiedPackageName & n) const
{
Context context("When fetching versions of '" + stringify(n) + "' in "
@@ -630,7 +630,7 @@ VDBRepository::do_version_specs(const QualifiedPackageName & n) const
if (! _imp->entries_valid)
_imp->load_entries_for(n.category);
- std::tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
+ tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
std::pair<std::vector<VDBEntry>::const_iterator, std::vector<VDBEntry>::const_iterator>
r(std::equal_range(_imp->entries.begin(), _imp->entries.end(), n,
@@ -649,11 +649,11 @@ VDBRepository::do_has_version(const QualifiedPackageName & q,
Context context("When checking for version '" + stringify(v) + "' in '"
+ stringify(q) + "' in " + stringify(name()) + ":");
- std::tr1::shared_ptr<const VersionSpecCollection> versions(do_version_specs(q));
+ tr1::shared_ptr<const VersionSpecCollection> versions(do_version_specs(q));
return versions->end() != versions->find(v);
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
VDBRepository::do_version_metadata(
const QualifiedPackageName & q, const VersionSpec & v) const
{
@@ -677,7 +677,7 @@ VDBRepository::do_version_metadata(
}
}
-std::tr1::shared_ptr<const Contents>
+tr1::shared_ptr<const Contents>
VDBRepository::do_contents(
const QualifiedPackageName & q, const VersionSpec & v) const
{
@@ -697,10 +697,10 @@ VDBRepository::do_contents(
"version lookup failed for request for '" +
stringify(q) + "-" + stringify(v) + "' in repository '" +
stringify(name()) + "'");
- return std::tr1::shared_ptr<const Contents>(new Contents);
+ return tr1::shared_ptr<const Contents>(new Contents);
}
- std::tr1::shared_ptr<Contents> result(new Contents);
+ tr1::shared_ptr<Contents> result(new Contents);
FSEntry f(_imp->location / stringify(q.category) /
(stringify(q.package) + "-" + stringify(v)));
@@ -738,15 +738,15 @@ VDBRepository::do_contents(
}
if ("obj" == tokens.at(0))
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsFileEntry(tokens.at(1))));
+ result->add(tr1::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(tr1::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(tr1::shared_ptr<ContentsEntry>(new ContentsMiscEntry(tokens.at(1))));
else if ("fif" == tokens.at(0))
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsFifoEntry(tokens.at(1))));
+ result->add(tr1::shared_ptr<ContentsEntry>(new ContentsFifoEntry(tokens.at(1))));
else if ("dev" == tokens.at(0))
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsDevEntry(tokens.at(1))));
+ result->add(tr1::shared_ptr<ContentsEntry>(new ContentsDevEntry(tokens.at(1))));
else if ("sym" == tokens.at(0))
{
if (tokens.size() < 4)
@@ -758,7 +758,7 @@ VDBRepository::do_contents(
continue;
}
- result->add(std::tr1::shared_ptr<ContentsEntry>(new ContentsSymEntry(
+ result->add(tr1::shared_ptr<ContentsEntry>(new ContentsSymEntry(
tokens.at(1), tokens.at(3))));
}
}
@@ -843,10 +843,10 @@ VDBRepository::do_query_use_force(const UseFlagName & u, const PackageDatabaseEn
return use_enabled == do_query_use(u, e);
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
VDBRepository::make_vdb_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
{
std::string repo_file(m->end() == m->find("repo_file") ? std::string("?") : m->find("repo_file")->second);
Context context("When making VDB repository from repo_file '" + repo_file + "':");
@@ -885,7 +885,7 @@ VDBRepository::make_vdb_repository(
if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
buildroot = "/var/tmp/paludis";
- return std::tr1::shared_ptr<Repository>(new VDBRepository(VDBRepositoryParams::create()
+ return tr1::shared_ptr<Repository>(new VDBRepository(VDBRepositoryParams::create()
.environment(env)
.location(location)
.root(root)
@@ -932,13 +932,13 @@ VDBRepository::_uninstall(const QualifiedPackageName & q, const VersionSpec & v,
PackageDatabaseEntry e(q, v, name());
- std::tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
eclassdirs->append(FSEntry(_imp->location / stringify(q.category) /
(reinstalling_str + stringify(q.package) + "-" + stringify(v))));
FSEntry pkg_dir(_imp->location / stringify(q.category) / (reinstalling_str + stringify(q.package) + "-" + stringify(v)));
- std::tr1::shared_ptr<FSEntry> load_env(new FSEntry(pkg_dir / "environment.bz2"));
+ tr1::shared_ptr<FSEntry> load_env(new FSEntry(pkg_dir / "environment.bz2"));
EbuildCommandParams params(EbuildCommandParams::create()
.environment(_imp->env)
@@ -1007,7 +1007,7 @@ VDBRepository::do_config(const QualifiedPackageName & q, const VersionSpec & v)
throw PackageInstallActionError("Couldn't configure '" + stringify(q) + "-" +
stringify(v) + "' because root ('" + stringify(_imp->root) + "') is not a directory");
- std::tr1::shared_ptr<const VersionMetadata> metadata;
+ tr1::shared_ptr<const VersionMetadata> metadata;
if (! has_version(q, v))
throw PackageInstallActionError("Couldn't configure '" + stringify(q) + "-" +
stringify(v) + "' because has_version failed");
@@ -1016,14 +1016,14 @@ VDBRepository::do_config(const QualifiedPackageName & q, const VersionSpec & v)
PackageDatabaseEntry e(q, v, name());
- std::tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
+ tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
eclassdirs->append(FSEntry(_imp->location / stringify(q.category) /
(stringify(q.package) + "-" + stringify(v))));
FSEntry pkg_dir(_imp->location / stringify(q.category) /
(stringify(q.package) + "-" + stringify(v)));
- std::tr1::shared_ptr<FSEntry> load_env(new FSEntry(pkg_dir / "environment.bz2"));
+ tr1::shared_ptr<FSEntry> load_env(new FSEntry(pkg_dir / "environment.bz2"));
EbuildConfigCommand config_cmd(EbuildCommandParams::create()
.environment(_imp->env)
@@ -1042,7 +1042,7 @@ VDBRepository::do_config(const QualifiedPackageName & q, const VersionSpec & v)
config_cmd();
}
-std::tr1::shared_ptr<DepSpec>
+tr1::shared_ptr<DepSpec>
VDBRepository::do_package_set(const SetName & s) const
{
Context context("When fetching package set '" + stringify(s) + "' from '" +
@@ -1050,8 +1050,8 @@ VDBRepository::do_package_set(const SetName & s) const
if ("everything" == s.data())
{
- std::tr1::shared_ptr<AllDepSpec> result(new AllDepSpec);
- std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("everything"), stringify(name())));
+ tr1::shared_ptr<AllDepSpec> result(new AllDepSpec);
+ tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("everything"), stringify(name())));
if (! _imp->entries_valid)
_imp->load_entries();
@@ -1059,8 +1059,8 @@ VDBRepository::do_package_set(const SetName & s) const
for (std::vector<VDBEntry>::const_iterator p(_imp->entries.begin()),
p_end(_imp->entries.end()) ; p != p_end ; ++p)
{
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(p->name))));
+ tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(p->name))));
spec->set_tag(tag);
result->add_child(spec);
}
@@ -1069,7 +1069,7 @@ VDBRepository::do_package_set(const SetName & s) const
}
else if ("world" == s.data())
{
- std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("world"), stringify(name())));
+ tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("world"), stringify(name())));
if (_imp->world_file.exists())
{
@@ -1086,18 +1086,18 @@ VDBRepository::do_package_set(const SetName & s) const
"World file '" + stringify(_imp->world_file) +
"' doesn't exist");
- return std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec);
+ return tr1::shared_ptr<AllDepSpec>(new AllDepSpec);
}
else
- return std::tr1::shared_ptr<DepSpec>();
+ return tr1::shared_ptr<DepSpec>();
}
-std::tr1::shared_ptr<const SetNameCollection>
+tr1::shared_ptr<const SetNameCollection>
VDBRepository::sets_list() const
{
Context context("While generating the list of sets:");
- std::tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
+ tr1::shared_ptr<SetNameCollection> result(new SetNameCollection::Concrete);
result->insert(SetName("everything"));
result->insert(SetName("world"));
return result;
@@ -1129,7 +1129,7 @@ VDBRepository::add_string_to_world(const std::string & n) const
.file_name(_imp->world_file)
.type(sft_simple)
.parse_mode(pds_pm_unspecific)
- .tag(std::tr1::shared_ptr<DepTag>())
+ .tag(tr1::shared_ptr<DepTag>())
.environment(_imp->env));
world.add(n);
world.rewrite();
@@ -1146,7 +1146,7 @@ VDBRepository::remove_string_from_world(const std::string & n) const
.file_name(_imp->world_file)
.type(sft_simple)
.parse_mode(pds_pm_unspecific)
- .tag(std::tr1::shared_ptr<DepTag>())
+ .tag(tr1::shared_ptr<DepTag>())
.environment(_imp->env));
world.remove(n);
@@ -1220,7 +1220,7 @@ VDBRepository::get_environment_variable(
+ stringify(for_package) + "'");
}
-std::tr1::shared_ptr<const RepositoryProvidesInterface::ProvidesCollection>
+tr1::shared_ptr<const RepositoryProvidesInterface::ProvidesCollection>
VDBRepository::provided_packages() const
{
if (_imp->provides)
@@ -1232,11 +1232,11 @@ VDBRepository::provided_packages() const
return _imp->provides;
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
VDBRepository::provided_package_version_metadata(const RepositoryProvidesEntry & p) const
{
- std::tr1::shared_ptr<const VersionMetadata> m(version_metadata(p.provided_by_name, p.version));
- std::tr1::shared_ptr<VDBVirtualVersionMetadata> result(new VDBVirtualVersionMetadata(
+ tr1::shared_ptr<const VersionMetadata> m(version_metadata(p.provided_by_name, p.version));
+ tr1::shared_ptr<VDBVirtualVersionMetadata> result(new VDBVirtualVersionMetadata(
m->slot, PackageDatabaseEntry(p.provided_by_name, p.version, name())));
result->eapi = m->eapi;
@@ -1246,28 +1246,28 @@ VDBRepository::provided_package_version_metadata(const RepositoryProvidesEntry &
return result;
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
VDBRepository::do_arch_flags() const
{
- return std::tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
+ return tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
VDBRepository::do_use_expand_flags() const
{
- return std::tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
+ return tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
VDBRepository::do_use_expand_prefixes() const
{
- return std::tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
+ return tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
}
-std::tr1::shared_ptr<const UseFlagNameCollection>
+tr1::shared_ptr<const UseFlagNameCollection>
VDBRepository::do_use_expand_hidden_prefixes() const
{
- return std::tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
+ return tr1::shared_ptr<const UseFlagNameCollection>(new UseFlagNameCollection::Concrete);
}
bool
@@ -1278,7 +1278,7 @@ VDBRepository::load_provided_using_cache() const
Context context("When loading VDB PROVIDEs map using '" + stringify(_imp->provides_cache) + "':");
- std::tr1::shared_ptr<ProvidesCollection> result(new ProvidesCollection::Concrete);
+ tr1::shared_ptr<ProvidesCollection> result(new ProvidesCollection::Concrete);
if (! _imp->provides_cache.is_regular_file())
{
@@ -1340,7 +1340,7 @@ VDBRepository::load_provided_the_slow_way() const
Log::get_instance()->message(ll_debug, lc_no_context, "Starting VDB PROVIDEs map creation");
- std::tr1::shared_ptr<ProvidesCollection> result(new ProvidesCollection::Concrete);
+ tr1::shared_ptr<ProvidesCollection> result(new ProvidesCollection::Concrete);
if (! _imp->entries_valid)
_imp->load_entries();
@@ -1353,7 +1353,7 @@ VDBRepository::load_provided_the_slow_way() const
try
{
- std::tr1::shared_ptr<const DepSpec> provide;
+ tr1::shared_ptr<const DepSpec> provide;
if (e->metadata)
provide = e->metadata->ebuild_interface->provide();
else
@@ -1432,7 +1432,7 @@ VDBRepository::regenerate_provides_cache() const
for (std::vector<VDBEntry>::const_iterator c(_imp->entries.begin()), c_end(_imp->entries.end()) ;
c != c_end ; ++c)
{
- std::tr1::shared_ptr<const DepSpec> provide;
+ tr1::shared_ptr<const DepSpec> provide;
if (c->metadata)
provide = c->metadata->ebuild_interface->provide();
else
@@ -1449,13 +1449,13 @@ VDBRepository::regenerate_provides_cache() const
}
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
VDBRepository::do_category_names_containing_package(const PackageNamePart & p) const
{
if (! _imp->names_cache->usable())
return Repository::do_category_names_containing_package(p);
- std::tr1::shared_ptr<const CategoryNamePartCollection> result(
+ tr1::shared_ptr<const CategoryNamePartCollection> result(
_imp->names_cache->category_names_containing_package(p));
return result ? result : Repository::do_category_names_containing_package(p);
diff --git a/paludis/repositories/gentoo/vdb_repository.hh b/paludis/repositories/gentoo/vdb_repository.hh
index 33adcd9..a79b118 100644
--- a/paludis/repositories/gentoo/vdb_repository.hh
+++ b/paludis/repositories/gentoo/vdb_repository.hh
@@ -73,21 +73,21 @@ namespace paludis
virtual bool do_has_package_named(const QualifiedPackageName &) const;
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
- virtual std::tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
+ virtual tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
const CategoryNamePart &) const;
- virtual std::tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
+ virtual tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
const QualifiedPackageName &) const;
virtual bool do_has_version(const QualifiedPackageName &, const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const VersionMetadata> do_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> do_version_metadata(
const QualifiedPackageName &,
const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const Contents> do_contents(
+ virtual tr1::shared_ptr<const Contents> do_contents(
const QualifiedPackageName &,
const VersionSpec &) const;
@@ -98,21 +98,21 @@ namespace paludis
virtual void do_uninstall(const QualifiedPackageName &, const VersionSpec &,
const UninstallOptions &) const;
- virtual std::tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
+ virtual tr1::shared_ptr<DepSpec> do_package_set(const SetName &) const;
/* RepositoryUseInterface */
virtual UseFlagState do_query_use(const UseFlagName &, const PackageDatabaseEntry &) const;
virtual bool do_query_use_mask(const UseFlagName &, const PackageDatabaseEntry &) const;
virtual bool do_query_use_force(const UseFlagName &, const PackageDatabaseEntry &) const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_arch_flags() const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_flags() const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_hidden_prefixes() const;
- virtual std::tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_prefixes() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_arch_flags() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_flags() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_hidden_prefixes() const;
+ virtual tr1::shared_ptr<const UseFlagNameCollection> do_use_expand_prefixes() const;
/* end of RepositoryUseInterface */
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> do_category_names_containing_package(
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> do_category_names_containing_package(
const PackageNamePart &) const;
/**
@@ -136,9 +136,9 @@ namespace paludis
/**
* Virtual constructor.
*/
- static std::tr1::shared_ptr<Repository> make_vdb_repository(
+ static tr1::shared_ptr<Repository> make_vdb_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m);
/**
* Destructor.
@@ -161,12 +161,12 @@ namespace paludis
const PackageDatabaseEntry & for_package,
const std::string & var) const;
- virtual std::tr1::shared_ptr<const ProvidesCollection> provided_packages() const;
+ virtual tr1::shared_ptr<const ProvidesCollection> provided_packages() const;
- virtual std::tr1::shared_ptr<const VersionMetadata> provided_package_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> provided_package_version_metadata(
const RepositoryProvidesEntry &) const;
- virtual std::tr1::shared_ptr<const SetNameCollection> sets_list() const;
+ virtual tr1::shared_ptr<const SetNameCollection> sets_list() const;
virtual bool is_suitable_destination_for(const PackageDatabaseEntry &) const;
diff --git a/paludis/repositories/gentoo/vdb_repository_TEST.cc b/paludis/repositories/gentoo/vdb_repository_TEST.cc
index 15b4b07..46d02b6 100644
--- a/paludis/repositories/gentoo/vdb_repository_TEST.cc
+++ b/paludis/repositories/gentoo/vdb_repository_TEST.cc
@@ -46,13 +46,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
- std::tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(&env, keys));
+ tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "installed");
}
} test_vdb_repository_repo_name;
@@ -68,13 +68,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
- std::tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
+ tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
&env, keys));
TEST_CHECK(repo->has_category_named(CategoryNamePart("cat-one")));
@@ -94,13 +94,13 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
- std::tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
+ tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
&env, keys));
PackageDatabaseEntry e1(CategoryNamePart("cat-one") + PackageNamePart("pkg-one"),
@@ -126,14 +126,14 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-new-file");
- std::tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
+ tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
&env, keys));
repo->world_interface->add_to_world(QualifiedPackageName("cat-one/foofoo"));
std::ifstream world("vdb_repository_TEST_dir/world-new-file");
@@ -152,14 +152,14 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-empty");
- std::tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
+ tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
&env, keys));
repo->world_interface->add_to_world(QualifiedPackageName("cat-one/foofoo"));
std::ifstream world("vdb_repository_TEST_dir/world-empty");
@@ -178,14 +178,14 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-no-match");
- std::tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
+ tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
&env, keys));
repo->world_interface->add_to_world(QualifiedPackageName("cat-one/foofoo"));
std::ifstream world("vdb_repository_TEST_dir/world-no-match");
@@ -204,14 +204,14 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-match");
- std::tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
+ tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
&env, keys));
repo->world_interface->add_to_world(QualifiedPackageName("cat-one/foofoo"));
std::ifstream world("vdb_repository_TEST_dir/world-match");
@@ -230,14 +230,14 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
+ tr1::shared_ptr<AssociativeCollection<std::string, std::string> > keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
keys->insert("names_cache", "/var/empty");
keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-no-match-no-eol");
- std::tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
+ tr1::shared_ptr<Repository> repo(VDBRepository::make_vdb_repository(
&env, keys));
repo->world_interface->add_to_world(QualifiedPackageName("cat-one/foofoo"));
std::ifstream world("vdb_repository_TEST_dir/world-no-match-no-eol");
diff --git a/paludis/repositories/gentoo/vdb_unmerger.cc b/paludis/repositories/gentoo/vdb_unmerger.cc
index e0195a8..8314b4b 100644
--- a/paludis/repositories/gentoo/vdb_unmerger.cc
+++ b/paludis/repositories/gentoo/vdb_unmerger.cc
@@ -80,7 +80,7 @@ VDBUnmerger::extend_hook(const Hook & h)
std::string pv(stringify(_imp->options.version.remove_revision()));
std::string slot(stringify(_imp->options.repository->version_metadata(_imp->options.package_name, _imp->options.version)->slot));
- std::tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->options.environment->bashrc_files());
+ tr1::shared_ptr<const FSEntryCollection> bashrc_files(_imp->options.environment->bashrc_files());
return Unmerger::extend_hook(h)
("P", pn + "-" + pv)
diff --git a/paludis/repositories/gentoo/xml_things.cc b/paludis/repositories/gentoo/xml_things.cc
index 40839bd..f300579 100644
--- a/paludis/repositories/gentoo/xml_things.cc
+++ b/paludis/repositories/gentoo/xml_things.cc
@@ -30,7 +30,7 @@ using namespace paludis;
extern "C"
{
- std::tr1::shared_ptr<GLSA> PALUDIS_VISIBLE create_glsa_from_xml_file(const std::string &);
+ tr1::shared_ptr<GLSA> PALUDIS_VISIBLE create_glsa_from_xml_file(const std::string &);
}
namespace
@@ -50,7 +50,7 @@ namespace
class Handler
{
private:
- std::tr1::shared_ptr<GLSA> _glsa;
+ tr1::shared_ptr<GLSA> _glsa;
public:
Handler() :
@@ -86,7 +86,7 @@ namespace
}
}
- void handle_package_archs(xmlDocPtr doc, xmlAttr * const attr, std::tr1::shared_ptr<GLSAPackage> pkg)
+ void handle_package_archs(xmlDocPtr doc, xmlAttr * const attr, tr1::shared_ptr<GLSAPackage> pkg)
{
for (xmlAttr * a(attr) ; a ; a = a->next)
{
@@ -122,7 +122,7 @@ namespace
}
}
- void handle_package_children(xmlDocPtr doc, xmlNode * const node, std::tr1::shared_ptr<GLSAPackage> pkg)
+ void handle_package_children(xmlDocPtr doc, xmlNode * const node, tr1::shared_ptr<GLSAPackage> pkg)
{
for (xmlNode * n(node) ; n ; n = n->next)
{
@@ -166,7 +166,7 @@ namespace
{
std::string m;
handle_package_name(doc, n->properties, m);
- std::tr1::shared_ptr<GLSAPackage> pkg(new GLSAPackage(QualifiedPackageName(m)));
+ tr1::shared_ptr<GLSAPackage> pkg(new GLSAPackage(QualifiedPackageName(m)));
handle_package_archs(doc, n->properties, pkg);
handle_package_children(doc, n->children, pkg);
_glsa->add_package(pkg);
@@ -180,17 +180,17 @@ namespace
}
- std::tr1::shared_ptr<GLSA> glsa()
+ tr1::shared_ptr<GLSA> glsa()
{
return _glsa;
}
};
}
-std::tr1::shared_ptr<GLSA>
+tr1::shared_ptr<GLSA>
create_glsa_from_xml_file(const std::string & filename)
{
- std::tr1::shared_ptr<xmlDoc> xml_doc(xmlReadFile(filename.c_str(), 0, 0), &xmlFreeDoc);
+ tr1::shared_ptr<xmlDoc> xml_doc(xmlReadFile(filename.c_str(), 0, 0), &xmlFreeDoc);
if (! xml_doc)
throw GLSAError("Could not parse GLSA", filename);
diff --git a/paludis/repositories/gentoo/xml_things_TEST.cc b/paludis/repositories/gentoo/xml_things_TEST.cc
index 76d8313..8bdbbd9 100644
--- a/paludis/repositories/gentoo/xml_things_TEST.cc
+++ b/paludis/repositories/gentoo/xml_things_TEST.cc
@@ -33,7 +33,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<GLSA> glsa(GLSA::create_from_xml_file("xml_things_TEST_dir/glsa-123456-78.xml"));
+ tr1::shared_ptr<GLSA> glsa(GLSA::create_from_xml_file("xml_things_TEST_dir/glsa-123456-78.xml"));
TEST_CHECK(glsa);
TEST_CHECK_EQUAL("123456-78", glsa->id());
@@ -63,7 +63,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<GLSA> glsa(GLSA::create_from_xml_file("xml_things_TEST_dir/glsa-987654-32.xml"));
+ tr1::shared_ptr<GLSA> glsa(GLSA::create_from_xml_file("xml_things_TEST_dir/glsa-987654-32.xml"));
TEST_CHECK(glsa);
TEST_CHECK_EQUAL("987654-32", glsa->id());
diff --git a/paludis/repositories/repository_maker.cc b/paludis/repositories/repository_maker.cc
index 7693f39..3829b63 100644
--- a/paludis/repositories/repository_maker.cc
+++ b/paludis/repositories/repository_maker.cc
@@ -40,8 +40,8 @@
using namespace paludis;
template class VirtualConstructor<std::string,
- std::tr1::shared_ptr<Repository> (*) (Environment * const,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >),
+ tr1::shared_ptr<Repository> (*) (Environment * const,
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >),
virtual_constructor_not_found::ThrowException<NoSuchRepositoryTypeError> >;
NoSuchRepositoryTypeError::NoSuchRepositoryTypeError(const std::string & format) throw ():
diff --git a/paludis/repositories/repository_maker.hh b/paludis/repositories/repository_maker.hh
index 5d2dc5b..3d8ff6d 100644
--- a/paludis/repositories/repository_maker.hh
+++ b/paludis/repositories/repository_maker.hh
@@ -92,8 +92,8 @@ namespace paludis
*/
class PALUDIS_VISIBLE RepositoryMaker :
public VirtualConstructor<std::string,
- std::tr1::shared_ptr<Repository> (*) (Environment * const,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >),
+ tr1::shared_ptr<Repository> (*) (Environment * const,
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >),
virtual_constructor_not_found::ThrowException<NoSuchRepositoryTypeError> >,
public InstantiationPolicy<RepositoryMaker, instantiation_method::SingletonTag>,
private PrivateImplementationPattern<RepositoryMaker>
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index 06f2b0f..dd16d7f 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -108,7 +108,7 @@ InstalledVirtualsRepository::InstalledVirtualsRepository(const Environment * con
PrivateImplementationPattern<InstalledVirtualsRepository>(
new Implementation<InstalledVirtualsRepository>(env, r))
{
- std::tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
+ tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
config_info->add_kv("format", "installed_virtuals");
_info->add_section(config_info);
}
@@ -132,7 +132,7 @@ InstalledVirtualsRepository::need_entries() const
if (! (*r)->provides_interface)
continue;
- std::tr1::shared_ptr<const RepositoryProvidesInterface::ProvidesCollection> pp(
+ tr1::shared_ptr<const RepositoryProvidesInterface::ProvidesCollection> pp(
(*r)->provides_interface->provided_packages());
for (RepositoryProvidesInterface::ProvidesCollection::Iterator p(
@@ -159,10 +159,10 @@ InstalledVirtualsRepository::need_entries() const
_imp->has_entries = true;
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
InstalledVirtualsRepository::make_installed_virtuals_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > k)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > k)
{
std::string root_str;
@@ -172,7 +172,7 @@ InstalledVirtualsRepository::make_installed_virtuals_repository(
if (root_str.empty())
throw ConfigurationError("No root specified for InstalledVirtualsRepository");
- return std::tr1::shared_ptr<Repository>(new InstalledVirtualsRepository(env, FSEntry(root_str)));
+ return tr1::shared_ptr<Repository>(new InstalledVirtualsRepository(env, FSEntry(root_str)));
}
bool
@@ -189,7 +189,7 @@ InstalledVirtualsRepository::do_query_profile_masks(const QualifiedPackageName &
return false;
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
InstalledVirtualsRepository::do_version_metadata(
const QualifiedPackageName & q,
const VersionSpec & v) const
@@ -227,11 +227,11 @@ InstalledVirtualsRepository::do_has_version(const QualifiedPackageName & q,
return p.first != p.second;
}
-std::tr1::shared_ptr<const VersionSpecCollection>
+tr1::shared_ptr<const VersionSpecCollection>
InstalledVirtualsRepository::do_version_specs(const QualifiedPackageName & q) const
{
if (q.category.data() != "virtual")
- return std::tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
+ return tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
need_entries();
@@ -240,18 +240,18 @@ InstalledVirtualsRepository::do_version_specs(const QualifiedPackageName & q) co
VREntry(q, VersionSpec("0"), QualifiedPackageName("dummy/package"),
RepositoryName("dummy_repository")), EntriesNameComparator()));
- std::tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
+ tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
for ( ; p.first != p.second ; ++p.first)
result->insert(p.first->version);
return result;
}
-std::tr1::shared_ptr<const QualifiedPackageNameCollection>
+tr1::shared_ptr<const QualifiedPackageNameCollection>
InstalledVirtualsRepository::do_package_names(const CategoryNamePart & c) const
{
if (c.data() != "virtual")
- return std::tr1::shared_ptr<QualifiedPackageNameCollection>(new QualifiedPackageNameCollection::Concrete);
+ return tr1::shared_ptr<QualifiedPackageNameCollection>(new QualifiedPackageNameCollection::Concrete);
need_entries();
@@ -261,7 +261,7 @@ InstalledVirtualsRepository::do_package_names(const CategoryNamePart & c) const
RepositoryName("dummy_repository")), EntriesCategoryComparator()));
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
fast_unique_copy(p.first, p.second,
transform_inserter(result->inserter(), EntriesNameExtractor()),
EntriesNameComparator());
@@ -269,10 +269,10 @@ InstalledVirtualsRepository::do_package_names(const CategoryNamePart & c) const
return result;
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
InstalledVirtualsRepository::do_category_names() const
{
- std::tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
+ tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
result->insert(CategoryNamePart("virtual"));
return result;
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index bb6cb13..47bc42a 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -46,20 +46,20 @@ namespace paludis
virtual bool do_query_profile_masks(const QualifiedPackageName &,
const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const VersionMetadata> do_version_metadata(
+ virtual tr1::shared_ptr<const VersionMetadata> do_version_metadata(
const QualifiedPackageName &,
const VersionSpec &) const;
virtual bool do_has_version(const QualifiedPackageName &,
const VersionSpec &) const;
- virtual std::tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
+ virtual tr1::shared_ptr<const VersionSpecCollection> do_version_specs(
const QualifiedPackageName &) const;
- virtual std::tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
+ virtual tr1::shared_ptr<const QualifiedPackageNameCollection> do_package_names(
const CategoryNamePart &) const;
- virtual std::tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
+ virtual tr1::shared_ptr<const CategoryNamePartCollection> do_category_names() const;
virtual bool do_has_package_named(const QualifiedPackageName &) const;
@@ -79,9 +79,9 @@ namespace paludis
/**
* Create an InstalledVirtualsRepository instance.
*/
- static std::tr1::shared_ptr<Repository> make_installed_virtuals_repository(
+ static tr1::shared_ptr<Repository> make_installed_virtuals_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >);
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >);
virtual void invalidate();
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index 16c8701..8a2fd65 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -37,7 +37,7 @@ namespace paludis
{
const Environment * const env;
- mutable std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > > names;
+ mutable std::vector<std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > > names;
mutable bool has_names;
mutable std::vector<VREntry> entries;
@@ -57,8 +57,8 @@ namespace
struct NamesCategoryComparator
{
bool
- operator() (const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & a,
- const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & b) const
+ operator() (const std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > & a,
+ const std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > & b) const
{
return a.first.category < b.first.category;
}
@@ -67,8 +67,8 @@ namespace
struct NamesNameComparator
{
bool
- operator() (const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & a,
- const std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > & b) const
+ operator() (const std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > & a,
+ const std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > & b) const
{
return a.first < b.first;
}
@@ -100,7 +100,7 @@ VirtualsRepository::VirtualsRepository(const Environment * const env) :
PrivateImplementationPattern<VirtualsRepository>(
new Implementation<VirtualsRepository>(env))
{
- std::tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
+ tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
config_info->add_kv("format", "virtuals");
_info->add_section(config_info);
}
@@ -126,18 +126,18 @@ VirtualsRepository::need_names() const
if (! (*r)->provides_interface)
continue;
- std::tr1::shared_ptr<const RepositoryProvidesInterface::ProvidesCollection> provides(
+ tr1::shared_ptr<const RepositoryProvidesInterface::ProvidesCollection> provides(
(*r)->provides_interface->provided_packages());
for (RepositoryProvidesInterface::ProvidesCollection::Iterator p(provides->begin()),
p_end(provides->end()) ; p != p_end ; ++p)
- _imp->names.push_back(std::make_pair(p->virtual_name, std::tr1::shared_ptr<const PackageDepSpec>(
+ _imp->names.push_back(std::make_pair(p->virtual_name, tr1::shared_ptr<const PackageDepSpec>(
new PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(p->provided_by_name))))));
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(p->provided_by_name))))));
}
std::sort(_imp->names.begin(), _imp->names.end(), NamesNameComparator());
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > > new_names;
+ std::vector<std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > > new_names;
for (PackageDatabase::RepositoryIterator r(_imp->env->package_database()->begin_repositories()),
r_end(_imp->env->package_database()->end_repositories()) ; r != r_end ; ++r)
@@ -145,16 +145,16 @@ VirtualsRepository::need_names() const
if (! (*r)->virtuals_interface)
continue;
- std::tr1::shared_ptr<const RepositoryVirtualsInterface::VirtualsCollection> virtuals(
+ tr1::shared_ptr<const RepositoryVirtualsInterface::VirtualsCollection> virtuals(
(*r)->virtuals_interface->virtual_packages());
for (RepositoryVirtualsInterface::VirtualsCollection::Iterator v(virtuals->begin()),
v_end(virtuals->end()) ; v != v_end ; ++v)
{
std::pair<
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator,
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
+ std::vector<std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > >::const_iterator,
+ std::vector<std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
std::equal_range(_imp->names.begin(), _imp->names.end(),
- std::make_pair(v->virtual_name, std::tr1::shared_ptr<const PackageDepSpec>()),
+ std::make_pair(v->virtual_name, tr1::shared_ptr<const PackageDepSpec>()),
NamesNameComparator()));
if (p.first == p.second)
@@ -180,10 +180,10 @@ VirtualsRepository::need_entries() const
Log::get_instance()->message(ll_debug, lc_context, "VirtualsRepository need_entries");
/* Populate our _imp->entries. */
- for (std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator
+ for (std::vector<std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > >::const_iterator
v(_imp->names.begin()), v_end(_imp->names.end()) ; v != v_end ; ++v)
{
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection> matches(_imp->env->package_database()->query(
+ tr1::shared_ptr<const PackageDatabaseEntryCollection> matches(_imp->env->package_database()->query(
query::Matches(*v->second) & query::RepositoryHasInstallableInterface(), qo_order_by_version));
if (matches->empty())
@@ -207,12 +207,12 @@ VirtualsRepository::need_entries() const
_imp->has_entries = true;
}
-std::tr1::shared_ptr<Repository>
+tr1::shared_ptr<Repository>
VirtualsRepository::make_virtuals_repository(
Environment * const env,
- std::tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >)
+ tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >)
{
- return std::tr1::shared_ptr<Repository>(new VirtualsRepository(env));
+ return tr1::shared_ptr<Repository>(new VirtualsRepository(env));
}
bool
@@ -229,7 +229,7 @@ VirtualsRepository::do_query_profile_masks(const QualifiedPackageName &,
return false;
}
-std::tr1::shared_ptr<const VersionMetadata>
+tr1::shared_ptr<const VersionMetadata>
VirtualsRepository::do_version_metadata(
const QualifiedPackageName & q,
const VersionSpec & v) const
@@ -258,8 +258,8 @@ VirtualsRepository::do_version_metadata(
return vif->virtual_package_version_metadata(
RepositoryVirtualsEntry::create()
.virtual_name(p.first->virtual_name)
- .provided_by_spec(std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
- std::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(p.first->provided_by_name))))),
+ .provided_by_spec(tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
+ tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(p.first->provided_by_name))))),
v);
}
@@ -279,11 +279,11 @@ VirtualsRepository::do_has_version(const QualifiedPackageName & q,
return p.first != p.second;
}
-std::tr1::shared_ptr<const VersionSpecCollection>
+tr1::shared_ptr<const VersionSpecCollection>
VirtualsRepository::do_version_specs(const QualifiedPackageName & q) const
{
if (q.category.data() != "virtual")
- return std::tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
+ return tr1::shared_ptr<VersionSpecCollection>(new VersionSpecCollection::Concrete);
need_entries();
@@ -292,39 +292,39 @@ VirtualsRepository::do_version_specs(const QualifiedPackageName & q) const
VREntry(q, VersionSpec("0"), QualifiedPackageName("dummy/package"),
RepositoryName("dummy_repository")), EntriesNameComparator()));
- std::tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
+ tr1::shared_ptr<VersionSpecCollection> result(new VersionSpecCollection::Concrete);
for ( ; p.first != p.second ; ++p.first)
result->insert(p.first->version);
return result;
}
-std::tr1::shared_ptr<const QualifiedPackageNameCollection>
+tr1::shared_ptr<const QualifiedPackageNameCollection>
VirtualsRepository::do_package_names(const CategoryNamePart & c) const
{
if (c.data() != "virtual")
- return std::tr1::shared_ptr<QualifiedPackageNameCollection>(new QualifiedPackageNameCollection::Concrete);
+ return tr1::shared_ptr<QualifiedPackageNameCollection>(new QualifiedPackageNameCollection::Concrete);
need_names();
std::pair<
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator,
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
+ std::vector<std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > >::const_iterator,
+ std::vector<std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
std::equal_range(_imp->names.begin(), _imp->names.end(),
- std::make_pair(c + PackageNamePart("dummy"), std::tr1::shared_ptr<const PackageDepSpec>()),
+ std::make_pair(c + PackageNamePart("dummy"), tr1::shared_ptr<const PackageDepSpec>()),
NamesCategoryComparator()));
- std::tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
+ tr1::shared_ptr<QualifiedPackageNameCollection> result(new QualifiedPackageNameCollection::Concrete);
std::copy(p.first, p.second, transform_inserter(result->inserter(),
- SelectFirst<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> >()));
+ SelectFirst<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> >()));
return result;
}
-std::tr1::shared_ptr<const CategoryNamePartCollection>
+tr1::shared_ptr<const CategoryNamePartCollection>
VirtualsRepository::do_category_names() const
{
- std::tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
+ tr1::shared_ptr<CategoryNamePartCollection> result(new CategoryNamePartCollection::Concrete);
result->insert(CategoryNamePart("virtual"));
return result;
}
@@ -338,10 +338,10 @@ VirtualsRepository::do_has_package_named(const QualifiedPackageName & q) const
need_names();
std::pair<
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator,
- std::vector<std::pair<QualifiedPackageName, std::tr1::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
+ std::vector<std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > >::const_iterator,
+ std::vector<std::pair<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > >::const_iterator> p(
std::equal_range(_imp->names.begin(), _imp->names.end(),
- std::make_pair(q, std::tr1::shared_ptr<const PackageDepSpec>()),
+ std::make_pair(q, tr1::shared_ptr<const PackageDepSpec>()),
NamesNameComparator()));
return p.first != p.second;
diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh
index 0df6450..786dc66 100644
--- a/paludis/repositories/virtuals/virtuals_repository.hh
+++ b/paludis/repositories/virtuals/virtuals_repository.hh
@@ -46,20 +46,20 @@ namespace paludis
virtual bool do_query_profile_masks(const QualifiedPackageName &,