[paludis-commits] r4621 - in trunk: . doc/api/cplusplus/examples doc/configuration misc paludis paludis/args paludis/environments/adapted paludis/environments/no_config paludis/environments/paludis paludis/environments/portage paludis/environments/test paludis/repositories/cran paludis/repositories/e paludis/repositories/e/qa paludis/repositories/fake paludis/repositories/gems paludis/repositories/unpackaged paludis/repositories/virtuals paludis/selinux paludis/util python ruby src/clients/accerso src/clients/adjutrix src/clients/contrarius src/clients/gtkpaludis src/clients/gtkpaludis/libgtkpaludis src/clients/importare src/clients/inquisitio src/clients/instruo src/clients/paludis src/clients/qualudis src/clients/reconcilio src/clients/reconcilio/broken_linkage_finder src/clients/reconcilio/littlelf src/clients/reconcilio/util src/output
ciaranm at svn.pioto.org
ciaranm at svn.pioto.org
Sat Apr 26 13:59:09 UTC 2008
Author: ciaranm
Date: 2008-04-26 13:59:04 +0000 (Sat, 26 Apr 2008)
New Revision: 4621
Added:
trunk/paludis/util/hashes.cc
trunk/paludis/util/hashes.hh
Removed:
trunk/paludis/hashed_containers.cc
trunk/paludis/hashed_containers.hh
trunk/paludis/hashed_containers_TEST.cc
trunk/paludis/util/tr1_functional.hh
trunk/paludis/util/tr1_memory.hh
trunk/paludis/util/tr1_type_traits.hh
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
trunk/doc/api/cplusplus/examples/example_action.cc
trunk/doc/api/cplusplus/examples/example_contents.cc
trunk/doc/api/cplusplus/examples/example_dep_label.cc
trunk/doc/api/cplusplus/examples/example_dep_spec.cc
trunk/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
trunk/doc/api/cplusplus/examples/example_dep_tag.cc
trunk/doc/api/cplusplus/examples/example_dep_tree.cc
trunk/doc/api/cplusplus/examples/example_environment.cc
trunk/doc/api/cplusplus/examples/example_formatter.cc
trunk/doc/api/cplusplus/examples/example_mask.cc
trunk/doc/api/cplusplus/examples/example_match_package.cc
trunk/doc/api/cplusplus/examples/example_metadata_key.cc
trunk/doc/api/cplusplus/examples/example_package_database.cc
trunk/doc/api/cplusplus/examples/example_package_id.cc
trunk/doc/api/cplusplus/examples/example_query.cc
trunk/doc/api/cplusplus/examples/example_query_delegate.cc
trunk/doc/api/cplusplus/examples/example_repository.cc
trunk/doc/api/cplusplus/examples/example_stringify_formatter.cc
trunk/doc/api/cplusplus/examples/example_version_spec.cc
trunk/doc/configuration/hooks.html.part
trunk/misc/make_sr.bash
trunk/paludis/action-fwd.hh
trunk/paludis/action.cc
trunk/paludis/action.hh
trunk/paludis/args/dep_list_args_group.cc
trunk/paludis/args/install_args_group.cc
trunk/paludis/args/install_args_group.hh
trunk/paludis/args/man.cc
trunk/paludis/condition_tracker.cc
trunk/paludis/condition_tracker.hh
trunk/paludis/contents.cc
trunk/paludis/contents.hh
trunk/paludis/dep_label-fwd.hh
trunk/paludis/dep_label.cc
trunk/paludis/dep_label.hh
trunk/paludis/dep_list-fwd.hh
trunk/paludis/dep_list.cc
trunk/paludis/dep_list.hh
trunk/paludis/dep_list.sr
trunk/paludis/dep_list_TEST.cc
trunk/paludis/dep_list_TEST.hh
trunk/paludis/dep_list_TEST_blockers.cc
trunk/paludis/dep_list_exceptions.cc
trunk/paludis/dep_list_exceptions.hh
trunk/paludis/dep_spec-fwd.hh
trunk/paludis/dep_spec.cc
trunk/paludis/dep_spec.hh
trunk/paludis/dep_spec_TEST.cc
trunk/paludis/dep_spec_flattener.cc
trunk/paludis/dep_spec_flattener.hh
trunk/paludis/dep_tag.cc
trunk/paludis/dep_tag.hh
trunk/paludis/dep_tag.sr
trunk/paludis/distribution.cc
trunk/paludis/distribution.hh
trunk/paludis/environment.hh
trunk/paludis/environment_implementation.cc
trunk/paludis/environment_implementation.hh
trunk/paludis/environment_maker.cc
trunk/paludis/environment_maker.hh
trunk/paludis/environments/adapted/adapted_environment.cc
trunk/paludis/environments/adapted/adapted_environment.hh
trunk/paludis/environments/adapted/adapted_environment_TEST.cc
trunk/paludis/environments/no_config/no_config_environment.cc
trunk/paludis/environments/no_config/no_config_environment.hh
trunk/paludis/environments/no_config/no_config_environment.sr
trunk/paludis/environments/no_config/no_config_environment_TEST.cc
trunk/paludis/environments/paludis/bashable_conf.cc
trunk/paludis/environments/paludis/bashable_conf.hh
trunk/paludis/environments/paludis/keywords_conf.cc
trunk/paludis/environments/paludis/keywords_conf.hh
trunk/paludis/environments/paludis/licenses_conf.cc
trunk/paludis/environments/paludis/mirrors_conf.cc
trunk/paludis/environments/paludis/mirrors_conf.hh
trunk/paludis/environments/paludis/package_mask_conf.cc
trunk/paludis/environments/paludis/paludis_config.cc
trunk/paludis/environments/paludis/paludis_config.hh
trunk/paludis/environments/paludis/paludis_environment.cc
trunk/paludis/environments/paludis/paludis_environment.hh
trunk/paludis/environments/paludis/paludis_environment_TEST.cc
trunk/paludis/environments/paludis/registration.cc
trunk/paludis/environments/paludis/repository_config_entry.sr
trunk/paludis/environments/paludis/use_conf.cc
trunk/paludis/environments/paludis/use_conf.hh
trunk/paludis/environments/paludis/use_config_entry.sr
trunk/paludis/environments/paludis/world.cc
trunk/paludis/environments/paludis/world.hh
trunk/paludis/environments/portage/portage_environment.cc
trunk/paludis/environments/portage/portage_environment.hh
trunk/paludis/environments/portage/portage_environment_TEST.cc
trunk/paludis/environments/portage/registration.cc
trunk/paludis/environments/test/test_environment.cc
trunk/paludis/environments/test/test_environment.hh
trunk/paludis/files.m4
trunk/paludis/find_unused_packages_task.cc
trunk/paludis/find_unused_packages_task.hh
trunk/paludis/formatter.hh
trunk/paludis/fuzzy_finder.cc
trunk/paludis/fuzzy_finder_TEST.cc
trunk/paludis/handled_information.cc
trunk/paludis/handled_information.hh
trunk/paludis/hook.hh
trunk/paludis/hooker.cc
trunk/paludis/hooker.hh
trunk/paludis/install_task.cc
trunk/paludis/install_task.hh
trunk/paludis/literal_metadata_key.cc
trunk/paludis/literal_metadata_key.hh
trunk/paludis/mask-fwd.hh
trunk/paludis/mask.hh
trunk/paludis/match_package.cc
trunk/paludis/match_package.hh
trunk/paludis/merger.cc
trunk/paludis/merger.hh
trunk/paludis/merger_TEST.cc
trunk/paludis/metadata_key.cc
trunk/paludis/metadata_key.hh
trunk/paludis/metadata_key_holder.cc
trunk/paludis/metadata_key_holder.hh
trunk/paludis/name.cc
trunk/paludis/name.sr
trunk/paludis/ndbam-fwd.hh
trunk/paludis/ndbam.cc
trunk/paludis/ndbam.hh
trunk/paludis/ndbam_merger.cc
trunk/paludis/ndbam_merger.hh
trunk/paludis/ndbam_unmerger.cc
trunk/paludis/ndbam_unmerger.hh
trunk/paludis/override_functions.cc
trunk/paludis/package_database.cc
trunk/paludis/package_database.hh
trunk/paludis/package_database_TEST.cc
trunk/paludis/package_id-fwd.hh
trunk/paludis/package_id.cc
trunk/paludis/package_id.hh
trunk/paludis/python_hooks.cc
trunk/paludis/qa.cc
trunk/paludis/qa.sr
trunk/paludis/query.cc
trunk/paludis/query.hh
trunk/paludis/query_delegate.cc
trunk/paludis/query_delegate.hh
trunk/paludis/query_visitor.cc
trunk/paludis/query_visitor.hh
trunk/paludis/range_rewriter.cc
trunk/paludis/range_rewriter.hh
trunk/paludis/range_rewriter_TEST.cc
trunk/paludis/report_task.cc
trunk/paludis/report_task.hh
trunk/paludis/repositories/cran/cran_dep_parser.cc
trunk/paludis/repositories/cran/cran_dep_parser.hh
trunk/paludis/repositories/cran/cran_installed_repository.cc
trunk/paludis/repositories/cran/cran_installed_repository.hh
trunk/paludis/repositories/cran/cran_installed_repository_TEST.cc
trunk/paludis/repositories/cran/cran_package_id.cc
trunk/paludis/repositories/cran/cran_package_id.hh
trunk/paludis/repositories/cran/cran_repository.cc
trunk/paludis/repositories/cran/cran_repository.hh
trunk/paludis/repositories/cran/cran_repository_TEST.cc
trunk/paludis/repositories/cran/keys.cc
trunk/paludis/repositories/cran/keys.hh
trunk/paludis/repositories/cran/package_dep_spec.cc
trunk/paludis/repositories/e/aa_visitor_TEST.cc
trunk/paludis/repositories/e/check_fetched_files_visitor.cc
trunk/paludis/repositories/e/check_fetched_files_visitor.hh
trunk/paludis/repositories/e/conditional_dep_spec.cc
trunk/paludis/repositories/e/conditional_dep_spec.hh
trunk/paludis/repositories/e/dep_parser.cc
trunk/paludis/repositories/e/dep_parser.hh
trunk/paludis/repositories/e/dep_parser_TEST.cc
trunk/paludis/repositories/e/dep_spec_pretty_printer.cc
trunk/paludis/repositories/e/dep_spec_pretty_printer.hh
trunk/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
trunk/paludis/repositories/e/dependencies_rewriter.cc
trunk/paludis/repositories/e/e_installed_repository.cc
trunk/paludis/repositories/e/e_installed_repository.hh
trunk/paludis/repositories/e/e_installed_repository_id.cc
trunk/paludis/repositories/e/e_installed_repository_id.hh
trunk/paludis/repositories/e/e_key.cc
trunk/paludis/repositories/e/e_key.hh
trunk/paludis/repositories/e/e_mask.cc
trunk/paludis/repositories/e/e_mask.hh
trunk/paludis/repositories/e/e_repository.cc
trunk/paludis/repositories/e/e_repository.hh
trunk/paludis/repositories/e/e_repository_TEST.cc
trunk/paludis/repositories/e/e_repository_entries.cc
trunk/paludis/repositories/e/e_repository_entries.hh
trunk/paludis/repositories/e/e_repository_id.cc
trunk/paludis/repositories/e/e_repository_id.hh
trunk/paludis/repositories/e/e_repository_mask_file.cc
trunk/paludis/repositories/e/e_repository_mask_file.hh
trunk/paludis/repositories/e/e_repository_news.cc
trunk/paludis/repositories/e/e_repository_params.sr
trunk/paludis/repositories/e/e_repository_profile.cc
trunk/paludis/repositories/e/e_repository_profile.hh
trunk/paludis/repositories/e/e_repository_profile_file.cc
trunk/paludis/repositories/e/e_repository_sets.cc
trunk/paludis/repositories/e/e_repository_sets.hh
trunk/paludis/repositories/e/e_repository_sets_TEST.cc
trunk/paludis/repositories/e/e_stripper.hh
trunk/paludis/repositories/e/eapi-fwd.hh
trunk/paludis/repositories/e/eapi.cc
trunk/paludis/repositories/e/eapi.hh
trunk/paludis/repositories/e/eapi.sr
trunk/paludis/repositories/e/eapi_phase.cc
trunk/paludis/repositories/e/ebuild.cc
trunk/paludis/repositories/e/ebuild.hh
trunk/paludis/repositories/e/ebuild_entries.cc
trunk/paludis/repositories/e/ebuild_entries.hh
trunk/paludis/repositories/e/ebuild_flat_metadata_cache.cc
trunk/paludis/repositories/e/ebuild_flat_metadata_cache.hh
trunk/paludis/repositories/e/ebuild_id.cc
trunk/paludis/repositories/e/ebuild_id.hh
trunk/paludis/repositories/e/eclass_mtimes.cc
trunk/paludis/repositories/e/eclass_mtimes.hh
trunk/paludis/repositories/e/exheres_layout.cc
trunk/paludis/repositories/e/exheres_layout.hh
trunk/paludis/repositories/e/exndbam_id.cc
trunk/paludis/repositories/e/exndbam_id.hh
trunk/paludis/repositories/e/exndbam_repository.cc
trunk/paludis/repositories/e/exndbam_repository.hh
trunk/paludis/repositories/e/exndbam_repository_TEST.cc
trunk/paludis/repositories/e/fetch_visitor.cc
trunk/paludis/repositories/e/fetch_visitor.hh
trunk/paludis/repositories/e/fetch_visitor_TEST.cc
trunk/paludis/repositories/e/fix_locked_dependencies.cc
trunk/paludis/repositories/e/fix_locked_dependencies.hh
trunk/paludis/repositories/e/fix_locked_dependencies_TEST.cc
trunk/paludis/repositories/e/glsa.cc
trunk/paludis/repositories/e/glsa.hh
trunk/paludis/repositories/e/layout.cc
trunk/paludis/repositories/e/layout.hh
trunk/paludis/repositories/e/make_ebuild_repository.cc
trunk/paludis/repositories/e/make_ebuild_repository.hh
trunk/paludis/repositories/e/package_dep_spec.cc
trunk/paludis/repositories/e/package_dep_spec.hh
trunk/paludis/repositories/e/pipe_command_handler.cc
trunk/paludis/repositories/e/pipe_command_handler.hh
trunk/paludis/repositories/e/pretend_fetch_visitor.cc
trunk/paludis/repositories/e/pretend_fetch_visitor.hh
trunk/paludis/repositories/e/qa/categories.cc
trunk/paludis/repositories/e/qa/categories.hh
trunk/paludis/repositories/e/qa/default_functions.cc
trunk/paludis/repositories/e/qa/default_functions.hh
trunk/paludis/repositories/e/qa/default_functions_TEST.cc
trunk/paludis/repositories/e/qa/deprecated_functions.cc
trunk/paludis/repositories/e/qa/deprecated_functions.hh
trunk/paludis/repositories/e/qa/eapi_supported.cc
trunk/paludis/repositories/e/qa/eapi_supported.hh
trunk/paludis/repositories/e/qa/ebuild_count.cc
trunk/paludis/repositories/e/qa/ebuild_count.hh
trunk/paludis/repositories/e/qa/extractors.cc
trunk/paludis/repositories/e/qa/extractors.hh
trunk/paludis/repositories/e/qa/extractors_TEST.cc
trunk/paludis/repositories/e/qa/fetches_key.cc
trunk/paludis/repositories/e/qa/fetches_key.hh
trunk/paludis/repositories/e/qa/function_keyword.cc
trunk/paludis/repositories/e/qa/function_keyword.hh
trunk/paludis/repositories/e/qa/function_keyword_TEST.cc
trunk/paludis/repositories/e/qa/header.cc
trunk/paludis/repositories/e/qa/header.hh
trunk/paludis/repositories/e/qa/homepage_key.cc
trunk/paludis/repositories/e/qa/homepage_key.hh
trunk/paludis/repositories/e/qa/homepage_key_TEST.cc
trunk/paludis/repositories/e/qa/inherited_key.cc
trunk/paludis/repositories/e/qa/inherited_key.hh
trunk/paludis/repositories/e/qa/iuse_key.cc
trunk/paludis/repositories/e/qa/iuse_key.hh
trunk/paludis/repositories/e/qa/keywords_key.cc
trunk/paludis/repositories/e/qa/keywords_key.hh
trunk/paludis/repositories/e/qa/kv_variables.cc
trunk/paludis/repositories/e/qa/kv_variables.hh
trunk/paludis/repositories/e/qa/kv_variables_TEST.cc
trunk/paludis/repositories/e/qa/license_key.cc
trunk/paludis/repositories/e/qa/license_key.hh
trunk/paludis/repositories/e/qa/manifest.cc
trunk/paludis/repositories/e/qa/manifest.hh
trunk/paludis/repositories/e/qa/manifest_TEST.cc
trunk/paludis/repositories/e/qa/metadata_keys.cc
trunk/paludis/repositories/e/qa/metadata_keys.hh
trunk/paludis/repositories/e/qa/qa.cc
trunk/paludis/repositories/e/qa/qa_checks.cc
trunk/paludis/repositories/e/qa/qa_checks.hh
trunk/paludis/repositories/e/qa/qa_checks_group.cc
trunk/paludis/repositories/e/qa/qa_controller.cc
trunk/paludis/repositories/e/qa/qa_controller.hh
trunk/paludis/repositories/e/qa/restrict_key.cc
trunk/paludis/repositories/e/qa/restrict_key.hh
trunk/paludis/repositories/e/qa/root_variable.cc
trunk/paludis/repositories/e/qa/root_variable.hh
trunk/paludis/repositories/e/qa/short_description_key.cc
trunk/paludis/repositories/e/qa/short_description_key.hh
trunk/paludis/repositories/e/qa/spec_keys.cc
trunk/paludis/repositories/e/qa/spec_keys.hh
trunk/paludis/repositories/e/qa/spec_keys_TEST.cc
trunk/paludis/repositories/e/qa/stray_files.cc
trunk/paludis/repositories/e/qa/stray_files.hh
trunk/paludis/repositories/e/qa/subshell_die.cc
trunk/paludis/repositories/e/qa/subshell_die.hh
trunk/paludis/repositories/e/qa/subshell_die_TEST.cc
trunk/paludis/repositories/e/qa/variable_assigns.cc
trunk/paludis/repositories/e/qa/variable_assigns.hh
trunk/paludis/repositories/e/qa/visibility.cc
trunk/paludis/repositories/e/qa/visibility.hh
trunk/paludis/repositories/e/qa/visibility_TEST.cc
trunk/paludis/repositories/e/qa/whitespace.cc
trunk/paludis/repositories/e/qa/whitespace.hh
trunk/paludis/repositories/e/registration.cc
trunk/paludis/repositories/e/source_uri_finder.cc
trunk/paludis/repositories/e/source_uri_finder_TEST.cc
trunk/paludis/repositories/e/traditional_layout.cc
trunk/paludis/repositories/e/traditional_layout.hh
trunk/paludis/repositories/e/use_desc.cc
trunk/paludis/repositories/e/use_requirements.cc
trunk/paludis/repositories/e/use_requirements.hh
trunk/paludis/repositories/e/vdb_id.cc
trunk/paludis/repositories/e/vdb_id.hh
trunk/paludis/repositories/e/vdb_merger.cc
trunk/paludis/repositories/e/vdb_merger.hh
trunk/paludis/repositories/e/vdb_merger_TEST.cc
trunk/paludis/repositories/e/vdb_repository.cc
trunk/paludis/repositories/e/vdb_repository.hh
trunk/paludis/repositories/e/vdb_repository_TEST.cc
trunk/paludis/repositories/e/vdb_unmerger.cc
trunk/paludis/repositories/e/vdb_unmerger.hh
trunk/paludis/repositories/e/vdb_unmerger_TEST.cc
trunk/paludis/repositories/e/xml_things.cc
trunk/paludis/repositories/e/xml_things_TEST.cc
trunk/paludis/repositories/fake/fake_installed_repository.cc
trunk/paludis/repositories/fake/fake_installed_repository.hh
trunk/paludis/repositories/fake/fake_installed_repository_TEST.cc
trunk/paludis/repositories/fake/fake_package_id.cc
trunk/paludis/repositories/fake/fake_package_id.hh
trunk/paludis/repositories/fake/fake_repository.cc
trunk/paludis/repositories/fake/fake_repository.hh
trunk/paludis/repositories/fake/fake_repository_TEST.cc
trunk/paludis/repositories/fake/fake_repository_base.cc
trunk/paludis/repositories/fake/fake_repository_base.hh
trunk/paludis/repositories/gems/gem_specification.cc
trunk/paludis/repositories/gems/gem_specification.hh
trunk/paludis/repositories/gems/gem_specification_TEST.cc
trunk/paludis/repositories/gems/gem_specifications.cc
trunk/paludis/repositories/gems/gem_specifications.hh
trunk/paludis/repositories/gems/gems_repository.cc
trunk/paludis/repositories/gems/gems_repository.hh
trunk/paludis/repositories/gems/installed_gems_repository.cc
trunk/paludis/repositories/gems/installed_gems_repository.hh
trunk/paludis/repositories/gems/registration.cc
trunk/paludis/repositories/gems/yaml.cc
trunk/paludis/repositories/unpackaged/dep_parser.cc
trunk/paludis/repositories/unpackaged/dep_parser.hh
trunk/paludis/repositories/unpackaged/dep_parser_TEST.cc
trunk/paludis/repositories/unpackaged/installed_id.cc
trunk/paludis/repositories/unpackaged/installed_id.hh
trunk/paludis/repositories/unpackaged/installed_repository.cc
trunk/paludis/repositories/unpackaged/installed_repository.hh
trunk/paludis/repositories/unpackaged/installed_repository_TEST.cc
trunk/paludis/repositories/unpackaged/registration.cc
trunk/paludis/repositories/unpackaged/unpackaged_id.cc
trunk/paludis/repositories/unpackaged/unpackaged_id.hh
trunk/paludis/repositories/unpackaged/unpackaged_key.cc
trunk/paludis/repositories/unpackaged/unpackaged_key.hh
trunk/paludis/repositories/unpackaged/unpackaged_repository.cc
trunk/paludis/repositories/unpackaged/unpackaged_repository.hh
trunk/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
trunk/paludis/repositories/unpackaged/unpackaged_stripper.hh
trunk/paludis/repositories/virtuals/installed_virtuals_repository.cc
trunk/paludis/repositories/virtuals/installed_virtuals_repository.hh
trunk/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
trunk/paludis/repositories/virtuals/package_id.cc
trunk/paludis/repositories/virtuals/package_id.hh
trunk/paludis/repositories/virtuals/virtuals_repository.cc
trunk/paludis/repositories/virtuals/virtuals_repository.hh
trunk/paludis/repositories/virtuals/virtuals_repository_TEST.cc
trunk/paludis/repository-fwd.hh
trunk/paludis/repository.cc
trunk/paludis/repository.hh
trunk/paludis/repository_maker.cc
trunk/paludis/repository_maker.hh
trunk/paludis/repository_name_cache.cc
trunk/paludis/repository_name_cache.hh
trunk/paludis/repository_name_cache_TEST.cc
trunk/paludis/selinux/security_context.cc
trunk/paludis/selinux/security_context.hh
trunk/paludis/set_file.cc
trunk/paludis/set_file.hh
trunk/paludis/set_file.sr
trunk/paludis/set_file_TEST.cc
trunk/paludis/show_suggest_visitor.cc
trunk/paludis/show_suggest_visitor.hh
trunk/paludis/stage_builder_task.cc
trunk/paludis/stage_builder_task.hh
trunk/paludis/stringify_formatter-impl.hh
trunk/paludis/stripper.cc
trunk/paludis/sync_task.cc
trunk/paludis/syncer.cc
trunk/paludis/uninstall_list.cc
trunk/paludis/uninstall_list.hh
trunk/paludis/uninstall_list.sr
trunk/paludis/uninstall_list_TEST.cc
trunk/paludis/uninstall_task.cc
trunk/paludis/uninstall_task.hh
trunk/paludis/unmerger.cc
trunk/paludis/unmerger.hh
trunk/paludis/user_dep_spec.cc
trunk/paludis/util/action_queue.cc
trunk/paludis/util/action_queue.hh
trunk/paludis/util/action_queue_TEST.cc
trunk/paludis/util/clone-impl.hh
trunk/paludis/util/clone.hh
trunk/paludis/util/config_file-fwd.hh
trunk/paludis/util/config_file.cc
trunk/paludis/util/config_file.hh
trunk/paludis/util/config_file_TEST.cc
trunk/paludis/util/damerau_levenshtein.cc
trunk/paludis/util/dir_iterator.cc
trunk/paludis/util/exception.cc
trunk/paludis/util/files.m4
trunk/paludis/util/fs_entry.cc
trunk/paludis/util/fs_entry.hh
trunk/paludis/util/graph-impl.hh
trunk/paludis/util/graph.cc
trunk/paludis/util/graph.hh
trunk/paludis/util/indirect_iterator.hh
trunk/paludis/util/indirect_iterator_TEST.cc
trunk/paludis/util/instantiation_policy_TEST.cc
trunk/paludis/util/kc.hh
trunk/paludis/util/log.cc
trunk/paludis/util/make_shared_ptr-fwd.hh
trunk/paludis/util/make_shared_ptr.hh
trunk/paludis/util/member_iterator-fwd.hh
trunk/paludis/util/member_iterator-impl.hh
trunk/paludis/util/member_iterator.hh
trunk/paludis/util/remove_shared_ptr.hh
trunk/paludis/util/save.hh
trunk/paludis/util/save_TEST.cc
trunk/paludis/util/stringify.hh
trunk/paludis/util/system.cc
trunk/paludis/util/system.hh
trunk/paludis/util/system_TEST.cc
trunk/paludis/util/thread.cc
trunk/paludis/util/thread.hh
trunk/paludis/util/thread_TEST.cc
trunk/paludis/util/thread_pool.cc
trunk/paludis/util/thread_pool.hh
trunk/paludis/util/thread_pool_TEST.cc
trunk/paludis/util/virtual_constructor-impl.hh
trunk/paludis/util/virtual_constructor_TEST.cc
trunk/paludis/util/visitor-impl.hh
trunk/paludis/util/visitor.hh
trunk/paludis/util/visitor_TEST.cc
trunk/paludis/util/visitor_cast.hh
trunk/paludis/util/visitor_cast_TEST.cc
trunk/paludis/util/wrapped_forward_iterator.hh
trunk/paludis/version_requirements-fwd.hh
trunk/paludis/version_spec.cc
trunk/paludis/version_spec.hh
trunk/paludis/version_spec_TEST.cc
trunk/python/action.cc
trunk/python/additional_tests.cc
trunk/python/contents.cc
trunk/python/dep_label.cc
trunk/python/dep_list.cc
trunk/python/dep_spec.cc
trunk/python/dep_spec.hh
trunk/python/dep_tag.cc
trunk/python/environment.cc
trunk/python/exception.cc
trunk/python/exception.hh
trunk/python/iterable.hh
trunk/python/mask.cc
trunk/python/metadata_key.cc
trunk/python/package_database.cc
trunk/python/paludis_python.hh
trunk/python/query.cc
trunk/python/repository.cc
trunk/ruby/action.cc
trunk/ruby/contents.cc
trunk/ruby/dep_list.cc
trunk/ruby/dep_spec.cc
trunk/ruby/dep_tag.cc
trunk/ruby/environment.cc
trunk/ruby/find_unused_packages_task.cc
trunk/ruby/mask.cc
trunk/ruby/metadata_key.cc
trunk/ruby/package_database.cc
trunk/ruby/package_id.cc
trunk/ruby/paludis_ruby.cc
trunk/ruby/paludis_ruby.hh
trunk/ruby/repository.cc
trunk/src/clients/accerso/accerso.cc
trunk/src/clients/adjutrix/adjutrix.cc
trunk/src/clients/adjutrix/display_default_system_resolution.cc
trunk/src/clients/adjutrix/downgrade_check.cc
trunk/src/clients/adjutrix/find_dropped_keywords.cc
trunk/src/clients/adjutrix/find_insecure_packages.cc
trunk/src/clients/adjutrix/find_reverse_deps.cc
trunk/src/clients/adjutrix/find_stable_candidates.cc
trunk/src/clients/adjutrix/find_unused_packages.cc
trunk/src/clients/adjutrix/keywords_graph.cc
trunk/src/clients/adjutrix/what_needs_keywording.cc
trunk/src/clients/contrarius/contrarius.cc
trunk/src/clients/contrarius/contrarius_stage_options.sr
trunk/src/clients/contrarius/install.cc
trunk/src/clients/contrarius/install.hh
trunk/src/clients/contrarius/stage.cc
trunk/src/clients/contrarius/stage.hh
trunk/src/clients/contrarius/stage_builder.cc
trunk/src/clients/contrarius/stage_builder.hh
trunk/src/clients/gtkpaludis/gtkpaludis.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/categories_list.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/messages_page.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/package_buttons.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/package_buttons.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/packages_list.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/packages_list_filtered_model.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/packages_page.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/packages_page.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/repository_buttons.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/sets_list.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/task_window.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/threaded_window.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/version_info_model.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/versions_list.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.hh
trunk/src/clients/gtkpaludis/libgtkpaludis/versions_page.cc
trunk/src/clients/gtkpaludis/libgtkpaludis/versions_page.hh
trunk/src/clients/importare/importare.cc
trunk/src/clients/importare/install.cc
trunk/src/clients/importare/install.hh
trunk/src/clients/inquisitio/do_search.cc
trunk/src/clients/inquisitio/inquisitio.cc
trunk/src/clients/inquisitio/key_extractor.cc
trunk/src/clients/inquisitio/matcher.cc
trunk/src/clients/inquisitio/matcher.hh
trunk/src/clients/instruo/instruo.cc
trunk/src/clients/paludis/applets.cc
trunk/src/clients/paludis/applets.hh
trunk/src/clients/paludis/do_config.cc
trunk/src/clients/paludis/do_config.hh
trunk/src/clients/paludis/do_contents.cc
trunk/src/clients/paludis/do_contents.hh
trunk/src/clients/paludis/do_executables.cc
trunk/src/clients/paludis/do_executables.hh
trunk/src/clients/paludis/info.cc
trunk/src/clients/paludis/info.hh
trunk/src/clients/paludis/install.cc
trunk/src/clients/paludis/install.hh
trunk/src/clients/paludis/list.cc
trunk/src/clients/paludis/list.hh
trunk/src/clients/paludis/owner.cc
trunk/src/clients/paludis/owner.hh
trunk/src/clients/paludis/paludis.cc
trunk/src/clients/paludis/query.cc
trunk/src/clients/paludis/query.hh
trunk/src/clients/paludis/report.cc
trunk/src/clients/paludis/report.hh
trunk/src/clients/paludis/sync.cc
trunk/src/clients/paludis/sync.hh
trunk/src/clients/paludis/uninstall.cc
trunk/src/clients/paludis/uninstall.hh
trunk/src/clients/qualudis/qualudis.cc
trunk/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc
trunk/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.hh
trunk/src/clients/reconcilio/broken_linkage_finder/configuration.cc
trunk/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc
trunk/src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.hh
trunk/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc
trunk/src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.hh
trunk/src/clients/reconcilio/broken_linkage_finder/linkage_checker.hh
trunk/src/clients/reconcilio/fix_linkage.cc
trunk/src/clients/reconcilio/fix_linkage.hh
trunk/src/clients/reconcilio/install.cc
trunk/src/clients/reconcilio/install.hh
trunk/src/clients/reconcilio/littlelf/elf.cc
trunk/src/clients/reconcilio/littlelf/elf_dynamic_section.cc
trunk/src/clients/reconcilio/littlelf/elf_dynamic_section.hh
trunk/src/clients/reconcilio/reconcilio.cc
trunk/src/clients/reconcilio/util/wildcard_expander.cc
trunk/src/output/colour_formatter.cc
trunk/src/output/colour_formatter.hh
trunk/src/output/console_install_task.cc
trunk/src/output/console_install_task.hh
trunk/src/output/console_install_task.sr
trunk/src/output/console_query_task.cc
trunk/src/output/console_query_task.hh
trunk/src/output/mask_displayer.cc
trunk/src/output/mask_displayer.hh
Log:
paludis::tr1:: is dead. We no longer support compilers that don't do tr1 (that means you, gcc-3).
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/ChangeLog 2008-04-26 13:59:04 UTC (rev 4621)
@@ -5,6 +5,11 @@
only listed in SVN log. For a summary of what has changed between releases,
see the NEWS file. This file is occasionally pruned to ChangeLog.old.bz2.
+2008-04-26 Ciaran McCreesh
+
+ * (everything): paludis::tr1:: is dead. We no longer support compilers
+ that don't do tr1 (that means you, gcc-3).
+
2008-04-25 Ciaran McCreesh
* NEWS, configure.ac: Preparation for 0.26.0.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/NEWS 2008-04-26 13:59:04 UTC (rev 4621)
@@ -4,6 +4,10 @@
This file lists the major changes between versions. For a more detailed list
of every change, see the ChangeLog.
+trunk/:
+ * Compilers without tr1 memory, type traits and functional support are no
+ longer supported. This means you, gcc-3.
+
0.26.0:
* Fixed gcc-3.4 compile.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/configure.ac 2008-04-26 13:59:04 UTC (rev 4621)
@@ -267,46 +267,12 @@
m.insert(std::make_pair(1, 2));
}
],
- [
- AC_MSG_RESULT([std::tr1::unordered_map])
- PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_HASH_IS_STD_TR1_UNORDERED=1"
- PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_HASH_IS_STD_TR1_UNORDERED=1"
- ],
- [
- AC_COMPILE_IFELSE([
-#include <ext/hash_map>
-int main(int, char **)
-{
- __gnu_cxx::hash_map<int, int> m;
- m.insert(std::make_pair(1, 2));
-}
-],
- [
- AC_MSG_RESULT([__gnu_cxx::hash_map])
- PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_HASH_IS_GNU_CXX_HASH=1"
- PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_HASH_IS_GNU_CXX_HASH=1"
- ],
- [
- AC_COMPILE_IFELSE([
-#include <hash_map>
-int main(int, char **)
-{
- std::hash_map<int, int> m;
- m.insert(std::make_pair(1, 2));
-}
-],
- [
- AC_MSG_RESULT([std::hash_map])
- PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_HASH_IS_STD_HASH=1"
- PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_HASH_IS_STD_HASH=1"
- ],
- [
- AC_MSG_RESULT([no, falling back to std::map (slower)])
- ])])])
+ [AC_MSG_RESULT([std::tr1::unordered_map])],
+ [AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Your compiler doesn't support tr1])])
dnl }}}
dnl {{{ tr1 shared pointers
-need_pointer_wrappers=no
AC_MSG_CHECKING([for std::tr1::shared_ptr<>])
AC_COMPILE_IFELSE([
#include <tr1/memory>
@@ -316,31 +282,12 @@
return *x;
}
],
- [AC_MSG_RESULT([yes])
- PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_MEMORY_IS_STD_TR1=1"
- PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_TR1_MEMORY_IS_STD_TR1=1"
- ],
+ [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
- AC_MSG_CHECKING([for boost::shared_ptr<>])
- AC_COMPILE_IFELSE([
-#include <boost/shared_ptr.hpp>
-int main(int, char **)
-{
- boost::shared_ptr<int> x(new int(10));
- return *x;
-}
-],
- [AC_MSG_RESULT([yes])
- PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_MEMORY_IS_BOOST=1"
- PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -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])])])
-AM_CONDITIONAL([NEED_POINTER_WRAPPERS], test x$need_pointer_wrappers = "xyes")
+ AC_MSG_ERROR([Your compiler doesn't support tr1])])
dnl }}}
dnl {{{ tr1 type traits
-need_type_traits_wrappers=no
AC_MSG_CHECKING([for std::tr1::remove_pointer<>])
AC_COMPILE_IFELSE([
#include <tr1/type_traits>
@@ -350,31 +297,12 @@
return x;
}
],
- [AC_MSG_RESULT([yes])
- PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_TYPE_TRAITS_IS_STD_TR1=1"
- PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_TR1_TYPE_TRAITS_IS_STD_TR1=1"
- ],
+ [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
- AC_MSG_CHECKING([for boost::remove_pointer<>])
- AC_COMPILE_IFELSE([
-#include <boost/type_traits.hpp>
-int main(int, char **)
-{
- boost::remove_pointer<int *>::type x(10);
- return x;
-}
-],
- [AC_MSG_RESULT([yes])
- PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_TYPE_TRAITS_IS_BOOST=1"
- PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -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])])])
-AM_CONDITIONAL([NEED_TYPE_TRAITS_WRAPPERS], test x$need_type_traits_wrappers = "xyes")
+ AC_MSG_ERROR([Your compiler doesn't support tr1])])
dnl }}}
dnl {{{ tr1 binders
-need_bind_wrappers=no
AC_MSG_CHECKING([for std::tr1::bind<>])
AC_COMPILE_IFELSE([
#include <tr1/functional>
@@ -396,39 +324,9 @@
std::tr1::bind(std::tr1::mem_fn(&S::x), &s, _1));
}
],
- [AC_MSG_RESULT([yes])
- PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_FUNCTIONAL_IS_STD_TR1=1"
- PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_TR1_FUNCTIONAL_IS_STD_TR1=1"
- ],
+ [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
- AC_MSG_CHECKING([for boost::bind<>])
- AC_COMPILE_IFELSE([
-#include <boost/bind.hpp>
-#include <boost/mem_fn.hpp>
-#include <functional>
-#include <algorithm>
-#include <list>
-struct S
-{
- void x(const int) const
- {
- }
-};
-int main(int, char **)
-{
- std::list<int> l;
- S s;
- std::for_each(l.begin(), l.end(),
- boost::bind(boost::mem_fn(&S::x), &s, _1));
-}
-],
- [AC_MSG_RESULT([yes])
- PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_TR1_FUNCTIONAL_IS_BOOST=1"
- PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -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])])])
-AM_CONDITIONAL([NEED_BIND_WRAPPERS], test x$need_bind_wrappers = "xyes")
+ AC_MSG_ERROR([Your compiler doesn't support tr1])])
dnl }}}
need_xml_check=
Modified: trunk/doc/api/cplusplus/examples/example_action.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_action.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_action.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -33,11 +33,11 @@
"example_action", "EXAMPLE_ACTION_OPTIONS", "EXAMPLE_ACTION_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for 'sys-apps/paludis'. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::Matches(make_package_dep_spec().package(QualifiedPackageName("sys-apps/paludis"))),
qo_order_by_version));
Modified: trunk/doc/api/cplusplus/examples/example_contents.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_contents.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_contents.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -75,11 +75,11 @@
"example_contents", "EXAMPLE_CONTENTS_OPTIONS", "EXAMPLE_CONTENTS_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for installed 'sys-apps/paludis'. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::Matches(make_package_dep_spec().package(QualifiedPackageName("sys-apps/paludis"))) &
query::SupportsAction<InstalledAction>(),
qo_order_by_version));
@@ -100,7 +100,7 @@
/* Visit the contents key's value's entries with our visitor. We use
* indirect_iterator because value()->begin() and ->end() return
- * iterators to tr1::shared_ptr<>s rather than raw objects. */
+ * iterators to std::tr1::shared_ptr<>s rather than raw objects. */
ContentsPrinter p;
std::for_each(
indirect_iterator((*i)->contents_key()->value()->begin()),
Modified: trunk/doc/api/cplusplus/examples/example_dep_label.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_dep_label.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_dep_label.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -155,11 +155,11 @@
"example_dep_label", "EXAMPLE_DEP_LABEL_OPTIONS", "EXAMPLE_DEP_LABEL_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for all installed packages. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::SupportsAction<InstalledAction>(),
qo_whatever));
Modified: trunk/doc/api/cplusplus/examples/example_dep_spec.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_dep_spec.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_dep_spec.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -41,7 +41,7 @@
"example_dep_spec", "EXAMPLE_DEP_SPEC_OPTIONS", "EXAMPLE_DEP_SPEC_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* For each command line parameter... */
@@ -122,7 +122,7 @@
/* And display packages matching that spec */
cout << " " << left << setw(24) << "Matches:" << " ";
- tr1::shared_ptr<const PackageIDSequence> ids(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(
env->package_database()->query(query::Matches(spec), qo_order_by_version));
bool need_indent(false);
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
Modified: trunk/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_dep_spec_flattener.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_dep_spec_flattener.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -38,11 +38,11 @@
"example_dep_spec_flattener", "EXAMPLE_DEP_SPEC_FLATTENER_OPTIONS", "EXAMPLE_DEP_SPEC_FLATTENER_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for all installed packages. */
- tr1::shared_ptr<const PackageIDSequence> ids(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(
env->package_database()->query(
query::SupportsAction<InstalledAction>(),
qo_order_by_version));
@@ -64,7 +64,7 @@
(*i)->provide_key()->value()->accept(provides);
/* The results are available through DepSpecFlattener::begin()
- * and ::end(). These return an iterator to a tr1::shared_ptr<>,
+ * and ::end(). These return an iterator to a std::tr1::shared_ptr<>,
* so we use indirect_iterator to add a level of dereferencing.*/
cout << " " << left << setw(24) << "Provides:" << " "
<< join(indirect_iterator(provides.begin()), indirect_iterator(provides.end()), " ")
Modified: trunk/doc/api/cplusplus/examples/example_dep_tag.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_dep_tag.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_dep_tag.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -78,11 +78,11 @@
/* Display information about a named set. */
void display_set(
- const tr1::shared_ptr<const Environment> & env,
+ const std::tr1::shared_ptr<const Environment> & env,
const SetName & name,
SeenCategories & seen_categories)
{
- tr1::shared_ptr<const SetSpecTree::ConstItem> set(env->set(name));
+ std::tr1::shared_ptr<const SetSpecTree::ConstItem> set(env->set(name));
/* Environment::set can return a zero pointer, if a set is not known. */
if (! set)
@@ -132,7 +132,7 @@
"example_dep_tag", "EXAMPLE_DEP_TAG_OPTIONS", "EXAMPLE_DEP_TAG_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
SeenCategories seen_categories;
@@ -153,7 +153,7 @@
/* Fetch the category. DepTagCategoryMaker::find_maker returns a
* function that creates the category, rather than directly
* returning the category. */
- tr1::shared_ptr<const DepTagCategory> category(
+ std::tr1::shared_ptr<const DepTagCategory> category(
DepTagCategoryMaker::get_instance()->find_maker(*s)());
cout << left << setw(20) << " Visible:" << " " << boolalpha << category->visible() << endl;
Modified: trunk/doc/api/cplusplus/examples/example_dep_tree.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_dep_tree.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_dep_tree.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -52,15 +52,15 @@
public ConstVisitor<DependencySpecTree>::VisitConstSequence<DependenciesCollector, AnyDepSpec>
{
private:
- const tr1::shared_ptr<const Environment> _env;
- const tr1::shared_ptr<const PackageID> _id;
+ const std::tr1::shared_ptr<const Environment> _env;
+ const std::tr1::shared_ptr<const PackageID> _id;
ResultsMap & _results;
std::set<SetName> _recursing_sets;
public:
DependenciesCollector(
- const tr1::shared_ptr<const Environment> & e,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const Environment> & e,
+ const std::tr1::shared_ptr<const PackageID> & i,
ResultsMap & r) :
_env(e),
_id(i),
@@ -92,7 +92,7 @@
void visit_leaf(const NamedSetDepSpec & spec)
{
/* For named set specs, we visit the set. */
- tr1::shared_ptr<const SetSpecTree::ConstItem> set(_env->set(spec.name()));
+ std::tr1::shared_ptr<const SetSpecTree::ConstItem> set(_env->set(spec.name()));
/* First complication: we might have a name referring to a set
* that doesn't exist. */
@@ -140,14 +140,14 @@
public ConstVisitor<FetchableURISpecTree>::VisitConstSequence<FileExtensionsCollector, AllDepSpec>
{
private:
- const tr1::shared_ptr<const Environment> _env;
- const tr1::shared_ptr<const PackageID> _id;
+ const std::tr1::shared_ptr<const Environment> _env;
+ const std::tr1::shared_ptr<const PackageID> _id;
ResultsMap & _results;
public:
FileExtensionsCollector(
- const tr1::shared_ptr<const Environment> & e,
- const tr1::shared_ptr<const PackageID> & i,
+ const std::tr1::shared_ptr<const Environment> & e,
+ const std::tr1::shared_ptr<const PackageID> & i,
ResultsMap & r) :
_env(e),
_id(i),
@@ -190,11 +190,11 @@
"example_dep_tree", "EXAMPLE_DEP_TREE_OPTIONS", "EXAMPLE_DEP_TREE_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for all installed packages. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::SupportsAction<InstalledAction>(),
qo_order_by_version));
Modified: trunk/doc/api/cplusplus/examples/example_environment.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_environment.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_environment.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -43,7 +43,7 @@
* the environment class to use (e.g. 'paludis', 'portage') and the
* second part is passed as parameters to be handled by that
* environment's constructor. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* A lot of the Environment members aren't very useful to clients. The
@@ -54,7 +54,7 @@
* change in the future) use flag queries. The package database has its
* own examples, so we'll start with sets: */
- tr1::shared_ptr<SetSpecTree::ConstItem> world(env->set(SetName("world")));
+ std::tr1::shared_ptr<SetSpecTree::ConstItem> world(env->set(SetName("world")));
if (world)
{
/* See \ref example_dep_tree.cc "example_dep_tree.cc" for how to
@@ -65,7 +65,7 @@
cout << "No world set defined" << endl;
/* And use flags, for which we need a package IDs: */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::Matches(make_package_dep_spec().package(QualifiedPackageName("sys-apps/paludis"))) &
query::SupportsAction<InstalledAction>(),
qo_order_by_version));
Modified: trunk/doc/api/cplusplus/examples/example_formatter.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_formatter.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_formatter.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -155,11 +155,11 @@
"example_formatter", "EXAMPLE_FORMATTER_OPTIONS", "EXAMPLE_FORMATTER_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for installable 'sys-apps/paludis'. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::Matches(make_package_dep_spec().package(QualifiedPackageName("sys-apps/paludis"))) &
query::SupportsAction<InstallAction>(),
qo_order_by_version));
Modified: trunk/doc/api/cplusplus/examples/example_mask.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_mask.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_mask.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -80,11 +80,11 @@
"example_mask", "EXAMPLE_MASK_OPTIONS", "EXAMPLE_MASK_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for 'sys-apps/paludis'. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::Matches(make_package_dep_spec().package(QualifiedPackageName("sys-apps/paludis"))),
qo_order_by_version));
Modified: trunk/doc/api/cplusplus/examples/example_match_package.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_match_package.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_match_package.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -36,17 +36,17 @@
"example_match_package", "EXAMPLE_MATCH_PACKAGE_OPTIONS", "EXAMPLE_MATCH_PACKAGE_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch all installed packages. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::SupportsAction<InstalledAction>(),
qo_order_by_version));
/* Fetch the 'system' and 'world' sets. Ordinarily we should check for
* zero pointers here, but these two sets will always exist. */
- tr1::shared_ptr<const SetSpecTree::ConstItem> system(env->set(SetName("system"))),
+ std::tr1::shared_ptr<const SetSpecTree::ConstItem> system(env->set(SetName("system"))),
world(env->set(SetName("world")));
/* For each ID: */
Modified: trunk/doc/api/cplusplus/examples/example_metadata_key.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_metadata_key.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_metadata_key.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -76,10 +76,10 @@
cout << indent << left << setw(30) << " Value:" << " " << key.value() << endl;
}
- void visit(const MetadataValueKey<tr1::shared_ptr<const PackageID> > & key)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & key)
{
cout << indent << left << setw(30) << " Class:" << " " <<
- "MetadataValueKey<tr1::shared_ptr<const PackageID> >" << endl;
+ "MetadataValueKey<std::tr1::shared_ptr<const PackageID> >" << endl;
cout << indent << left << setw(30) << " Value:" << " " << *key.value() << endl;
}
@@ -95,21 +95,21 @@
cout << indent << left << setw(30) << " Value:" << " " << buf << endl;
}
- void visit(const MetadataValueKey<tr1::shared_ptr<const Contents> > &)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > &)
{
cout << indent << left << setw(30) << " Class:" << " " <<
- "MetadataValueKey<tr1::shared_ptr<const Contents> > " << endl;
+ "MetadataValueKey<std::tr1::shared_ptr<const Contents> > " << endl;
/* We won't display the contents of the contents key here, since
* it involves creating another visitor. See \ref
* example_contents.cc "example_contents.cc" for that. */
}
- void visit(const MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> > & key)
+ void visit(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > & key)
{
cout << indent << left << setw(30) << " Class:" << " " <<
- "MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> >" << endl;
+ "MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> >" << endl;
- /* MetadataValueKey<tr1::shared_ptr<const RepositoryMaskInfo> >::value()
+ /* MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> >::value()
* can return a zero pointer. Other keys can't. */
if (key.value())
{
@@ -255,11 +255,11 @@
"example_metadata_key", "EXAMPLE_METADATA_KEY_OPTIONS", "EXAMPLE_METADATA_KEY_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for 'sys-apps/paludis'. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::Matches(make_package_dep_spec().package(QualifiedPackageName("sys-apps/paludis"))),
qo_order_by_version));
@@ -273,7 +273,7 @@
for (PackageID::MetadataConstIterator k((*i)->begin_metadata()), k_end((*i)->end_metadata()) ;
k != k_end ; ++k)
{
- /* Display it. Note that PackageID::MetadataConstIterator returns a tr1::shared_ptr
+ /* Display it. Note that PackageID::MetadataConstIterator returns a std::tr1::shared_ptr
* to a key, so we dereference twice (or we could have used IndirectIterator). */
show_key(**k);
cout << endl;
@@ -294,7 +294,7 @@
k != k_end ; ++k)
{
/* Display it. Repository::MetadataConstIterator also returns a
- * tr1::shared_ptr to the key. */
+ * std::tr1::shared_ptr to the key. */
show_key(**k);
cout << endl;
}
Modified: trunk/doc/api/cplusplus/examples/example_package_database.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_package_database.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_package_database.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -37,14 +37,14 @@
"example_package_database", "EXAMPLE_PACKAGE_DATABASE_OPTIONS", "EXAMPLE_PACKAGE_DATABASE_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* The most useful PackageDatabase method is PackageDatabase::query,
* which is covered in other examples. But there are others: */
if (env->package_database()->has_repository_named(RepositoryName("gentoo")))
{
- tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(RepositoryName("gentoo")));
+ std::tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(RepositoryName("gentoo")));
cout << "Repository 'gentoo' exists, and has format '" <<
(repo->format_key() ? repo->format_key()->value() : "") << "'" << endl;
}
Modified: trunk/doc/api/cplusplus/examples/example_package_id.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_package_id.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_package_id.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -42,11 +42,11 @@
"example_package_id", "EXAMPLE_PACKAGE_ID_OPTIONS", "EXAMPLE_PACKAGE_ID_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for 'sys-apps/paludis'. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::Matches(make_package_dep_spec().package(QualifiedPackageName("sys-apps/paludis"))),
qo_order_by_version));
Modified: trunk/doc/api/cplusplus/examples/example_query.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_query.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_query.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -29,14 +29,14 @@
namespace
{
/* Run a particular query, and show its results. */
- void show_query(const tr1::shared_ptr<const Environment> & env, const Query & query)
+ void show_query(const std::tr1::shared_ptr<const Environment> & env, const Query & query)
{
/* Queries support a crude form of stringification. */
cout << query << ":" << endl;
/* Usually the only thing clients will do with a Query object is pass it
* to PackageDatabase::query. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(query, qo_order_by_version));
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(query, qo_order_by_version));
/* Show the results */
if (! ids->empty())
@@ -56,7 +56,7 @@
"example_action", "EXAMPLE_ACTION_OPTIONS", "EXAMPLE_ACTION_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Make some queries, and display what they give. */
Modified: trunk/doc/api/cplusplus/examples/example_query_delegate.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_query_delegate.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_query_delegate.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -42,12 +42,12 @@
{
}
- tr1::shared_ptr<PackageIDSequence>
+ std::tr1::shared_ptr<PackageIDSequence>
ids(const Environment & e,
- tr1::shared_ptr<const RepositoryNameSequence> repos,
- tr1::shared_ptr<const QualifiedPackageNameSet> pkgs) const
+ std::tr1::shared_ptr<const RepositoryNameSequence> repos,
+ std::tr1::shared_ptr<const QualifiedPackageNameSet> pkgs) const
{
- tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
+ std::tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
/* We have to iterate over every repository by hand... */
for (RepositoryNameSequence::ConstIterator r(repos->begin()), r_end(repos->end()) ;
@@ -55,12 +55,12 @@
{
/* And from each repository, we iterate over packages by
* hand... */
- tr1::shared_ptr<const Repository> repo(e.package_database()->fetch_repository(*r));
+ std::tr1::shared_ptr<const Repository> repo(e.package_database()->fetch_repository(*r));
for (QualifiedPackageNameSet::ConstIterator p(pkgs->begin()), p_end(pkgs->end()) ;
p != p_end ; ++p)
{
/* And finally, IDs by hand... */
- tr1::shared_ptr<const PackageIDSequence> i(repo->package_ids(*p));
+ std::tr1::shared_ptr<const PackageIDSequence> i(repo->package_ids(*p));
for (PackageIDSequence::ConstIterator v(i->begin()), v_end(i->end()) ;
v != v_end ; ++v)
{
@@ -89,20 +89,20 @@
{
public:
DescriptionContains(const std::string & pattern) :
- Query(tr1::shared_ptr<QueryDelegate>(new DescriptionContainsDelegate(pattern)))
+ Query(std::tr1::shared_ptr<QueryDelegate>(new DescriptionContainsDelegate(pattern)))
{
}
};
/* Run a particular query, and show its results. */
- void show_query(const tr1::shared_ptr<const Environment> & env, const Query & query)
+ void show_query(const std::tr1::shared_ptr<const Environment> & env, const Query & query)
{
/* Queries support a crude form of stringification. */
cout << query << ":" << endl;
/* Usually the only thing clients will do with a Query object is pass it
* to PackageDatabase::query. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(query, qo_order_by_version));
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(query, qo_order_by_version));
/* Show the results */
if (! ids->empty())
@@ -122,7 +122,7 @@
"example_query_delegate", "EXAMPLE_QUERY_DELEGATE", "EXAMPLE_QUERY_DELEGATE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Make some queries, and display what they give. */
Modified: trunk/doc/api/cplusplus/examples/example_repository.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_repository.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_repository.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -35,7 +35,7 @@
"example_environment", "EXAMPLE_ENVIRONMENT_OPTIONS", "EXAMPLE_ENVIRONMENT_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* For each repository... */
@@ -61,9 +61,9 @@
* packages, IDs and so on. These methods are used by
* PackageDatabase::query, but are also sometimes of direct use to
* clients. */
- tr1::shared_ptr<const CategoryNamePartSet> cats((*r)->category_names());
+ std::tr1::shared_ptr<const CategoryNamePartSet> cats((*r)->category_names());
cout << left << setw(30) << " Number of categories:" << " " << cats->size() << endl;
- tr1::shared_ptr<const PackageIDSequence> ids((*r)->package_ids(QualifiedPackageName("sys-apps/paludis")));
+ std::tr1::shared_ptr<const PackageIDSequence> ids((*r)->package_ids(QualifiedPackageName("sys-apps/paludis")));
cout << left << setw(30) << " IDs for sys-apps/paludis:" << " " <<
join(indirect_iterator(ids->begin()), indirect_iterator(ids->end()), " ") << endl;
Modified: trunk/doc/api/cplusplus/examples/example_stringify_formatter.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_stringify_formatter.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_stringify_formatter.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -34,11 +34,11 @@
"example_stringify_formatter", "EXAMPLE_STRINGIFY_FORMATTER_OPTIONS", "EXAMPLE_STRINGIFY_FORMATTER_CMDLINE");
/* We start with an Environment, respecting the user's '--environment' choice. */
- tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
+ std::tr1::shared_ptr<Environment> env(EnvironmentMaker::get_instance()->make_from_spec(
CommandLine::get_instance()->a_environment.argument()));
/* Fetch package IDs for installable 'sys-apps/paludis'. */
- tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> ids(env->package_database()->query(
query::Matches(make_package_dep_spec().package(QualifiedPackageName("sys-apps/paludis"))) &
query::SupportsAction<InstallAction>(),
qo_order_by_version));
Modified: trunk/doc/api/cplusplus/examples/example_version_spec.cc
===================================================================
--- trunk/doc/api/cplusplus/examples/example_version_spec.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/api/cplusplus/examples/example_version_spec.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -56,7 +56,7 @@
/* Show the output of various members. Not all of these are of much
* direct use. */
- cout << " " << left << setw(24) << "Hash value:" << " " << "0x" << hex << v->hash_value() << endl;
+ cout << " " << left << setw(24) << "Hash value:" << " " << "0x" << hex << v->hash() << endl;
cout << " " << left << setw(24) << "Remove revision:" << " " << v->remove_revision() << endl;
cout << " " << left << setw(24) << "Revision only:" << " " << v->revision_only() << endl;
cout << " " << left << setw(24) << "Bump:" << " " << v->bump() << endl;
Modified: trunk/doc/configuration/hooks.html.part
===================================================================
--- trunk/doc/configuration/hooks.html.part 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/doc/configuration/hooks.html.part 2008-04-26 13:59:04 UTC (rev 4621)
@@ -434,7 +434,7 @@
<code>void paludis_hook_add_dependencies(const paludis::Environment *, const paludis::Hook &,
paludis::DirectedGraph<std::string, int> &)</code>
if it needs to define ordering dependencies with other hooks. If the hook is to be placed in an <code>auto</code>
-directory, it must also define <code>const paludis::tr1::shared_ptr<const Seqyence<std::string> >
+directory, it must also define <code>const std::tr1::shared_ptr<const Seqyence<std::string> >
paludis_hook_auto_phases(const paludis::Environment *)</code>. All functions are
declared in the header <code><paludis/hook.hh></code>, including any necessary
<code>extern</code> or visibility declarations.</p>
Modified: trunk/misc/make_sr.bash
===================================================================
--- trunk/misc/make_sr.bash 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/misc/make_sr.bash 2008-04-26 13:59:04 UTC (rev 4621)
@@ -232,7 +232,7 @@
else
echo " protected:"
echo " ${want_key_types[${k}]% ->*} raw_${want_keys[${k}]};"
- echo " mutable paludis::tr1::shared_ptr<const ${want_key_types[${k}]#*-> }> cached_${want_keys[${k}]};"
+ echo " mutable paludis::std::tr1::shared_ptr<const ${want_key_types[${k}]#*-> }> cached_${want_keys[${k}]};"
echo
fi
done
@@ -254,7 +254,7 @@
echo " const ${want_key_types[${k}]%-> *} get_raw_${want_keys[${k}]}() const"
echo " PALUDIS_ATTRIBUTE((warn_unused_result));"
echo
- echo " paludis::tr1::shared_ptr<const ${want_key_types[${k}]#*-> }> ${want_keys[${k}]}() const"
+ echo " paludis::std::tr1::shared_ptr<const ${want_key_types[${k}]#*-> }> ${want_keys[${k}]}() const"
echo " PALUDIS_ATTRIBUTE((warn_unused_result));"
echo
fi
@@ -642,7 +642,7 @@
echo " return raw_${want_keys[${k}]};"
echo "}"
echo
- echo "paludis::tr1::shared_ptr<const ${want_key_types[${k}]#*-> }>"
+ echo "paludis::std::tr1::shared_ptr<const ${want_key_types[${k}]#*-> }>"
echo "${a}::${want_keys[${k}]}() const"
echo "{"
echo " if (! cached_${want_keys[${k}]})"
Modified: trunk/paludis/action-fwd.hh
===================================================================
--- trunk/paludis/action-fwd.hh 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/action-fwd.hh 2008-04-26 13:59:04 UTC (rev 4621)
@@ -24,8 +24,8 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/kc-fwd.hh>
#include <paludis/util/keys.hh>
-#include <paludis/util/tr1_memory.hh>
#include <paludis/repository-fwd.hh>
+#include <tr1/memory>
/** \file
* Forward declarations for paludis/action.hh .
@@ -84,7 +84,7 @@
kc::Field<k::no_config_protect, bool>,
kc::Field<k::debug_build, InstallActionDebugOption>,
kc::Field<k::checks, InstallActionChecksOption>,
- kc::Field<k::destination, tr1::shared_ptr<Repository> >
+ kc::Field<k::destination, std::tr1::shared_ptr<Repository> >
> InstallActionOptions;
/**
Modified: trunk/paludis/action.cc
===================================================================
--- trunk/paludis/action.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/action.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -268,7 +268,7 @@
}
FetchActionError::FetchActionError(const std::string & msg,
- const tr1::shared_ptr<const Sequence<FetchActionFailure> > & e) throw () :
+ const std::tr1::shared_ptr<const Sequence<FetchActionFailure> > & e) throw () :
ActionError("Fetch error: " + msg),
_failures(e)
{
@@ -283,7 +283,7 @@
{
}
-const tr1::shared_ptr<const Sequence<FetchActionFailure> >
+const std::tr1::shared_ptr<const Sequence<FetchActionFailure> >
FetchActionError::failures() const
{
return _failures;
Modified: trunk/paludis/action.hh
===================================================================
--- trunk/paludis/action.hh 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/action.hh 2008-04-26 13:59:04 UTC (rev 4621)
@@ -410,20 +410,20 @@
public ActionError
{
private:
- const tr1::shared_ptr<const Sequence<FetchActionFailure> > _failures;
+ const std::tr1::shared_ptr<const Sequence<FetchActionFailure> > _failures;
public:
///\name Basic operations
///\{
FetchActionError(const std::string &) throw ();
- FetchActionError(const std::string &, const tr1::shared_ptr<const Sequence<FetchActionFailure> > &) throw ();
+ FetchActionError(const std::string &, const std::tr1::shared_ptr<const Sequence<FetchActionFailure> > &) throw ();
~FetchActionError() throw ();
///\}
/// More information about failed fetches.
- const tr1::shared_ptr<const Sequence<FetchActionFailure> > failures() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const Sequence<FetchActionFailure> > failures() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
/**
Modified: trunk/paludis/args/dep_list_args_group.cc
===================================================================
--- trunk/paludis/args/dep_list_args_group.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/args/dep_list_args_group.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -161,7 +161,7 @@
void
DepListArgsGroup::populate_dep_list_options(const Environment * env, DepListOptions & options) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
if (dl_reinstall.argument() == "never")
options.reinstall = dl_reinstall_never;
@@ -233,8 +233,8 @@
if (! options.override_masks)
options.override_masks.reset(new DepListOverrideMasksFunctions);
- options.override_masks->push_back(tr1::bind(&override_tilde_keywords, env, _1, _2));
- options.override_masks->push_back(tr1::bind(&override_license, _2));
+ options.override_masks->push_back(std::tr1::bind(&override_tilde_keywords, env, _1, _2));
+ options.override_masks->push_back(std::tr1::bind(&override_license, _2));
if (dl_override_masks.specified())
{
@@ -247,18 +247,18 @@
a_end(dl_override_masks.end_args()) ; a != a_end ; ++a)
{
if (*a == "tilde-keyword")
- options.override_masks->push_back(tr1::bind(&override_tilde_keywords, env, _1, _2));
+ options.override_masks->push_back(std::tr1::bind(&override_tilde_keywords, env, _1, _2));
else if (*a == "unkeyworded")
- options.override_masks->push_back(tr1::bind(&override_unkeyworded, env, _1, _2));
+ options.override_masks->push_back(std::tr1::bind(&override_unkeyworded, env, _1, _2));
else if (*a == "repository")
- options.override_masks->push_back(tr1::bind(&override_repository_masks, _2));
+ options.override_masks->push_back(std::tr1::bind(&override_repository_masks, _2));
else if (*a == "license")
- options.override_masks->push_back(tr1::bind(&override_license, _2));
+ options.override_masks->push_back(std::tr1::bind(&override_license, _2));
else if (*a == "profile")
{
Log::get_instance()->message("paludis.args.deprecated", ll_warning, lc_no_context) <<
"--dl-override-masks profile is deprecated, use --dl-override-masks repository";
- options.override_masks->push_back(tr1::bind(&override_repository_masks, _2));
+ options.override_masks->push_back(std::tr1::bind(&override_repository_masks, _2));
}
else if (*a == "none")
{
Modified: trunk/paludis/args/install_args_group.cc
===================================================================
--- trunk/paludis/args/install_args_group.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/args/install_args_group.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -82,19 +82,19 @@
options.dependency_tags = a_show_reasons.argument() == "summary" || a_show_reasons.argument() == "full";
}
-tr1::shared_ptr<const DestinationsSet>
+std::tr1::shared_ptr<const DestinationsSet>
InstallArgsGroup::destinations(Environment * env) const
{
if (a_destinations.specified())
{
Context local_context("When building destinations collection:");
- tr1::shared_ptr<DestinationsSet> d(new DestinationsSet);
+ std::tr1::shared_ptr<DestinationsSet> d(new DestinationsSet);
for (args::StringSetArg::ConstIterator i(a_destinations.begin_args()),
i_end(a_destinations.end_args()) ;
i != i_end ; ++i)
{
- tr1::shared_ptr<Repository> repo(env->package_database()->fetch_repository(
+ std::tr1::shared_ptr<Repository> repo(env->package_database()->fetch_repository(
RepositoryName(*i)));
if ((*repo)[k::destination_interface()])
d->insert(repo);
Modified: trunk/paludis/args/install_args_group.hh
===================================================================
--- trunk/paludis/args/install_args_group.hh 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/args/install_args_group.hh 2008-04-26 13:59:04 UTC (rev 4621)
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
* Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -112,7 +112,7 @@
/**
* Fetch our specified destinations set.
*/
- tr1::shared_ptr<const DestinationsSet> destinations(Environment *) const;
+ std::tr1::shared_ptr<const DestinationsSet> destinations(Environment *) const;
/**
* Populate an InstallTask from our values.
Modified: trunk/paludis/args/man.cc
===================================================================
--- trunk/paludis/args/man.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/args/man.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -19,8 +19,8 @@
#include "man.hh"
#include <paludis/util/visitor-impl.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/visitor_cast.hh>
+#include <tr1/functional>
#include <ostream>
#include <sstream>
#include <algorithm>
@@ -95,7 +95,7 @@
void
paludis::args::generate_doc(DocWriter & dw, const ArgsHandler * const h)
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
dw.heading(h->app_name(), h->man_section(), h->app_synopsis());
@@ -146,7 +146,7 @@
if (h->begin_notes() != h->end_notes())
{
dw.start_notes();
- std::for_each(h->begin_notes(), h->end_notes(), tr1::bind(&DocWriter::note, &dw, _1));
+ std::for_each(h->begin_notes(), h->end_notes(), std::tr1::bind(&DocWriter::note, &dw, _1));
dw.end_notes();
}
Modified: trunk/paludis/condition_tracker.cc
===================================================================
--- trunk/paludis/condition_tracker.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/condition_tracker.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -24,13 +24,13 @@
#include <paludis/dep_label.hh>
using namespace paludis;
-using namespace tr1::placeholders;
+using namespace std::tr1::placeholders;
ConditionTracker::ConditionTracker(
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > conditions) :
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > conditions) :
base(new ConstTreeSequence<DependencySpecTree, AllDepSpec>(
- tr1::shared_ptr<AllDepSpec>(new AllDepSpec))),
- adder(tr1::bind(&ConstTreeSequence<DependencySpecTree, AllDepSpec>::add, base.get(), _1))
+ std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec))),
+ adder(std::tr1::bind(&ConstTreeSequence<DependencySpecTree, AllDepSpec>::add, base.get(), _1))
{
conditions->accept(*this);
}
@@ -40,44 +40,44 @@
}
template <typename T_>
-tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
+std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
ConditionTracker::do_add_sequence(const T_ & node)
{
- adder(tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, T_> >(
+ adder(std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, T_> >(
new ConstTreeSequence<DependencySpecTree, T_>(
- tr1::static_pointer_cast<T_>(node.clone()))));
+ std::tr1::static_pointer_cast<T_>(node.clone()))));
return base;
}
template <typename T_>
-tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
+std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
ConditionTracker::do_add_leaf(const T_ & node)
{
- adder(tr1::shared_ptr<TreeLeaf<DependencySpecTree, T_> >(
+ adder(std::tr1::shared_ptr<TreeLeaf<DependencySpecTree, T_> >(
new TreeLeaf<DependencySpecTree, T_>(
- tr1::static_pointer_cast<T_>(node.clone()))));
+ std::tr1::static_pointer_cast<T_>(node.clone()))));
return base;
}
-tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
+std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
ConditionTracker::add_condition(const AnyDepSpec & any)
{
return do_add_sequence(any);
}
-tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
+std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
ConditionTracker::add_condition(const ConditionalDepSpec & use)
{
return do_add_sequence(use);
}
-tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
+std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
ConditionTracker::add_condition(const PackageDepSpec & pkg)
{
return do_add_leaf(pkg);
}
-tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
+std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >
ConditionTracker::add_condition(const BlockDepSpec & block)
{
return do_add_leaf(block);
@@ -89,11 +89,11 @@
DependencySpecTree::ConstSequenceIterator begin,
DependencySpecTree::ConstSequenceIterator end)
{
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, T_> > a(
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, T_> > a(
new ConstTreeSequence<DependencySpecTree, T_>(
- tr1::static_pointer_cast<T_>(node.clone())));
+ std::tr1::static_pointer_cast<T_>(node.clone())));
adder(a);
- adder = tr1::bind(&ConstTreeSequence<DependencySpecTree, T_>::add, a.get(), _1);
+ adder = std::tr1::bind(&ConstTreeSequence<DependencySpecTree, T_>::add, a.get(), _1);
if (begin != end)
{
begin->accept(*this);
Modified: trunk/paludis/condition_tracker.hh
===================================================================
--- trunk/paludis/condition_tracker.hh 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/condition_tracker.hh 2008-04-26 13:59:04 UTC (rev 4621)
@@ -20,11 +20,11 @@
#ifndef PALUDIS_GUARD_PALUDIS_CONDITION_TRACKER_HH
#define PALUDIS_GUARD_PALUDIS_CONDITION_TRACKER_HH 1
-#include <paludis/util/tr1_memory.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/visitor.hh>
#include <paludis/dep_tree.hh>
#include <paludis/dep_spec-fwd.hh>
+#include <tr1/memory>
+#include <tr1/functional>
/** \file
* Declarations for ConditionTracker, which is used internally by DepList.
@@ -50,8 +50,8 @@
public ConstVisitor<DependencySpecTree>::VisitConstSequence<ConditionTracker, AllDepSpec>
{
private:
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > base;
- tr1::function<void (tr1::shared_ptr<ConstAcceptInterface<DependencySpecTree> >)> adder;
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > base;
+ std::tr1::function<void (std::tr1::shared_ptr<ConstAcceptInterface<DependencySpecTree> >)> adder;
template <typename T_>
void do_visit_sequence(const T_ &,
@@ -59,15 +59,15 @@
DependencySpecTree::ConstSequenceIterator);
template <typename T_>
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > do_add_sequence(const T_ &);
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > do_add_sequence(const T_ &);
template <typename T_>
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > do_add_leaf(const T_ &);
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > do_add_leaf(const T_ &);
public:
///\name Basic operations
///\{
- ConditionTracker(tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >);
+ ConditionTracker(std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >);
virtual ~ConditionTracker();
@@ -76,10 +76,10 @@
///\name Add a condition
///\{
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > add_condition(const AnyDepSpec &);
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > add_condition(const ConditionalDepSpec &);
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > add_condition(const PackageDepSpec &);
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > add_condition(const BlockDepSpec &);
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > add_condition(const AnyDepSpec &);
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > add_condition(const ConditionalDepSpec &);
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > add_condition(const PackageDepSpec &);
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > add_condition(const BlockDepSpec &);
///\}
Modified: trunk/paludis/contents.cc
===================================================================
--- trunk/paludis/contents.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/contents.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -42,7 +42,7 @@
template class Visits<const ContentsDevEntry>;
template class Visits<const ContentsMiscEntry>;
-template class WrappedForwardIterator<Contents::ConstIteratorTag, const tr1::shared_ptr<const ContentsEntry> >;
+template class WrappedForwardIterator<Contents::ConstIteratorTag, const std::tr1::shared_ptr<const ContentsEntry> >;
ContentsEntry::ContentsEntry(const std::string & n) :
_name(n)
@@ -101,7 +101,7 @@
template<>
struct Implementation<Contents>
{
- std::list<tr1::shared_ptr<const ContentsEntry> > c;
+ std::list<std::tr1::shared_ptr<const ContentsEntry> > c;
};
}
@@ -115,7 +115,7 @@
}
void
-Contents::add(tr1::shared_ptr<const ContentsEntry> c)
+Contents::add(std::tr1::shared_ptr<const ContentsEntry> c)
{
_imp->c.push_back(c);
}
Modified: trunk/paludis/contents.hh
===================================================================
--- trunk/paludis/contents.hh 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/contents.hh 2008-04-26 13:59:04 UTC (rev 4621)
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -25,7 +25,7 @@
#include <paludis/util/visitor.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/tr1_memory.hh>
+#include <tr1/memory>
#include <string>
@@ -244,13 +244,13 @@
///\}
/// Add a new entry.
- void add(tr1::shared_ptr<const ContentsEntry> c);
+ void add(std::tr1::shared_ptr<const ContentsEntry> c);
///\name Iterate over our entries
///\{
struct ConstIteratorTag;
- typedef WrappedForwardIterator<ConstIteratorTag, const tr1::shared_ptr<const ContentsEntry> > ConstIterator;
+ typedef WrappedForwardIterator<ConstIteratorTag, const std::tr1::shared_ptr<const ContentsEntry> > ConstIterator;
ConstIterator begin() const
PALUDIS_ATTRIBUTE((warn_unused_result));
Modified: trunk/paludis/dep_label-fwd.hh
===================================================================
--- trunk/paludis/dep_label-fwd.hh 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/dep_label-fwd.hh 2008-04-26 13:59:04 UTC (rev 4621)
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/sequence-fwd.hh>
-#include <paludis/util/tr1_memory.hh>
+#include <tr1/memory>
#include <iosfwd>
/** \file
@@ -77,7 +77,7 @@
* \ingroup g_dep_spec
* \since 0.26
*/
- typedef Sequence<tr1::shared_ptr<const DependencyLabel> > DependencyLabelSequence;
+ typedef Sequence<std::tr1::shared_ptr<const DependencyLabel> > DependencyLabelSequence;
/**
* A collection of DependencySystemLabel instances.
@@ -85,7 +85,7 @@
* \ingroup g_dep_spec
* \since 0.26
*/
- typedef Sequence<tr1::shared_ptr<const DependencySystemLabel> > DependencySystemLabelSequence;
+ typedef Sequence<std::tr1::shared_ptr<const DependencySystemLabel> > DependencySystemLabelSequence;
/**
* A collection of DependencyTypeLabel instances.
@@ -93,7 +93,7 @@
* \ingroup g_dep_spec
* \since 0.26
*/
- typedef Sequence<tr1::shared_ptr<const DependencyTypeLabel> > DependencyTypeLabelSequence;
+ typedef Sequence<std::tr1::shared_ptr<const DependencyTypeLabel> > DependencyTypeLabelSequence;
/**
* A collection of DependencySuggestLabel instances.
@@ -101,7 +101,7 @@
* \ingroup g_dep_spec
* \since 0.26
*/
- typedef Sequence<tr1::shared_ptr<const DependencySuggestLabel> > DependencySuggestLabelSequence;
+ typedef Sequence<std::tr1::shared_ptr<const DependencySuggestLabel> > DependencySuggestLabelSequence;
/**
* A collection of DependencyABIsLabel instances.
@@ -109,7 +109,7 @@
* \ingroup g_dep_spec
* \since 0.26
*/
- typedef Sequence<tr1::shared_ptr<const DependencyABIsLabel> > DependencyABIsLabelSequence;
+ typedef Sequence<std::tr1::shared_ptr<const DependencyABIsLabel> > DependencyABIsLabelSequence;
template <typename T_, typename Category_> struct ConcreteDependencyLabel;
Modified: trunk/paludis/dep_label.cc
===================================================================
--- trunk/paludis/dep_label.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/dep_label.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -28,11 +28,11 @@
using namespace paludis;
-template class Sequence<tr1::shared_ptr<const DependencyLabel> >;
-template class Sequence<tr1::shared_ptr<const DependencySystemLabel> >;
-template class Sequence<tr1::shared_ptr<const DependencyTypeLabel> >;
-template class Sequence<tr1::shared_ptr<const DependencySuggestLabel> >;
-template class Sequence<tr1::shared_ptr<const DependencyABIsLabel> >;
+template class Sequence<std::tr1::shared_ptr<const DependencyLabel> >;
+template class Sequence<std::tr1::shared_ptr<const DependencySystemLabel> >;
+template class Sequence<std::tr1::shared_ptr<const DependencyTypeLabel> >;
+template class Sequence<std::tr1::shared_ptr<const DependencySuggestLabel> >;
+template class Sequence<std::tr1::shared_ptr<const DependencyABIsLabel> >;
std::ostream &
paludis::operator<< (std::ostream & s, const URILabel & l)
@@ -144,10 +144,10 @@
template <>
struct Implementation<ActiveDependencyLabels>
{
- tr1::shared_ptr<DependencySystemLabelSequence> system_labels;
- tr1::shared_ptr<DependencyTypeLabelSequence> type_labels;
- tr1::shared_ptr<DependencyABIsLabelSequence> abi_labels;
- tr1::shared_ptr<DependencySuggestLabelSequence> suggest_labels;
+ std::tr1::shared_ptr<DependencySystemLabelSequence> system_labels;
+ std::tr1::shared_ptr<DependencyTypeLabelSequence> type_labels;
+ std::tr1::shared_ptr<DependencyABIsLabelSequence> abi_labels;
+ std::tr1::shared_ptr<DependencySuggestLabelSequence> suggest_labels;
};
}
@@ -157,10 +157,10 @@
ConstVisitor<DependencyLabelVisitorTypes>
{
Implementation<ActiveDependencyLabels> & _imp;
- const tr1::shared_ptr<const DependencyLabel> _l;
+ const std::tr1::shared_ptr<const DependencyLabel> _l;
LabelsPopulator(Implementation<ActiveDependencyLabels> & i,
- const tr1::shared_ptr<const DependencyLabel> & l) :
+ const std::tr1::shared_ptr<const DependencyLabel> & l) :
_imp(i),
_l(l)
{
@@ -170,28 +170,28 @@
{
if (! _imp.suggest_labels)
_imp.suggest_labels.reset(new DependencySuggestLabelSequence);
- _imp.suggest_labels->push_back(tr1::static_pointer_cast<const DependencySuggestLabel>(_l));
+ _imp.suggest_labels->push_back(std::tr1::static_pointer_cast<const DependencySuggestLabel>(_l));
}
void visit(const DependencySystemLabel &)
{
if (! _imp.system_labels)
_imp.system_labels.reset(new DependencySystemLabelSequence);
- _imp.system_labels->push_back(tr1::static_pointer_cast<const DependencySystemLabel>(_l));
+ _imp.system_labels->push_back(std::tr1::static_pointer_cast<const DependencySystemLabel>(_l));
}
void visit(const DependencyABIsLabel &)
{
if (! _imp.abi_labels)
_imp.abi_labels.reset(new DependencyABIsLabelSequence);
- _imp.abi_labels->push_back(tr1::static_pointer_cast<const DependencyABIsLabel>(_l));
+ _imp.abi_labels->push_back(std::tr1::static_pointer_cast<const DependencyABIsLabel>(_l));
}
void visit(const DependencyTypeLabel &)
{
if (! _imp.type_labels)
_imp.type_labels.reset(new DependencyTypeLabelSequence);
- _imp.type_labels->push_back(tr1::static_pointer_cast<const DependencyTypeLabel>(_l));
+ _imp.type_labels->push_back(std::tr1::static_pointer_cast<const DependencyTypeLabel>(_l));
}
};
}
@@ -288,25 +288,25 @@
{
}
-const tr1::shared_ptr<const DependencySystemLabelSequence>
+const std::tr1::shared_ptr<const DependencySystemLabelSequence>
ActiveDependencyLabels::system_labels() const
{
return _imp->system_labels;
}
-const tr1::shared_ptr<const DependencyTypeLabelSequence>
+const std::tr1::shared_ptr<const DependencyTypeLabelSequence>
ActiveDependencyLabels::type_labels() const
{
return _imp->type_labels;
}
-const tr1::shared_ptr<const DependencyABIsLabelSequence>
+const std::tr1::shared_ptr<const DependencyABIsLabelSequence>
ActiveDependencyLabels::abi_labels() const
{
return _imp->abi_labels;
}
-const tr1::shared_ptr<const DependencySuggestLabelSequence>
+const std::tr1::shared_ptr<const DependencySuggestLabelSequence>
ActiveDependencyLabels::suggest_labels() const
{
return _imp->suggest_labels;
Modified: trunk/paludis/dep_label.hh
===================================================================
--- trunk/paludis/dep_label.hh 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/dep_label.hh 2008-04-26 13:59:04 UTC (rev 4621)
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -364,10 +364,10 @@
///\name Current label selections
///\{
- const tr1::shared_ptr<const DependencySystemLabelSequence> system_labels() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const tr1::shared_ptr<const DependencyTypeLabelSequence> type_labels() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const tr1::shared_ptr<const DependencyABIsLabelSequence> abi_labels() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const tr1::shared_ptr<const DependencySuggestLabelSequence> suggest_labels() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const DependencySystemLabelSequence> system_labels() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const DependencyTypeLabelSequence> type_labels() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const DependencyABIsLabelSequence> abi_labels() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::tr1::shared_ptr<const DependencySuggestLabelSequence> suggest_labels() const PALUDIS_ATTRIBUTE((warn_unused_result));
///\}
};
Modified: trunk/paludis/dep_list-fwd.hh
===================================================================
--- trunk/paludis/dep_list-fwd.hh 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/dep_list-fwd.hh 2008-04-26 13:59:04 UTC (rev 4621)
@@ -20,7 +20,6 @@
#ifndef PALUDIS_GUARD_PALUDIS_DEP_LIST_FWD_HH
#define PALUDIS_GUARD_PALUDIS_DEP_LIST_FWD_HH 1
-#include <paludis/util/tr1_memory.hh>
#include <paludis/repository-fwd.hh>
#include <paludis/dep_tree.hh>
#include <paludis/package_id-fwd.hh>
Modified: trunk/paludis/dep_list.cc
===================================================================
--- trunk/paludis/dep_list.cc 2008-04-26 09:48:09 UTC (rev 4620)
+++ trunk/paludis/dep_list.cc 2008-04-26 13:59:04 UTC (rev 4621)
@@ -30,7 +30,6 @@
#include <paludis/action.hh>
#include <paludis/dep_spec_flattener.hh>
#include <paludis/distribution.hh>
-#include <paludis/hashed_containers.hh>
#include <paludis/match_package.hh>
#include <paludis/metadata_key.hh>
#include <paludis/query.hh>
@@ -48,22 +47,24 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <paludis/util/kc.hh>
+#include <paludis/util/hashes.hh>
#include <algorithm>
#include <functional>
#include <vector>
#include <list>
#include <set>
+#include <tr1/functional>
+#include <tr1/unordered_map>
using namespace paludis;
-typedef std::list<tr1::shared_ptr<ActiveDependencyLabels> > LabelsStack;
+typedef std::list<std::tr1::shared_ptr<ActiveDependencyLabels> > LabelsStack;
-template class Sequence<tr1::function<bool (const PackageID &, const Mask &)> >;
+template class Sequence<std::tr1::function<bool (const PackageID &, const Mask &)> >;
template class WrappedForwardIterator<DepList::IteratorTag, DepListEntry>;
template class WrappedForwardIterator<DepList::ConstIteratorTag, const DepListEntry>;
@@ -96,13 +97,13 @@
namespace paludis
{
typedef std::list<DepListEntry> MergeList;
- typedef MakeHashedMultiMap<QualifiedPackageName, MergeList::iterator>::Type MergeListIndex;
+ typedef std::tr1::unordered_multimap<QualifiedPackageName, MergeList::iterator, Hash<QualifiedPackageName> > MergeListIndex;
template<>
struct Implementation<DepList>
{
const Environment * const env;
- tr1::shared_ptr<DepListOptions> opts;
+ std::tr1::shared_ptr<DepListOptions> opts;
MergeList merge_list;
MergeList::const_iterator current_merge_list_entry;
@@ -117,11 +118,11 @@
LabelsStack labels;
- const tr1::shared_ptr<const PackageID> current_package_id() const
+ const std::tr1::shared_ptr<const PackageID> current_package_id() const
{
if (current_merge_list_entry != merge_list.end())
return current_merge_list_entry->package_id;
- return tr1::shared_ptr<const PackageID>();
+ return std::tr1::shared_ptr<const PackageID>();
}
Implementation(const Environment * const e, const DepListOptions & o) :
@@ -170,7 +171,7 @@
/* see EffSTL 9 for why this is so painful */
if (e.tags->empty())
return;
- tr1::shared_ptr<DepListEntryTags> t(new DepListEntryTags);
+ std::tr1::shared_ptr<DepListEntryTags> t(new DepListEntryTags);
GenerationGreaterThan pred(g);
for (DepListEntryTags::ConstIterator i(e.tags->begin()), i_end(e.tags->end()) ;
i != i_end ; ++i)
@@ -290,16 +291,16 @@
ConstVisitor<DependencySpecTree>
{
DepList * const d;
- tr1::shared_ptr<const DestinationsSet> destinations;
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > conditions;
+ std::tr1::shared_ptr<const DestinationsSet> destinations;
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > conditions;
std::set<SetName> recursing_sets;
const bool only_if_not_suggested_label;
- AddVisitor(DepList * const dd, bool l, tr1::shared_ptr<const DestinationsSet> ddd,
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > c =
- (tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >(
+ AddVisitor(DepList * const dd, bool l, std::tr1::shared_ptr<const DestinationsSet> ddd,
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > c =
+ (std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >(
new ConstTreeSequence<DependencySpecTree, AllDepSpec>(
- tr1::shared_ptr<AllDepSpec>(new AllDepSpec))))) :
+ std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec))))) :
d(dd),
destinations(ddd),
conditions(c),
@@ -377,12 +378,12 @@
}
}
- Save<tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > > save_c(
+ Save<std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > > save_c(
&conditions, d->_imp->opts->dependency_tags ? ConditionTracker(conditions).add_condition(a) : conditions);
/* find already installed things */
// TODO: check destinations
- tr1::shared_ptr<const PackageIDSequence> already_installed(d->_imp->env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> already_installed(d->_imp->env->package_database()->query(
query::SupportsAction<InstalledAction>() &
query::Matches(a),
qo_order_by_version));
@@ -408,7 +409,7 @@
if (d->_imp->opts->dependency_tags && d->_imp->current_package_id())
existing_merge_list_entry->tags->insert(DepTagEntry::create()
- .tag(tr1::shared_ptr<DepTag>(new DependencyDepTag(d->_imp->current_package_id(), a, conditions)))
+ .tag(std::tr1::shared_ptr<DepTag>(new DependencyDepTag(d->_imp->current_package_id(), a, conditions)))
.generation(d->_imp->merge_list_generation));
/* add an appropriate destination */
@@ -439,8 +440,8 @@
}
/* find installable candidates, and find the best visible candidate */
- tr1::shared_ptr<const PackageID> best_visible_candidate;
- tr1::shared_ptr<const PackageIDSequence> installable_candidates(
+ std::tr1::shared_ptr<const PackageID> best_visible_candidate;
+ std::tr1::shared_ptr<const PackageIDSequence> installable_candidates(
d->_imp->env->package_database()->query(
query::MaybeSupportsAction<InstallAction>() &
query::Matches(a),
@@ -542,7 +543,7 @@
if (! a.additional_requirements_ptr())
throw AllMaskedError(a);
- tr1::shared_ptr<const PackageIDSequence> match_except_reqs(d->_imp->env->package_database()->query(
+ std::tr1::shared_ptr<const PackageIDSequence> match_except_reqs(d->_imp->env->package_database()->query(
query::Matches(*a.without_additional_requirements()), qo_whatever));
for (PackageIDSequence::ConstIterator i(match_except_reqs->begin()),
@@ -561,7 +562,7 @@
}
}
- tr1::shared_ptr<PackageIDSequence> already_installed_in_same_slot(new PackageIDSequence);
+ std::tr1::shared_ptr<PackageIDSequence> already_installed_in_same_slot(new PackageIDSequence);
for (PackageIDSequence::ConstIterator aa(already_installed->begin()),
aa_end(already_installed->end()) ; aa != aa_end ; ++aa)
if ((*aa)->slot() == best_visible_candidate->slot())
@@ -616,7 +617,7 @@
case dl_downgrade_error:
case dl_downgrade_warning:
{
- tr1::shared_ptr<const PackageIDSequence> are_we_downgrading(
+ std::tr1::shared_ptr<const PackageIDSequence> are_we_downgrading(
d->_imp->env->package_database()->query(
query::SupportsAction<InstalledAction>() &
query::Matches(make_package_dep_spec()
@@ -652,7 +653,7 @@
{
Context context("When adding NamedSetDepSpec '" + stringify(a) + "':");
- tr1::shared_ptr<const SetSpecTree::ConstItem> set(d->_imp->env->set(a.name()));
+ std::tr1::shared_ptr<const SetSpecTree::ConstItem> set(d->_imp->env->set(a.name()));
if (! set)
throw NoSuchSetError(stringify(a.name()));
@@ -674,7 +675,7 @@
DependencySpecTree::ConstSequenceIterator end)
{
d->_imp->labels.push_front(make_shared_ptr(new ActiveDependencyLabels(**d->_imp->labels.begin())));
- RunOnDestruction restore_labels(tr1::bind(tr1::mem_fn(&LabelsStack::pop_front), &d->_imp->labels));
+ RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &d->_imp->labels));
std::for_each(cur, end, accept_visitor(*this));
}
@@ -684,13 +685,13 @@
DependencySpecTree::ConstSequenceIterator cur,
DependencySpecTree::ConstSequenceIterator end)
{
- Save<tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > > save_c(
+ Save<std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > > save_c(
&conditions, d->_imp->opts->dependency_tags ? ConditionTracker(conditions).add_condition(a) : conditions);
if (d->_imp->opts->use == dl_use_deps_standard)
{
d->_imp->labels.push_front(make_shared_ptr(new ActiveDependencyLabels(**d->_imp->labels.begin())));
- RunOnDestruction restore_labels(tr1::bind(tr1::mem_fn(&LabelsStack::pop_front), &d->_imp->labels));
+ RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &d->_imp->labels));
if (a.condition_met())
std::for_each(cur, end, accept_visitor(*this));
@@ -707,10 +708,10 @@
DependencySpecTree::ConstSequenceIterator cur,
DependencySpecTree::ConstSequenceIterator end)
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
d->_imp->labels.push_front(make_shared_ptr(new ActiveDependencyLabels(**d->_imp->labels.begin())));
- RunOnDestruction restore_labels(tr1::bind(tr1::mem_fn(&LabelsStack::pop_front), &d->_imp->labels));
+ RunOnDestruction restore_labels(std::tr1::bind(std::tr1::mem_fn(&LabelsStack::pop_front), &d->_imp->labels));
/* annoying requirement: || ( foo? ( ... ) ) resolves to empty if !foo. */
if (end == std::find_if(cur, end, &is_viable_any_child))
@@ -719,7 +720,7 @@
{
RangeRewriter r;
std::for_each(cur, end, accept_visitor(r));
- tr1::shared_ptr<PackageDepSpec> rewritten_spec(r.spec());
+ std::tr1::shared_ptr<PackageDepSpec> rewritten_spec(r.spec());
if (rewritten_spec)
{
TreeLeaf<DependencySpecTree, PackageDepSpec> rr(r.spec());
@@ -728,7 +729,7 @@
}
}
- Save<tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > > save_c(
+ Save<std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > > save_c(
&conditions, d->_imp->opts->dependency_tags ? ConditionTracker(conditions).add_condition(a) : conditions);
/* see if any of our children is already installed. if any is, add it so that
@@ -761,8 +762,8 @@
Save<bool> save_t(&d->_imp->throw_on_blocker,
dl_blocks_discard_completely != d->_imp->opts->blocks);
- Save<tr1::shared_ptr<DepListOverrideMasksFunctions> > save_o(&d->_imp->opts->override_masks,
- tr1::shared_ptr<DepListOverrideMasksFunctions>());
+ Save<std::tr1::shared_ptr<DepListOverrideMasksFunctions> > save_o(&d->_imp->opts->override_masks,
+ std::tr1::shared_ptr<DepListOverrideMasksFunctions>());
d->add_not_top_level(only_if_not_suggested_label, *c, destinations, conditions);
return;
}
@@ -783,8 +784,8 @@
Save<bool> save_t(&d->_imp->throw_on_blocker,
dl_blocks_discard_completely != d->_imp->opts->blocks);
- Save<tr1::shared_ptr<DepListOverrideMasksFunctions> > save_o(&d->_imp->opts->override_masks,
- tr1::shared_ptr<DepListOverrideMasksFunctions>());
+ Save<std::tr1::shared_ptr<DepListOverrideMasksFunctions> > save_o(&d->_imp->opts->override_masks,
+ std::tr1::shared_ptr<DepListOverrideMasksFunctions>());
d->add_not_top_level(only_if_not_suggested_label, *c, destinations, conditions);
return;
}
@@ -818,12 +819,12 @@
Context context("When checking BlockDepSpec '!" + stringify(*a.blocked_spec()) + "':");
- Save<tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > > save_c(
+ Save<std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > > save_c(
&conditions, d->_imp->opts->dependency_tags ? ConditionTracker(conditions).add_condition(a) : conditions);
bool check_whole_list(false);
std::list<MergeList::const_iterator> will_be_installed;
- tr1::shared_ptr<const PackageIDSequence> already_installed;
+ std::tr1::shared_ptr<const PackageIDSequence> already_installed;
if (a.blocked_spec()->package_ptr())
{
@@ -987,13 +988,13 @@
{
}
-tr1::shared_ptr<DepListOptions>
+std::tr1::shared_ptr<DepListOptions>
DepList::options()
{
return _imp->opts;
}
-const tr1::shared_ptr<const DepListOptions>
+const std::tr1::shared_ptr<const DepListOptions>
DepList::options() const
{
return _imp->opts;
@@ -1008,18 +1009,18 @@
void
DepList::add_in_role(const bool only_if_not_suggested_label, DependencySpecTree::ConstItem & spec, const std::string & role,
- tr1::shared_ptr<const DestinationsSet> destinations)
+ std::tr1::shared_ptr<const DestinationsSet> destinations)
{
Context context("When adding " + role + (only_if_not_suggested_label ? " unless under a suggested label" : "") + ":");
add_not_top_level(only_if_not_suggested_label, spec, destinations,
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >(
- new ConstTreeSequence<DependencySpecTree, AllDepSpec>(tr1::shared_ptr<AllDepSpec>(new AllDepSpec))));
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> >(
+ new ConstTreeSequence<DependencySpecTree, AllDepSpec>(std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec))));
}
void
DepList::add_not_top_level(const bool only_if_not_suggested_label,
- DependencySpecTree::ConstItem & spec, tr1::shared_ptr<const DestinationsSet> destinations,
- tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > conditions)
+ DependencySpecTree::ConstItem & spec, std::tr1::shared_ptr<const DestinationsSet> destinations,
+ std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > conditions)
{
DepListTransaction transaction(_imp->merge_list, _imp->merge_list_index, _imp->merge_list_generation);
@@ -1029,7 +1030,7 @@
}
void
-DepList::add(SetSpecTree::ConstItem & spec, tr1::shared_ptr<const DestinationsSet> destinations)
+DepList::add(SetSpecTree::ConstItem & spec, std::tr1::shared_ptr<const DestinationsSet> destinations)
{
DepListTransaction transaction(_imp->merge_list, _imp->merge_list_index, _imp->merge_list_generation);
@@ -1042,16 +1043,16 @@
}
void
-DepList::add(const PackageDepSpec & spec, tr1::shared_ptr<const DestinationsSet> destinations)
+DepList::add(const PackageDepSpec & spec, std::tr1::shared_pt