aboutsummaryrefslogtreecommitdiff
path: root/src/clients/cave
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 10:11:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:54:57 +0100
commit7a8a792ae878e2b432e0c67a813022117faa4e60 (patch)
treed9eac8e45ccc206bc6920d14e25f5613b54be02f /src/clients/cave
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'src/clients/cave')
-rw-r--r--src/clients/cave/cave.cc4
-rw-r--r--src/clients/cave/cmd_config.cc12
-rw-r--r--src/clients/cave/cmd_config.hh6
-rw-r--r--src/clients/cave/cmd_contents.cc14
-rw-r--r--src/clients/cave/cmd_contents.hh6
-rw-r--r--src/clients/cave/cmd_display_resolution.cc150
-rw-r--r--src/clients/cave/cmd_display_resolution.hh12
-rw-r--r--src/clients/cave/cmd_executables.cc8
-rw-r--r--src/clients/cave/cmd_executables.hh6
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc190
-rw-r--r--src/clients/cave/cmd_execute_resolution.hh12
-rw-r--r--src/clients/cave/cmd_find_candidates.cc40
-rw-r--r--src/clients/cave/cmd_find_candidates.hh16
-rw-r--r--src/clients/cave/cmd_fix_cache.cc8
-rw-r--r--src/clients/cave/cmd_fix_cache.hh6
-rw-r--r--src/clients/cave/cmd_fix_linkage.cc14
-rw-r--r--src/clients/cave/cmd_fix_linkage.hh6
-rw-r--r--src/clients/cave/cmd_help.cc14
-rw-r--r--src/clients/cave/cmd_help.hh6
-rw-r--r--src/clients/cave/cmd_import.cc24
-rw-r--r--src/clients/cave/cmd_import.hh6
-rw-r--r--src/clients/cave/cmd_info.cc52
-rw-r--r--src/clients/cave/cmd_info.hh6
-rw-r--r--src/clients/cave/cmd_match.cc26
-rw-r--r--src/clients/cave/cmd_match.hh12
-rw-r--r--src/clients/cave/cmd_owner.cc10
-rw-r--r--src/clients/cave/cmd_owner.hh6
-rw-r--r--src/clients/cave/cmd_perform.cc60
-rw-r--r--src/clients/cave/cmd_perform.hh6
-rw-r--r--src/clients/cave/cmd_print_categories.cc10
-rw-r--r--src/clients/cave/cmd_print_categories.hh6
-rw-r--r--src/clients/cave/cmd_print_commands.cc8
-rw-r--r--src/clients/cave/cmd_print_commands.hh6
-rw-r--r--src/clients/cave/cmd_print_environment_metadata.cc8
-rw-r--r--src/clients/cave/cmd_print_environment_metadata.hh6
-rw-r--r--src/clients/cave/cmd_print_id_actions.cc12
-rw-r--r--src/clients/cave/cmd_print_id_actions.hh6
-rw-r--r--src/clients/cave/cmd_print_id_contents.cc12
-rw-r--r--src/clients/cave/cmd_print_id_contents.hh6
-rw-r--r--src/clients/cave/cmd_print_id_executables.cc8
-rw-r--r--src/clients/cave/cmd_print_id_executables.hh6
-rw-r--r--src/clients/cave/cmd_print_id_masks.cc26
-rw-r--r--src/clients/cave/cmd_print_id_masks.hh6
-rw-r--r--src/clients/cave/cmd_print_id_metadata.cc10
-rw-r--r--src/clients/cave/cmd_print_id_metadata.hh6
-rw-r--r--src/clients/cave/cmd_print_ids.cc34
-rw-r--r--src/clients/cave/cmd_print_ids.hh6
-rw-r--r--src/clients/cave/cmd_print_owners.cc8
-rw-r--r--src/clients/cave/cmd_print_owners.hh6
-rw-r--r--src/clients/cave/cmd_print_packages.cc10
-rw-r--r--src/clients/cave/cmd_print_packages.hh6
-rw-r--r--src/clients/cave/cmd_print_repositories.cc6
-rw-r--r--src/clients/cave/cmd_print_repositories.hh6
-rw-r--r--src/clients/cave/cmd_print_repository_formats.cc6
-rw-r--r--src/clients/cave/cmd_print_repository_formats.hh6
-rw-r--r--src/clients/cave/cmd_print_repository_metadata.cc10
-rw-r--r--src/clients/cave/cmd_print_repository_metadata.hh6
-rw-r--r--src/clients/cave/cmd_print_set.cc14
-rw-r--r--src/clients/cave/cmd_print_set.hh6
-rw-r--r--src/clients/cave/cmd_print_sets.cc6
-rw-r--r--src/clients/cave/cmd_print_sets.hh6
-rw-r--r--src/clients/cave/cmd_print_sync_protocols.cc8
-rw-r--r--src/clients/cave/cmd_print_sync_protocols.hh6
-rw-r--r--src/clients/cave/cmd_purge.cc14
-rw-r--r--src/clients/cave/cmd_purge.hh6
-rw-r--r--src/clients/cave/cmd_resolve.cc8
-rw-r--r--src/clients/cave/cmd_resolve.hh6
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.cc14
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.hh6
-rw-r--r--src/clients/cave/cmd_resolve_dump.cc11
-rw-r--r--src/clients/cave/cmd_resolve_dump.hh4
-rw-r--r--src/clients/cave/cmd_resume.cc22
-rw-r--r--src/clients/cave/cmd_resume.hh6
-rw-r--r--src/clients/cave/cmd_search.cc36
-rw-r--r--src/clients/cave/cmd_search.hh6
-rw-r--r--src/clients/cave/cmd_search_cmdline.hh2
-rw-r--r--src/clients/cave/cmd_show.cc80
-rw-r--r--src/clients/cave/cmd_show.hh6
-rw-r--r--src/clients/cave/cmd_sync.cc28
-rw-r--r--src/clients/cave/cmd_sync.hh6
-rw-r--r--src/clients/cave/cmd_uninstall.cc26
-rw-r--r--src/clients/cave/cmd_uninstall.hh6
-rw-r--r--src/clients/cave/cmd_update_world.cc6
-rw-r--r--src/clients/cave/cmd_update_world.hh6
-rw-r--r--src/clients/cave/cmd_verify.cc12
-rw-r--r--src/clients/cave/cmd_verify.hh6
-rw-r--r--src/clients/cave/command.hh8
-rw-r--r--src/clients/cave/command_factory.cc92
-rw-r--r--src/clients/cave/command_factory.hh4
-rw-r--r--src/clients/cave/exceptions.cc4
-rw-r--r--src/clients/cave/exceptions.hh6
-rw-r--r--src/clients/cave/executables_common.cc14
-rw-r--r--src/clients/cave/executables_common.hh8
-rw-r--r--src/clients/cave/format_general.cc16
-rw-r--r--src/clients/cave/format_plain_contents_entry.cc4
-rw-r--r--src/clients/cave/format_plain_contents_entry.hh4
-rw-r--r--src/clients/cave/format_plain_metadata_key.cc16
-rw-r--r--src/clients/cave/format_plain_metadata_key.hh6
-rw-r--r--src/clients/cave/format_string.cc2
-rw-r--r--src/clients/cave/format_string.hh4
-rw-r--r--src/clients/cave/man_cave.cc2
-rw-r--r--src/clients/cave/owner_common.cc22
-rw-r--r--src/clients/cave/owner_common.hh8
-rw-r--r--src/clients/cave/resolve_common.cc306
-rw-r--r--src/clients/cave/resolve_common.hh10
-rw-r--r--src/clients/cave/resume_data.cc8
-rw-r--r--src/clients/cave/resume_data.hh10
-rw-r--r--src/clients/cave/script_command.cc6
-rw-r--r--src/clients/cave/script_command.hh6
-rw-r--r--src/clients/cave/select_format_for_spec.cc2
-rw-r--r--src/clients/cave/select_format_for_spec.hh2
111 files changed, 964 insertions, 965 deletions
diff --git a/src/clients/cave/cave.cc b/src/clients/cave/cave.cc
index d5abf235c..110d02629 100644
--- a/src/clients/cave/cave.cc
+++ b/src/clients/cave/cave.cc
@@ -89,13 +89,13 @@ int main(int argc, char * argv[])
Log::get_instance()->set_program_name(argv[0]);
Log::get_instance()->set_log_level(cmdline.a_log_level.option());
- std::tr1::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create(cmdline.a_environment.argument()));
+ std::shared_ptr<Environment> env(EnvironmentFactory::get_instance()->create(cmdline.a_environment.argument()));
env->set_paludis_command(std::string(BINDIR"/paludis")
+ " --" + cmdline.a_log_level.long_name() + " " + cmdline.a_log_level.argument()
+ " --" + cmdline.a_environment.long_name() + " " + (cmdline.a_environment.argument().empty() ? ":" : cmdline.a_environment.argument()));
- std::tr1::shared_ptr<Sequence<std::string> > seq(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > seq(new Sequence<std::string>);
std::copy(next(cmdline.begin_parameters()), cmdline.end_parameters(), seq->back_inserter());
return cave::CommandFactory::get_instance()->create(*cmdline.begin_parameters())->run(env, seq);
diff --git a/src/clients/cave/cmd_config.cc b/src/clients/cave/cmd_config.cc
index d80efecd3..ae0fa2f72 100644
--- a/src/clients/cave/cmd_config.cc
+++ b/src/clients/cave/cmd_config.cc
@@ -78,8 +78,8 @@ namespace
int
ConfigCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
ConfigCommandLine cmdline;
@@ -96,24 +96,24 @@ ConfigCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(),
UserPackageDepSpecOptions()));
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
generator::Matches(spec, MatchPackageOptions()) | filter::SupportsAction<ConfigAction>())]);
if (ids->empty())
throw NothingMatching(spec);
else if (1 != std::distance(ids->begin(), ids->end()))
throw BeMoreSpecific(spec, ids);
- const std::tr1::shared_ptr<const PackageID> id(*ids->begin());
+ const std::shared_ptr<const PackageID> id(*ids->begin());
OutputManagerFromEnvironment output_manager_holder(env.get(), id, oe_exclusive, ClientOutputFeatures());
ConfigAction action(make_named_values<ConfigActionOptions>(
- n::make_output_manager() = std::tr1::ref(output_manager_holder)
+ n::make_output_manager() = std::ref(output_manager_holder)
));
id->perform_action(action);
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
ConfigCommand::make_doc_cmdline()
{
return make_shared_ptr(new ConfigCommandLine);
diff --git a/src/clients/cave/cmd_config.hh b/src/clients/cave/cmd_config.hh
index 22d41f031..33495876c 100644
--- a/src/clients/cave/cmd_config.hh
+++ b/src/clients/cave/cmd_config.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_contents.cc b/src/clients/cave/cmd_contents.cc
index 35a05d5f1..48b1884c8 100644
--- a/src/clients/cave/cmd_contents.cc
+++ b/src/clients/cave/cmd_contents.cc
@@ -100,7 +100,7 @@ namespace
}
};
- std::string stringify_contents_entry(const std::tr1::shared_ptr<const ContentsEntry> & e)
+ std::string stringify_contents_entry(const std::shared_ptr<const ContentsEntry> & e)
{
return e->accept_returning<std::string>(StringifyContentsEntry());
}
@@ -108,8 +108,8 @@ namespace
int
ContentsCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
ContentsCommandLine cmdline;
@@ -127,13 +127,13 @@ ContentsCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(),
UserPackageDepSpecOptions(), filter::InstalledAtRoot(env->root())));
- std::tr1::shared_ptr<const PackageIDSequence> entries(
+ std::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
throw NothingMatching(spec);
- const std::tr1::shared_ptr<const PackageID> id(*entries->last());
+ const std::shared_ptr<const PackageID> id(*entries->last());
if (! id->contents_key())
throw BadIDForCommand(spec, id, "does not support listing contents");
@@ -141,12 +141,12 @@ ContentsCommand::run(
id->contents_key()->value()->begin(),
id->contents_key()->value()->end(),
std::ostream_iterator<std::string>(cout, "\n"),
- std::tr1::bind(stringify_contents_entry, std::tr1::placeholders::_1));
+ std::bind(stringify_contents_entry, std::placeholders::_1));
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
ContentsCommand::make_doc_cmdline()
{
return make_shared_ptr(new ContentsCommandLine);
diff --git a/src/clients/cave/cmd_contents.hh b/src/clients/cave/cmd_contents.hh
index 6093eafc8..58c46dccf 100644
--- a/src/clients/cave/cmd_contents.hh
+++ b/src/clients/cave/cmd_contents.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 1a7736347..4312b16c3 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -84,7 +84,7 @@ using namespace paludis::resolver;
using std::cout;
using std::endl;
-typedef std::map<ChoiceNameWithPrefix, std::tr1::shared_ptr<PackageIDSequence> > ChoiceValuesToExplain;
+typedef std::map<ChoiceNameWithPrefix, std::shared_ptr<PackageIDSequence> > ChoiceValuesToExplain;
typedef std::map<std::string, ChoiceValuesToExplain> ChoicesToExplain;
namespace
@@ -121,7 +121,7 @@ namespace
};
std::string get_annotation(
- const std::tr1::shared_ptr<const MetadataSectionKey> & section,
+ const std::shared_ptr<const MetadataSectionKey> & section,
const std::string & name)
{
MetadataSectionKey::MetadataConstIterator i(section->find_metadata(name));
@@ -157,7 +157,7 @@ namespace
}
std::pair<std::string, Tribool> annotate(
- const std::tr1::shared_ptr<const MetadataSectionKey> & key,
+ const std::shared_ptr<const MetadataSectionKey> & key,
const std::pair<std::string, Tribool> unannotated) const
{
if ((! key) || (! more_annotations))
@@ -257,49 +257,49 @@ namespace
struct IDForDecisionOrNullVisitor
{
- const std::tr1::shared_ptr<const PackageID> visit(const ExistingNoChangeDecision & d) const
+ const std::shared_ptr<const PackageID> visit(const ExistingNoChangeDecision & d) const
{
return d.existing_id();
}
- const std::tr1::shared_ptr<const PackageID> visit(const BreakDecision & d) const
+ const std::shared_ptr<const PackageID> visit(const BreakDecision & d) const
{
return d.existing_id();
}
- const std::tr1::shared_ptr<const PackageID> visit(const ChangesToMakeDecision & d) const
+ const std::shared_ptr<const PackageID> visit(const ChangesToMakeDecision & d) const
{
return d.origin_id();
}
- const std::tr1::shared_ptr<const PackageID> visit(const UnableToMakeDecision &) const
+ const std::shared_ptr<const PackageID> visit(const UnableToMakeDecision &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const RemoveDecision &) const
+ const std::shared_ptr<const PackageID> visit(const RemoveDecision &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const NothingNoChangeDecision &) const
+ const std::shared_ptr<const PackageID> visit(const NothingNoChangeDecision &) const
{
return make_null_shared_ptr();
}
};
- const std::tr1::shared_ptr<const PackageID> id_for_decision_or_null(const Decision & d)
+ const std::shared_ptr<const PackageID> id_for_decision_or_null(const Decision & d)
{
- return d.accept_returning<std::tr1::shared_ptr<const PackageID> >(IDForDecisionOrNullVisitor());
+ return d.accept_returning<std::shared_ptr<const PackageID> >(IDForDecisionOrNullVisitor());
}
bool decision_matches_spec(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const Resolvent & resolvent,
const Decision & decision,
const PackageDepSpec & spec)
{
- const std::tr1::shared_ptr<const PackageID> maybe_id(id_for_decision_or_null(decision));
+ const std::shared_ptr<const PackageID> maybe_id(id_for_decision_or_null(decision));
if (maybe_id)
return match_package(*env, spec, *maybe_id, MatchPackageOptions());
else
@@ -438,8 +438,8 @@ namespace
}
void display_explanations(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
const DisplayResolutionCommandLine & cmdline)
{
Context context("When displaying explanations:");
@@ -476,9 +476,9 @@ namespace
}
void display_one_description(
- const std::tr1::shared_ptr<Environment> &,
+ const std::shared_ptr<Environment> &,
const DisplayResolutionCommandLine & cmdline,
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & id,
const bool is_new)
{
if (id->short_description_key())
@@ -501,10 +501,10 @@ namespace
}
void display_choices(
- const std::tr1::shared_ptr<Environment> &,
+ const std::shared_ptr<Environment> &,
const DisplayResolutionCommandLine & cmdline,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const PackageID> & old_id,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & old_id,
ChoicesToExplain & choices_to_explain
)
{
@@ -513,7 +513,7 @@ namespace
ColourFormatter formatter(0);
- std::tr1::shared_ptr<const Choices> old_choices;
+ std::shared_ptr<const Choices> old_choices;
if (old_id && old_id->choices_key())
old_choices = old_id->choices_key()->value();
@@ -568,7 +568,7 @@ namespace
{
if (old_choices)
{
- std::tr1::shared_ptr<const ChoiceValue> old_choice(
+ std::shared_ptr<const ChoiceValue> old_choice(
old_choices->find_by_name_with_prefix((*i)->name_with_prefix()));
if (! old_choice)
added = true;
@@ -620,7 +620,7 @@ namespace
}
void display_reasons(
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const bool more_annotations
)
{
@@ -708,7 +708,7 @@ namespace
void display_confirmations(
const ConfirmableDecision & decision)
{
- const std::tr1::shared_ptr<const RequiredConfirmations> r(decision.required_confirmations_if_any());
+ const std::shared_ptr<const RequiredConfirmations> r(decision.required_confirmations_if_any());
if (r && ! r->empty())
cout << c::bold_red() << " Cannot proceed without: " << c::normal() <<
join(indirect_iterator(r->begin()), indirect_iterator(r->end()), ", ", stringify_confirmation) << endl;
@@ -770,10 +770,10 @@ namespace
}
void display_one_installish(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const DisplayResolutionCommandLine & cmdline,
const ChangesToMakeDecision & decision,
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const bool more_annotations,
const bool confirmations,
const bool untaken,
@@ -883,7 +883,7 @@ namespace
}
cout << endl;
- std::tr1::shared_ptr<const PackageID> old_id;
+ std::shared_ptr<const PackageID> old_id;
if (! decision.destination()->replacing()->empty())
old_id = *decision.destination()->replacing()->begin();
@@ -899,9 +899,9 @@ namespace
}
void display_one_uninstall(
- const std::tr1::shared_ptr<Environment> &,
+ const std::shared_ptr<Environment> &,
const DisplayResolutionCommandLine &,
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const RemoveDecision & decision,
const bool more_annotations,
const bool confirmations,
@@ -965,7 +965,7 @@ namespace
struct MaskedByKeyVisitor
{
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const PackageID> > & k)
{
cout << " " << k.human_name() << " " << *k.value() << endl;
}
@@ -1000,12 +1000,12 @@ namespace
cout << " " << k.human_name() << " " << pretty_print_time(k.value().seconds()) << endl;
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const Contents> > & k)
{
cout << " " << k.human_name() << endl;
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const RepositoryMaskInfo> > & k)
{
cout << " " << k.value()->mask_file() << endl;
for (Sequence<std::string>::ConstIterator l(k.value()->comment()->begin()), l_end(k.value()->comment()->end()) ;
@@ -1084,7 +1084,7 @@ namespace
cout << " " << k.human_name() << " " << k.pretty_print_flat(formatter) << endl;
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const Choices> > & k)
{
ColourFormatter formatter(0);
cout << " " << k.human_name() << endl;
@@ -1127,8 +1127,8 @@ namespace
};
void display_unable_to_make_decision(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolution> & resolution,
const UnableToMakeDecision & d,
const bool untaken)
{
@@ -1202,7 +1202,7 @@ namespace
}
void display_choices_to_explain(
- const std::tr1::shared_ptr<Environment> &,
+ const std::shared_ptr<Environment> &,
const DisplayResolutionCommandLine &,
const ChoicesToExplain & choices_to_explain)
{
@@ -1216,7 +1216,7 @@ namespace
v != v_end ; ++v)
{
bool all_same(true);
- const std::tr1::shared_ptr<const ChoiceValue> first_choice_value(
+ const std::shared_ptr<const ChoiceValue> first_choice_value(
(*v->second->begin())->choices_key()->value()->find_by_name_with_prefix(v->first));
std::string description(first_choice_value->description());
for (PackageIDSequence::ConstIterator w(next(v->second->begin())), w_end(v->second->end()) ;
@@ -1236,7 +1236,7 @@ namespace
for (PackageIDSequence::ConstIterator w(v->second->begin()), w_end(v->second->end()) ;
w != w_end ; ++w)
{
- const std::tr1::shared_ptr<const ChoiceValue> value(
+ const std::shared_ptr<const ChoiceValue> value(
(*w)->choices_key()->value()->find_by_name_with_prefix(v->first));
cout << " " << std::left << std::setw(30) <<
((*w)->canonical_form(idcf_no_version) + ":") << " " << value->description() << endl;
@@ -1248,22 +1248,22 @@ namespace
}
}
- std::pair<std::tr1::shared_ptr<const ConfirmableDecision>, std::tr1::shared_ptr<const OrdererNotes> >
- get_decision_and_notes(const std::tr1::shared_ptr<const ConfirmableDecision> & d)
+ std::pair<std::shared_ptr<const ConfirmableDecision>, std::shared_ptr<const OrdererNotes> >
+ get_decision_and_notes(const std::shared_ptr<const ConfirmableDecision> & d)
{
return std::make_pair(d, make_null_shared_ptr());
}
- std::pair<std::tr1::shared_ptr<const ConfirmableDecision>, std::tr1::shared_ptr<const OrdererNotes> >
- get_decision_and_notes(const std::pair<std::tr1::shared_ptr<const ConfirmableDecision>, std::tr1::shared_ptr<const OrdererNotes> > & d)
+ std::pair<std::shared_ptr<const ConfirmableDecision>, std::shared_ptr<const OrdererNotes> >
+ get_decision_and_notes(const std::pair<std::shared_ptr<const ConfirmableDecision>, std::shared_ptr<const OrdererNotes> > & d)
{
return d;
}
void display_one_break(
- const std::tr1::shared_ptr<Environment> &,
+ const std::shared_ptr<Environment> &,
const DisplayResolutionCommandLine &,
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const BreakDecision & decision,
const bool more_annotations,
const bool untaken)
@@ -1281,9 +1281,9 @@ namespace
struct DisplayAVisitor
{
- const std::tr1::shared_ptr<Environment> env;
+ const std::shared_ptr<Environment> env;
const DisplayResolutionCommandLine & cmdline;
- const std::tr1::shared_ptr<const Resolution> resolution;
+ const std::shared_ptr<const Resolution> resolution;
const bool more_annotations;
const bool unconfirmed;
const bool untaken;
@@ -1292,9 +1292,9 @@ namespace
ChoicesToExplain & choices_to_explain;
DisplayAVisitor(
- const std::tr1::shared_ptr<Environment> & e,
+ const std::shared_ptr<Environment> & e,
const DisplayResolutionCommandLine & c,
- const std::tr1::shared_ptr<const Resolution> & r,
+ const std::shared_ptr<const Resolution> & r,
bool m,
bool uc,
bool ut,
@@ -1356,9 +1356,9 @@ namespace
template <typename Decisions_>
void display_a_changes_and_removes(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
- const std::tr1::shared_ptr<Decisions_> & decisions,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Decisions_> & decisions,
const DisplayResolutionCommandLine & cmdline,
ChoicesToExplain & choices_to_explain,
const bool more_annotations,
@@ -1384,8 +1384,8 @@ namespace
any = true;
const std::pair<
- std::tr1::shared_ptr<const ConfirmableDecision>,
- std::tr1::shared_ptr<const OrdererNotes> > star_i(get_decision_and_notes(*i));
+ std::shared_ptr<const ConfirmableDecision>,
+ std::shared_ptr<const OrdererNotes> > star_i(get_decision_and_notes(*i));
DisplayAVisitor v(
env,
@@ -1407,8 +1407,8 @@ namespace
}
void display_changes_and_removes(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
const DisplayResolutionCommandLine & cmdline,
ChoicesToExplain & choices_to_explain)
{
@@ -1417,8 +1417,8 @@ namespace
}
void display_unorderable_changes_and_removed(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
const DisplayResolutionCommandLine & cmdline,
ChoicesToExplain & choices_to_explain)
{
@@ -1428,8 +1428,8 @@ namespace
}
void display_untaken_changes_and_removes(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
const DisplayResolutionCommandLine & cmdline,
ChoicesToExplain & choices_to_explain)
{
@@ -1439,9 +1439,9 @@ namespace
}
void display_an_errors(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
- const std::tr1::shared_ptr<const Decisions<UnableToMakeDecision> > & decisions,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<const Decisions<UnableToMakeDecision> > & decisions,
const DisplayResolutionCommandLine &,
const bool untaken)
{
@@ -1470,8 +1470,8 @@ namespace
}
void display_taken_errors(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
const DisplayResolutionCommandLine & cmdline)
{
if (! resolved->taken_unable_to_make_decisions()->empty())
@@ -1479,8 +1479,8 @@ namespace
}
void display_untaken_errors(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
const DisplayResolutionCommandLine & cmdline)
{
if (! resolved->untaken_unable_to_make_decisions()->empty())
@@ -1488,8 +1488,8 @@ namespace
}
void display_taken_changes_requiring_confirmation(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
const DisplayResolutionCommandLine & cmdline)
{
ChoicesToExplain ignore_choices_to_explain;
@@ -1507,9 +1507,9 @@ DisplayResolutionCommand::important() const
int
DisplayResolutionCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args,
- const std::tr1::shared_ptr<const Resolved> & maybe_resolved
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args,
+ const std::shared_ptr<const Resolved> & maybe_resolved
)
{
DisplayResolutionCommandLine cmdline;
@@ -1523,7 +1523,7 @@ DisplayResolutionCommand::run(
cmdline.import_options.apply(env);
- std::tr1::shared_ptr<const Resolved> resolved(maybe_resolved);
+ std::shared_ptr<const Resolved> resolved(maybe_resolved);
if (! resolved)
{
if (getenv_with_default("PALUDIS_SERIALISED_RESOLUTION_FD", "").empty())
@@ -1552,13 +1552,13 @@ DisplayResolutionCommand::run(
int
DisplayResolutionCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args)
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args)
{
return run(env, args, make_null_shared_ptr());
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
DisplayResolutionCommand::make_doc_cmdline()
{
return make_shared_ptr(new DisplayResolutionCommandLine);
diff --git a/src/clients/cave/cmd_display_resolution.hh b/src/clients/cave/cmd_display_resolution.hh
index aa23e8af9..fcf1d7093 100644
--- a/src/clients/cave/cmd_display_resolution.hh
+++ b/src/clients/cave/cmd_display_resolution.hh
@@ -34,17 +34,17 @@ namespace paludis
bool important() const;
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args,
- const std::tr1::shared_ptr<const resolver::Resolved> & maybe_resolved
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args,
+ const std::shared_ptr<const resolver::Resolved> & maybe_resolved
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_executables.cc b/src/clients/cave/cmd_executables.cc
index a30e9d978..ad8bbedf7 100644
--- a/src/clients/cave/cmd_executables.cc
+++ b/src/clients/cave/cmd_executables.cc
@@ -36,7 +36,7 @@
#include <algorithm>
#include <set>
#include <cstdlib>
-#include <tr1/memory>
+#include <memory>
using namespace paludis;
using namespace cave;
@@ -77,8 +77,8 @@ namespace
int
ExecutablesCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
ExecutablesCommandLine cmdline;
@@ -96,7 +96,7 @@ ExecutablesCommand::run(
return executables_common(env, *cmdline.begin_parameters(), &format_fsentry);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
ExecutablesCommand::make_doc_cmdline()
{
return make_shared_ptr(new ExecutablesCommandLine);
diff --git a/src/clients/cave/cmd_executables.hh b/src/clients/cave/cmd_executables.hh
index 470a28e27..a84029478 100644
--- a/src/clients/cave/cmd_executables.hh
+++ b/src/clients/cave/cmd_executables.hh
@@ -32,11 +32,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index 6f8cfbfec..f22035f75 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -84,7 +84,7 @@
#include <list>
#include <cstdlib>
#include <algorithm>
-#include <tr1/unordered_map>
+#include <unordered_map>
using namespace paludis;
using namespace cave;
@@ -138,22 +138,22 @@ namespace
};
bool do_pretend(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const ExecuteResolutionCommandLine & cmdline,
const PackageDepSpec & origin_id_spec,
const int x, const int y, const int prev_x,
- std::tr1::shared_ptr<OutputManager> & output_manager_goes_here)
+ std::shared_ptr<OutputManager> & output_manager_goes_here)
{
Context context("When pretending for '" + stringify(origin_id_spec) + "':");
- const std::tr1::shared_ptr<const PackageID> origin_id(*(*env)[selection::RequireExactlyOne(
+ const std::shared_ptr<const PackageID> origin_id(*(*env)[selection::RequireExactlyOne(
generator::Matches(origin_id_spec, MatchPackageOptions()))]->begin());
if (0 != prev_x)
cout << std::string(stringify(prev_x).length() + stringify(y).length() + 4, '\010');
cout << x << " of " << y << std::flush;
- std::tr1::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
args->push_back("pretend");
args->push_back("--hooks");
@@ -184,14 +184,14 @@ namespace
a != a_end ; ++a)
command = command + " " + args::escape(*a);
- IPCInputManager input_manager(env.get(), std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)>());
+ IPCInputManager input_manager(env.get(), std::function<void (const std::shared_ptr<OutputManager> &)>());
paludis::Command cmd(command);
cmd
.with_pipe_command_handler("PALUDIS_IPC", input_manager.pipe_command_handler())
;
retcode = run_command(cmd);
- const std::tr1::shared_ptr<OutputManager> output_manager(input_manager.underlying_output_manager_if_constructed());
+ const std::shared_ptr<OutputManager> output_manager(input_manager.underlying_output_manager_if_constructed());
if (output_manager)
{
output_manager->nothing_more_to_come();
@@ -209,7 +209,7 @@ namespace
void starting_action(
const std::string & action,
- const std::tr1::shared_ptr<const PackageIDSequence> & ids,
+ const std::shared_ptr<const PackageIDSequence> & ids,
const int x, const int y)
{
cout << endl;
@@ -220,7 +220,7 @@ namespace
void done_action(
const std::string & action,
- const std::tr1::shared_ptr<const PackageIDSequence> & ids,
+ const std::shared_ptr<const PackageIDSequence> & ids,
const bool success)
{
cout << endl;
@@ -236,14 +236,14 @@ namespace
void set_output_manager(
Mutex & mutex,
JobActiveState & active_state,
- const std::tr1::shared_ptr<OutputManager> & o)
+ const std::shared_ptr<OutputManager> & o)
{
Lock lock(mutex);
active_state.set_output_manager(o);
}
bool do_fetch(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const ExecuteResolutionCommandLine & cmdline,
const PackageDepSpec & id_spec,
const int x, const int y, bool normal_only,
@@ -252,7 +252,7 @@ namespace
{
Context context("When fetching for '" + stringify(id_spec) + "':");
- const std::tr1::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
+ const std::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
generator::Matches(id_spec, MatchPackageOptions()))]->begin());
std::string command(cmdline.program_options.a_perform_program.argument());
@@ -303,8 +303,8 @@ namespace
command.append(" --" + cmdline.import_options.a_unpackaged_repository_params.long_name() + " '" + *p + "'");
}
- IPCInputManager input_manager(env.get(), std::tr1::bind(&set_output_manager, std::tr1::ref(job_mutex),
- std::tr1::ref(active_state), std::tr1::placeholders::_1));
+ IPCInputManager input_manager(env.get(), std::bind(&set_output_manager, std::ref(job_mutex),
+ std::ref(active_state), std::placeholders::_1));
paludis::Command cmd(command);
cmd
@@ -316,17 +316,17 @@ namespace
}
bool do_install(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const ExecuteResolutionCommandLine & cmdline,
const PackageDepSpec & id_spec,
const RepositoryName & destination_repository_name,
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > & replacing_specs,
+ const std::shared_ptr<const Sequence<PackageDepSpec> > & replacing_specs,
const std::string & destination_string,
const int x, const int y,
Mutex & job_mutex,
JobActiveState & active_state)
{
- const std::tr1::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
+ const std::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
generator::Matches(id_spec, MatchPackageOptions()))]->begin());
Context context("When " + destination_string + " for '" + stringify(*id) + "':");
@@ -382,20 +382,20 @@ namespace
command.append(" --" + cmdline.import_options.a_unpackaged_repository_params.long_name() + " '" + *p + "'");
}
- IPCInputManager input_manager(env.get(), std::tr1::bind(&set_output_manager, std::tr1::ref(job_mutex),
- std::tr1::ref(active_state), std::tr1::placeholders::_1));
+ IPCInputManager input_manager(env.get(), std::bind(&set_output_manager, std::ref(job_mutex),
+ std::ref(active_state), std::placeholders::_1));
paludis::Command cmd(command);
cmd
.with_pipe_command_handler("PALUDIS_IPC", input_manager.pipe_command_handler())
;
int retcode(run_command(cmd));
- const std::tr1::shared_ptr<OutputManager> output_manager(input_manager.underlying_output_manager_if_constructed());
+ const std::shared_ptr<OutputManager> output_manager(input_manager.underlying_output_manager_if_constructed());
return 0 == retcode;
}
bool do_uninstall(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const ExecuteResolutionCommandLine & cmdline,
const PackageDepSpec & id_spec,
const int x, const int y,
@@ -404,7 +404,7 @@ namespace
{
Context context("When removing '" + stringify(id_spec) + "':");
- const std::tr1::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
+ const std::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
generator::Matches(id_spec, MatchPackageOptions()))]->begin());
std::string command(cmdline.program_options.a_perform_program.argument());
@@ -453,15 +453,15 @@ namespace
command.append(" --" + cmdline.import_options.a_unpackaged_repository_params.long_name() + " '" + *p + "'");
}
- IPCInputManager input_manager(env.get(), std::tr1::bind(&set_output_manager, std::tr1::ref(job_mutex),
- std::tr1::ref(active_state), std::tr1::placeholders::_1));
+ IPCInputManager input_manager(env.get(), std::bind(&set_output_manager, std::ref(job_mutex),
+ std::ref(active_state), std::placeholders::_1));
paludis::Command cmd(command);
cmd
.with_pipe_command_handler("PALUDIS_IPC", input_manager.pipe_command_handler())
;
int retcode(run_command(cmd));
- const std::tr1::shared_ptr<OutputManager> output_manager(input_manager.underlying_output_manager_if_constructed());
+ const std::shared_ptr<OutputManager> output_manager(input_manager.underlying_output_manager_if_constructed());
if (output_manager)
output_manager->succeeded();
@@ -469,7 +469,7 @@ namespace
}
void update_world(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const ExecuteResolutionCommandLine & cmdline,
const bool removes)
{
@@ -562,7 +562,7 @@ namespace
}
void execute_update_world(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const ExecuteResolutionCommandLine & cmdline)
{
if (cmdline.execution_options.a_preserve_world.specified())
@@ -575,8 +575,8 @@ namespace
}
int execute_pretends(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<JobLists> & lists,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<JobLists> & lists,
const ExecuteResolutionCommandLine & cmdline)
{
bool failed(false);
@@ -594,7 +594,7 @@ namespace
if (++x == 1)
cout << "Executing pretend actions: " << std::flush;
- std::tr1::shared_ptr<OutputManager> output_manager_goes_here;
+ std::shared_ptr<OutputManager> output_manager_goes_here;
failed = failed || ! do_pretend(env, cmdline, (*c)->origin_id_spec(), x, y, prev_x, output_manager_goes_here);
prev_x = x;
}
@@ -651,7 +651,7 @@ namespace
struct ExecuteOneVisitor
{
- const std::tr1::shared_ptr<Environment> env;
+ const std::shared_ptr<Environment> env;
const ExecuteResolutionCommandLine & cmdline;
ExecuteCounts & counts;
Mutex & job_mutex;
@@ -659,7 +659,7 @@ namespace
int retcode;
ExecuteOneVisitor(
- const std::tr1::shared_ptr<Environment> & e,
+ const std::shared_ptr<Environment> & e,
const ExecuteResolutionCommandLine & c,
ExecuteCounts & k,
Mutex & m,
@@ -696,7 +696,7 @@ namespace
if (destination_string.empty())
throw InternalError(PALUDIS_HERE, "unhandled dt");
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::RequireExactlyOne(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::RequireExactlyOne(
generator::Matches(install_item.origin_id_spec(), MatchPackageOptions()))]);
switch (part)
@@ -710,7 +710,7 @@ namespace
case x1_main:
{
- const std::tr1::shared_ptr<JobActiveState> active_state(new JobActiveState);
+ const std::shared_ptr<JobActiveState> active_state(new JobActiveState);
{
Lock lock(job_mutex);
install_item.set_state(active_state);
@@ -748,12 +748,12 @@ namespace
int visit(UninstallJob & uninstall_item)
{
- const std::tr1::shared_ptr<PackageIDSequence> ids(new PackageIDSequence);
+ const std::shared_ptr<PackageIDSequence> ids(new PackageIDSequence);
for (Sequence<PackageDepSpec>::ConstIterator i(uninstall_item.ids_to_remove_specs()->begin()),
i_end(uninstall_item.ids_to_remove_specs()->end()) ;
i != i_end ; ++i)
{
- const std::tr1::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
+ const std::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
generator::Matches(*i, MatchPackageOptions()))]->begin());
ids->push_back(id);
}
@@ -769,7 +769,7 @@ namespace
case x1_main:
{
- const std::tr1::shared_ptr<JobActiveState> active_state(new JobActiveState);
+ const std::shared_ptr<JobActiveState> active_state(new JobActiveState);
{
Lock lock(job_mutex);
uninstall_item.set_state(active_state);
@@ -800,7 +800,7 @@ namespace
int visit(FetchJob & fetch_item)
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::RequireExactlyOne(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::RequireExactlyOne(
generator::Matches(fetch_item.origin_id_spec(), MatchPackageOptions()))]);
switch (part)
@@ -814,7 +814,7 @@ namespace
case x1_main:
{
- const std::tr1::shared_ptr<JobActiveState> active_state(new JobActiveState);
+ const std::shared_ptr<JobActiveState> active_state(new JobActiveState);
{
Lock lock(job_mutex);
fetch_item.set_state(active_state);
@@ -911,10 +911,10 @@ namespace
};
std::string stringify_id_or_spec(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const PackageDepSpec & spec)
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(
generator::Matches(spec, MatchPackageOptions()))]);
if (ids->empty())
return stringify(spec);
@@ -924,13 +924,13 @@ namespace
struct AlreadyDoneVisitor
{
- const std::tr1::shared_ptr<Environment> env;
+ const std::shared_ptr<Environment> env;
ExecuteCounts & counts;
int x, y;
std::string text;
AlreadyDoneVisitor(
- const std::tr1::shared_ptr<Environment> & e,
+ const std::shared_ptr<Environment> & e,
ExecuteCounts & c) :
env(e),
counts(c)
@@ -954,16 +954,16 @@ namespace
void visit(const UninstallJob & j)
{
text = "uninstall " + join(j.ids_to_remove_specs()->begin(), j.ids_to_remove_specs()->end(), ", ",
- std::tr1::bind(&stringify_id_or_spec, env, std::tr1::placeholders::_1));
+ std::bind(&stringify_id_or_spec, env, std::placeholders::_1));
x = ++counts.x_installs;
y = counts.y_installs;
}
};
void already_done_action(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const std::string & state,
- const std::tr1::shared_ptr<const ExecuteJob> & job,
+ const std::shared_ptr<const ExecuteJob> & job,
ExecuteCounts & counts)
{
AlreadyDoneVisitor v(env, counts);
@@ -976,9 +976,9 @@ namespace
struct MakeJobID
{
- const std::tr1::shared_ptr<Environment> env;
+ const std::shared_ptr<Environment> env;
- MakeJobID(const std::tr1::shared_ptr<Environment> & e) :
+ MakeJobID(const std::shared_ptr<Environment> & e) :
env(e)
{
}
@@ -986,7 +986,7 @@ namespace
std::string visit(const UninstallJob & j) const
{
return "uninstalling " + join(j.ids_to_remove_specs()->begin(), j.ids_to_remove_specs()->end(), ", ",
- std::tr1::bind(stringify_id_or_spec, env, std::tr1::placeholders::_1));
+ std::bind(stringify_id_or_spec, env, std::placeholders::_1));
}
std::string visit(const InstallJob & j) const
@@ -1002,27 +1002,27 @@ namespace
struct GetOutputManager
{
- const std::tr1::shared_ptr<OutputManager> visit(const JobActiveState & s) const
+ const std::shared_ptr<OutputManager> visit(const JobActiveState & s) const
{
return s.output_manager();
}
- const std::tr1::shared_ptr<OutputManager> visit(const JobFailedState & s) const
+ const std::shared_ptr<OutputManager> visit(const JobFailedState & s) const
{
return s.output_manager();
}
- const std::tr1::shared_ptr<OutputManager> visit(const JobSucceededState & s) const
+ const std::shared_ptr<OutputManager> visit(const JobSucceededState & s) const
{
return s.output_manager();
}
- const std::tr1::shared_ptr<OutputManager> visit(const JobSkippedState &) const
+ const std::shared_ptr<OutputManager> visit(const JobSkippedState &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<OutputManager> visit(const JobPendingState &) const
+ const std::shared_ptr<OutputManager> visit(const JobPendingState &) const
{
return make_null_shared_ptr();
}
@@ -1059,10 +1059,10 @@ namespace
struct ExecuteJobExecutive :
Executive
{
- const std::tr1::shared_ptr<Environment> env;
+ const std::shared_ptr<Environment> env;
const ExecuteResolutionCommandLine & cmdline;
- const std::tr1::shared_ptr<ExecuteJob> job;
- const std::tr1::shared_ptr<const JobLists> lists;
+ const std::shared_ptr<ExecuteJob> job;
+ const std::shared_ptr<const JobLists> lists;
JobRequirementIf require_if;
Mutex & retcode_mutex;
int & retcode;
@@ -1076,10 +1076,10 @@ namespace
bool want, already_done;
ExecuteJobExecutive(
- const std::tr1::shared_ptr<Environment> & e,
+ const std::shared_ptr<Environment> & e,
const ExecuteResolutionCommandLine & c,
- const std::tr1::shared_ptr<ExecuteJob> & j,
- const std::tr1::shared_ptr<const JobLists> & l,
+ const std::shared_ptr<ExecuteJob> & j,
+ const std::shared_ptr<const JobLists> & l,
JobRequirementIf r,
Mutex & m,
int & rc,
@@ -1122,7 +1122,7 @@ namespace
if (! r->required_if()[jri_fetching])
continue;
- const std::tr1::shared_ptr<const ExecuteJob> req(*lists->execute_job_list()->fetch(r->job_number()));
+ const std::shared_ptr<const ExecuteJob> req(*lists->execute_job_list()->fetch(r->job_number()));
if (! req->state()->accept_returning<bool>(CanStartState()))
return false;
}
@@ -1178,7 +1178,7 @@ namespace
if (! r->required_if()[require_if])
continue;
- const std::tr1::shared_ptr<const ExecuteJob> req(*lists->execute_job_list()->fetch(r->job_number()));
+ const std::shared_ptr<const ExecuteJob> req(*lists->execute_job_list()->fetch(r->job_number()));
want = want && req->state()->accept_returning<bool>(ContinueAfterState());
}
}
@@ -1217,8 +1217,8 @@ namespace
return;
Lock lock(job_mutex);
- const std::tr1::shared_ptr<OutputManager> output_manager(
- job->state()->accept_returning<std::tr1::shared_ptr<OutputManager> >(GetOutputManager()));
+ const std::shared_ptr<OutputManager> output_manager(
+ job->state()->accept_returning<std::shared_ptr<OutputManager> >(GetOutputManager()));
if (output_manager)
{
@@ -1249,8 +1249,8 @@ namespace
void flush_threaded()
{
Lock lock(job_mutex);
- const std::tr1::shared_ptr<OutputManager> output_manager(
- job->state()->accept_returning<std::tr1::shared_ptr<OutputManager> >(GetOutputManager()));
+ const std::shared_ptr<OutputManager> output_manager(
+ job->state()->accept_returning<std::shared_ptr<OutputManager> >(GetOutputManager()));
if (output_manager && output_manager->want_to_flush())
display_active();
@@ -1271,8 +1271,8 @@ namespace
retcode |= job->accept_returning<int>(execute);
Lock lock(job_mutex);
- const std::tr1::shared_ptr<OutputManager> output_manager(
- job->state()->accept_returning<std::tr1::shared_ptr<OutputManager> >(GetOutputManager()));
+ const std::shared_ptr<OutputManager> output_manager(
+ job->state()->accept_returning<std::shared_ptr<OutputManager> >(GetOutputManager()));
if (output_manager)
{
@@ -1285,8 +1285,8 @@ namespace
};
int execute_executions(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<JobLists> & lists,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<JobLists> & lists,
const ExecuteResolutionCommandLine & cmdline)
{
int retcode(0);
@@ -1337,8 +1337,8 @@ namespace
}
int execute_resolution_main(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<JobLists> & lists,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<JobLists> & lists,
const ExecuteResolutionCommandLine & cmdline)
{
for (JobList<ExecuteJob>::ConstIterator c(lists->execute_job_list()->begin()),
@@ -1365,9 +1365,9 @@ namespace
struct SummaryNameVisitor
{
- const std::tr1::shared_ptr<Environment> env;
+ const std::shared_ptr<Environment> env;
- SummaryNameVisitor(const std::tr1::shared_ptr<Environment> & e) :
+ SummaryNameVisitor(const std::shared_ptr<Environment> & e) :
env(e)
{
}
@@ -1385,21 +1385,21 @@ namespace
std::string visit(const UninstallJob & j) const
{
return "uninstall " + join(j.ids_to_remove_specs()->begin(), j.ids_to_remove_specs()->end(), ", ",
- std::tr1::bind(&stringify_id_or_spec, env, std::tr1::placeholders::_1));
+ std::bind(&stringify_id_or_spec, env, std::placeholders::_1));
}
};
struct SummaryDisplayer
{
- const std::tr1::shared_ptr<Environment> env;
- const std::tr1::shared_ptr<const ExecuteJob> job;
+ const std::shared_ptr<Environment> env;
+ const std::shared_ptr<const ExecuteJob> job;
const bool something_failed;
bool & done_heading;
SummaryDisplayer(
- const std::tr1::shared_ptr<Environment> & e,
- const std::tr1::shared_ptr<const ExecuteJob> & j,
+ const std::shared_ptr<Environment> & e,
+ const std::shared_ptr<const ExecuteJob> & j,
const bool s,
bool & b) :
env(e),
@@ -1462,8 +1462,8 @@ namespace
};
void display_summary(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<JobLists> & lists,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<JobLists> & lists,
const bool something_failed)
{
bool done_heading(false);
@@ -1479,15 +1479,15 @@ namespace
struct NotASuccess
{
- bool operator() (const std::tr1::shared_ptr<const ExecuteJob> & job) const
+ bool operator() (const std::shared_ptr<const ExecuteJob> & job) const
{
return (! job->state()) || ! simple_visitor_cast<const JobSucceededState>(*job->state());
}
};
void write_resume_file(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<JobLists> & lists,
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<JobLists> & lists,
const ExecuteResolutionCommandLine & cmdline)
{
if (! cmdline.execution_options.a_resume_file.specified())
@@ -1503,10 +1503,10 @@ namespace
}
else
{
- std::tr1::shared_ptr<Sequence<std::string> > targets(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > targets(new Sequence<std::string>);
std::copy(cmdline.begin_parameters(), cmdline.end_parameters(), targets->back_inserter());
- std::tr1::shared_ptr<Sequence<std::string> > world_specs(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > world_specs(new Sequence<std::string>);
std::copy(cmdline.a_world_specs.begin_args(), cmdline.a_world_specs.end_args(), world_specs->back_inserter());
ResumeData resume_data(make_named_values<ResumeData>(
@@ -1525,8 +1525,8 @@ namespace
}
int execute_resolution(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<JobLists> & lists,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<JobLists> & lists,
const ExecuteResolutionCommandLine & cmdline)
{
Context context("When executing chosen resolution:");
@@ -1583,9 +1583,9 @@ ExecuteResolutionCommand::important() const
int
ExecuteResolutionCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args,
- const std::tr1::shared_ptr<JobLists> & maybe_lists
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args,
+ const std::shared_ptr<JobLists> & maybe_lists
)
{
ExecuteResolutionCommandLine cmdline;
@@ -1599,7 +1599,7 @@ ExecuteResolutionCommand::run(
cmdline.import_options.apply(env);
- std::tr1::shared_ptr<JobLists> lists(maybe_lists);
+ std::shared_ptr<JobLists> lists(maybe_lists);
if (! lists)
{
if (getenv_with_default("PALUDIS_SERIALISED_RESOLUTION_FD", "").empty())
@@ -1618,13 +1618,13 @@ ExecuteResolutionCommand::run(
int
ExecuteResolutionCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args)
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args)
{
return run(env, args, make_null_shared_ptr());
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
ExecuteResolutionCommand::make_doc_cmdline()
{
return make_shared_ptr(new ExecuteResolutionCommandLine);
diff --git a/src/clients/cave/cmd_execute_resolution.hh b/src/clients/cave/cmd_execute_resolution.hh
index 7ef3c2894..5e76354ee 100644
--- a/src/clients/cave/cmd_execute_resolution.hh
+++ b/src/clients/cave/cmd_execute_resolution.hh
@@ -34,16 +34,16 @@ namespace paludis
bool important() const;
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args,
- const std::tr1::shared_ptr<resolver::JobLists> & maybe_job_lists);
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args,
+ const std::shared_ptr<resolver::JobLists> & maybe_job_lists);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_find_candidates.cc b/src/clients/cave/cmd_find_candidates.cc
index ee798efe3..f5e5524a1 100644
--- a/src/clients/cave/cmd_find_candidates.cc
+++ b/src/clients/cave/cmd_find_candidates.cc
@@ -93,9 +93,9 @@ namespace
}
void check_candidates(
- const std::tr1::function<void (const PackageDepSpec &)> & yield,
- const std::tr1::function<void (const std::string &)> & step,
- const std::tr1::shared_ptr<const PackageIDSequence> & ids)
+ const std::function<void (const PackageDepSpec &)> & yield,
+ const std::function<void (const std::string &)> & step,
+ const std::shared_ptr<const PackageIDSequence> & ids)
{
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
@@ -108,8 +108,8 @@ namespace
int
FindCandidatesCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
FindCandidatesCommandLine cmdline;
@@ -124,7 +124,7 @@ FindCandidatesCommand::run(
if (cmdline.begin_parameters() == cmdline.end_parameters())
throw args::DoHelp("find-candidates requires at least one parameter");
- const std::tr1::shared_ptr<Set<std::string> > patterns(new Set<std::string>);
+ const std::shared_ptr<Set<std::string> > patterns(new Set<std::string>);
std::copy(cmdline.begin_parameters(), cmdline.end_parameters(), patterns->inserter());
run_hosted(env, cmdline.search_options, cmdline.match_options, patterns, &print_spec, &no_step);
@@ -138,12 +138,12 @@ typedef std::set<QualifiedPackageName> QualifiedPackageNames;
void
FindCandidatesCommand::run_hosted(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const SearchCommandLineCandidateOptions & search_options,
const SearchCommandLineMatchOptions &,
- const std::tr1::shared_ptr<const Set<std::string> > &,
- const std::tr1::function<void (const PackageDepSpec &)> & yield,
- const std::tr1::function<void (const std::string &)> & step)
+ const std::shared_ptr<const Set<std::string> > &,
+ const std::function<void (const PackageDepSpec &)> & yield,
+ const std::function<void (const std::string &)> & step)
{
if (! search_options.a_matching.specified())
{
@@ -160,8 +160,8 @@ FindCandidatesCommand::run_hosted(
for (RepositoryNames::const_iterator r(repository_names.begin()), r_end(repository_names.end()) ;
r != r_end ; ++r)
{
- const std::tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(*r));
- const std::tr1::shared_ptr<const CategoryNamePartSet> cats(repo->category_names());
+ const std::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(*r));
+ const std::shared_ptr<const CategoryNamePartSet> cats(repo->category_names());
std::copy(cats->begin(), cats->end(), std::inserter(category_names, category_names.end()));
}
@@ -171,11 +171,11 @@ FindCandidatesCommand::run_hosted(
for (RepositoryNames::const_iterator r(repository_names.begin()), r_end(repository_names.end()) ;
r != r_end ; ++r)
{
- const std::tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(*r));
+ const std::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(*r));
for (CategoryNames::const_iterator c(category_names.begin()), c_end(category_names.end()) ;
c != c_end ; ++c)
{
- const std::tr1::shared_ptr<const QualifiedPackageNameSet> qpns(repo->package_names(*c));
+ const std::shared_ptr<const QualifiedPackageNameSet> qpns(repo->package_names(*c));
std::copy(qpns->begin(), qpns->end(), std::inserter(package_names, package_names.end()));
}
}
@@ -187,13 +187,13 @@ FindCandidatesCommand::run_hosted(
{
if (search_options.a_all_versions.specified())
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
generator::Package(*q))]);
check_candidates(yield, step, ids);
}
else
{
- std::tr1::shared_ptr<const PackageIDSequence> ids;
+ std::shared_ptr<const PackageIDSequence> ids;
ids = ((*env)[selection::BestVersionOnly(generator::Package(*q) | filter::SupportsAction<InstallAction>() | filter::NotMasked())]);
if (ids->empty())
@@ -209,7 +209,7 @@ FindCandidatesCommand::run_hosted(
{
step("Searching matches");
- std::tr1::shared_ptr<Generator> match_generator;
+ std::shared_ptr<Generator> match_generator;
for (args::StringSetArg::ConstIterator k(search_options.a_matching.begin_args()),
k_end(search_options.a_matching.end_args()) ;
@@ -225,20 +225,20 @@ FindCandidatesCommand::run_hosted(
if (search_options.a_all_versions.specified())
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
*match_generator)]);
check_candidates(yield, step, ids);
}
else
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(
*match_generator)]);
check_candidates(yield, step, ids);
}
}
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
FindCandidatesCommand::make_doc_cmdline()
{
return make_shared_ptr(new FindCandidatesCommandLine);
diff --git a/src/clients/cave/cmd_find_candidates.hh b/src/clients/cave/cmd_find_candidates.hh
index c03dcce68..b9e1e7f18 100644
--- a/src/clients/cave/cmd_find_candidates.hh
+++ b/src/clients/cave/cmd_find_candidates.hh
@@ -24,7 +24,7 @@
#include "cmd_search_cmdline.hh"
#include <paludis/dep_spec-fwd.hh>
#include <paludis/util/set-fwd.hh>
-#include <tr1/functional>
+#include <functional>
namespace paludis
{
@@ -35,19 +35,19 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
void run_hosted(
- const std::tr1::shared_ptr<Environment> &,
+ const std::shared_ptr<Environment> &,
const SearchCommandLineCandidateOptions &,
const SearchCommandLineMatchOptions &,
- const std::tr1::shared_ptr<const Set<std::string> > &,
- const std::tr1::function<void (const PackageDepSpec &)> &,
- const std::tr1::function<void (const std::string &)> &);
+ const std::shared_ptr<const Set<std::string> > &,
+ const std::function<void (const PackageDepSpec &)> &,
+ const std::function<void (const std::string &)> &);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_fix_cache.cc b/src/clients/cave/cmd_fix_cache.cc
index 01046c61b..b50628a68 100644
--- a/src/clients/cave/cmd_fix_cache.cc
+++ b/src/clients/cave/cmd_fix_cache.cc
@@ -83,8 +83,8 @@ namespace
int
FixCacheCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
FixCacheCommandLine cmdline;
@@ -142,14 +142,14 @@ FixCacheCommand::run(
r != r_end; ++r)
{
cout << format_general_s(f::fix_cache_fixing(), stringify(*r));
- const std::tr1::shared_ptr<Repository> repo(env->package_database()->fetch_repository(*r));
+ const std::shared_ptr<Repository> repo(env->package_database()->fetch_repository(*r));
repo->regenerate_cache();
}
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
FixCacheCommand::make_doc_cmdline()
{
return make_shared_ptr(new FixCacheCommandLine);
diff --git a/src/clients/cave/cmd_fix_cache.hh b/src/clients/cave/cmd_fix_cache.hh
index 6cc22ff31..9c4e33a37 100644
--- a/src/clients/cave/cmd_fix_cache.hh
+++ b/src/clients/cave/cmd_fix_cache.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc
index 82aafcae8..03a7adf2f 100644
--- a/src/clients/cave/cmd_fix_linkage.cc
+++ b/src/clients/cave/cmd_fix_linkage.cc
@@ -135,8 +135,8 @@ namespace
int
FixLinkageCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
FixLinkageCommandLine cmdline;
@@ -166,11 +166,11 @@ FixLinkageCommand::run(
resolve_cmdline.resolution_options.a_execute.set_specified(true);
std::string library(cmdline.a_library.argument());
- std::tr1::shared_ptr<BrokenLinkageFinder> finder;
+ std::shared_ptr<BrokenLinkageFinder> finder;
{
DisplayCallback display_callback("Searching: ");
ScopedNotifierCallback display_callback_holder(env.get(),
- NotifierCallbackFunction(std::tr1::cref(display_callback)));
+ NotifierCallbackFunction(std::cref(display_callback)));
finder.reset(new BrokenLinkageFinder(env.get(), cmdline.a_library.argument()));
}
@@ -184,7 +184,7 @@ FixLinkageCommand::run(
return EXIT_SUCCESS;
}
- std::tr1::shared_ptr<Sequence<std::pair<std::string, std::string> > > targets(new Sequence<std::pair<std::string, std::string> >);
+ std::shared_ptr<Sequence<std::pair<std::string, std::string> > > targets(new Sequence<std::pair<std::string, std::string> >);
for (BrokenLinkageFinder::BrokenPackageConstIterator pkg_it(finder->begin_broken_packages()),
pkg_it_end(finder->end_broken_packages()); pkg_it_end != pkg_it; ++pkg_it)
@@ -223,7 +223,7 @@ FixLinkageCommand::run(
targets->push_back(std::make_pair(stringify(PackageDepSpec(part_spec)), join(broken_files.begin(), broken_files.end(), ", ")));
}
- std::tr1::shared_ptr<const PackageID> orphans;
+ std::shared_ptr<const PackageID> orphans;
if (finder->begin_broken_files(orphans) != finder->end_broken_files(orphans))
{
if (library.empty())
@@ -251,7 +251,7 @@ FixLinkageCommand::run(
make_null_shared_ptr(), targets, make_null_shared_ptr(), false);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
FixLinkageCommand::make_doc_cmdline()
{
return make_shared_ptr(new FixLinkageCommandLine);
diff --git a/src/clients/cave/cmd_fix_linkage.hh b/src/clients/cave/cmd_fix_linkage.hh
index 2b7667d43..6dd3d9191 100644
--- a/src/clients/cave/cmd_fix_linkage.hh
+++ b/src/clients/cave/cmd_fix_linkage.hh
@@ -33,11 +33,11 @@ namespace paludis
bool important() const;
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_help.cc b/src/clients/cave/cmd_help.cc
index 43a0dea19..ba460a97f 100644
--- a/src/clients/cave/cmd_help.cc
+++ b/src/clients/cave/cmd_help.cc
@@ -72,8 +72,8 @@ namespace
bool
operator() (const std::string & left, const std::string & right)
{
- std::tr1::shared_ptr<Command> lhs(CommandFactory::get_instance()->create(left));
- std::tr1::shared_ptr<Command> rhs(CommandFactory::get_instance()->create(right));
+ std::shared_ptr<Command> lhs(CommandFactory::get_instance()->create(left));
+ std::shared_ptr<Command> rhs(CommandFactory::get_instance()->create(right));
if (lhs->important() && rhs->important())
return left.length() < right.length();
@@ -94,8 +94,8 @@ HelpCommand::important() const
}
int
-HelpCommand::run(const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr< const Sequence<std::string> > & args)
+HelpCommand::run(const std::shared_ptr<Environment> & env,
+ const std::shared_ptr< const Sequence<std::string> > & args)
{
HelpCommandLine cmdline;
cmdline.run(args, "CAVE", "CAVE_HELP_OPTIONS", "CAVE_HELP_CMDLINE");
@@ -137,7 +137,7 @@ HelpCommand::run(const std::tr1::shared_ptr<Environment> & env,
for (CommandFactory::ConstIterator cmd(CommandFactory::get_instance()->begin()), cmd_end(CommandFactory::get_instance()->end()) ;
cmd != cmd_end ; ++cmd)
{
- std::tr1::shared_ptr<Command> instance(CommandFactory::get_instance()->create(*cmd));
+ std::shared_ptr<Command> instance(CommandFactory::get_instance()->create(*cmd));
if (instance->important())
cout << " " << *cmd << std::string(length - cmd->length(), ' ') << " "
@@ -148,7 +148,7 @@ HelpCommand::run(const std::tr1::shared_ptr<Environment> & env,
}
else
{
- std::tr1::shared_ptr< Sequence<std::string> > help(make_shared_ptr(new Sequence<std::string>));
+ std::shared_ptr< Sequence<std::string> > help(make_shared_ptr(new Sequence<std::string>));
help->push_back("--help");
return CommandFactory::get_instance()->create(*cmdline.begin_parameters())->run(env, help);
@@ -157,7 +157,7 @@ HelpCommand::run(const std::tr1::shared_ptr<Environment> & env,
return EXIT_FAILURE;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
HelpCommand::make_doc_cmdline()
{
return make_shared_ptr(new HelpCommandLine);
diff --git a/src/clients/cave/cmd_help.hh b/src/clients/cave/cmd_help.hh
index d83468486..2245a9453 100644
--- a/src/clients/cave/cmd_help.hh
+++ b/src/clients/cave/cmd_help.hh
@@ -31,10 +31,10 @@ namespace paludis
public:
bool important() const;
- int run(const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr< const Sequence<std::string> > & args);
+ int run(const std::shared_ptr<Environment> &,
+ const std::shared_ptr< const Sequence<std::string> > & args);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_import.cc b/src/clients/cave/cmd_import.cc
index 4dd7a0d8b..aa4799dec 100644
--- a/src/clients/cave/cmd_import.cc
+++ b/src/clients/cave/cmd_import.cc
@@ -155,7 +155,7 @@ namespace
}
};
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -168,8 +168,8 @@ namespace
int
ImportCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
ImportCommandLine cmdline;
@@ -202,8 +202,8 @@ ImportCommand::run(
if (cmdline.a_preserve_metadata.specified())
{
- std::tr1::shared_ptr<const PackageIDSequence> old_ids((*env)[selection::AllVersionsSorted(generator::Package(package))]);
- std::tr1::shared_ptr<const PackageID> old_id;
+ std::shared_ptr<const PackageIDSequence> old_ids((*env)[selection::AllVersionsSorted(generator::Package(package))]);
+ std::shared_ptr<const PackageID> old_id;
for (PackageIDSequence::ConstIterator i(old_ids->begin()), i_end(old_ids->end()) ;
i != i_end ; ++i)
{
@@ -239,7 +239,7 @@ ImportCommand::run(
cmdline.a_run_dependency.begin_args(),
cmdline.a_run_dependency.end_args(), ", ");
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("location", stringify(
cmdline.a_location.specified() ?
FSEntry(cmdline.a_location.argument()) :
@@ -258,10 +258,10 @@ ImportCommand::run(
keys->insert("description", description);
keys->insert("build_dependencies", build_dependencies);
keys->insert("run_dependencies", run_dependencies);
- std::tr1::shared_ptr<Repository> repo(RepositoryFactory::get_instance()->create(env.get(),
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(RepositoryFactory::get_instance()->create(env.get(),
+ std::bind(from_keys, keys, std::placeholders::_1)));
env->package_database()->add_repository(10, repo);
- std::tr1::shared_ptr<const PackageIDSequence> ids(repo->package_ids(package));
+ std::shared_ptr<const PackageIDSequence> ids(repo->package_ids(package));
if (1 != std::distance(ids->begin(), ids->end()))
throw InternalError(PALUDIS_HERE, "ids is '" + join(indirect_iterator(ids->begin()), indirect_iterator(
ids->end()), " ") + "'");
@@ -272,10 +272,10 @@ ImportCommand::run(
if (cmdline.a_execute.specified())
resolve_cmdline.resolution_options.a_execute.set_specified(true);
- std::tr1::shared_ptr<Sequence<std::pair<std::string, std::string> > > targets(new Sequence<std::pair<std::string, std::string> >);
+ std::shared_ptr<Sequence<std::pair<std::string, std::string> > > targets(new Sequence<std::pair<std::string, std::string> >);
targets->push_back(std::make_pair(stringify((*ids->begin())->name()), ""));
- std::tr1::shared_ptr<Sequence<std::string> > world_specs(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > world_specs(new Sequence<std::string>);
world_specs->push_back(stringify((*ids->begin())->name()));
return resolve_common(env,
@@ -286,7 +286,7 @@ ImportCommand::run(
keys, targets, world_specs, false);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
ImportCommand::make_doc_cmdline()
{
return make_shared_ptr(new ImportCommandLine);
diff --git a/src/clients/cave/cmd_import.hh b/src/clients/cave/cmd_import.hh
index fe0562ddc..f4629ae51 100644
--- a/src/clients/cave/cmd_import.hh
+++ b/src/clients/cave/cmd_import.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_info.cc b/src/clients/cave/cmd_info.cc
index 63eac7fee..dbbeff16d 100644
--- a/src/clients/cave/cmd_info.cc
+++ b/src/clients/cave/cmd_info.cc
@@ -86,7 +86,7 @@ namespace
struct MetadataKeyComparator
{
- bool operator() (const std::tr1::shared_ptr<const MetadataKey> & a, const std::tr1::shared_ptr<const MetadataKey> & b) const
+ bool operator() (const std::shared_ptr<const MetadataKey> & a, const std::shared_ptr<const MetadataKey> & b) const
{
bool a_is_section(simple_visitor_cast<const MetadataSectionKey>(*a));
bool b_is_section(simple_visitor_cast<const MetadataSectionKey>(*b));
@@ -147,8 +147,8 @@ namespace
void visit(const MetadataSectionKey & k)
{
cout << format_general_his(f::info_metadata_subsection(), k.human_name(), indent, k.human_name());
- std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(k.begin_metadata(), k.end_metadata());
- for (std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
+ std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(k.begin_metadata(), k.end_metadata());
+ for (std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
s(keys.begin()), s_end(keys.end()) ; s != s_end ; ++s)
{
InfoDisplayer i(cmdline, indent + 1);
@@ -253,21 +253,21 @@ namespace
cout << format_general_his(f::info_metadata(), k.human_name(), indent, stringify(k.value()));
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const PackageID> > & k)
{
ColourFormatter f(indent);
cout << format_general_his(f::info_metadata(), k.human_name(), indent, stringify(*k.value()));
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > &)
+ void visit(const MetadataValueKey<std::shared_ptr<const Contents> > &)
{
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > &)
+ void visit(const MetadataValueKey<std::shared_ptr<const Choices> > &)
{
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > &)
+ void visit(const MetadataValueKey<std::shared_ptr<const RepositoryMaskInfo> > &)
{
}
@@ -280,12 +280,12 @@ namespace
void do_one_repository(
const InfoCommandLine & cmdline,
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Repository> & repo)
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Repository> & repo)
{
cout << format_general_s(f::info_repository_heading(), stringify(repo->name()));
- std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(repo->begin_metadata(), repo->end_metadata());
- for (std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
+ std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(repo->begin_metadata(), repo->end_metadata());
+ for (std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
k(keys.begin()), k_end(keys.end()) ; k != k_end ; ++k)
{
if ((*k)->type() == mkt_internal)
@@ -299,11 +299,11 @@ namespace
void do_env(
const InfoCommandLine & cmdline,
- const std::tr1::shared_ptr<Environment> & env)
+ const std::shared_ptr<Environment> & env)
{
cout << format_general_s(f::info_heading(), "Environment Information");
- std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(env->begin_metadata(), env->end_metadata());
- for (std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
+ std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(env->begin_metadata(), env->end_metadata());
+ for (std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
k(keys.begin()), k_end(keys.end()) ; k != k_end ; ++k)
{
if ((*k)->type() == mkt_internal)
@@ -317,12 +317,12 @@ namespace
void do_about(
const InfoCommandLine & cmdline,
- const std::tr1::shared_ptr<Environment> &)
+ const std::shared_ptr<Environment> &)
{
cout << format_general_s(f::info_heading(), "Package Manager Information");
- std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(AboutMetadata::get_instance()->begin_metadata(),
+ std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(AboutMetadata::get_instance()->begin_metadata(),
AboutMetadata::get_instance()->end_metadata());
- for (std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
+ for (std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
k(keys.begin()), k_end(keys.end()) ; k != k_end ; ++k)
{
if ((*k)->type() == mkt_internal)
@@ -336,15 +336,15 @@ namespace
void do_one_id(
const InfoCommandLine &,
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const PackageID> & id)
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const PackageID> & id)
{
if (! id->supports_action(SupportsActionTest<InfoAction>()))
return;
cout << format_general_s(f::info_id_heading(), stringify(*id));
- std::tr1::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
args->push_back("info");
args->push_back("--if-supported");
args->push_back("--hooks");
@@ -358,14 +358,14 @@ namespace
void do_one_param(
const InfoCommandLine & cmdline,
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const std::string & param)
{
PackageDepSpec spec(parse_user_package_dep_spec(param, env.get(), UserPackageDepSpecOptions()));
- const std::tr1::shared_ptr<const PackageIDSequence> installed_ids((*env)[selection::AllVersionsSorted(generator::Matches(
+ const std::shared_ptr<const PackageIDSequence> installed_ids((*env)[selection::AllVersionsSorted(generator::Matches(
spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
- const std::tr1::shared_ptr<const PackageIDSequence> installable_ids((*env)[selection::BestVersionOnly(generator::Matches(
+ const std::shared_ptr<const PackageIDSequence> installable_ids((*env)[selection::BestVersionOnly(generator::Matches(
spec, MatchPackageOptions()) | filter::SupportsAction<InstallAction>() | filter::NotMasked())]);
if (installed_ids->empty() && installable_ids->empty())
@@ -389,8 +389,8 @@ InfoCommand::important() const
int
InfoCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
InfoCommandLine cmdline;
@@ -427,7 +427,7 @@ InfoCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
InfoCommand::make_doc_cmdline()
{
return make_shared_ptr(new InfoCommandLine);
diff --git a/src/clients/cave/cmd_info.hh b/src/clients/cave/cmd_info.hh
index f1cceb894..ce6c6f7cf 100644
--- a/src/clients/cave/cmd_info.hh
+++ b/src/clients/cave/cmd_info.hh
@@ -33,11 +33,11 @@ namespace paludis
bool important() const;
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_match.cc b/src/clients/cave/cmd_match.cc
index a5f3ca92c..05867daad 100644
--- a/src/clients/cave/cmd_match.cc
+++ b/src/clients/cave/cmd_match.cc
@@ -245,12 +245,12 @@ namespace
texts.push_back(stringify(k.value()));
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const PackageID> > & k)
{
texts.push_back(stringify(*k.value()));
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const Choices> > & k)
{
for (Choices::ConstIterator c(k.value()->begin()), c_end(k.value()->end()) ;
c != c_end ; ++c)
@@ -259,11 +259,11 @@ namespace
texts.push_back(stringify((*i)->name_with_prefix()));
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > &)
+ void visit(const MetadataValueKey<std::shared_ptr<const RepositoryMaskInfo> > &)
{
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > &)
+ void visit(const MetadataValueKey<std::shared_ptr<const Contents> > &)
{
}
@@ -334,7 +334,7 @@ namespace
std::transform(k.value()->begin(), k.value()->end(), std::back_inserter(texts), &stringify<KeywordName>);
}
- void visit(const MetadataCollectionKey<Sequence<std::tr1::shared_ptr<const PackageID> > > & k)
+ void visit(const MetadataCollectionKey<Sequence<std::shared_ptr<const PackageID> > > & k)
{
std::transform(indirect_iterator(k.value()->begin()), indirect_iterator(k.value()->end()),
std::back_inserter(texts), &stringify<PackageID>);
@@ -345,8 +345,8 @@ namespace
int
MatchCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
MatchCommandLine cmdline;
@@ -363,7 +363,7 @@ MatchCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), UserPackageDepSpecOptions()));
- const std::tr1::shared_ptr<Set<std::string> > patterns(new Set<std::string>);
+ const std::shared_ptr<Set<std::string> > patterns(new Set<std::string>);
std::copy(next(cmdline.begin_parameters()), cmdline.end_parameters(), patterns->inserter());
return run_hosted(env, cmdline.match_options, patterns, spec) ? EXIT_SUCCESS : EXIT_FAILURE;
@@ -371,12 +371,12 @@ MatchCommand::run(
bool
MatchCommand::run_hosted(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const SearchCommandLineMatchOptions & match_options,
- const std::tr1::shared_ptr<const Set<std::string> > & patterns,
+ const std::shared_ptr<const Set<std::string> > & patterns,
const PackageDepSpec & spec)
{
- const std::tr1::shared_ptr<const PackageID> id(*((*env)[selection::RequireExactlyOne(
+ const std::shared_ptr<const PackageID> id(*((*env)[selection::RequireExactlyOne(
generator::Matches(spec, MatchPackageOptions()))])->begin());
std::list<std::string> texts;
@@ -412,7 +412,7 @@ MatchCommand::run_hosted(
t != t_end ; ++t)
{
bool current(patterns->end() != std::find_if(patterns->begin(), patterns->end(),
- std::tr1::bind(&match, *t, std::tr1::placeholders::_1, match_options.a_type.argument())));
+ std::bind(&match, *t, std::placeholders::_1, match_options.a_type.argument())));
if (match_options.a_not.specified())
current = ! current;
@@ -424,7 +424,7 @@ MatchCommand::run_hosted(
return match_options.a_and.specified() ? all : any;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
MatchCommand::make_doc_cmdline()
{
return make_shared_ptr(new MatchCommandLine);
diff --git a/src/clients/cave/cmd_match.hh b/src/clients/cave/cmd_match.hh
index 91079fb88..f4d002a70 100644
--- a/src/clients/cave/cmd_match.hh
+++ b/src/clients/cave/cmd_match.hh
@@ -24,7 +24,7 @@
#include "cmd_search_cmdline.hh"
#include <paludis/dep_spec-fwd.hh>
#include <paludis/util/set-fwd.hh>
-#include <tr1/functional>
+#include <functional>
namespace paludis
{
@@ -35,17 +35,17 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
bool run_hosted(
- const std::tr1::shared_ptr<Environment> &,
+ const std::shared_ptr<Environment> &,
const SearchCommandLineMatchOptions &,
- const std::tr1::shared_ptr<const Set<std::string> > &,
+ const std::shared_ptr<const Set<std::string> > &,
const PackageDepSpec &);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_owner.cc b/src/clients/cave/cmd_owner.cc
index e706a40d3..7c032e315 100644
--- a/src/clients/cave/cmd_owner.cc
+++ b/src/clients/cave/cmd_owner.cc
@@ -34,7 +34,7 @@
#include <iostream>
#include <cstdlib>
-#include <tr1/functional>
+#include <functional>
using namespace paludis;
using namespace cave;
@@ -78,7 +78,7 @@ namespace
}
};
- void format_id(const std::tr1::shared_ptr<const PackageID> & id)
+ void format_id(const std::shared_ptr<const PackageID> & id)
{
cout << format_general_s(f::owner_id(), stringify(*id));
}
@@ -86,8 +86,8 @@ namespace
int
OwnerCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
OwnerCommandLine cmdline;
@@ -105,7 +105,7 @@ OwnerCommand::run(
return owner_common(env, cmdline.a_match.argument(), *cmdline.begin_parameters(), &format_id);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
OwnerCommand::make_doc_cmdline()
{
return make_shared_ptr(new OwnerCommandLine);
diff --git a/src/clients/cave/cmd_owner.hh b/src/clients/cave/cmd_owner.hh
index f90a11f4b..6d55636ab 100644
--- a/src/clients/cave/cmd_owner.hh
+++ b/src/clients/cave/cmd_owner.hh
@@ -32,11 +32,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_perform.cc b/src/clients/cave/cmd_perform.cc
index 8ac54576e..65f6af279 100644
--- a/src/clients/cave/cmd_perform.cc
+++ b/src/clients/cave/cmd_perform.cc
@@ -189,13 +189,13 @@ namespace
struct OutputManagerFromIPCOrEnvironment
{
- std::tr1::shared_ptr<OutputManagerFromIPC> manager_if_ipc;
- std::tr1::shared_ptr<OutputManagerFromEnvironment> manager_if_env;
+ std::shared_ptr<OutputManagerFromIPC> manager_if_ipc;
+ std::shared_ptr<OutputManagerFromEnvironment> manager_if_env;
OutputManagerFromIPCOrEnvironment(
const Environment * const e,
const PerformCommandLine & cmdline,
- const std::tr1::shared_ptr<const PackageID> & id)
+ const std::shared_ptr<const PackageID> & id)
{
if (cmdline.a_managed_output.specified())
manager_if_ipc.reset(new OutputManagerFromIPC(e, id, get_output_exclusivity(cmdline),
@@ -205,7 +205,7 @@ namespace
ClientOutputFeatures() + cof_summary_at_end));
}
- const std::tr1::shared_ptr<OutputManager> operator() (const Action & a)
+ const std::shared_ptr<OutputManager> operator() (const Action & a)
{
if (manager_if_env)
return (*manager_if_env)(a);
@@ -213,7 +213,7 @@ namespace
return (*manager_if_ipc)(a);
}
- const std::tr1::shared_ptr<OutputManager> output_manager_if_constructed()
+ const std::shared_ptr<OutputManager> output_manager_if_constructed()
{
if (manager_if_env)
return manager_if_env->output_manager_if_constructed();
@@ -231,9 +231,9 @@ namespace
};
void execute(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const PerformCommandLine & cmdline,
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & id,
const std::string & action_name,
Action & action)
{
@@ -268,9 +268,9 @@ namespace
}
void perform_uninstall(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const PerformCommandLine & cmdline,
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & id,
const std::string & action_name,
const UninstallActionOptions & options)
{
@@ -298,7 +298,7 @@ namespace
WantPhase operator() (const std::string & phase)
{
output_manager_holder.construct_standard_if_unconstructed();
- std::tr1::shared_ptr<OutputManager> output_manager(output_manager_holder.output_manager_if_constructed());
+ std::shared_ptr<OutputManager> output_manager(output_manager_holder.output_manager_if_constructed());
if (cmdline.a_abort_at_phase.end_args() != std::find(
cmdline.a_abort_at_phase.begin_args(), cmdline.a_abort_at_phase.end_args(), phase))
@@ -366,8 +366,8 @@ namespace
int
PerformCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PerformCommandLine cmdline;
@@ -388,13 +388,13 @@ PerformCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*next(cmdline.begin_parameters()), env.get(),
UserPackageDepSpecOptions()));
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
generator::Matches(spec, MatchPackageOptions()))]);
if (ids->empty())
throw NothingMatching(spec);
else if (1 != std::distance(ids->begin(), ids->end()))
throw BeMoreSpecific(spec, ids);
- const std::tr1::shared_ptr<const PackageID> id(*ids->begin());
+ const std::shared_ptr<const PackageID> id(*ids->begin());
FetchParts parts;
parts += fp_regulars;
@@ -410,7 +410,7 @@ PerformCommand::run(
OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id);
ConfigActionOptions options(make_named_values<ConfigActionOptions>(
- n::make_output_manager() = std::tr1::ref(output_manager_holder)
+ n::make_output_manager() = std::ref(output_manager_holder)
));
ConfigAction config_action(options);
execute(env, cmdline, id, action, config_action);
@@ -422,14 +422,14 @@ PerformCommand::run(
OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id);
WantInstallPhase want_phase(cmdline, output_manager_holder);
- std::tr1::shared_ptr<Sequence<FetchActionFailure> > failures(new Sequence<FetchActionFailure>);
+ std::shared_ptr<Sequence<FetchActionFailure> > failures(new Sequence<FetchActionFailure>);
FetchActionOptions options(make_named_values<FetchActionOptions>(
n::errors() = failures,
n::exclude_unmirrorable() = cmdline.a_exclude_unmirrorable.specified(),
n::fetch_parts() = parts,
n::ignore_not_in_manifest() = false,
n::ignore_unfetched() = cmdline.a_ignore_unfetched.specified(),
- n::make_output_manager() = std::tr1::ref(output_manager_holder),
+ n::make_output_manager() = std::ref(output_manager_holder),
n::safe_resume() = true,
n::want_phase() = want_phase
));
@@ -465,9 +465,9 @@ PerformCommand::run(
n::fetch_parts() = parts,
n::ignore_not_in_manifest() = false,
n::ignore_unfetched() = cmdline.a_ignore_unfetched.specified(),
- n::make_output_manager() = std::tr1::ref(output_manager_holder),
+ n::make_output_manager() = std::ref(output_manager_holder),
n::safe_resume() = true,
- n::want_phase() = std::tr1::bind(return_literal_function(wp_yes))
+ n::want_phase() = std::bind(return_literal_function(wp_yes))
));
OurPretendFetchAction pretend_fetch_action(options);
execute(env, cmdline, id, action, pretend_fetch_action);
@@ -489,7 +489,7 @@ PerformCommand::run(
OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id);
InfoActionOptions options(make_named_values<InfoActionOptions>(
- n::make_output_manager() = std::tr1::ref(output_manager_holder)
+ n::make_output_manager() = std::ref(output_manager_holder)
));
InfoAction info_action(options);
execute(env, cmdline, id, action, info_action);
@@ -502,16 +502,16 @@ PerformCommand::run(
if (! cmdline.a_destination.specified())
throw args::DoHelp("--destination must be specified for an install");
- const std::tr1::shared_ptr<Repository> destination(env->package_database()->fetch_repository(
+ const std::shared_ptr<Repository> destination(env->package_database()->fetch_repository(
RepositoryName(cmdline.a_destination.argument())));
- const std::tr1::shared_ptr<PackageIDSequence> replacing(new PackageIDSequence);
+ const std::shared_ptr<PackageIDSequence> replacing(new PackageIDSequence);
for (args::StringSetArg::ConstIterator p(cmdline.a_replacing.begin_args()),
p_end(cmdline.a_replacing.end_args()) ;
p != p_end ; ++p)
{
PackageDepSpec rspec(parse_user_package_dep_spec(*p, env.get(), UserPackageDepSpecOptions()));
- const std::tr1::shared_ptr<const PackageIDSequence> rids((*env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> rids((*env)[selection::AllVersionsUnsorted(
generator::Matches(rspec, MatchPackageOptions()))]);
if (rids->empty())
throw NothingMatching(rspec);
@@ -525,10 +525,10 @@ PerformCommand::run(
WantInstallPhase want_phase(cmdline, output_manager_holder);
InstallActionOptions options(make_named_values<InstallActionOptions>(
n::destination() = destination,
- n::make_output_manager() = std::tr1::ref(output_manager_holder),
- n::perform_uninstall() = std::tr1::bind(&perform_uninstall,
- env, std::tr1::cref(cmdline), std::tr1::placeholders::_1,
- action, std::tr1::placeholders::_2
+ n::make_output_manager() = std::ref(output_manager_holder),
+ n::perform_uninstall() = std::bind(&perform_uninstall,
+ env, std::cref(cmdline), std::placeholders::_1,
+ action, std::placeholders::_2
),
n::replacing() = replacing,
n::want_phase() = want_phase
@@ -543,7 +543,7 @@ PerformCommand::run(
OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id);
PretendActionOptions options(make_named_values<PretendActionOptions>(
- n::make_output_manager() = std::tr1::ref(output_manager_holder)
+ n::make_output_manager() = std::ref(output_manager_holder)
));
PretendAction pretend_action(options);
execute(env, cmdline, id, action, pretend_action);
@@ -561,7 +561,7 @@ PerformCommand::run(
n::if_for_install_id() = make_null_shared_ptr(),
n::ignore_for_unmerge() = &ignore_nothing,
n::is_overwrite() = false,
- n::make_output_manager() = std::tr1::ref(output_manager_holder)
+ n::make_output_manager() = std::ref(output_manager_holder)
));
UninstallAction uninstall_action(options);
execute(env, cmdline, id, action, uninstall_action);
@@ -572,7 +572,7 @@ PerformCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PerformCommand::make_doc_cmdline()
{
return make_shared_ptr(new PerformCommandLine);
diff --git a/src/clients/cave/cmd_perform.hh b/src/clients/cave/cmd_perform.hh
index ff7cb4db3..db8a84a35 100644
--- a/src/clients/cave/cmd_perform.hh
+++ b/src/clients/cave/cmd_perform.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_categories.cc b/src/clients/cave/cmd_print_categories.cc
index a88f355ab..445267f07 100644
--- a/src/clients/cave/cmd_print_categories.cc
+++ b/src/clients/cave/cmd_print_categories.cc
@@ -79,8 +79,8 @@ namespace
int
PrintCategoriesCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintCategoriesCommandLine cmdline;
@@ -110,13 +110,13 @@ PrintCategoriesCommand::run(
for (args::StringSetArg::ConstIterator p(cmdline.a_containing.begin_args()), p_end(cmdline.a_containing.end_args()) ;
p != p_end ; ++p)
{
- std::tr1::shared_ptr<const CategoryNamePartSet> cats((*r)->category_names_containing_package(PackageNamePart(*p)));
+ std::shared_ptr<const CategoryNamePartSet> cats((*r)->category_names_containing_package(PackageNamePart(*p)));
std::copy(cats->begin(), cats->end(), std::inserter(categories, categories.begin()));
}
}
else
{
- std::tr1::shared_ptr<const CategoryNamePartSet> cats((*r)->category_names());
+ std::shared_ptr<const CategoryNamePartSet> cats((*r)->category_names());
std::copy(cats->begin(), cats->end(), std::inserter(categories, categories.begin()));
}
}
@@ -126,7 +126,7 @@ PrintCategoriesCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintCategoriesCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintCategoriesCommandLine);
diff --git a/src/clients/cave/cmd_print_categories.hh b/src/clients/cave/cmd_print_categories.hh
index d451a883f..e30820b7a 100644
--- a/src/clients/cave/cmd_print_categories.hh
+++ b/src/clients/cave/cmd_print_categories.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_commands.cc b/src/clients/cave/cmd_print_commands.cc
index af3d202c8..46d899ee9 100644
--- a/src/clients/cave/cmd_print_commands.cc
+++ b/src/clients/cave/cmd_print_commands.cc
@@ -70,8 +70,8 @@ namespace
int
PrintCommandsCommand::run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintCommandsCommandLine cmdline;
@@ -89,7 +89,7 @@ PrintCommandsCommand::run(
for (CommandFactory::ConstIterator cmd(CommandFactory::get_instance()->begin()), cmd_end(CommandFactory::get_instance()->end()) ;
cmd != cmd_end ; ++cmd)
{
- std::tr1::shared_ptr<Command> instance(CommandFactory::get_instance()->create(*cmd));
+ std::shared_ptr<Command> instance(CommandFactory::get_instance()->create(*cmd));
if (! cmdline.a_all.specified() && ! instance->important())
continue;
@@ -100,7 +100,7 @@ PrintCommandsCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintCommandsCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintCommandsCommandLine);
diff --git a/src/clients/cave/cmd_print_commands.hh b/src/clients/cave/cmd_print_commands.hh
index 66a0bb0ea..3ad580a4d 100644
--- a/src/clients/cave/cmd_print_commands.hh
+++ b/src/clients/cave/cmd_print_commands.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_environment_metadata.cc b/src/clients/cave/cmd_print_environment_metadata.cc
index d5763aacf..a3e27512b 100644
--- a/src/clients/cave/cmd_print_environment_metadata.cc
+++ b/src/clients/cave/cmd_print_environment_metadata.cc
@@ -82,7 +82,7 @@ namespace
};
void do_one_key(
- const std::tr1::shared_ptr<const MetadataKey> & k,
+ const std::shared_ptr<const MetadataKey> & k,
const PrintEnvironmentMetadataCommandLine & cmdline,
const std::string & name_prefix
)
@@ -114,8 +114,8 @@ namespace
int
PrintEnvironmentMetadataCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintEnvironmentMetadataCommandLine cmdline;
@@ -137,7 +137,7 @@ PrintEnvironmentMetadataCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintEnvironmentMetadataCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintEnvironmentMetadataCommandLine);
diff --git a/src/clients/cave/cmd_print_environment_metadata.hh b/src/clients/cave/cmd_print_environment_metadata.hh
index e135d4911..06a7d63d7 100644
--- a/src/clients/cave/cmd_print_environment_metadata.hh
+++ b/src/clients/cave/cmd_print_environment_metadata.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_id_actions.cc b/src/clients/cave/cmd_print_id_actions.cc
index bceee5f13..c61927bfa 100644
--- a/src/clients/cave/cmd_print_id_actions.cc
+++ b/src/clients/cave/cmd_print_id_actions.cc
@@ -78,7 +78,7 @@ namespace
};
template <typename Action_>
- void do_one_action(const std::tr1::shared_ptr<const PackageID> & id)
+ void do_one_action(const std::shared_ptr<const PackageID> & id)
{
if (id->supports_action(SupportsActionTest<Action_>()))
cout << ActionNames<Action_>::value << endl;
@@ -87,8 +87,8 @@ namespace
int
PrintIDActionsCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintIDActionsCommandLine cmdline;
@@ -105,7 +105,7 @@ PrintIDActionsCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), UserPackageDepSpecOptions()));
- std::tr1::shared_ptr<const PackageIDSequence> entries(
+ std::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()))]);
if (entries->empty())
@@ -114,7 +114,7 @@ PrintIDActionsCommand::run(
if ((! cmdline.a_best.specified()) && (next(entries->begin()) != entries->end()))
throw BeMoreSpecific(spec, entries);
- const std::tr1::shared_ptr<const PackageID> id(*entries->last());
+ const std::shared_ptr<const PackageID> id(*entries->last());
do_one_action<ConfigAction>(id);
do_one_action<FetchAction>(id);
@@ -127,7 +127,7 @@ PrintIDActionsCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintIDActionsCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintIDActionsCommandLine);
diff --git a/src/clients/cave/cmd_print_id_actions.hh b/src/clients/cave/cmd_print_id_actions.hh
index 51e05adf6..dee40146b 100644
--- a/src/clients/cave/cmd_print_id_actions.hh
+++ b/src/clients/cave/cmd_print_id_actions.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_id_contents.cc b/src/clients/cave/cmd_print_id_contents.cc
index d472abe70..1cc8f4368 100644
--- a/src/clients/cave/cmd_print_id_contents.cc
+++ b/src/clients/cave/cmd_print_id_contents.cc
@@ -93,8 +93,8 @@ namespace
int
PrintIDContentsCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintContentsCommandLine cmdline;
@@ -112,7 +112,7 @@ PrintIDContentsCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(),
UserPackageDepSpecOptions(), filter::InstalledAtRoot(env->root())));
- std::tr1::shared_ptr<const PackageIDSequence> entries(
+ std::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
@@ -121,7 +121,7 @@ PrintIDContentsCommand::run(
if ((! cmdline.a_best.specified()) && (next(entries->begin()) != entries->end()))
throw BeMoreSpecific(spec, entries);
- const std::tr1::shared_ptr<const PackageID> id(*entries->last());
+ const std::shared_ptr<const PackageID> id(*entries->last());
if (! id->contents_key())
throw BadIDForCommand(spec, id, "does not support listing contents");
@@ -129,12 +129,12 @@ PrintIDContentsCommand::run(
id->contents_key()->value()->begin(),
id->contents_key()->value()->end(),
std::ostream_iterator<std::string>(cout, ""),
- std::tr1::bind(format_plain_contents_entry, std::tr1::placeholders::_1, cmdline.a_format.argument()));
+ std::bind(format_plain_contents_entry, std::placeholders::_1, cmdline.a_format.argument()));
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintIDContentsCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintContentsCommandLine);
diff --git a/src/clients/cave/cmd_print_id_contents.hh b/src/clients/cave/cmd_print_id_contents.hh
index c1b5c0fd8..6db7c29fa 100644
--- a/src/clients/cave/cmd_print_id_contents.hh
+++ b/src/clients/cave/cmd_print_id_contents.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_id_executables.cc b/src/clients/cave/cmd_print_id_executables.cc
index 6610cf891..670f68f02 100644
--- a/src/clients/cave/cmd_print_id_executables.cc
+++ b/src/clients/cave/cmd_print_id_executables.cc
@@ -33,7 +33,7 @@
#include <algorithm>
#include <set>
#include <cstdlib>
-#include <tr1/memory>
+#include <memory>
using namespace paludis;
using namespace cave;
@@ -75,8 +75,8 @@ namespace
int
PrintIDExecutablesCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintIDExecutablesCommandLine cmdline;
@@ -94,7 +94,7 @@ PrintIDExecutablesCommand::run(
return executables_common(env, *cmdline.begin_parameters(), &print_fsentry);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintIDExecutablesCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintIDExecutablesCommandLine);
diff --git a/src/clients/cave/cmd_print_id_executables.hh b/src/clients/cave/cmd_print_id_executables.hh
index e44609874..58021afb7 100644
--- a/src/clients/cave/cmd_print_id_executables.hh
+++ b/src/clients/cave/cmd_print_id_executables.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_id_masks.cc b/src/clients/cave/cmd_print_id_masks.cc
index 57104a11a..4d401eef1 100644
--- a/src/clients/cave/cmd_print_id_masks.cc
+++ b/src/clients/cave/cmd_print_id_masks.cc
@@ -101,44 +101,44 @@ namespace
struct GetInfo
{
- const std::pair<std::tr1::shared_ptr<const MetadataKey>, std::string> visit(const UserMask &) const
+ const std::pair<std::shared_ptr<const MetadataKey>, std::string> visit(const UserMask &) const
{
return std::make_pair(make_null_shared_ptr(), "");
}
- const std::pair<std::tr1::shared_ptr<const MetadataKey>, std::string> visit(const UnacceptedMask & m) const
+ const std::pair<std::shared_ptr<const MetadataKey>, std::string> visit(const UnacceptedMask & m) const
{
return std::make_pair(m.unaccepted_key(), "");
}
- const std::pair<std::tr1::shared_ptr<const MetadataKey>, std::string> visit(const RepositoryMask & m) const
+ const std::pair<std::shared_ptr<const MetadataKey>, std::string> visit(const RepositoryMask & m) const
{
return std::make_pair(m.mask_key(), "");
}
- const std::pair<std::tr1::shared_ptr<const MetadataKey>, std::string> visit(const UnsupportedMask &) const
+ const std::pair<std::shared_ptr<const MetadataKey>, std::string> visit(const UnsupportedMask &) const
{
return std::make_pair(make_null_shared_ptr(), "");
}
- const std::pair<std::tr1::shared_ptr<const MetadataKey>, std::string> visit(const AssociationMask & m) const
+ const std::pair<std::shared_ptr<const MetadataKey>, std::string> visit(const AssociationMask & m) const
{
return std::make_pair(make_null_shared_ptr(), stringify(*m.associated_package()));
}
};
void do_one_mask(
- const std::tr1::shared_ptr<const Mask> & mask,
+ const std::shared_ptr<const Mask> & mask,
const MaskOverrideReason & override,
const PrintIDMasksCommandLine & cmdline
)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('k', std::string(1, mask->key()));
m->insert('d', mask->description());
- std::pair<std::tr1::shared_ptr<const MetadataKey>, std::string> info(
- mask->accept_returning<std::pair<std::tr1::shared_ptr<const MetadataKey>, std::string> >(GetInfo()));
+ std::pair<std::shared_ptr<const MetadataKey>, std::string> info(
+ mask->accept_returning<std::pair<std::shared_ptr<const MetadataKey>, std::string> >(GetInfo()));
m->insert('r', info.first ? info.first->raw_name() : "");
m->insert('=', info.first ? "=" : "");
m->insert('h', info.first ? info.first->human_name() : "");
@@ -165,8 +165,8 @@ namespace
int
PrintIDMasksCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintIDMasksCommandLine cmdline;
@@ -183,7 +183,7 @@ PrintIDMasksCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), UserPackageDepSpecOptions()));
- std::tr1::shared_ptr<const PackageIDSequence> entries(
+ std::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()))]);
if (entries->empty())
@@ -205,7 +205,7 @@ PrintIDMasksCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintIDMasksCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintIDMasksCommandLine);
diff --git a/src/clients/cave/cmd_print_id_masks.hh b/src/clients/cave/cmd_print_id_masks.hh
index 5609addf0..44701bbbd 100644
--- a/src/clients/cave/cmd_print_id_masks.hh
+++ b/src/clients/cave/cmd_print_id_masks.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_id_metadata.cc b/src/clients/cave/cmd_print_id_metadata.cc
index ca31c3b40..aaa0c59d2 100644
--- a/src/clients/cave/cmd_print_id_metadata.cc
+++ b/src/clients/cave/cmd_print_id_metadata.cc
@@ -99,7 +99,7 @@ namespace
};
void do_one_key(
- const std::tr1::shared_ptr<const MetadataKey> & k,
+ const std::shared_ptr<const MetadataKey> & k,
const PrintIDMetadataCommandLine & cmdline,
const std::string & name_prefix
)
@@ -131,8 +131,8 @@ namespace
int
PrintIDMetadataCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintIDMetadataCommandLine cmdline;
@@ -149,7 +149,7 @@ PrintIDMetadataCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), UserPackageDepSpecOptions()));
- std::tr1::shared_ptr<const PackageIDSequence> entries(
+ std::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()))]);
if (entries->empty())
@@ -165,7 +165,7 @@ PrintIDMetadataCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintIDMetadataCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintIDMetadataCommandLine);
diff --git a/src/clients/cave/cmd_print_id_metadata.hh b/src/clients/cave/cmd_print_id_metadata.hh
index c17e78133..e72bc1ced 100644
--- a/src/clients/cave/cmd_print_id_metadata.hh
+++ b/src/clients/cave/cmd_print_id_metadata.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_ids.cc b/src/clients/cave/cmd_print_ids.cc
index b6407ab7b..64201bbce 100644
--- a/src/clients/cave/cmd_print_ids.cc
+++ b/src/clients/cave/cmd_print_ids.cc
@@ -136,34 +136,34 @@ namespace
return "with mask '" + mask + "'";
}
- virtual std::tr1::shared_ptr<const RepositoryNameSet> repositories(
+ virtual std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const,
- const std::tr1::shared_ptr<const RepositoryNameSet> & r) const
+ const std::shared_ptr<const RepositoryNameSet> & r) const
{
return r;
}
- virtual std::tr1::shared_ptr<const CategoryNamePartSet> categories(
+ virtual std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const,
- const std::tr1::shared_ptr<const RepositoryNameSet> &,
- const std::tr1::shared_ptr<const CategoryNamePartSet> & c) const
+ const std::shared_ptr<const RepositoryNameSet> &,
+ const std::shared_ptr<const CategoryNamePartSet> & c) const
{
return c;
}
- virtual std::tr1::shared_ptr<const QualifiedPackageNameSet> packages(
+ virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const,
- const std::tr1::shared_ptr<const RepositoryNameSet> &,
- const std::tr1::shared_ptr<const QualifiedPackageNameSet> & q) const
+ const std::shared_ptr<const RepositoryNameSet> &,
+ const std::shared_ptr<const QualifiedPackageNameSet> & q) const
{
return q;
}
- virtual std::tr1::shared_ptr<const PackageIDSet> ids(
+ virtual std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
- const std::tr1::shared_ptr<const PackageIDSet> & c) const
+ const std::shared_ptr<const PackageIDSet> & c) const
{
- std::tr1::shared_ptr<PackageIDSet> result(new PackageIDSet);
+ std::shared_ptr<PackageIDSet> result(new PackageIDSet);
for (PackageIDSet::ConstIterator i(c->begin()), i_end(c->end()) ;
i != i_end ; ++i)
@@ -247,9 +247,9 @@ namespace
std::string format_id(
const PrintIDsCommandLine & c,
- const std::tr1::shared_ptr<const PackageID> & i)
+ const std::shared_ptr<const PackageID> & i)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('c', stringify(i->name().category()));
m->insert('p', stringify(i->name().package()));
m->insert('v', stringify(i->version()));
@@ -266,8 +266,8 @@ namespace
int
PrintIDsCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintIDsCommandLine cmdline;
@@ -331,7 +331,7 @@ PrintIDsCommand::run(
}
}
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(fg)]);
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(fg)]);
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
cout << format_id(cmdline, *i);
@@ -339,7 +339,7 @@ PrintIDsCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintIDsCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintIDsCommandLine);
diff --git a/src/clients/cave/cmd_print_ids.hh b/src/clients/cave/cmd_print_ids.hh
index 2e6868db2..5dac13823 100644
--- a/src/clients/cave/cmd_print_ids.hh
+++ b/src/clients/cave/cmd_print_ids.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_owners.cc b/src/clients/cave/cmd_print_owners.cc
index 630112acb..33ebb779c 100644
--- a/src/clients/cave/cmd_print_owners.cc
+++ b/src/clients/cave/cmd_print_owners.cc
@@ -69,7 +69,7 @@ namespace
}
};
- void print_package_id(const std::tr1::shared_ptr<const PackageID> & id)
+ void print_package_id(const std::shared_ptr<const PackageID> & id)
{
cout << *id << endl;
}
@@ -77,8 +77,8 @@ namespace
int
PrintOwnersCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintOwnersCommandLine cmdline;
@@ -96,7 +96,7 @@ PrintOwnersCommand::run(
return owner_common(env, cmdline.a_match.argument(), *cmdline.begin_parameters(), &print_package_id);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintOwnersCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintOwnersCommandLine);
diff --git a/src/clients/cave/cmd_print_owners.hh b/src/clients/cave/cmd_print_owners.hh
index cf0883eaf..23064195e 100644
--- a/src/clients/cave/cmd_print_owners.hh
+++ b/src/clients/cave/cmd_print_owners.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_packages.cc b/src/clients/cave/cmd_print_packages.cc
index 568078915..5f1cf583d 100644
--- a/src/clients/cave/cmd_print_packages.cc
+++ b/src/clients/cave/cmd_print_packages.cc
@@ -64,8 +64,8 @@ namespace
int
PrintPackagesCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintPackagesCommandLine cmdline;
@@ -85,11 +85,11 @@ PrintPackagesCommand::run(
for (PackageDatabase::RepositoryConstIterator r(env->package_database()->begin_repositories()), r_end(env->package_database()->end_repositories());
r != r_end; ++r)
{
- std::tr1::shared_ptr<const CategoryNamePartSet> categories((*r)->category_names());
+ std::shared_ptr<const CategoryNamePartSet> categories((*r)->category_names());
for (CategoryNamePartSet::ConstIterator c(categories->begin()), c_end(categories->end());
c != c_end; ++c)
{
- std::tr1::shared_ptr<const QualifiedPackageNameSet> packages((*r)->package_names(*c));
+ std::shared_ptr<const QualifiedPackageNameSet> packages((*r)->package_names(*c));
std::copy(packages->begin(), packages->end(), std::inserter(all_packages, all_packages.begin()));
}
}
@@ -99,7 +99,7 @@ PrintPackagesCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintPackagesCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintPackagesCommandLine);
diff --git a/src/clients/cave/cmd_print_packages.hh b/src/clients/cave/cmd_print_packages.hh
index 13878d3bc..bea80f527 100644
--- a/src/clients/cave/cmd_print_packages.hh
+++ b/src/clients/cave/cmd_print_packages.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_repositories.cc b/src/clients/cave/cmd_print_repositories.cc
index cc9e1d1aa..862fb9467 100644
--- a/src/clients/cave/cmd_print_repositories.cc
+++ b/src/clients/cave/cmd_print_repositories.cc
@@ -77,8 +77,8 @@ namespace
int
PrintRepositoriesCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintRepositoriesCommandLine cmdline;
@@ -119,7 +119,7 @@ PrintRepositoriesCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintRepositoriesCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintRepositoriesCommandLine);
diff --git a/src/clients/cave/cmd_print_repositories.hh b/src/clients/cave/cmd_print_repositories.hh
index 6851c0420..29a9aed86 100644
--- a/src/clients/cave/cmd_print_repositories.hh
+++ b/src/clients/cave/cmd_print_repositories.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_repository_formats.cc b/src/clients/cave/cmd_print_repository_formats.cc
index 617eb7b4b..faba2e7ed 100644
--- a/src/clients/cave/cmd_print_repository_formats.cc
+++ b/src/clients/cave/cmd_print_repository_formats.cc
@@ -63,8 +63,8 @@ namespace
int
PrintRepositoryFormatsCommand::run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintRepositoryFormatsCommandLine cmdline;
@@ -90,7 +90,7 @@ PrintRepositoryFormatsCommand::run(
return EXIT_FAILURE;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintRepositoryFormatsCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintRepositoryFormatsCommandLine);
diff --git a/src/clients/cave/cmd_print_repository_formats.hh b/src/clients/cave/cmd_print_repository_formats.hh
index bfa1d388c..5e16be45e 100644
--- a/src/clients/cave/cmd_print_repository_formats.hh
+++ b/src/clients/cave/cmd_print_repository_formats.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_repository_metadata.cc b/src/clients/cave/cmd_print_repository_metadata.cc
index 5a5501e13..8eeecfc8c 100644
--- a/src/clients/cave/cmd_print_repository_metadata.cc
+++ b/src/clients/cave/cmd_print_repository_metadata.cc
@@ -85,7 +85,7 @@ namespace
};
void do_one_key(
- const std::tr1::shared_ptr<const MetadataKey> & k,
+ const std::shared_ptr<const MetadataKey> & k,
const PrintRepositoryMetadataCommandLine & cmdline,
const std::string & name_prefix
)
@@ -117,8 +117,8 @@ namespace
int
PrintRepositoryMetadataCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintRepositoryMetadataCommandLine cmdline;
@@ -134,7 +134,7 @@ PrintRepositoryMetadataCommand::run(
throw args::DoHelp("print-repository-metadata takes exactly one parameter");
RepositoryName name(*cmdline.begin_parameters());
- const std::tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(name));
+ const std::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(name));
for (Repository::MetadataConstIterator m(repo->begin_metadata()), m_end(repo->end_metadata()) ;
m != m_end ; ++m)
@@ -143,7 +143,7 @@ PrintRepositoryMetadataCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintRepositoryMetadataCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintRepositoryMetadataCommandLine);
diff --git a/src/clients/cave/cmd_print_repository_metadata.hh b/src/clients/cave/cmd_print_repository_metadata.hh
index 6d73970bc..73ed7f25e 100644
--- a/src/clients/cave/cmd_print_repository_metadata.hh
+++ b/src/clients/cave/cmd_print_repository_metadata.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_set.cc b/src/clients/cave/cmd_print_set.cc
index 1b47390bf..b2c720942 100644
--- a/src/clients/cave/cmd_print_set.cc
+++ b/src/clients/cave/cmd_print_set.cc
@@ -79,11 +79,11 @@ namespace
struct SetPrinter
{
- const std::tr1::shared_ptr<const Environment> env;
+ const std::shared_ptr<const Environment> env;
const PrintSetCommandLine & cmdline;
std::set<SetName> & recursing;
- SetPrinter(const std::tr1::shared_ptr<const Environment> & e, const PrintSetCommandLine & c, std::set<SetName> & r) :
+ SetPrinter(const std::shared_ptr<const Environment> & e, const PrintSetCommandLine & c, std::set<SetName> & r) :
env(e),
cmdline(c),
recursing(r)
@@ -103,7 +103,7 @@ namespace
if (! recursing.insert(name).second)
throw RecursivelyDefinedSetError(stringify(name));
- const std::tr1::shared_ptr<const SetSpecTree> set(env->set(name));
+ const std::shared_ptr<const SetSpecTree> set(env->set(name));
if (! set)
throw NoSuchSetError(stringify(name));
@@ -124,8 +124,8 @@ namespace
int
PrintSetCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintSetCommandLine cmdline;
@@ -140,7 +140,7 @@ PrintSetCommand::run(
if (1 != std::distance(cmdline.begin_parameters(), cmdline.end_parameters()))
throw args::DoHelp("print-ids takes exactly one parameter");
- const std::tr1::shared_ptr<const SetSpecTree> set(env->set(SetName(*cmdline.begin_parameters())));
+ const std::shared_ptr<const SetSpecTree> set(env->set(SetName(*cmdline.begin_parameters())));
if (! set)
throw NothingMatching(*cmdline.begin_parameters());
@@ -150,7 +150,7 @@ PrintSetCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintSetCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintSetCommandLine);
diff --git a/src/clients/cave/cmd_print_set.hh b/src/clients/cave/cmd_print_set.hh
index b0ef6ab76..32294fc92 100644
--- a/src/clients/cave/cmd_print_set.hh
+++ b/src/clients/cave/cmd_print_set.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_sets.cc b/src/clients/cave/cmd_print_sets.cc
index 21339c0e4..7ade5213b 100644
--- a/src/clients/cave/cmd_print_sets.cc
+++ b/src/clients/cave/cmd_print_sets.cc
@@ -65,8 +65,8 @@ namespace
int
PrintSetsCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintSetsCommandLine cmdline;
@@ -86,7 +86,7 @@ PrintSetsCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintSetsCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintSetsCommandLine);
diff --git a/src/clients/cave/cmd_print_sets.hh b/src/clients/cave/cmd_print_sets.hh
index cc750827b..14632ab21 100644
--- a/src/clients/cave/cmd_print_sets.hh
+++ b/src/clients/cave/cmd_print_sets.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_print_sync_protocols.cc b/src/clients/cave/cmd_print_sync_protocols.cc
index 1d97ada0f..89c8fcaee 100644
--- a/src/clients/cave/cmd_print_sync_protocols.cc
+++ b/src/clients/cave/cmd_print_sync_protocols.cc
@@ -64,8 +64,8 @@ namespace
int
PrintSyncProtocolsCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PrintSyncProtocolsCommandLine cmdline;
@@ -82,7 +82,7 @@ PrintSyncProtocolsCommand::run(
std::set<std::string> syncers;
- std::tr1::shared_ptr<const FSEntrySequence> fes(env->syncers_dirs());
+ std::shared_ptr<const FSEntrySequence> fes(env->syncers_dirs());
for (FSEntrySequence::ConstIterator s(fes->begin()), s_end(fes->end());
s != s_end; ++s)
@@ -110,7 +110,7 @@ PrintSyncProtocolsCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PrintSyncProtocolsCommand::make_doc_cmdline()
{
return make_shared_ptr(new PrintSyncProtocolsCommandLine);
diff --git a/src/clients/cave/cmd_print_sync_protocols.hh b/src/clients/cave/cmd_print_sync_protocols.hh
index f01d86ff2..ee59e2043 100644
--- a/src/clients/cave/cmd_print_sync_protocols.hh
+++ b/src/clients/cave/cmd_print_sync_protocols.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_purge.cc b/src/clients/cave/cmd_purge.cc
index f7118b61f..deee0a55d 100644
--- a/src/clients/cave/cmd_purge.cc
+++ b/src/clients/cave/cmd_purge.cc
@@ -47,10 +47,10 @@ namespace
struct PurgeCommandLine :
CaveCommandCommandLine
{
- std::tr1::shared_ptr<ResolveCommandLineResolutionOptions> resolution_options;
- std::tr1::shared_ptr<ResolveCommandLineExecutionOptions> execution_options;
- std::tr1::shared_ptr<ResolveCommandLineDisplayOptions> display_options;
- std::tr1::shared_ptr<ResolveCommandLineProgramOptions> program_options;
+ std::shared_ptr<ResolveCommandLineResolutionOptions> resolution_options;
+ std::shared_ptr<ResolveCommandLineExecutionOptions> execution_options;
+ std::shared_ptr<ResolveCommandLineDisplayOptions> display_options;
+ std::shared_ptr<ResolveCommandLineProgramOptions> program_options;
PurgeCommandLine(const bool for_docs) :
resolution_options(for_docs ? make_null_shared_ptr() : make_shared_ptr(new ResolveCommandLineResolutionOptions(this))),
@@ -88,8 +88,8 @@ PurgeCommand::important() const
int
PurgeCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
PurgeCommandLine cmdline(false);
@@ -111,7 +111,7 @@ PurgeCommand::run(
*cmdline.program_options, make_null_shared_ptr(), make_null_shared_ptr(), make_null_shared_ptr(), true);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
PurgeCommand::make_doc_cmdline()
{
return make_shared_ptr(new PurgeCommandLine(true));
diff --git a/src/clients/cave/cmd_purge.hh b/src/clients/cave/cmd_purge.hh
index 33c8920db..8fcb85719 100644
--- a/src/clients/cave/cmd_purge.hh
+++ b/src/clients/cave/cmd_purge.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
bool important() const;
};
diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
index 8a6a5edef..eb714ec2d 100644
--- a/src/clients/cave/cmd_resolve.cc
+++ b/src/clients/cave/cmd_resolve.cc
@@ -81,8 +81,8 @@ ResolveCommand::important() const
int
ResolveCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
ResolveCommandLine cmdline;
@@ -97,7 +97,7 @@ ResolveCommand::run(
cmdline.resolution_options.apply_shortcuts();
cmdline.resolution_options.verify(env);
- std::tr1::shared_ptr<Sequence<std::pair<std::string, std::string> > > targets(new Sequence<std::pair<std::string, std::string> >);
+ std::shared_ptr<Sequence<std::pair<std::string, std::string> > > targets(new Sequence<std::pair<std::string, std::string> >);
for (ResolveCommandLine::ParametersConstIterator p(cmdline.begin_parameters()), p_end(cmdline.end_parameters()) ;
p != p_end ; ++p)
targets->push_back(std::make_pair(*p, ""));
@@ -106,7 +106,7 @@ ResolveCommand::run(
cmdline.program_options, make_null_shared_ptr(), targets, make_null_shared_ptr(), false);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
ResolveCommand::make_doc_cmdline()
{
return make_shared_ptr(new ResolveCommandLine);
diff --git a/src/clients/cave/cmd_resolve.hh b/src/clients/cave/cmd_resolve.hh
index 9d7edbf74..f31f9df4a 100644
--- a/src/clients/cave/cmd_resolve.hh
+++ b/src/clients/cave/cmd_resolve.hh
@@ -33,11 +33,11 @@ namespace paludis
bool important() const;
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc
index 751bdef0b..7d7f6b24e 100644
--- a/src/clients/cave/cmd_resolve_cmdline.cc
+++ b/src/clients/cave/cmd_resolve_cmdline.cc
@@ -24,14 +24,14 @@
#include <paludis/package_database.hh>
#include <paludis/util/map.hh>
#include <paludis/repository_factory.hh>
-#include <tr1/memory>
+#include <memory>
using namespace paludis;
using namespace cave;
namespace
{
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -357,12 +357,12 @@ ResolveCommandLineImportOptions::ResolveCommandLineImportOptions(args::ArgsHandl
}
void
-ResolveCommandLineImportOptions::apply(const std::tr1::shared_ptr<Environment> & env) const
+ResolveCommandLineImportOptions::apply(const std::shared_ptr<Environment> & env) const
{
if (! a_unpackaged_repository_params.specified())
return;
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
for (args::StringSetArg::ConstIterator a(a_unpackaged_repository_params.begin_args()),
a_end(a_unpackaged_repository_params.end_args()) ;
a != a_end ; ++a)
@@ -373,8 +373,8 @@ ResolveCommandLineImportOptions::apply(const std::tr1::shared_ptr<Environment> &
keys->insert(a->substr(0, p), a->substr(p + 1));
}
- std::tr1::shared_ptr<Repository> repo(RepositoryFactory::get_instance()->create(env.get(),
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
+ std::shared_ptr<Repository> repo(RepositoryFactory::get_instance()->create(env.get(),
+ std::bind(from_keys, keys, std::placeholders::_1)));
env->package_database()->add_repository(10, repo);
}
@@ -427,7 +427,7 @@ ResolveCommandLineResolutionOptions::apply_shortcuts()
}
void
-ResolveCommandLineResolutionOptions::verify(const std::tr1::shared_ptr<const Environment> &)
+ResolveCommandLineResolutionOptions::verify(const std::shared_ptr<const Environment> &)
{
}
diff --git a/src/clients/cave/cmd_resolve_cmdline.hh b/src/clients/cave/cmd_resolve_cmdline.hh
index 178cfc9b8..ae44a0370 100644
--- a/src/clients/cave/cmd_resolve_cmdline.hh
+++ b/src/clients/cave/cmd_resolve_cmdline.hh
@@ -22,7 +22,7 @@
#include "command_command_line.hh"
#include <paludis/environment-fwd.hh>
-#include <tr1/memory>
+#include <memory>
#include "config.h"
namespace paludis
@@ -110,7 +110,7 @@ namespace paludis
args::SwitchArg a_dump_restarts;
void apply_shortcuts();
- void verify(const std::tr1::shared_ptr<const Environment> & env);
+ void verify(const std::shared_ptr<const Environment> & env);
};
struct ResolveCommandLineExecutionOptions :
@@ -168,7 +168,7 @@ namespace paludis
args::ArgsGroup g_import_options;
args::StringSetArg a_unpackaged_repository_params;
- void apply(const std::tr1::shared_ptr<Environment> & env) const;
+ void apply(const std::shared_ptr<Environment> & env) const;
};
}
}
diff --git a/src/clients/cave/cmd_resolve_dump.cc b/src/clients/cave/cmd_resolve_dump.cc
index 5c00ad281..469f182d5 100644
--- a/src/clients/cave/cmd_resolve_dump.cc
+++ b/src/clients/cave/cmd_resolve_dump.cc
@@ -33,7 +33,6 @@
#include <paludis/util/join.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
-#include <paludis/util/indirect_iterator-impl.hh>
#include <iostream>
#include <sstream>
@@ -57,7 +56,7 @@ namespace
return s;
}
- std::string stringify_if_not_null(const std::tr1::shared_ptr<const Destination> & d)
+ std::string stringify_if_not_null(const std::shared_ptr<const Destination> & d)
{
if (d)
{
@@ -244,8 +243,8 @@ namespace
}
void dump(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<Resolver> & resolver,
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<Resolver> & resolver,
const ResolveCommandLineResolutionOptions &)
{
std::cout << "Dumping resolutions by QPN:S:" << std::endl << std::endl;
@@ -264,8 +263,8 @@ namespace
void
paludis::cave::dump_if_requested(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<Resolver> & resolver,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<Resolver> & resolver,
const ResolveCommandLineResolutionOptions & resolution_options)
{
Context context("When dumping the resolver:");
diff --git a/src/clients/cave/cmd_resolve_dump.hh b/src/clients/cave/cmd_resolve_dump.hh
index eb254046e..17eaa8bde 100644
--- a/src/clients/cave/cmd_resolve_dump.hh
+++ b/src/clients/cave/cmd_resolve_dump.hh
@@ -29,8 +29,8 @@ namespace paludis
namespace cave
{
void dump_if_requested(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<resolver::Resolver> & resolver,
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<resolver::Resolver> & resolver,
const ResolveCommandLineResolutionOptions & resolution_options);
}
}
diff --git a/src/clients/cave/cmd_resume.cc b/src/clients/cave/cmd_resume.cc
index 0b8cded99..5883e41fe 100644
--- a/src/clients/cave/cmd_resume.cc
+++ b/src/clients/cave/cmd_resume.cc
@@ -104,14 +104,14 @@ namespace
};
int perform_resolution(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<ResumeData> & data,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<ResumeData> & data,
const ResolveCommandLineExecutionOptions & execution_options,
const ResolveCommandLineProgramOptions & program_options)
{
Context context("When performing chosen resolution:");
- std::tr1::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
for (args::ArgsSection::GroupsConstIterator g(program_options.begin()), g_end(program_options.end()) ;
g != g_end ; ++g)
@@ -120,7 +120,7 @@ namespace
o != o_end ; ++o)
if ((*o)->specified())
{
- const std::tr1::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
+ const std::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
std::copy(f->begin(), f->end(), args->back_inserter());
}
}
@@ -132,7 +132,7 @@ namespace
o != o_end ; ++o)
if ((*o)->specified())
{
- const std::tr1::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
+ const std::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
std::copy(f->begin(), f->end(), args->back_inserter());
}
}
@@ -221,9 +221,9 @@ namespace
};
void fix_lists(
- const std::tr1::shared_ptr<Environment> &,
+ const std::shared_ptr<Environment> &,
const ResumeCommandLine & cmdline,
- const std::tr1::shared_ptr<JobLists> & lists)
+ const std::shared_ptr<JobLists> & lists)
{
for (JobList<ExecuteJob>::ConstIterator c(lists->execute_job_list()->begin()),
c_end(lists->execute_job_list()->end()) ;
@@ -253,8 +253,8 @@ ResumeCommand::important() const
int
ResumeCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
ResumeCommandLine cmdline;
@@ -269,7 +269,7 @@ ResumeCommand::run(
if (! cmdline.execution_options.a_resume_file.specified())
throw args::DoHelp("--" + cmdline.execution_options.a_resume_file.long_name() + " must be specified");
- std::tr1::shared_ptr<ResumeData> data;
+ std::shared_ptr<ResumeData> data;
{
FSEntry f(cmdline.execution_options.a_resume_file.argument());
if (! f.exists())
@@ -284,7 +284,7 @@ ResumeCommand::run(
return perform_resolution(env, data, cmdline.execution_options, cmdline.program_options);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
ResumeCommand::make_doc_cmdline()
{
return make_shared_ptr(new ResumeCommandLine);
diff --git a/src/clients/cave/cmd_resume.hh b/src/clients/cave/cmd_resume.hh
index 975294057..5750997bd 100644
--- a/src/clients/cave/cmd_resume.hh
+++ b/src/clients/cave/cmd_resume.hh
@@ -34,11 +34,11 @@ namespace paludis
bool important() const;
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_search.cc b/src/clients/cave/cmd_search.cc
index 242722fd3..87e2d2712 100644
--- a/src/clients/cave/cmd_search.cc
+++ b/src/clients/cave/cmd_search.cc
@@ -102,22 +102,22 @@ namespace
};
void found_match(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<Set<QualifiedPackageName> > & result,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<Set<QualifiedPackageName> > & result,
const PackageDepSpec & spec)
{
- const std::tr1::shared_ptr<const PackageID> id(*((*env)[selection::RequireExactlyOne(
+ const std::shared_ptr<const PackageID> id(*((*env)[selection::RequireExactlyOne(
generator::Matches(spec, MatchPackageOptions()))])->begin());
result->insert(id->name());
}
void found_candidate(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
MatchCommand & match_command,
const SearchCommandLineMatchOptions & match_options,
const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const Set<std::string> > & patterns,
- const std::tr1::function<void (const PackageDepSpec &)> & success
+ const std::shared_ptr<const Set<std::string> > & patterns,
+ const std::function<void (const PackageDepSpec &)> & success
)
{
if (match_command.run_hosted(env, match_options, patterns, spec))
@@ -255,8 +255,8 @@ SearchCommand::important() const
int
SearchCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
SearchCommandLine cmdline;
@@ -271,27 +271,27 @@ SearchCommand::run(
if (cmdline.begin_parameters() == cmdline.end_parameters())
throw args::DoHelp("search requires at least one parameter");
- const std::tr1::shared_ptr<Sequence<std::string> > show_args(new Sequence<std::string>);
+ const std::shared_ptr<Sequence<std::string> > show_args(new Sequence<std::string>);
{
DisplayCallback display_callback;
ScopedNotifierCallback display_callback_holder(env.get(),
- NotifierCallbackFunction(std::tr1::cref(display_callback)));
+ NotifierCallbackFunction(std::cref(display_callback)));
- const std::tr1::shared_ptr<Set<std::string> > patterns(new Set<std::string>);
+ const std::shared_ptr<Set<std::string> > patterns(new Set<std::string>);
std::copy(cmdline.begin_parameters(), cmdline.end_parameters(), patterns->inserter());
FindCandidatesCommand find_candidates_command;
MatchCommand match_command;
- std::tr1::shared_ptr<Set<QualifiedPackageName> > matches(new Set<QualifiedPackageName>);
+ std::shared_ptr<Set<QualifiedPackageName> > matches(new Set<QualifiedPackageName>);
find_candidates_command.run_hosted(env, cmdline.search_options, cmdline.match_options,
- patterns, std::tr1::bind(
- &found_candidate, env, std::tr1::ref(match_command), std::tr1::cref(cmdline.match_options),
- std::tr1::placeholders::_1, patterns, std::tr1::function<void (const PackageDepSpec &)>(std::tr1::bind(
- &found_match, env, std::tr1::ref(matches), std::tr1::placeholders::_1
+ patterns, std::bind(
+ &found_candidate, env, std::ref(match_command), std::cref(cmdline.match_options),
+ std::placeholders::_1, patterns, std::function<void (const PackageDepSpec &)>(std::bind(
+ &found_match, env, std::ref(matches), std::placeholders::_1
))),
- std::tr1::bind(&step, std::tr1::ref(display_callback), std::tr1::placeholders::_1)
+ std::bind(&step, std::ref(display_callback), std::placeholders::_1)
);
for (Set<QualifiedPackageName>::ConstIterator p(matches->begin()), p_end(matches->end()) ;
@@ -317,7 +317,7 @@ SearchCommand::run(
return show_command.run(env, show_args);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
SearchCommand::make_doc_cmdline()
{
return make_shared_ptr(new SearchCommandLine);
diff --git a/src/clients/cave/cmd_search.hh b/src/clients/cave/cmd_search.hh
index 4b4906165..391fecb57 100644
--- a/src/clients/cave/cmd_search.hh
+++ b/src/clients/cave/cmd_search.hh
@@ -33,11 +33,11 @@ namespace paludis
bool important() const;
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_search_cmdline.hh b/src/clients/cave/cmd_search_cmdline.hh
index cbb99e900..153830320 100644
--- a/src/clients/cave/cmd_search_cmdline.hh
+++ b/src/clients/cave/cmd_search_cmdline.hh
@@ -22,7 +22,7 @@
#include "command_command_line.hh"
#include <paludis/environment-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index bd7feb6d3..091a7097f 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -128,7 +128,7 @@ namespace
}
};
- std::string slot_as_string(const std::tr1::shared_ptr<const PackageID> & id)
+ std::string slot_as_string(const std::shared_ptr<const PackageID> & id)
{
if (id->slot_key())
return stringify(id->slot_key()->value());
@@ -138,11 +138,11 @@ namespace
struct SetDisplayer
{
- const std::tr1::shared_ptr<const Environment> env;
+ const std::shared_ptr<const Environment> env;
int indent;
std::set<SetName> recursing_sets;
- SetDisplayer(const std::tr1::shared_ptr<const Environment> & e, const int i) :
+ SetDisplayer(const std::shared_ptr<const Environment> & e, const int i) :
env(e),
indent(i)
{
@@ -161,7 +161,7 @@ namespace
{
cout << format_general_si(f::show_set_set(), stringify(*node.spec()), indent);
- const std::tr1::shared_ptr<const SetSpecTree> set(env->set(node.spec()->name()));
+ const std::shared_ptr<const SetSpecTree> set(env->set(node.spec()->name()));
if (! set)
throw NoSuchSetError(stringify(node.spec()->name()));
@@ -181,11 +181,11 @@ namespace
}
};
- void do_one_set(const std::tr1::shared_ptr<Environment> & env, const SetName & s)
+ void do_one_set(const std::shared_ptr<Environment> & env, const SetName & s)
{
cout << format_general_s(f::show_set_heading(), stringify(s));
- const std::tr1::shared_ptr<const SetSpecTree> set(env->set(s));
+ const std::shared_ptr<const SetSpecTree> set(env->set(s));
if (! set)
throw NoSuchSetError(stringify(s));
@@ -195,11 +195,11 @@ namespace
cout << endl;
}
- void do_one_wildcard(const std::tr1::shared_ptr<Environment> & env, const PackageDepSpec & s)
+ void do_one_wildcard(const std::shared_ptr<Environment> & env, const PackageDepSpec & s)
{
cout << format_general_s(f::show_wildcard_heading(), stringify(s));
- const std::tr1::shared_ptr<const PackageIDSequence> names((*env)[selection::BestVersionOnly(generator::Matches(s, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> names((*env)[selection::BestVersionOnly(generator::Matches(s, MatchPackageOptions()))]);
if (names->empty())
throw NothingMatching(s);
@@ -220,7 +220,7 @@ namespace
struct MetadataKeyComparator
{
- bool operator() (const std::tr1::shared_ptr<const MetadataKey> & a, const std::tr1::shared_ptr<const MetadataKey> & b) const
+ bool operator() (const std::shared_ptr<const MetadataKey> & a, const std::shared_ptr<const MetadataKey> & b) const
{
bool a_is_section(simple_visitor_cast<const MetadataSectionKey>(*a));
bool b_is_section(simple_visitor_cast<const MetadataSectionKey>(*b));
@@ -269,7 +269,7 @@ namespace
bool want_key(
const ShowCommandLine & cmdline,
- const std::tr1::shared_ptr<const MetadataKey> & key)
+ const std::shared_ptr<const MetadataKey> & key)
{
if (cmdline.a_key.end_args() != std::find(cmdline.a_key.begin_args(), cmdline.a_key.end_args(), key->raw_name()))
return true;
@@ -284,12 +284,12 @@ namespace
}
std::string added_or_changed_string(
- const std::tr1::shared_ptr<const Choice> & choice,
- const std::tr1::shared_ptr<const ChoiceValue> & value,
- const std::tr1::shared_ptr<const PackageID> & maybe_old_id,
+ const std::shared_ptr<const Choice> & choice,
+ const std::shared_ptr<const ChoiceValue> & value,
+ const std::shared_ptr<const PackageID> & maybe_old_id,
const bool old_id_is_installed)
{
- std::tr1::shared_ptr<const ChoiceValue> maybe_old_value;
+ std::shared_ptr<const ChoiceValue> maybe_old_value;
if (maybe_old_id && maybe_old_id->choices_key())
maybe_old_value = maybe_old_id->choices_key()->value()->find_by_name_with_prefix(value->name_with_prefix());
@@ -314,11 +314,11 @@ namespace
const ShowCommandLine & cmdline;
const int indent;
const bool important;
- const std::tr1::shared_ptr<const PackageID> maybe_old_id;
+ const std::shared_ptr<const PackageID> maybe_old_id;
const bool old_id_is_installed;
InfoDisplayer(const ShowCommandLine & c, const int i, const bool m,
- const std::tr1::shared_ptr<const PackageID> & o, const bool b) :
+ const std::shared_ptr<const PackageID> & o, const bool b) :
cmdline(c),
indent(i),
important(m),
@@ -333,8 +333,8 @@ namespace
(cmdline.a_raw_names.specified() ? f::show_metadata_subsection_raw() : f::show_metadata_subsection_human()),
k.raw_name(), k.human_name(), "",
indent, important);
- std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(k.begin_metadata(), k.end_metadata());
- for (std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
+ std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(k.begin_metadata(), k.end_metadata());
+ for (std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
s(keys.begin()), s_end(keys.end()) ; s != s_end ; ++s)
{
InfoDisplayer i(cmdline, indent + 1, ((*s)->type() == mkt_significant), maybe_old_id, old_id_is_installed);
@@ -523,7 +523,7 @@ namespace
stringify(k.value()), indent, important);
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const PackageID> > & k)
{
cout << format_general_rhvib(
(cmdline.a_raw_names.specified() ? f::show_metadata_key_value_raw() : f::show_metadata_key_value_human()),
@@ -531,7 +531,7 @@ namespace
stringify(*k.value()), indent, important);
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const Contents> > & k)
{
if (cmdline.a_complex_keys.specified() || important)
{
@@ -559,7 +559,7 @@ namespace
}
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const Choices> > & k)
{
if (cmdline.a_flat.specified())
{
@@ -718,7 +718,7 @@ namespace
}
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const RepositoryMaskInfo> > & k)
{
if (k.value())
{
@@ -812,14 +812,14 @@ namespace
void do_one_repository(
const ShowCommandLine & cmdline,
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const RepositoryName & s)
{
cout << format_general_s(f::show_repository_heading(), stringify(s));
- const std::tr1::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(s));
- std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(repo->begin_metadata(), repo->end_metadata());
- for (std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
+ const std::shared_ptr<const Repository> repo(env->package_database()->fetch_repository(s));
+ std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(repo->begin_metadata(), repo->end_metadata());
+ for (std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
k(keys.begin()), k_end(keys.end()) ; k != k_end ; ++k)
{
InfoDisplayer i(cmdline, 0, ((*k)->type() == mkt_significant), make_null_shared_ptr(), false);
@@ -831,14 +831,14 @@ namespace
void do_one_package_id(
const ShowCommandLine & cmdline,
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const PackageID> & best,
- const std::tr1::shared_ptr<const PackageID> & maybe_old_id,
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const PackageID> & best,
+ const std::shared_ptr<const PackageID> & maybe_old_id,
const bool old_id_is_installed)
{
cout << format_general_s(f::show_package_id_heading(), stringify(*best));
- std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(best->begin_metadata(), best->end_metadata());
- for (std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
+ std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(best->begin_metadata(), best->end_metadata());
+ for (std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
k(keys.begin()), k_end(keys.end()) ; k != k_end ; ++k)
{
InfoDisplayer i(cmdline, 1, ((*k)->type() == mkt_significant), maybe_old_id, old_id_is_installed);
@@ -893,18 +893,18 @@ namespace
void do_one_package(
const ShowCommandLine & cmdline,
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const PackageDepSpec & s)
{
cout << format_general_s(f::show_package_heading(), stringify(s));
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsGroupedBySlot(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsGroupedBySlot(
generator::Matches(s, MatchPackageOptions()))]);
if (ids->empty())
throw NothingMatching(s);
- std::tr1::shared_ptr<const PackageID> best_installable, best_weak_masked_installable, best_masked_installable, best_not_installed;
- std::tr1::shared_ptr<PackageIDSequence> all_installed(new PackageIDSequence);
+ std::shared_ptr<const PackageID> best_installable, best_weak_masked_installable, best_masked_installable, best_not_installed;
+ std::shared_ptr<PackageIDSequence> all_installed(new PackageIDSequence);
std::set<RepositoryName> repos;
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
@@ -1025,10 +1025,10 @@ namespace
void do_all_packages(
const ShowCommandLine & cmdline,
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const PackageDepSpec & s)
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(generator::Matches(s,
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(generator::Matches(s,
MatchPackageOptions()))]);
if (ids->empty())
throw NothingMatching(s);
@@ -1047,8 +1047,8 @@ ShowCommand::important() const
int
ShowCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
ShowCommandLine cmdline;
@@ -1118,7 +1118,7 @@ ShowCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
ShowCommand::make_doc_cmdline()
{
return make_shared_ptr(new ShowCommandLine);
diff --git a/src/clients/cave/cmd_show.hh b/src/clients/cave/cmd_show.hh
index f253030c7..eab97e66b 100644
--- a/src/clients/cave/cmd_show.hh
+++ b/src/clients/cave/cmd_show.hh
@@ -33,11 +33,11 @@ namespace paludis
bool important() const;
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_sync.cc b/src/clients/cave/cmd_sync.cc
index 043909c2b..5740ee203 100644
--- a/src/clients/cave/cmd_sync.cc
+++ b/src/clients/cave/cmd_sync.cc
@@ -40,7 +40,7 @@
#include <paludis/syncer.hh>
#include <paludis/metadata_key.hh>
#include <paludis/create_output_manager_info.hh>
-#include <tr1/functional>
+#include <functional>
#include <cstdlib>
#include <iostream>
#include <list>
@@ -96,17 +96,17 @@ namespace
bool skipped;
std::string error;
- const std::tr1::shared_ptr<Environment> env;
+ const std::shared_ptr<Environment> env;
const SyncCommandLine & cmdline;
const Executor * const executor;
const RepositoryName name;
Timestamp last_flushed, last_output;
- std::tr1::shared_ptr<OutputManager> output_manager;
+ std::shared_ptr<OutputManager> output_manager;
SyncExecutive(
- const std::tr1::shared_ptr<Environment> & e,
+ const std::shared_ptr<Environment> & e,
const SyncCommandLine & c,
const Executor * const x,
const RepositoryName & n) :
@@ -128,7 +128,7 @@ namespace
if (cmdline.a_sequential.specified())
return "";
- const std::tr1::shared_ptr<const Repository> r(env->package_database()->fetch_repository(name));
+ const std::shared_ptr<const Repository> r(env->package_database()->fetch_repository(name));
if (r->sync_host_key())
return r->sync_host_key()->value();
else
@@ -161,7 +161,7 @@ namespace
).max_exit_status())
throw SyncFailedError("Sync aborted by hook");
- const std::tr1::shared_ptr<Repository> repo(env->package_database()->fetch_repository(name));
+ const std::shared_ptr<Repository> repo(env->package_database()->fetch_repository(name));
CreateOutputManagerForRepositorySyncInfo info(repo->name(),
cmdline.a_sequential.specified() ? oe_exclusive : oe_with_others,
ClientOutputFeatures() + cof_summary_at_end);
@@ -189,7 +189,7 @@ namespace
try
{
- const std::tr1::shared_ptr<Repository> repo(env->package_database()->fetch_repository(name));
+ const std::shared_ptr<Repository> repo(env->package_database()->fetch_repository(name));
if (! repo->sync(output_manager))
skipped = true;
@@ -292,11 +292,11 @@ namespace
};
int sync_these(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const SyncCommandLine & cmdline,
const Repos & repos)
{
- std::list<std::tr1::shared_ptr<SyncExecutive> > executives;
+ std::list<std::shared_ptr<SyncExecutive> > executives;
{
Executor executor;
@@ -304,7 +304,7 @@ namespace
for (Repos::const_iterator r(repos.begin()), r_end(repos.end()) ;
r != r_end ; ++r)
{
- const std::tr1::shared_ptr<SyncExecutive> x(new SyncExecutive(env, cmdline, &executor, *r));
+ const std::shared_ptr<SyncExecutive> x(new SyncExecutive(env, cmdline, &executor, *r));
executor.add(x);
executives.push_back(x);
}
@@ -315,7 +315,7 @@ namespace
int retcode(0);
cout << format_general_s(f::sync_heading(), "Sync results");
- for (std::list<std::tr1::shared_ptr<SyncExecutive> >::const_iterator x(executives.begin()),
+ for (std::list<std::shared_ptr<SyncExecutive> >::const_iterator x(executives.begin()),
x_end(executives.end()) ;
x != x_end ; ++x)
{
@@ -349,8 +349,8 @@ SyncCommand::important() const
int
SyncCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
SyncCommandLine cmdline;
@@ -409,7 +409,7 @@ SyncCommand::run(
return retcode;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
SyncCommand::make_doc_cmdline()
{
return make_shared_ptr(new SyncCommandLine);
diff --git a/src/clients/cave/cmd_sync.hh b/src/clients/cave/cmd_sync.hh
index f01650ab2..f67d1d713 100644
--- a/src/clients/cave/cmd_sync.hh
+++ b/src/clients/cave/cmd_sync.hh
@@ -33,11 +33,11 @@ namespace paludis
bool important() const;
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_uninstall.cc b/src/clients/cave/cmd_uninstall.cc
index 9d9bc31ec..e66aa6c0d 100644
--- a/src/clients/cave/cmd_uninstall.cc
+++ b/src/clients/cave/cmd_uninstall.cc
@@ -53,10 +53,10 @@ namespace
args::ArgsGroup g_target_options;
args::SwitchArg a_all_versions;
- std::tr1::shared_ptr<ResolveCommandLineResolutionOptions> resolution_options;
- std::tr1::shared_ptr<ResolveCommandLineExecutionOptions> execution_options;
- std::tr1::shared_ptr<ResolveCommandLineDisplayOptions> display_options;
- std::tr1::shared_ptr<ResolveCommandLineProgramOptions> program_options;
+ std::shared_ptr<ResolveCommandLineResolutionOptions> resolution_options;
+ std::shared_ptr<ResolveCommandLineExecutionOptions> execution_options;
+ std::shared_ptr<ResolveCommandLineDisplayOptions> display_options;
+ std::shared_ptr<ResolveCommandLineProgramOptions> program_options;
UninstallCommandLine(const bool for_docs) :
g_target_options(main_options_section(), "Target options", "Target options"),
@@ -89,7 +89,7 @@ namespace
}
};
- bool has_multiple_versions(const std::tr1::shared_ptr<const PackageIDSequence> & ids)
+ bool has_multiple_versions(const std::shared_ptr<const PackageIDSequence> & ids)
{
QualifiedPackageName old_qpn("x/x");
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
@@ -112,8 +112,8 @@ UninstallCommand::important() const
int
UninstallCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
UninstallCommandLine cmdline(false);
@@ -128,17 +128,17 @@ UninstallCommand::run(
cmdline.resolution_options->apply_shortcuts();
cmdline.resolution_options->verify(env);
- std::tr1::shared_ptr<Sequence<std::pair<std::string, std::string> > > targets(new Sequence<std::pair<std::string, std::string> >);
- std::tr1::shared_ptr<Sequence<std::string> > targets_cleaned_up(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::pair<std::string, std::string> > > targets(new Sequence<std::pair<std::string, std::string> >);
+ std::shared_ptr<Sequence<std::string> > targets_cleaned_up(new Sequence<std::string>);
std::set<QualifiedPackageName> qpns_being_changed;
- std::tr1::shared_ptr<PackageIDSequence> ids_going_away(new PackageIDSequence);
+ std::shared_ptr<PackageIDSequence> ids_going_away(new PackageIDSequence);
for (UninstallCommandLine::ParametersConstIterator p(cmdline.begin_parameters()), p_end(cmdline.end_parameters()) ;
p != p_end ; ++p)
{
PackageDepSpec spec(parse_user_package_dep_spec(*p, env.get(), UserPackageDepSpecOptions() + updso_allow_wildcards));
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(
generator::Matches(spec, MatchPackageOptions()) | filter::SupportsAction<UninstallAction>())]);
if (ids->empty())
throw NothingMatching(spec);
@@ -164,7 +164,7 @@ UninstallCommand::run(
q != q_end ; ++q)
{
bool removing_all_slots(true);
- const std::tr1::shared_ptr<const PackageIDSequence> all_uninstallable((*env)[selection::AllVersionsSorted(
+ const std::shared_ptr<const PackageIDSequence> all_uninstallable((*env)[selection::AllVersionsSorted(
generator::Package(*q) | filter::SupportsAction<UninstallAction>())]);
for (PackageIDSequence::ConstIterator i(all_uninstallable->begin()), i_end(all_uninstallable->end()) ;
i != i_end ; ++i)
@@ -189,7 +189,7 @@ UninstallCommand::run(
*cmdline.program_options, make_null_shared_ptr(), targets, targets_cleaned_up, false);
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
UninstallCommand::make_doc_cmdline()
{
return make_shared_ptr(new UninstallCommandLine(true));
diff --git a/src/clients/cave/cmd_uninstall.hh b/src/clients/cave/cmd_uninstall.hh
index d2c95e9cc..654cc0b5d 100644
--- a/src/clients/cave/cmd_uninstall.hh
+++ b/src/clients/cave/cmd_uninstall.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
bool important() const;
};
diff --git a/src/clients/cave/cmd_update_world.cc b/src/clients/cave/cmd_update_world.cc
index 1063e3247..a2d508b47 100644
--- a/src/clients/cave/cmd_update_world.cc
+++ b/src/clients/cave/cmd_update_world.cc
@@ -81,8 +81,8 @@ namespace
int
UpdateWorldCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
UpdateWorldCommandLine cmdline;
@@ -151,7 +151,7 @@ UpdateWorldCommand::run(
return EXIT_SUCCESS;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
UpdateWorldCommand::make_doc_cmdline()
{
return make_shared_ptr(new UpdateWorldCommandLine);
diff --git a/src/clients/cave/cmd_update_world.hh b/src/clients/cave/cmd_update_world.hh
index 7874fdbe4..ba44dfb6f 100644
--- a/src/clients/cave/cmd_update_world.hh
+++ b/src/clients/cave/cmd_update_world.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/cmd_verify.cc b/src/clients/cave/cmd_verify.cc
index 196f12b11..f8a7b60c3 100644
--- a/src/clients/cave/cmd_verify.cc
+++ b/src/clients/cave/cmd_verify.cc
@@ -87,12 +87,12 @@ namespace
struct Verifier
{
- const std::tr1::shared_ptr<const PackageID> id;
+ const std::shared_ptr<const PackageID> id;
int exit_status;
bool done_heading;
- Verifier(const std::tr1::shared_ptr<const PackageID> & i) :
+ Verifier(const std::shared_ptr<const PackageID> & i) :
id(i),
exit_status(0),
done_heading(false)
@@ -187,8 +187,8 @@ namespace
int
VerifyCommand::run(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
VerifyCommandLine cmdline;
@@ -206,7 +206,7 @@ VerifyCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(),
UserPackageDepSpecOptions() + updso_allow_wildcards, filter::InstalledAtRoot(env->root())));
- std::tr1::shared_ptr<const PackageIDSequence> entries(
+ std::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
@@ -229,7 +229,7 @@ VerifyCommand::run(
return exit_status;
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
VerifyCommand::make_doc_cmdline()
{
return make_shared_ptr(new VerifyCommandLine);
diff --git a/src/clients/cave/cmd_verify.hh b/src/clients/cave/cmd_verify.hh
index bc027d4d8..6d1b73ea6 100644
--- a/src/clients/cave/cmd_verify.hh
+++ b/src/clients/cave/cmd_verify.hh
@@ -31,11 +31,11 @@ namespace paludis
{
public:
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
);
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline();
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline();
};
}
}
diff --git a/src/clients/cave/command.hh b/src/clients/cave/command.hh
index e235ac8ce..8768f5aaa 100644
--- a/src/clients/cave/command.hh
+++ b/src/clients/cave/command.hh
@@ -23,7 +23,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/args/man.hh>
#include <paludis/environment-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -37,11 +37,11 @@ namespace paludis
virtual bool important() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
) PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline() = 0;
+ virtual std::shared_ptr<args::ArgsHandler> make_doc_cmdline() = 0;
};
}
}
diff --git a/src/clients/cave/command_factory.cc b/src/clients/cave/command_factory.cc
index ef8ccbbbb..cb5e18edf 100644
--- a/src/clients/cave/command_factory.cc
+++ b/src/clients/cave/command_factory.cc
@@ -30,7 +30,7 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/options.hh>
#include <paludis/util/system.hh>
-#include <tr1/functional>
+#include <functional>
#include <vector>
#include <map>
@@ -78,7 +78,7 @@
using namespace paludis;
using namespace cave;
-typedef std::map<std::string, std::tr1::function<const std::tr1::shared_ptr<cave::Command> ()> > Handlers;
+typedef std::map<std::string, std::function<const std::shared_ptr<cave::Command> ()> > Handlers;
namespace paludis
{
@@ -98,12 +98,12 @@ namespace paludis
namespace
{
template <typename T_>
- const std::tr1::shared_ptr<T_> make_command()
+ const std::shared_ptr<T_> make_command()
{
return make_shared_ptr(new T_);
}
- const std::tr1::shared_ptr<ScriptCommand> make_script_command(const std::string & s, const FSEntry & f)
+ const std::shared_ptr<ScriptCommand> make_script_command(const std::string & s, const FSEntry & f)
{
return make_shared_ptr(new ScriptCommand(s, f));
}
@@ -133,58 +133,58 @@ CommandFactory::CommandFactory() :
command_name.erase(p);
_imp->handlers.erase(command_name);
- _imp->handlers.insert(std::make_pair(command_name, std::tr1::bind(&make_script_command, command_name, *s)));
+ _imp->handlers.insert(std::make_pair(command_name, std::bind(&make_script_command, command_name, *s)));
}
}
}
- _imp->handlers.insert(std::make_pair("config", std::tr1::bind(&make_command<ConfigCommand>)));
- _imp->handlers.insert(std::make_pair("contents", std::tr1::bind(&make_command<ContentsCommand>)));
- _imp->handlers.insert(std::make_pair("display-resolution", std::tr1::bind(&make_command<DisplayResolutionCommand>)));
- _imp->handlers.insert(std::make_pair("executables", std::tr1::bind(&make_command<ExecutablesCommand>)));
- _imp->handlers.insert(std::make_pair("execute-resolution", std::tr1::bind(&make_command<ExecuteResolutionCommand>)));
- _imp->handlers.insert(std::make_pair("find-candidates", std::tr1::bind(&make_command<FindCandidatesCommand>)));
- _imp->handlers.insert(std::make_pair("fix-cache", std::tr1::bind(&make_command<FixCacheCommand>)));
- _imp->handlers.insert(std::make_pair("fix-linkage", std::tr1::bind(&make_command<FixLinkageCommand>)));
- _imp->handlers.insert(std::make_pair("help", std::tr1::bind(&make_command<HelpCommand>)));
- _imp->handlers.insert(std::make_pair("import", std::tr1::bind(&make_command<ImportCommand>)));
- _imp->handlers.insert(std::make_pair("info", std::tr1::bind(&make_command<InfoCommand>)));
- _imp->handlers.insert(std::make_pair("match", std::tr1::bind(&make_command<MatchCommand>)));
- _imp->handlers.insert(std::make_pair("owner", std::tr1::bind(&make_command<OwnerCommand>)));
- _imp->handlers.insert(std::make_pair("perform", std::tr1::bind(&make_command<PerformCommand>)));
- _imp->handlers.insert(std::make_pair("purge", std::tr1::bind(&make_command<PurgeCommand>)));
- _imp->handlers.insert(std::make_pair("print-categories", std::tr1::bind(&make_command<PrintCategoriesCommand>)));
- _imp->handlers.insert(std::make_pair("print-commands", std::tr1::bind(&make_command<PrintCommandsCommand>)));
- _imp->handlers.insert(std::make_pair("print-environment-metadata", std::tr1::bind(&make_command<PrintEnvironmentMetadataCommand>)));
- _imp->handlers.insert(std::make_pair("print-id-actions", std::tr1::bind(&make_command<PrintIDActionsCommand>)));
- _imp->handlers.insert(std::make_pair("print-id-contents", std::tr1::bind(&make_command<PrintIDContentsCommand>)));
- _imp->handlers.insert(std::make_pair("print-id-executables", std::tr1::bind(&make_command<PrintIDExecutablesCommand>)));
- _imp->handlers.insert(std::make_pair("print-id-masks", std::tr1::bind(&make_command<PrintIDMasksCommand>)));
- _imp->handlers.insert(std::make_pair("print-id-metadata", std::tr1::bind(&make_command<PrintIDMetadataCommand>)));
- _imp->handlers.insert(std::make_pair("print-ids", std::tr1::bind(&make_command<PrintIDsCommand>)));
- _imp->handlers.insert(std::make_pair("print-owners", std::tr1::bind(&make_command<PrintOwnersCommand>)));
- _imp->handlers.insert(std::make_pair("print-packages", std::tr1::bind(&make_command<PrintPackagesCommand>)));
- _imp->handlers.insert(std::make_pair("print-repositories", std::tr1::bind(&make_command<PrintRepositoriesCommand>)));
- _imp->handlers.insert(std::make_pair("print-repository-formats", std::tr1::bind(&make_command<PrintRepositoryFormatsCommand>)));
- _imp->handlers.insert(std::make_pair("print-repository-metadata", std::tr1::bind(&make_command<PrintRepositoryMetadataCommand>)));
- _imp->handlers.insert(std::make_pair("print-set", std::tr1::bind(&make_command<PrintSetCommand>)));
- _imp->handlers.insert(std::make_pair("print-sets", std::tr1::bind(&make_command<PrintSetsCommand>)));
- _imp->handlers.insert(std::make_pair("print-sync-protocols", std::tr1::bind(&make_command<PrintSyncProtocolsCommand>)));
- _imp->handlers.insert(std::make_pair("resolve", std::tr1::bind(&make_command<ResolveCommand>)));
- _imp->handlers.insert(std::make_pair("resume", std::tr1::bind(&make_command<ResumeCommand>)));
- _imp->handlers.insert(std::make_pair("search", std::tr1::bind(&make_command<SearchCommand>)));
- _imp->handlers.insert(std::make_pair("show", std::tr1::bind(&make_command<ShowCommand>)));
- _imp->handlers.insert(std::make_pair("sync", std::tr1::bind(&make_command<SyncCommand>)));
- _imp->handlers.insert(std::make_pair("uninstall", std::tr1::bind(&make_command<UninstallCommand>)));
- _imp->handlers.insert(std::make_pair("update-world", std::tr1::bind(&make_command<UpdateWorldCommand>)));
- _imp->handlers.insert(std::make_pair("verify", std::tr1::bind(&make_command<VerifyCommand>)));
+ _imp->handlers.insert(std::make_pair("config", std::bind(&make_command<ConfigCommand>)));
+ _imp->handlers.insert(std::make_pair("contents", std::bind(&make_command<ContentsCommand>)));
+ _imp->handlers.insert(std::make_pair("display-resolution", std::bind(&make_command<DisplayResolutionCommand>)));
+ _imp->handlers.insert(std::make_pair("executables", std::bind(&make_command<ExecutablesCommand>)));
+ _imp->handlers.insert(std::make_pair("execute-resolution", std::bind(&make_command<ExecuteResolutionCommand>)));
+ _imp->handlers.insert(std::make_pair("find-candidates", std::bind(&make_command<FindCandidatesCommand>)));
+ _imp->handlers.insert(std::make_pair("fix-cache", std::bind(&make_command<FixCacheCommand>)));
+ _imp->handlers.insert(std::make_pair("fix-linkage", std::bind(&make_command<FixLinkageCommand>)));
+ _imp->handlers.insert(std::make_pair("help", std::bind(&make_command<HelpCommand>)));
+ _imp->handlers.insert(std::make_pair("import", std::bind(&make_command<ImportCommand>)));
+ _imp->handlers.insert(std::make_pair("info", std::bind(&make_command<InfoCommand>)));
+ _imp->handlers.insert(std::make_pair("match", std::bind(&make_command<MatchCommand>)));
+ _imp->handlers.insert(std::make_pair("owner", std::bind(&make_command<OwnerCommand>)));
+ _imp->handlers.insert(std::make_pair("perform", std::bind(&make_command<PerformCommand>)));
+ _imp->handlers.insert(std::make_pair("purge", std::bind(&make_command<PurgeCommand>)));
+ _imp->handlers.insert(std::make_pair("print-categories", std::bind(&make_command<PrintCategoriesCommand>)));
+ _imp->handlers.insert(std::make_pair("print-commands", std::bind(&make_command<PrintCommandsCommand>)));
+ _imp->handlers.insert(std::make_pair("print-environment-metadata", std::bind(&make_command<PrintEnvironmentMetadataCommand>)));
+ _imp->handlers.insert(std::make_pair("print-id-actions", std::bind(&make_command<PrintIDActionsCommand>)));
+ _imp->handlers.insert(std::make_pair("print-id-contents", std::bind(&make_command<PrintIDContentsCommand>)));
+ _imp->handlers.insert(std::make_pair("print-id-executables", std::bind(&make_command<PrintIDExecutablesCommand>)));
+ _imp->handlers.insert(std::make_pair("print-id-masks", std::bind(&make_command<PrintIDMasksCommand>)));
+ _imp->handlers.insert(std::make_pair("print-id-metadata", std::bind(&make_command<PrintIDMetadataCommand>)));
+ _imp->handlers.insert(std::make_pair("print-ids", std::bind(&make_command<PrintIDsCommand>)));
+ _imp->handlers.insert(std::make_pair("print-owners", std::bind(&make_command<PrintOwnersCommand>)));
+ _imp->handlers.insert(std::make_pair("print-packages", std::bind(&make_command<PrintPackagesCommand>)));
+ _imp->handlers.insert(std::make_pair("print-repositories", std::bind(&make_command<PrintRepositoriesCommand>)));
+ _imp->handlers.insert(std::make_pair("print-repository-formats", std::bind(&make_command<PrintRepositoryFormatsCommand>)));
+ _imp->handlers.insert(std::make_pair("print-repository-metadata", std::bind(&make_command<PrintRepositoryMetadataCommand>)));
+ _imp->handlers.insert(std::make_pair("print-set", std::bind(&make_command<PrintSetCommand>)));
+ _imp->handlers.insert(std::make_pair("print-sets", std::bind(&make_command<PrintSetsCommand>)));
+ _imp->handlers.insert(std::make_pair("print-sync-protocols", std::bind(&make_command<PrintSyncProtocolsCommand>)));
+ _imp->handlers.insert(std::make_pair("resolve", std::bind(&make_command<ResolveCommand>)));
+ _imp->handlers.insert(std::make_pair("resume", std::bind(&make_command<ResumeCommand>)));
+ _imp->handlers.insert(std::make_pair("search", std::bind(&make_command<SearchCommand>)));
+ _imp->handlers.insert(std::make_pair("show", std::bind(&make_command<ShowCommand>)));
+ _imp->handlers.insert(std::make_pair("sync", std::bind(&make_command<SyncCommand>)));
+ _imp->handlers.insert(std::make_pair("uninstall", std::bind(&make_command<UninstallCommand>)));
+ _imp->handlers.insert(std::make_pair("update-world", std::bind(&make_command<UpdateWorldCommand>)));
+ _imp->handlers.insert(std::make_pair("verify", std::bind(&make_command<VerifyCommand>)));
}
CommandFactory::~CommandFactory()
{
}
-const std::tr1::shared_ptr<cave::Command>
+const std::shared_ptr<cave::Command>
CommandFactory::create(const std::string & s) const
{
Handlers::const_iterator i(_imp->handlers.find(s));
diff --git a/src/clients/cave/command_factory.hh b/src/clients/cave/command_factory.hh
index 63e7c8261..d31392572 100644
--- a/src/clients/cave/command_factory.hh
+++ b/src/clients/cave/command_factory.hh
@@ -25,7 +25,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/exception.hh>
#include <string>
-#include <tr1/memory>
+#include <memory>
#include "command.hh"
namespace paludis
@@ -50,7 +50,7 @@ namespace paludis
~CommandFactory();
public:
- const std::tr1::shared_ptr<Command> create(const std::string &)
+ const std::shared_ptr<Command> create(const std::string &)
const PALUDIS_ATTRIBUTE((warn_unused_result));
struct ConstIteratorTag;
diff --git a/src/clients/cave/exceptions.cc b/src/clients/cave/exceptions.cc
index 755ef2195..fdb587a1b 100644
--- a/src/clients/cave/exceptions.cc
+++ b/src/clients/cave/exceptions.cc
@@ -39,13 +39,13 @@ NothingMatching::NothingMatching(const std::string & name) throw () :
{
}
-BeMoreSpecific::BeMoreSpecific(const PackageDepSpec & spec, const std::tr1::shared_ptr<const PackageIDSequence> & s) throw () :
+BeMoreSpecific::BeMoreSpecific(const PackageDepSpec & spec, const std::shared_ptr<const PackageIDSequence> & s) throw () :
Exception("Found multiple suitable IDs matching '" + stringify(spec) + "': { '" + join(indirect_iterator(s->begin()),
indirect_iterator(s->end()), "', '") + "' }")
{
}
-BadIDForCommand::BadIDForCommand(const PackageDepSpec & spec, const std::tr1::shared_ptr<const PackageID> & s,
+BadIDForCommand::BadIDForCommand(const PackageDepSpec & spec, const std::shared_ptr<const PackageID> & s,
const std::string & r) throw () :
Exception("Spec '" + stringify(spec) + "' resolves to ID '" + stringify(*s) + "', which " + r)
{
diff --git a/src/clients/cave/exceptions.hh b/src/clients/cave/exceptions.hh
index c5082c234..7621d058c 100644
--- a/src/clients/cave/exceptions.hh
+++ b/src/clients/cave/exceptions.hh
@@ -24,7 +24,7 @@
#include <paludis/dep_spec-fwd.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/name-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -42,7 +42,7 @@ namespace paludis
public Exception
{
public:
- BeMoreSpecific(const PackageDepSpec &, const std::tr1::shared_ptr<const PackageIDSequence> &) throw ();
+ BeMoreSpecific(const PackageDepSpec &, const std::shared_ptr<const PackageIDSequence> &) throw ();
};
class PALUDIS_VISIBLE BadIDForCommand :
@@ -51,7 +51,7 @@ namespace paludis
public:
BadIDForCommand(
const PackageDepSpec &,
- const std::tr1::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const PackageID> &,
const std::string & r) throw ();
};
diff --git a/src/clients/cave/executables_common.cc b/src/clients/cave/executables_common.cc
index fb665b2d5..f7f94771e 100644
--- a/src/clients/cave/executables_common.cc
+++ b/src/clients/cave/executables_common.cc
@@ -38,7 +38,7 @@
#include <algorithm>
#include <set>
#include <cstdlib>
-#include <tr1/memory>
+#include <memory>
using namespace paludis;
using namespace cave;
@@ -49,7 +49,7 @@ namespace
{
private:
const std::set<std::string> & _paths;
- const std::tr1::function<void (const FSEntry &)> _displayer;
+ const std::function<void (const FSEntry &)> _displayer;
bool is_executable_in_path(const FSEntry & file)
{
@@ -70,7 +70,7 @@ namespace
public:
ExecutablesDisplayer(
const std::set<std::string> & p,
- const std::tr1::function<void (const FSEntry &)> & d) :
+ const std::function<void (const FSEntry &)> & d) :
_paths(p),
_displayer(d)
{
@@ -103,11 +103,11 @@ namespace
int
paludis::cave::executables_common(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const std::string & param,
- const std::tr1::function<void (const FSEntry &)> & displayer)
+ const std::function<void (const FSEntry &)> & displayer)
{
- std::tr1::shared_ptr<const PackageIDSequence> entries(
+ std::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(
param, env.get(),
@@ -127,7 +127,7 @@ paludis::cave::executables_common(
{
if ((*t)->contents_key())
{
- std::tr1::shared_ptr<const Contents> contents((*t)->contents_key()->value());
+ std::shared_ptr<const Contents> contents((*t)->contents_key()->value());
std::for_each(indirect_iterator(contents->begin()), indirect_iterator(contents->end()), accept_visitor(ed));
}
}
diff --git a/src/clients/cave/executables_common.hh b/src/clients/cave/executables_common.hh
index 3f8ba6219..1de807850 100644
--- a/src/clients/cave/executables_common.hh
+++ b/src/clients/cave/executables_common.hh
@@ -24,17 +24,17 @@
#include <paludis/util/fs_entry-fwd.hh>
#include <paludis/environment-fwd.hh>
#include <string>
-#include <tr1/functional>
-#include <tr1/memory>
+#include <functional>
+#include <memory>
namespace paludis
{
namespace cave
{
int executables_common(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const std::string &,
- const std::tr1::function<void (const FSEntry &)> &);
+ const std::function<void (const FSEntry &)> &);
}
}
diff --git a/src/clients/cave/format_general.cc b/src/clients/cave/format_general.cc
index 9aa4b3637..faf977a42 100644
--- a/src/clients/cave/format_general.cc
+++ b/src/clients/cave/format_general.cc
@@ -28,7 +28,7 @@ using namespace cave;
std::string
paludis::cave::format_general_s(const std::string & f, const std::string & s)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('s', s);
return format_string(f, m);
}
@@ -36,7 +36,7 @@ paludis::cave::format_general_s(const std::string & f, const std::string & s)
std::string
paludis::cave::format_general_si(const std::string & f, const std::string & s, const int i)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('s', s);
m->insert('i', std::string(i, ' '));
return format_string(f, m);
@@ -45,7 +45,7 @@ paludis::cave::format_general_si(const std::string & f, const std::string & s, c
std::string
paludis::cave::format_general_kv(const std::string & f, const std::string & k, const std::string & v)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('k', k);
m->insert('v', v);
return format_string(f, m);
@@ -54,7 +54,7 @@ paludis::cave::format_general_kv(const std::string & f, const std::string & k, c
std::string
paludis::cave::format_general_sr(const std::string & f, const std::string & s, const std::string & r)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('s', s);
m->insert('r', r);
return format_string(f, m);
@@ -63,7 +63,7 @@ paludis::cave::format_general_sr(const std::string & f, const std::string & s, c
std::string
paludis::cave::format_general_spad(const std::string & f, const std::string & s, const int p, const int a, const int d)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('s', s);
m->insert('p', stringify(p));
m->insert('a', stringify(a));
@@ -75,7 +75,7 @@ std::string
paludis::cave::format_general_rhvib(const std::string & f, const std::string & r, const std::string & h,
const std::string & v, const int i, const bool b)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('r', r);
m->insert('h', h);
m->insert('v', v);
@@ -87,7 +87,7 @@ paludis::cave::format_general_rhvib(const std::string & f, const std::string & r
std::string
paludis::cave::format_general_i(const std::string & f, const int i)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('i', std::string(i, ' '));
return format_string(f, m);
}
@@ -95,7 +95,7 @@ paludis::cave::format_general_i(const std::string & f, const int i)
std::string
paludis::cave::format_general_his(const std::string & f, const std::string & h, const int i, const std::string & s)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('h', h);
m->insert('i', std::string(i, ' '));
m->insert('s', s);
diff --git a/src/clients/cave/format_plain_contents_entry.cc b/src/clients/cave/format_plain_contents_entry.cc
index 274bf1546..c9ba47a69 100644
--- a/src/clients/cave/format_plain_contents_entry.cc
+++ b/src/clients/cave/format_plain_contents_entry.cc
@@ -68,13 +68,13 @@ namespace
std::string
paludis::cave::format_plain_contents_entry(
- const std::tr1::shared_ptr<const ContentsEntry> & c,
+ const std::shared_ptr<const ContentsEntry> & c,
const std::string & f)
{
ValueGetter v;
c->accept(v);
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('n', stringify(c->location_key()->value()));
m->insert('d', stringify(c->location_key()->value().dirname()));
m->insert('b', stringify(c->location_key()->value().basename()));
diff --git a/src/clients/cave/format_plain_contents_entry.hh b/src/clients/cave/format_plain_contents_entry.hh
index 8ed1f2c40..d39b2a6c3 100644
--- a/src/clients/cave/format_plain_contents_entry.hh
+++ b/src/clients/cave/format_plain_contents_entry.hh
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/contents-fwd.hh>
-#include <tr1/memory>
+#include <memory>
#include <string>
namespace paludis
@@ -30,7 +30,7 @@ namespace paludis
namespace cave
{
std::string format_plain_contents_entry(
- const std::tr1::shared_ptr<const ContentsEntry> &,
+ const std::shared_ptr<const ContentsEntry> &,
const std::string & format)
PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
}
diff --git a/src/clients/cave/format_plain_metadata_key.cc b/src/clients/cave/format_plain_metadata_key.cc
index 13a922f3a..e5ecbd4ea 100644
--- a/src/clients/cave/format_plain_metadata_key.cc
+++ b/src/clients/cave/format_plain_metadata_key.cc
@@ -44,26 +44,26 @@ namespace
s << k.value().seconds();
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const RepositoryMaskInfo> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const RepositoryMaskInfo> > & k)
{
if (k.value())
{
- const std::tr1::shared_ptr<const Sequence<std::string> > c(k.value()->comment());
+ const std::shared_ptr<const Sequence<std::string> > c(k.value()->comment());
s << join(c->begin(), c->end(), " ") << " " << k.value()->mask_file();
}
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Contents> > &)
+ void visit(const MetadataValueKey<std::shared_ptr<const Contents> > &)
{
s << "<unprintable>";
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const Choices> > &)
+ void visit(const MetadataValueKey<std::shared_ptr<const Choices> > &)
{
s << "<unprintable>";
}
- void visit(const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > & k)
+ void visit(const MetadataValueKey<std::shared_ptr<const PackageID> > & k)
{
s << *k.value();
}
@@ -168,11 +168,11 @@ namespace
std::string
paludis::cave::format_plain_metadata_key(
- const std::tr1::shared_ptr<const MetadataKey> & k,
+ const std::shared_ptr<const MetadataKey> & k,
const std::string & i,
const std::string & f)
{
- std::tr1::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
+ std::shared_ptr<Map<char, std::string> > m(new Map<char, std::string>);
m->insert('r', k->raw_name());
m->insert('h', k->human_name());
m->insert('v', format_plain_metadata_key_value(k));
@@ -183,7 +183,7 @@ paludis::cave::format_plain_metadata_key(
std::string
paludis::cave::format_plain_metadata_key_value(
- const std::tr1::shared_ptr<const MetadataKey> & k)
+ const std::shared_ptr<const MetadataKey> & k)
{
ValueGetter v;
k->accept(v);
diff --git a/src/clients/cave/format_plain_metadata_key.hh b/src/clients/cave/format_plain_metadata_key.hh
index 43c218d6c..745b7db61 100644
--- a/src/clients/cave/format_plain_metadata_key.hh
+++ b/src/clients/cave/format_plain_metadata_key.hh
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/metadata_key-fwd.hh>
-#include <tr1/memory>
+#include <memory>
#include <string>
namespace paludis
@@ -30,13 +30,13 @@ namespace paludis
namespace cave
{
std::string format_plain_metadata_key(
- const std::tr1::shared_ptr<const MetadataKey> &,
+ const std::shared_ptr<const MetadataKey> &,
const std::string & value_for_i,
const std::string & format)
PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
std::string format_plain_metadata_key_value(
- const std::tr1::shared_ptr<const MetadataKey> &)
+ const std::shared_ptr<const MetadataKey> &)
PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
}
}
diff --git a/src/clients/cave/format_string.cc b/src/clients/cave/format_string.cc
index 5127c4482..eb566f017 100644
--- a/src/clients/cave/format_string.cc
+++ b/src/clients/cave/format_string.cc
@@ -36,7 +36,7 @@ FormatStringError::FormatStringError(const std::string & f, const std::string &
std::string
paludis::cave::format_string(
const std::string & f,
- const std::tr1::shared_ptr<Map<char, std::string> > & m
+ const std::shared_ptr<Map<char, std::string> > & m
)
{
std::string result;
diff --git a/src/clients/cave/format_string.hh b/src/clients/cave/format_string.hh
index 0678eca87..72b6c8ad3 100644
--- a/src/clients/cave/format_string.hh
+++ b/src/clients/cave/format_string.hh
@@ -23,7 +23,7 @@
#include <paludis/util/map-fwd.hh>
#include <paludis/util/attributes.hh>
#include <paludis/util/exception.hh>
-#include <tr1/memory>
+#include <memory>
#include <string>
namespace paludis
@@ -39,7 +39,7 @@ namespace paludis
std::string format_string(
const std::string &,
- const std::tr1::shared_ptr<Map<char, std::string> > &
+ const std::shared_ptr<Map<char, std::string> > &
) PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
}
}
diff --git a/src/clients/cave/man_cave.cc b/src/clients/cave/man_cave.cc
index c5d9cae3a..fbda254d0 100644
--- a/src/clients/cave/man_cave.cc
+++ b/src/clients/cave/man_cave.cc
@@ -67,7 +67,7 @@ main(int argc, char * argv[])
ManCommandLine cmdline;
cmdline.run(argc, argv, "", "", "");
- std::tr1::shared_ptr<paludis::args::DocWriter> w;
+ std::shared_ptr<paludis::args::DocWriter> w;
if (cmdline.a_html.specified())
w.reset(new paludis::args::HtmlWriter(cout));
else
diff --git a/src/clients/cave/owner_common.cc b/src/clients/cave/owner_common.cc
index e129fb55f..3dc0f341f 100644
--- a/src/clients/cave/owner_common.cc
+++ b/src/clients/cave/owner_common.cc
@@ -35,23 +35,23 @@
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <algorithm>
-#include <tr1/functional>
+#include <functional>
using namespace paludis;
namespace
{
- bool handle_full(const std::string & q, const std::tr1::shared_ptr<const ContentsEntry> & e)
+ bool handle_full(const std::string & q, const std::shared_ptr<const ContentsEntry> & e)
{
return q == stringify(e->location_key()->value());
}
- bool handle_basename(const std::string & q, const std::tr1::shared_ptr<const ContentsEntry> & e)
+ bool handle_basename(const std::string & q, const std::shared_ptr<const ContentsEntry> & e)
{
return q == e->location_key()->value().basename();
}
- bool handle_partial(const std::string & q, const std::tr1::shared_ptr<const ContentsEntry> & e)
+ bool handle_partial(const std::string & q, const std::shared_ptr<const ContentsEntry> & e)
{
return std::string::npos != stringify(e->location_key()->value()).find(q);
}
@@ -59,13 +59,13 @@ namespace
int
paludis::cave::owner_common(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const std::string & match,
const std::string & query,
- const std::tr1::function<void (const std::tr1::shared_ptr<const PackageID> &)> & callback)
+ const std::function<void (const std::shared_ptr<const PackageID> &)> & callback)
{
bool found(false);
- std::tr1::function<bool (const std::string &, const std::tr1::shared_ptr<const ContentsEntry> &)> handler;
+ std::function<bool (const std::string &, const std::shared_ptr<const ContentsEntry> &)> handler;
if ("full" == match)
handler = handle_full;
@@ -83,7 +83,7 @@ paludis::cave::owner_common(
handler = handle_basename;
}
- std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(generator::All() |
+ std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(generator::All() |
filter::InstalledAtRoot(env->root()))]);
for (PackageIDSequence::ConstIterator p(ids->begin()), p_end(ids->end()); p != p_end; ++p)
@@ -91,9 +91,9 @@ paludis::cave::owner_common(
if (! (*p)->contents_key())
continue;
- std::tr1::shared_ptr<const Contents> contents((*p)->contents_key()->value());
- if (contents->end() != std::find_if(contents->begin(), contents->end(), std::tr1::bind(handler, query,
- std::tr1::placeholders::_1)))
+ std::shared_ptr<const Contents> contents((*p)->contents_key()->value());
+ if (contents->end() != std::find_if(contents->begin(), contents->end(), std::bind(handler, query,
+ std::placeholders::_1)))
{
callback(*p);
found = true;
diff --git a/src/clients/cave/owner_common.hh b/src/clients/cave/owner_common.hh
index c33e51f0f..12dabc8f6 100644
--- a/src/clients/cave/owner_common.hh
+++ b/src/clients/cave/owner_common.hh
@@ -25,18 +25,18 @@
#include <paludis/package_id-fwd.hh>
#include <paludis/environment-fwd.hh>
#include <string>
-#include <tr1/memory>
-#include <tr1/functional>
+#include <memory>
+#include <functional>
namespace paludis
{
namespace cave
{
int owner_common(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const std::string & match,
const std::string & query,
- const std::tr1::function<void (const std::tr1::shared_ptr<const PackageID> &)> &);
+ const std::function<void (const std::shared_ptr<const PackageID> &)> &);
}
}
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index ed4ca9139..89ae9b16a 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -92,19 +92,19 @@ using std::endl;
namespace
{
- typedef std::map<Resolvent, std::tr1::shared_ptr<Constraints> > InitialConstraints;
+ typedef std::map<Resolvent, std::shared_ptr<Constraints> > InitialConstraints;
typedef std::list<PackageDepSpec> PackageDepSpecList;
struct DestinationTypesFinder
{
const Environment * const env;
const ResolveCommandLineResolutionOptions & resolution_options;
- const std::tr1::shared_ptr<const PackageID> package_id;
+ const std::shared_ptr<const PackageID> package_id;
DestinationTypesFinder(
const Environment * const e,
const ResolveCommandLineResolutionOptions & c,
- const std::tr1::shared_ptr<const PackageID> & i) :
+ const std::shared_ptr<const PackageID> & i) :
env(e),
resolution_options(c),
package_id(i)
@@ -184,8 +184,8 @@ namespace
const Environment * const env,
const ResolveCommandLineResolutionOptions & resolution_options,
const PackageDepSpec &,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const Reason> & reason)
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const Reason> & reason)
{
DestinationTypesFinder f(env, resolution_options, id);
return reason->accept_returning<DestinationTypes>(f);
@@ -194,7 +194,7 @@ namespace
FilteredGenerator make_destination_filtered_generator(
const Environment * const,
const ResolveCommandLineResolutionOptions &,
- const std::tr1::shared_ptr<const Generator> & all_binary_repos_generator,
+ const std::shared_ptr<const Generator> & all_binary_repos_generator,
const Generator & g,
const Resolvent & r)
{
@@ -219,9 +219,9 @@ namespace
FilteredGenerator make_destination_filtered_generator_with_resolution(
const Environment * const env,
const ResolveCommandLineResolutionOptions & resolution_options,
- const std::tr1::shared_ptr<const Generator> & all_binary_repos_generator,
+ const std::shared_ptr<const Generator> & all_binary_repos_generator,
const Generator & g,
- const std::tr1::shared_ptr<const Resolution> & r)
+ const std::shared_ptr<const Resolution> & r)
{
return make_destination_filtered_generator(env, resolution_options, all_binary_repos_generator, g, r->resolvent());
}
@@ -229,9 +229,9 @@ namespace
FilteredGenerator make_origin_filtered_generator(
const Environment * const,
const ResolveCommandLineResolutionOptions &,
- const std::tr1::shared_ptr<const Generator> & not_binary_repos_generator,
+ const std::shared_ptr<const Generator> & not_binary_repos_generator,
const Generator & g,
- const std::tr1::shared_ptr<const Resolution> & r)
+ const std::shared_ptr<const Resolution> & r)
{
switch (r->resolvent().destination_type())
{
@@ -248,11 +248,11 @@ namespace
throw InternalError(PALUDIS_HERE, "bad dt");
}
- const std::tr1::shared_ptr<const Sequence<std::string> > add_resolver_targets(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<Resolver> & resolver,
+ const std::shared_ptr<const Sequence<std::string> > add_resolver_targets(
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<Resolver> & resolver,
const ResolveCommandLineResolutionOptions &,
- const std::tr1::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets,
+ const std::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets,
bool & is_set)
{
Context context("When adding targets from commandline:");
@@ -260,7 +260,7 @@ namespace
if (targets->empty())
throw args::DoHelp("Must specify at least one target");
- const std::tr1::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>);
+ const std::shared_ptr<Sequence<std::string> > result(new Sequence<std::string>);
bool seen_sets(false), seen_packages(false);
for (Sequence<std::pair<std::string, std::string> >::ConstIterator p(targets->begin()), p_end(targets->end()) ;
p != p_end ; ++p)
@@ -415,9 +415,9 @@ namespace
const ResolveCommandLineResolutionOptions & resolution_options,
const PackageDepSpecList & without,
const PackageDepSpecList & with,
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const Reason> & reason)
+ const std::shared_ptr<const Reason> & reason)
{
if (spec.package_ptr())
{
@@ -474,7 +474,7 @@ namespace
}
}
- bool is_scm_older_than(const std::tr1::shared_ptr<const PackageID> & id, const int n)
+ bool is_scm_older_than(const std::shared_ptr<const PackageID> & id, const int n)
{
if (id->version().is_scm() || is_scm_name(id->name()))
{
@@ -492,13 +492,13 @@ namespace
bool installed_is_scm_older_than(
const Environment * const env,
const ResolveCommandLineResolutionOptions & resolution_options,
- const std::tr1::shared_ptr<const Generator> & all_binary_repos_generator,
+ const std::shared_ptr<const Generator> & all_binary_repos_generator,
const Resolvent & q,
const int n)
{
Context context("When working out whether '" + stringify(q) + "' has installed SCM packages:");
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
make_destination_filtered_generator(env, resolution_options, all_binary_repos_generator,
generator::Package(q.package()), q) |
make_slot_filter(q)
@@ -514,14 +514,14 @@ namespace
return false;
}
- const std::tr1::shared_ptr<Constraints> make_initial_constraints_for(
+ const std::shared_ptr<Constraints> make_initial_constraints_for(
const Environment * const env,
const ResolveCommandLineResolutionOptions & resolution_options,
- const std::tr1::shared_ptr<const Generator> & all_binary_repos_generator,
+ const std::shared_ptr<const Generator> & all_binary_repos_generator,
const PackageDepSpecList & without,
const Resolvent & resolvent)
{
- const std::tr1::shared_ptr<Constraints> result(new Constraints);
+ const std::shared_ptr<Constraints> result(new Constraints);
int n(reinstall_scm_days(resolution_options));
if ((-1 != n) && installed_is_scm_older_than(env, resolution_options, all_binary_repos_generator, resolvent, n)
@@ -540,12 +540,12 @@ namespace
return result;
}
- const std::tr1::shared_ptr<Constraints> initial_constraints_for_fn(
+ const std::shared_ptr<Constraints> initial_constraints_for_fn(
const Environment * const env,
const ResolveCommandLineResolutionOptions & resolution_options,
const PackageDepSpecList & without,
const InitialConstraints & initial_constraints,
- const std::tr1::shared_ptr<const Generator> & all_binary_repos_generator,
+ const std::shared_ptr<const Generator> & all_binary_repos_generator,
const Resolvent & resolvent)
{
InitialConstraints::const_iterator i(initial_constraints.find(resolvent));
@@ -598,24 +598,24 @@ namespace
}
};
- bool is_target(const std::tr1::shared_ptr<const Reason> & reason)
+ bool is_target(const std::shared_ptr<const Reason> & reason)
{
IsTargetVisitor v;
return reason->accept_returning<bool>(v);
}
- const std::tr1::shared_ptr<Resolvents>
+ const std::shared_ptr<Resolvents>
get_resolvents_for_fn(const Environment * const env,
const ResolveCommandLineResolutionOptions & resolution_options,
const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const SlotName> & maybe_slot,
- const std::tr1::shared_ptr<const Reason> & reason,
+ const std::shared_ptr<const SlotName> & maybe_slot,
+ const std::shared_ptr<const Reason> & reason,
const DestinationTypes & extra_dts)
{
- std::tr1::shared_ptr<PackageIDSequence> result_ids(new PackageIDSequence);
- std::tr1::shared_ptr<const PackageID> best;
+ std::shared_ptr<PackageIDSequence> result_ids(new PackageIDSequence);
+ std::shared_ptr<const PackageID> best;
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(
+ const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(
generator::Matches(spec, MatchPackageOptions() + mpo_ignore_additional_requirements) |
filter::SupportsAction<InstallAction>() |
filter::NotMasked() |
@@ -624,7 +624,7 @@ namespace
if (! ids->empty())
best = *ids->begin();
- const std::tr1::shared_ptr<const PackageIDSequence> installed_ids((*env)[selection::BestVersionInEachSlot(
+ const std::shared_ptr<const PackageIDSequence> installed_ids((*env)[selection::BestVersionInEachSlot(
generator::Matches(spec, MatchPackageOptions()) |
filter::InstalledAtRoot(FSEntry("/")))]);
@@ -660,7 +660,7 @@ namespace
throw args::DoHelp("Don't understand argument '" + arg.argument() + "' to '--"
+ arg.long_name() + "'");
- std::tr1::shared_ptr<Resolvents> result(new Resolvents);
+ std::shared_ptr<Resolvents> result(new Resolvents);
for (PackageIDSequence::ConstIterator i(result_ids->begin()), i_end(result_ids->end()) ;
i != i_end ; ++i)
{
@@ -678,7 +678,7 @@ namespace
const ResolveCommandLineResolutionOptions &,
const PackageDepSpecList & no_blockers_from,
const PackageDepSpecList & no_dependencies_from,
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & id,
const bool is_block)
{
const PackageDepSpecList & list(is_block ? no_blockers_from : no_dependencies_from);
@@ -736,7 +736,7 @@ namespace
if (dep.spec().if_block())
return false;
- const std::tr1::shared_ptr<const PackageIDSequence> installed_ids(
+ const std::shared_ptr<const PackageIDSequence> installed_ids(
(*env)[selection::SomeArbitraryVersion(
generator::Matches(*dep.spec().if_package(), MatchPackageOptions()) |
filter::InstalledAtRoot(FSEntry("/")))]);
@@ -789,7 +789,7 @@ namespace
const PackageDepSpecList & ignore_from,
const PackageDepSpecList & no_blockers_from,
const PackageDepSpecList & no_dependencies_from,
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const SanitisedDependency & dep)
{
CareAboutDepFnVisitor v(env, resolution_options, no_blockers_from, no_dependencies_from, dep);
@@ -849,7 +849,7 @@ namespace
/* we also take suggestions and recommendations that have already been installed */
if (dep.spec().if_package())
{
- const std::tr1::shared_ptr<const PackageIDSequence> installed_ids(
+ const std::shared_ptr<const PackageIDSequence> installed_ids(
(*env)[selection::SomeArbitraryVersion(
generator::Matches(*dep.spec().if_package(), MatchPackageOptions()) |
filter::InstalledAtRoot(FSEntry("/")))]);
@@ -863,13 +863,13 @@ namespace
return si_ignore;
}
- const std::tr1::shared_ptr<const Repository>
+ const std::shared_ptr<const Repository>
find_repository_for_fn(const Environment * const env,
const ResolveCommandLineResolutionOptions &,
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const ChangesToMakeDecision & decision)
{
- std::tr1::shared_ptr<const Repository> result;
+ std::shared_ptr<const Repository> result;
for (PackageDatabase::RepositoryConstIterator r(env->package_database()->begin_repositories()),
r_end(env->package_database()->end_repositories()) ;
r != r_end ; ++r)
@@ -929,7 +929,7 @@ namespace
bool match_any(
const Environment * const env,
const PackageDepSpecList & list,
- const std::tr1::shared_ptr<const PackageID> & i)
+ const std::shared_ptr<const PackageID> & i)
{
for (PackageDepSpecList::const_iterator l(list.begin()), l_end(list.end()) ;
l != l_end ; ++l)
@@ -985,8 +985,8 @@ namespace
bool allowed_to_remove_fn(
const Environment * const env,
const PackageDepSpecList & list,
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> & i)
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> & i)
{
for (Constraints::ConstIterator c(resolution->constraints()->begin()),
c_end(resolution->constraints()->end()) ;
@@ -1000,7 +1000,7 @@ namespace
bool remove_if_dependent_fn(
const Environment * const env,
const PackageDepSpecList & list,
- const std::tr1::shared_ptr<const PackageID> & i)
+ const std::shared_ptr<const PackageID> & i)
{
return match_any(env, list, i);
}
@@ -1036,42 +1036,42 @@ namespace
const QualifiedPackageName & q)
{
if (favour.end() != std::find_if(favour.begin(), favour.end(),
- std::tr1::bind(&prefer_or_avoid_one, env, q, std::tr1::placeholders::_1)))
+ std::bind(&prefer_or_avoid_one, env, q, std::placeholders::_1)))
return true;
if (avoid.end() != std::find_if(avoid.begin(), avoid.end(),
- std::tr1::bind(&prefer_or_avoid_one, env, q, std::tr1::placeholders::_1)))
+ std::bind(&prefer_or_avoid_one, env, q, std::placeholders::_1)))
return false;
return indeterminate;
}
struct ChosenIDVisitor
{
- const std::tr1::shared_ptr<const PackageID> visit(const ChangesToMakeDecision & decision) const
+ const std::shared_ptr<const PackageID> visit(const ChangesToMakeDecision & decision) const
{
return decision.origin_id();
}
- const std::tr1::shared_ptr<const PackageID> visit(const BreakDecision & decision) const
+ const std::shared_ptr<const PackageID> visit(const BreakDecision & decision) const
{
return decision.existing_id();
}
- const std::tr1::shared_ptr<const PackageID> visit(const ExistingNoChangeDecision & decision) const
+ const std::shared_ptr<const PackageID> visit(const ExistingNoChangeDecision & decision) const
{
return decision.existing_id();
}
- const std::tr1::shared_ptr<const PackageID> visit(const NothingNoChangeDecision &) const
+ const std::shared_ptr<const PackageID> visit(const NothingNoChangeDecision &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const RemoveDecision &) const
+ const std::shared_ptr<const PackageID> visit(const RemoveDecision &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const UnableToMakeDecision &) const
+ const std::shared_ptr<const PackageID> visit(const UnableToMakeDecision &) const
{
return make_null_shared_ptr();
}
@@ -1082,9 +1082,9 @@ namespace
const ResolveCommandLineResolutionOptions &,
const PackageDepSpecList & early,
const PackageDepSpecList & late,
- const std::tr1::shared_ptr<const Resolution> & r)
+ const std::shared_ptr<const Resolution> & r)
{
- const std::tr1::shared_ptr<const PackageID> id(r->decision()->accept_returning<std::tr1::shared_ptr<const PackageID> >(
+ const std::shared_ptr<const PackageID> id(r->decision()->accept_returning<std::shared_ptr<const PackageID> >(
ChosenIDVisitor()));
if (id)
{
@@ -1105,7 +1105,7 @@ namespace
const PackageDepSpecList & permit_old_version;
const PackageDepSpecList & allowed_to_break_specs;
const bool allowed_to_break_system;
- const std::tr1::shared_ptr<const PackageID> id;
+ const std::shared_ptr<const PackageID> id;
ConfirmFnVisitor(const Environment * const e,
const ResolveCommandLineResolutionOptions & r,
@@ -1113,7 +1113,7 @@ namespace
const PackageDepSpecList & o,
const PackageDepSpecList & a,
const bool s,
- const std::tr1::shared_ptr<const PackageID> & i) :
+ const std::shared_ptr<const PackageID> & i) :
env(e),
resolution_options(r),
permit_downgrade(d),
@@ -1176,25 +1176,25 @@ namespace
const PackageDepSpecList & permit_old_version,
const PackageDepSpecList & allowed_to_break_specs,
const bool allowed_to_break_system,
- const std::tr1::shared_ptr<const Resolution> & r,
- const std::tr1::shared_ptr<const RequiredConfirmation> & c)
+ const std::shared_ptr<const Resolution> & r,
+ const std::shared_ptr<const RequiredConfirmation> & c)
{
return c->accept_returning<bool>(ConfirmFnVisitor(env, resolution_options, permit_downgrade, permit_old_version,
allowed_to_break_specs, allowed_to_break_system,
- r->decision()->accept_returning<std::tr1::shared_ptr<const PackageID> >(ChosenIDVisitor())
+ r->decision()->accept_returning<std::shared_ptr<const PackageID> >(ChosenIDVisitor())
));
}
- const std::tr1::shared_ptr<ConstraintSequence> get_constraints_for_dependent_fn(
+ const std::shared_ptr<ConstraintSequence> get_constraints_for_dependent_fn(
const Environment * const env,
const PackageDepSpecList & list,
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & ids)
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const ChangeByResolventSequence> & ids)
{
- const std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ const std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
- std::tr1::shared_ptr<PackageDepSpec> spec;
+ std::shared_ptr<PackageDepSpec> spec;
if (match_any(env, list, id))
spec = make_shared_copy(id->uniquely_identifying_spec());
else
@@ -1210,7 +1210,7 @@ namespace
for (ChangeByResolventSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
{
- const std::tr1::shared_ptr<DependentReason> reason(new DependentReason(*i));
+ const std::shared_ptr<DependentReason> reason(new DependentReason(*i));
result->push_back(make_shared_ptr(new Constraint(make_named_values<Constraint>(
n::destination_type() = dt_install_to_slash,
@@ -1225,14 +1225,14 @@ namespace
return result;
}
- const std::tr1::shared_ptr<ConstraintSequence> get_constraints_for_purge_fn(
+ const std::shared_ptr<ConstraintSequence> get_constraints_for_purge_fn(
const Environment * const env,
const PackageDepSpecList & list,
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & ids)
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const ChangeByResolventSequence> & ids)
{
- const std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ const std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
partial_spec.package(id->name());
@@ -1241,7 +1241,7 @@ namespace
id->slot_key()->value(), false)));
PackageDepSpec spec(partial_spec);
- const std::tr1::shared_ptr<WasUsedByReason> reason(new WasUsedByReason(ids));
+ const std::shared_ptr<WasUsedByReason> reason(new WasUsedByReason(ids));
result->push_back(make_shared_ptr(new Constraint(make_named_values<Constraint>(
n::destination_type() = dt_install_to_slash,
@@ -1255,18 +1255,18 @@ namespace
return result;
}
- const std::tr1::shared_ptr<ConstraintSequence> get_constraints_for_via_binary_fn(
+ const std::shared_ptr<ConstraintSequence> get_constraints_for_via_binary_fn(
const Environment * const,
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const Resolution> & other_resolution)
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & other_resolution)
{
- const std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ const std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
partial_spec.package(resolution->resolvent().package());
PackageDepSpec spec(partial_spec);
- const std::tr1::shared_ptr<ViaBinaryReason> reason(new ViaBinaryReason(other_resolution->resolvent()));
+ const std::shared_ptr<ViaBinaryReason> reason(new ViaBinaryReason(other_resolution->resolvent()));
result->push_back(make_shared_ptr(new Constraint(make_named_values<Constraint>(
n::destination_type() = resolution->resolvent().destination_type(),
@@ -1283,7 +1283,7 @@ namespace
bool can_use_fn(
const Environment * const env,
const PackageDepSpecList & list,
- const std::tr1::shared_ptr<const PackageID> & id)
+ const std::shared_ptr<const PackageID> & id)
{
return ! match_any(env, list, id);
}
@@ -1291,7 +1291,7 @@ namespace
bool always_via_binary_fn(
const Environment * const env,
const PackageDepSpecList & list,
- const std::tr1::shared_ptr<const Resolution> & resolution)
+ const std::shared_ptr<const Resolution> & resolution)
{
const ChangesToMakeDecision * changes_decision(simple_visitor_cast<const ChangesToMakeDecision>(*resolution->decision()));
if (! changes_decision)
@@ -1308,22 +1308,22 @@ namespace
}
int display_resolution(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
const ResolveCommandLineResolutionOptions &,
const ResolveCommandLineDisplayOptions & display_options,
const ResolveCommandLineProgramOptions & program_options,
- const std::tr1::shared_ptr<const Map<std::string, std::string> > & keys_if_import,
- const std::tr1::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets)
+ const std::shared_ptr<const Map<std::string, std::string> > & keys_if_import,
+ const std::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets)
{
Context context("When displaying chosen resolution:");
StringListStream ser_stream;
- Thread ser_thread(std::tr1::bind(&serialise_resolved,
- std::tr1::ref(ser_stream),
- std::tr1::cref(*resolved)));
+ Thread ser_thread(std::bind(&serialise_resolved,
+ std::ref(ser_stream),
+ std::cref(*resolved)));
- std::tr1::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
for (args::ArgsSection::GroupsConstIterator g(display_options.begin()), g_end(display_options.end()) ;
g != g_end ; ++g)
@@ -1332,7 +1332,7 @@ namespace
o != o_end ; ++o)
if ((*o)->specified())
{
- const std::tr1::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
+ const std::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
std::copy(f->begin(), f->end(), args->back_inserter());
}
}
@@ -1376,19 +1376,19 @@ namespace
}
int perform_resolution(
- const std::tr1::shared_ptr<Environment> & env,
- const std::tr1::shared_ptr<const Resolved> & resolved,
+ const std::shared_ptr<Environment> & env,
+ const std::shared_ptr<const Resolved> & resolved,
const ResolveCommandLineResolutionOptions & resolution_options,
const ResolveCommandLineExecutionOptions & execution_options,
const ResolveCommandLineProgramOptions & program_options,
- const std::tr1::shared_ptr<const Map<std::string, std::string> > & keys_if_import,
- const std::tr1::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets,
- const std::tr1::shared_ptr<const Sequence<std::string> > & world_specs,
+ const std::shared_ptr<const Map<std::string, std::string> > & keys_if_import,
+ const std::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets,
+ const std::shared_ptr<const Sequence<std::string> > & world_specs,
const bool is_set)
{
Context context("When performing chosen resolution:");
- std::tr1::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > args(new Sequence<std::string>);
if (is_set)
args->push_back("--set");
@@ -1400,7 +1400,7 @@ namespace
o != o_end ; ++o)
if ((*o)->specified())
{
- const std::tr1::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
+ const std::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
std::copy(f->begin(), f->end(), args->back_inserter());
}
}
@@ -1412,7 +1412,7 @@ namespace
o != o_end ; ++o)
if ((*o)->specified())
{
- const std::tr1::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
+ const std::shared_ptr<const Sequence<std::string> > f((*o)->forwardable_args());
std::copy(f->begin(), f->end(), args->back_inserter());
}
}
@@ -1574,8 +1574,8 @@ namespace
std::cout << "* " << r->resolvent() << std::endl;
std::cout << " Had decided upon ";
- const std::tr1::shared_ptr<const PackageID> id(r->previous_decision()->accept_returning<
- std::tr1::shared_ptr<const PackageID> >(ChosenIDVisitor()));
+ const std::shared_ptr<const PackageID> id(r->previous_decision()->accept_returning<
+ std::shared_ptr<const PackageID> >(ChosenIDVisitor()));
if (id)
std::cout << *id;
else
@@ -1596,14 +1596,14 @@ namespace
int
paludis::cave::resolve_common(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const ResolveCommandLineResolutionOptions & resolution_options,
const ResolveCommandLineExecutionOptions & execution_options,
const ResolveCommandLineDisplayOptions & display_options,
const ResolveCommandLineProgramOptions & program_options,
- const std::tr1::shared_ptr<const Map<std::string, std::string> > & keys_if_import,
- const std::tr1::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets_if_not_purge,
- const std::tr1::shared_ptr<const Sequence<std::string> > & world_specs_if_not_auto,
+ const std::shared_ptr<const Map<std::string, std::string> > & keys_if_import,
+ const std::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets_if_not_purge,
+ const std::shared_ptr<const Sequence<std::string> > & world_specs_if_not_auto,
const bool purge)
{
int retcode(0);
@@ -1747,7 +1747,7 @@ paludis::cave::resolve_common(
UserPackageDepSpecOptions() + updso_allow_wildcards));
#endif
- std::tr1::shared_ptr<Generator> all_binary_repos_generator, not_binary_repos_generator;
+ std::shared_ptr<Generator> all_binary_repos_generator, not_binary_repos_generator;
for (PackageDatabase::RepositoryConstIterator r(env->package_database()->begin_repositories()),
r_end(env->package_database()->end_repositories()) ;
r != r_end ; ++r)
@@ -1778,12 +1778,12 @@ paludis::cave::resolve_common(
i_end(resolution_options.a_preset.end_args()) ;
i != i_end ; ++i)
{
- const std::tr1::shared_ptr<const Reason> reason(new PresetReason("preset", make_null_shared_ptr()));
+ const std::shared_ptr<const Reason> reason(new PresetReason("preset", make_null_shared_ptr()));
PackageDepSpec spec(parse_user_package_dep_spec(*i, env.get(), UserPackageDepSpecOptions()));
DestinationTypes all_dts;
for (EnumIterator<DestinationType> t, t_end(last_dt) ; t != t_end ; ++t)
all_dts += *t;
- const std::tr1::shared_ptr<const Resolvents> resolvents(get_resolvents_for_fn(
+ const std::shared_ptr<const Resolvents> resolvents(get_resolvents_for_fn(
env.get(), resolution_options, spec, make_null_shared_ptr(), reason,
all_dts));
@@ -1793,7 +1793,7 @@ paludis::cave::resolve_common(
for (Resolvents::ConstIterator r(resolvents->begin()), r_end(resolvents->end()) ;
r != r_end ; ++r)
{
- const std::tr1::shared_ptr<Constraint> constraint(new Constraint(make_named_values<Constraint>(
+ const std::shared_ptr<Constraint> constraint(new Constraint(make_named_values<Constraint>(
n::destination_type() = r->destination_type(),
n::nothing_is_fine_too() = true,
n::reason() = reason,
@@ -1807,59 +1807,59 @@ paludis::cave::resolve_common(
}
}
- using std::tr1::placeholders::_1;
- using std::tr1::placeholders::_2;
- using std::tr1::placeholders::_3;
- using std::tr1::placeholders::_4;
+ using std::placeholders::_1;
+ using std::placeholders::_2;
+ using std::placeholders::_3;
+ using std::placeholders::_4;
ResolverFunctions resolver_functions(make_named_values<ResolverFunctions>(
- n::allowed_to_remove_fn() = std::tr1::bind(&allowed_to_remove_fn,
- env.get(), std::tr1::cref(allowed_to_remove_specs), _1, _2),
- n::always_via_binary_fn() = std::tr1::bind(&always_via_binary_fn,
- env.get(), std::tr1::cref(via_binary_specs), _1),
- n::can_use_fn() = std::tr1::bind(&can_use_fn,
- env.get(), std::tr1::cref(not_usable_specs), _1),
- n::confirm_fn() = std::tr1::bind(&confirm_fn,
- env.get(), std::tr1::cref(resolution_options), std::tr1::cref(permit_downgrade),
- std::tr1::cref(permit_old_version), std::tr1::cref(allowed_to_break_specs),
+ n::allowed_to_remove_fn() = std::bind(&allowed_to_remove_fn,
+ env.get(), std::cref(allowed_to_remove_specs), _1, _2),
+ n::always_via_binary_fn() = std::bind(&always_via_binary_fn,
+ env.get(), std::cref(via_binary_specs), _1),
+ n::can_use_fn() = std::bind(&can_use_fn,
+ env.get(), std::cref(not_usable_specs), _1),
+ n::confirm_fn() = std::bind(&confirm_fn,
+ env.get(), std::cref(resolution_options), std::cref(permit_downgrade),
+ std::cref(permit_old_version), std::cref(allowed_to_break_specs),
allowed_to_break_system, _1, _2),
- n::find_repository_for_fn() = std::tr1::bind(&find_repository_for_fn,
- env.get(), std::tr1::cref(resolution_options), _1, _2),
- n::get_constraints_for_dependent_fn() = std::tr1::bind(&get_constraints_for_dependent_fn,
- env.get(), std::tr1::cref(less_restrictive_remove_blockers_specs), _1, _2, _3),
- n::get_constraints_for_purge_fn() = std::tr1::bind(&get_constraints_for_purge_fn,
- env.get(), std::tr1::cref(purge_specs), _1, _2, _3),
- n::get_constraints_for_via_binary_fn() = std::tr1::bind(&get_constraints_for_via_binary_fn,
+ n::find_repository_for_fn() = std::bind(&find_repository_for_fn,
+ env.get(), std::cref(resolution_options), _1, _2),
+ n::get_constraints_for_dependent_fn() = std::bind(&get_constraints_for_dependent_fn,
+ env.get(), std::cref(less_restrictive_remove_blockers_specs), _1, _2, _3),
+ n::get_constraints_for_purge_fn() = std::bind(&get_constraints_for_purge_fn,
+ env.get(), std::cref(purge_specs), _1, _2, _3),
+ n::get_constraints_for_via_binary_fn() = std::bind(&get_constraints_for_via_binary_fn,
env.get(), _1, _2),
- n::get_destination_types_for_fn() = std::tr1::bind(&get_destination_types_for_fn,
- env.get(), std::tr1::cref(resolution_options), _1, _2, _3),
- n::get_initial_constraints_for_fn() = std::tr1::bind(&initial_constraints_for_fn,
- env.get(), std::tr1::cref(resolution_options), std::tr1::cref(without),
- std::tr1::cref(initial_constraints), all_binary_repos_generator, _1),
- n::get_resolvents_for_fn() = std::tr1::bind(&get_resolvents_for_fn,
- env.get(), std::tr1::cref(resolution_options), _1, _2, _3, DestinationTypes()),
- n::get_use_existing_fn() = std::tr1::bind(&use_existing_fn,
- env.get(), std::tr1::cref(resolution_options), std::tr1::cref(without), std::tr1::cref(with), _1, _2, _3),
- n::interest_in_spec_fn() = std::tr1::bind(&interest_in_spec_fn,
- env.get(), std::tr1::cref(resolution_options), std::tr1::cref(take), std::tr1::cref(take_from),
- std::tr1::cref(ignore), std::tr1::cref(ignore_from), std::tr1::cref(no_blockers_from),
- std::tr1::cref(no_dependencies_from), _1, _2),
- n::make_destination_filtered_generator_fn() = std::tr1::bind(&make_destination_filtered_generator_with_resolution,
- env.get(), std::tr1::cref(resolution_options), all_binary_repos_generator, _1, _2),
- n::make_origin_filtered_generator_fn() = std::tr1::bind(&make_origin_filtered_generator,
- env.get(), std::tr1::cref(resolution_options), not_binary_repos_generator, _1, _2),
- n::order_early_fn() = std::tr1::bind(&order_early_fn,
- env.get(), std::tr1::cref(resolution_options), std::tr1::cref(early), std::tr1::cref(late), _1),
- n::prefer_or_avoid_fn() = std::tr1::bind(&prefer_or_avoid_fn,
- env.get(), std::tr1::cref(resolution_options), std::tr1::cref(favour), std::tr1::cref(avoid), _1),
- n::remove_if_dependent_fn() = std::tr1::bind(&remove_if_dependent_fn,
- env.get(), std::tr1::cref(remove_if_dependent_specs), _1)
+ n::get_destination_types_for_fn() = std::bind(&get_destination_types_for_fn,
+ env.get(), std::cref(resolution_options), _1, _2, _3),
+ n::get_initial_constraints_for_fn() = std::bind(&initial_constraints_for_fn,
+ env.get(), std::cref(resolution_options), std::cref(without),
+ std::cref(initial_constraints), all_binary_repos_generator, _1),
+ n::get_resolvents_for_fn() = std::bind(&get_resolvents_for_fn,
+ env.get(), std::cref(resolution_options), _1, _2, _3, DestinationTypes()),
+ n::get_use_existing_fn() = std::bind(&use_existing_fn,
+ env.get(), std::cref(resolution_options), std::cref(without), std::cref(with), _1, _2, _3),
+ n::interest_in_spec_fn() = std::bind(&interest_in_spec_fn,
+ env.get(), std::cref(resolution_options), std::cref(take), std::cref(take_from),
+ std::cref(ignore), std::cref(ignore_from), std::cref(no_blockers_from),
+ std::cref(no_dependencies_from), _1, _2),
+ n::make_destination_filtered_generator_fn() = std::bind(&make_destination_filtered_generator_with_resolution,
+ env.get(), std::cref(resolution_options), all_binary_repos_generator, _1, _2),
+ n::make_origin_filtered_generator_fn() = std::bind(&make_origin_filtered_generator,
+ env.get(), std::cref(resolution_options), not_binary_repos_generator, _1, _2),
+ n::order_early_fn() = std::bind(&order_early_fn,
+ env.get(), std::cref(resolution_options), std::cref(early), std::cref(late), _1),
+ n::prefer_or_avoid_fn() = std::bind(&prefer_or_avoid_fn,
+ env.get(), std::cref(resolution_options), std::cref(favour), std::cref(avoid), _1),
+ n::remove_if_dependent_fn() = std::bind(&remove_if_dependent_fn,
+ env.get(), std::cref(remove_if_dependent_specs), _1)
));
ScopedSelectionCache selection_cache(env.get());
- std::tr1::shared_ptr<Resolver> resolver(new Resolver(env.get(), resolver_functions));
+ std::shared_ptr<Resolver> resolver(new Resolver(env.get(), resolver_functions));
bool is_set(false);
- std::tr1::shared_ptr<const Sequence<std::string> > targets_cleaned_up;
+ std::shared_ptr<const Sequence<std::string> > targets_cleaned_up;
std::list<SuggestRestart> restarts;
try
@@ -1867,7 +1867,7 @@ paludis::cave::resolve_common(
{
DisplayCallback display_callback("Resolving: ");
ScopedNotifierCallback display_callback_holder(env.get(),
- NotifierCallbackFunction(std::tr1::cref(display_callback)));
+ NotifierCallbackFunction(std::cref(display_callback)));
while (true)
{
diff --git a/src/clients/cave/resolve_common.hh b/src/clients/cave/resolve_common.hh
index 5fb0689b1..242b1ae3d 100644
--- a/src/clients/cave/resolve_common.hh
+++ b/src/clients/cave/resolve_common.hh
@@ -23,7 +23,7 @@
#include <paludis/environment-fwd.hh>
#include <paludis/util/sequence-fwd.hh>
#include <paludis/util/map-fwd.hh>
-#include <tr1/memory>
+#include <memory>
#include "cmd_resolve_cmdline.hh"
namespace paludis
@@ -31,14 +31,14 @@ namespace paludis
namespace cave
{
int resolve_common(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const ResolveCommandLineResolutionOptions & resolution_options,
const ResolveCommandLineExecutionOptions & execution_options,
const ResolveCommandLineDisplayOptions & display_options,
const ResolveCommandLineProgramOptions & program_options,
- const std::tr1::shared_ptr<const Map<std::string, std::string> > & keys_if_import,
- const std::tr1::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets_if_not_purge,
- const std::tr1::shared_ptr<const Sequence<std::string> > & world_specs_if_not_auto,
+ const std::shared_ptr<const Map<std::string, std::string> > & keys_if_import,
+ const std::shared_ptr<const Sequence<std::pair<std::string, std::string> > > & targets_if_not_purge,
+ const std::shared_ptr<const Sequence<std::string> > & world_specs_if_not_auto,
const bool purge
) PALUDIS_ATTRIBUTE((warn_unused_result));
}
diff --git a/src/clients/cave/resume_data.cc b/src/clients/cave/resume_data.cc
index c7358e93c..836c7d259 100644
--- a/src/clients/cave/resume_data.cc
+++ b/src/clients/cave/resume_data.cc
@@ -32,7 +32,7 @@ using namespace paludis;
using namespace paludis::resolver;
using namespace cave;
-const std::tr1::shared_ptr<ResumeData>
+const std::shared_ptr<ResumeData>
ResumeData::deserialise(Deserialisation & d)
{
if (d.class_name() != "ResumeData@" + stringify(PALUDIS_VERSION))
@@ -40,14 +40,14 @@ ResumeData::deserialise(Deserialisation & d)
Deserialisator v(d, "ResumeData@" + stringify(PALUDIS_VERSION));
- std::tr1::shared_ptr<Sequence<std::string> > targets(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > targets(new Sequence<std::string>);
{
Deserialisator vv(*v.find_remove_member("targets"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
targets->push_back(vv.member<std::string>(stringify(n)));
}
- std::tr1::shared_ptr<Sequence<std::string> > world_specs(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > world_specs(new Sequence<std::string>);
{
Deserialisator vv(*v.find_remove_member("world_specs"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
@@ -55,7 +55,7 @@ ResumeData::deserialise(Deserialisation & d)
}
return make_shared_copy(make_named_values<ResumeData>(
- n::job_lists() = v.member<std::tr1::shared_ptr<JobLists> >("job_lists"),
+ n::job_lists() = v.member<std::shared_ptr<JobLists> >("job_lists"),
n::preserve_world() = v.member<bool>("preserve_world"),
n::target_set() = v.member<bool>("target_set"),
n::targets() = targets,
diff --git a/src/clients/cave/resume_data.hh b/src/clients/cave/resume_data.hh
index 2f3e5ea32..3e0279483 100644
--- a/src/clients/cave/resume_data.hh
+++ b/src/clients/cave/resume_data.hh
@@ -24,7 +24,7 @@
#include <paludis/util/sequence-fwd.hh>
#include <paludis/resolver/job_lists-fwd.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -41,14 +41,14 @@ namespace paludis
{
struct ResumeData
{
- NamedValue<n::job_lists, std::tr1::shared_ptr<resolver::JobLists> > job_lists;
+ NamedValue<n::job_lists, std::shared_ptr<resolver::JobLists> > job_lists;
NamedValue<n::preserve_world, bool> preserve_world;
NamedValue<n::target_set, bool> target_set;
- NamedValue<n::targets, std::tr1::shared_ptr<Sequence<std::string> > > targets;
- NamedValue<n::world_specs, std::tr1::shared_ptr<Sequence<std::string> > > world_specs;
+ NamedValue<n::targets, std::shared_ptr<Sequence<std::string> > > targets;
+ NamedValue<n::world_specs, std::shared_ptr<Sequence<std::string> > > world_specs;
void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<ResumeData> deserialise(
+ static const std::shared_ptr<ResumeData> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/src/clients/cave/script_command.cc b/src/clients/cave/script_command.cc
index dd83966dd..31902136a 100644
--- a/src/clients/cave/script_command.cc
+++ b/src/clients/cave/script_command.cc
@@ -61,8 +61,8 @@ ScriptCommand::~ScriptCommand()
int
ScriptCommand::run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
)
{
std::string arg_str;
@@ -76,7 +76,7 @@ ScriptCommand::run(
throw InternalError(PALUDIS_HERE, "become_command failed");
}
-std::tr1::shared_ptr<args::ArgsHandler>
+std::shared_ptr<args::ArgsHandler>
ScriptCommand::make_doc_cmdline()
{
throw InternalError(PALUDIS_HERE, "no script cmdline");
diff --git a/src/clients/cave/script_command.hh b/src/clients/cave/script_command.hh
index c06199ac3..b707b03b4 100644
--- a/src/clients/cave/script_command.hh
+++ b/src/clients/cave/script_command.hh
@@ -37,11 +37,11 @@ namespace paludis
~ScriptCommand();
int run(
- const std::tr1::shared_ptr<Environment> &,
- const std::tr1::shared_ptr<const Sequence<std::string > > & args
+ const std::shared_ptr<Environment> &,
+ const std::shared_ptr<const Sequence<std::string > > & args
) PALUDIS_ATTRIBUTE((noreturn));
- std::tr1::shared_ptr<args::ArgsHandler> make_doc_cmdline() PALUDIS_ATTRIBUTE((noreturn));
+ std::shared_ptr<args::ArgsHandler> make_doc_cmdline() PALUDIS_ATTRIBUTE((noreturn));
};
}
}
diff --git a/src/clients/cave/select_format_for_spec.cc b/src/clients/cave/select_format_for_spec.cc
index a98dde4f6..49c192741 100644
--- a/src/clients/cave/select_format_for_spec.cc
+++ b/src/clients/cave/select_format_for_spec.cc
@@ -31,7 +31,7 @@ using namespace cave;
std::string
paludis::cave::select_format_for_spec(
- const std::tr1::shared_ptr<const Environment> & env,
+ const std::shared_ptr<const Environment> & env,
const PackageDepSpec & spec,
const std::string & if_installed,
const std::string & if_installable,
diff --git a/src/clients/cave/select_format_for_spec.hh b/src/clients/cave/select_format_for_spec.hh
index 64d1affa8..53b7fa71e 100644
--- a/src/clients/cave/select_format_for_spec.hh
+++ b/src/clients/cave/select_format_for_spec.hh
@@ -30,7 +30,7 @@ namespace paludis
namespace cave
{
std::string select_format_for_spec(
- const std::tr1::shared_ptr<const Environment> &,
+ const std::shared_ptr<const Environment> &,
const PackageDepSpec &,
const std::string & if_installed,
const std::string & if_installable,