RXT0112/Exheredludis
1
0
Fork 0
Code Issues Pull Requests Releases Activity

modernize: use override annotations

Browse Source 
Automated addition of override to overridden functions.  NFC.
This commit is contained in:
Saleem Abdulrasool 2016-08-04 22:09:28 -07:00
parent d81457e420
commit 1ad5f5ce20
116 changed files with 603 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
paludis/args/args_TEST.cc
View File

@ -53,19 +53,19 @@ namespace
StringSetArg arg_stringset;
CommandLine();
~CommandLine();
~CommandLine() override;
std::string app_name() const
std::string app_name() const override
{
return "args_TEST";
}
std::string app_synopsis() const
std::string app_synopsis() const override
{
return "tests for args";
}
std::string app_description() const
std::string app_description() const override
{
return "Tests args";
}

10
paludis/elike_conditional_dep_spec.cc
View File

@ -118,23 +118,23 @@ namespace
flag = ChoiceNameWithPrefix(s.substr(inverse ? 1 : 0, s.length() - (inverse ? 2 : 1)));
}
virtual std::string as_string() const
std::string as_string() const override
{
return (inverse ? "!" : "") + stringify(flag) + "?";
}
virtual bool condition_met(const Environment * const, const std::shared_ptr<const PackageID> & id) const
bool condition_met(const Environment * const, const std::shared_ptr<const PackageID> & id) const override
{
return icky_use_query(flag, *id, no_warning_for_unlisted) ^ inverse;
}
virtual bool condition_meetable(const Environment * const env, const std::shared_ptr<const PackageID> & id) const
bool condition_meetable(const Environment * const env, const std::shared_ptr<const PackageID> & id) const override
{
return condition_met(env, id) || ! icky_use_query_locked(flag, *id, no_warning_for_unlisted);
}
virtual bool condition_would_be_met_when(const Environment * const env, const std::shared_ptr<const PackageID> & id,
const ChangedChoices & changes) const
bool condition_would_be_met_when(const Environment * const env, const std::shared_ptr<const PackageID> & id,
const ChangedChoices & changes) const override
{
Tribool overridden(changes.overridden_value(flag));

100
paludis/elike_use_requirement.cc
View File

@ -292,14 +292,14 @@ namespace
{
}
virtual bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag, const ChangedChoices * const,
const std::shared_ptr<const PackageID> & pkg, const std::shared_ptr<const PackageID> &, const ChangedChoices * const changed_choices) const
bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag, const ChangedChoices * const,
const std::shared_ptr<const PackageID> & pkg, const std::shared_ptr<const PackageID> &, const ChangedChoices * const changed_choices) const override
{
return icky_use_query(_options, flag, pkg, changed_choices, default_value());
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> &) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> &) const override
{
return "Flag '" + stringify(flags()) + "' enabled" + default_value_human_string_fragment();
}
@ -316,14 +316,14 @@ namespace
{
}
virtual bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag, const ChangedChoices * const,
const std::shared_ptr<const PackageID> & pkg, const std::shared_ptr<const PackageID> &, const ChangedChoices * const changed_choices) const
bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag, const ChangedChoices * const,
const std::shared_ptr<const PackageID> & pkg, const std::shared_ptr<const PackageID> &, const ChangedChoices * const changed_choices) const override
{
return ! icky_use_query(_options, flag, pkg, changed_choices, default_value());
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> &) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> &) const override
{
return "Flag '" + stringify(flags()) + "' disabled" + default_value_human_string_fragment();
}
@ -340,15 +340,15 @@ namespace
{
}
virtual bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag, const ChangedChoices * const,
const std::shared_ptr<const PackageID> & pkg, const std::shared_ptr<const PackageID> &, const ChangedChoices * const changed_choices) const
bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag, const ChangedChoices * const,
const std::shared_ptr<const PackageID> & pkg, const std::shared_ptr<const PackageID> &, const ChangedChoices * const changed_choices) const override
{
return icky_use_query(_options, flag, pkg, changed_choices, default_value()) ||
! icky_use_query(_options, flag, pkg, changed_choices, default_value());
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> &) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> &) const override
{
return "Flag '" + stringify(flags()) + "' either enabled or disabled" + default_value_human_string_fragment();
}
@ -378,16 +378,16 @@ namespace
{
}
virtual bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
const ChangedChoices * const maybe_changes_to_owner, const std::shared_ptr<const PackageID> & pkg,
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const override
{
return ! icky_use_query(_options, flag, from_id, maybe_changes_to_owner) ||
icky_use_query(_options, flag, pkg, changed_choices, default_value());
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const override
{
return "Flag '" + stringify(flags()) + "' enabled if it is enabled for '"
+ stringify(*from_id) + "'" + default_value_human_string_fragment();
@ -405,17 +405,17 @@ namespace
{
}
virtual bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
const ChangedChoices * const maybe_changes_to_owner,
const std::shared_ptr<const PackageID> & pkg, const std::shared_ptr<const PackageID> & from_id,
const ChangedChoices * const changed_choices) const
const ChangedChoices * const changed_choices) const override
{
return icky_use_query(_options, flag, from_id, maybe_changes_to_owner) ||
icky_use_query(_options, flag, pkg, changed_choices, default_value());
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const override
{
return "Flag '" + stringify(flags()) + "' enabled if it is disabled for '" +
stringify(*from_id) + "'" + default_value_human_string_fragment();
@ -433,16 +433,16 @@ namespace
{
}
virtual bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
const ChangedChoices * const maybe_changes_to_owner, const std::shared_ptr<const PackageID> & pkg,
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const override
{
return ! icky_use_query(_options, flag, from_id, maybe_changes_to_owner) ||
! icky_use_query(_options, flag, pkg, changed_choices, default_value());
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const override
{
return "Flag '" + stringify(flags()) + "' disabled if it is enabled for '" +
stringify(*from_id) + "'" + default_value_human_string_fragment();
@ -460,16 +460,16 @@ namespace
{
}
virtual bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
const ChangedChoices * const maybe_changes_to_owner, const std::shared_ptr<const PackageID> & pkg,
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const override
{
return icky_use_query(_options, flag, from_id, maybe_changes_to_owner) ||
! icky_use_query(_options, flag, pkg, changed_choices, default_value());
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const override
{
return "Flag '" + stringify(flags()) + "' disabled if it is disabled for '" +
stringify(*from_id) + "'" + default_value_human_string_fragment();
@ -487,16 +487,16 @@ namespace
{
}
virtual bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
const ChangedChoices * const maybe_changes_to_owner, const std::shared_ptr<const PackageID> & pkg,
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const override
{
return icky_use_query(_options, flag, pkg, changed_choices, default_value()) ==
icky_use_query(_options, flag, from_id, maybe_changes_to_owner);
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const override
{
return "Flag '" + stringify(flags()) + "' enabled or disabled like it is for '"
+ stringify(*from_id) + "'" + default_value_human_string_fragment();
@ -514,16 +514,16 @@ namespace
{
}
virtual bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
bool one_requirement_met_base(const Environment * const, const ChoiceNameWithPrefix & flag,
const ChangedChoices * const maybe_changes_to_owner, const std::shared_ptr<const PackageID> & pkg,
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const
const std::shared_ptr<const PackageID> & from_id, const ChangedChoices * const changed_choices) const override
{
return icky_use_query(_options, flag, pkg, changed_choices, default_value()) !=
icky_use_query(_options, flag, from_id, maybe_changes_to_owner);
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const override
{
return "Flag '" + stringify(flags()) + "' enabled or disabled opposite to how it is for '"
+ stringify(*from_id) + "'" + default_value_human_string_fragment();
@ -545,12 +545,12 @@ namespace
{
}
virtual const std::pair<bool, std::string> requirement_met(
const std::pair<bool, std::string> requirement_met(
const Environment * const env,
const ChangedChoices * const maybe_changes_to_owner,
const std::shared_ptr<const PackageID> & id,
const std::shared_ptr<const PackageID> & from_id,
const ChangedChoices * const maybe_changes_to_target) const
const ChangedChoices * const maybe_changes_to_target) const override
{
using namespace std::placeholders;
@ -570,14 +570,14 @@ namespace
return result;
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const
const std::string as_human_string(
const std::shared_ptr<const PackageID> & from_id) const override
{
return join(_reqs.begin(), _reqs.end(), "; ", std::bind(std::mem_fn(&UseRequirement::as_human_string),
std::placeholders::_1, from_id));
}
virtual const std::string as_raw_string() const
const std::string as_raw_string() const override
{
return _raw;
}
@ -587,12 +587,12 @@ namespace
_reqs.push_back(req);
}
virtual Tribool accumulate_changes_to_make_met(
Tribool accumulate_changes_to_make_met(
const Environment * const env,
const ChangedChoices * const maybe_changes_to_owner,
const std::shared_ptr<const PackageID> & id,
const std::shared_ptr<const PackageID> & from_id,
ChangedChoices & changed_choices) const
ChangedChoices & changed_choices) const override
{
Tribool result(indeterminate);
for (const auto & _req : _reqs)
@ -907,12 +907,12 @@ namespace
{
}
virtual const std::pair<bool, std::string> requirement_met(
const std::pair<bool, std::string> requirement_met(
const Environment * const,
const ChangedChoices * const,
const std::shared_ptr<const PackageID> & id,
const std::shared_ptr<const PackageID> &,
const ChangedChoices * const) const PALUDIS_ATTRIBUTE((warn_unused_result))
const ChangedChoices * const) const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
if (! id->choices_key())
return std::make_pair(true, "");
@ -946,12 +946,12 @@ namespace
return std::make_pair(true, as_human_string(id));
}
virtual Tribool accumulate_changes_to_make_met(
Tribool accumulate_changes_to_make_met(
const Environment * const env,
const ChangedChoices * const maybe_changes_to_owner,
const std::shared_ptr<const PackageID> & id,
const std::shared_ptr<const PackageID> & spec_id,
ChangedChoices &) const PALUDIS_ATTRIBUTE((warn_unused_result))
ChangedChoices &) const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
if (requirement_met(env, maybe_changes_to_owner, id, spec_id, nullptr).first)
return indeterminate;
@ -959,13 +959,13 @@ namespace
return false;
}
virtual const std::string as_human_string(
const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string as_human_string(
const std::shared_ptr<const PackageID> &) const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return "Remaining presumed flags enabled";
}
virtual const std::string as_raw_string() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string as_raw_string() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return "";
}

2
paludis/environment_implementation_TEST.cc
View File

@ -94,7 +94,7 @@ namespace
{
}
std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const
std::shared_ptr<const CategoryNamePartSet> unimportant_category_names(const RepositoryContentMayExcludes &) const override
{
std::shared_ptr<CategoryNamePartSet> result(std::make_shared<CategoryNamePartSet>());
result->insert(CategoryNamePart("bad-cat1"));

10
paludis/environments/paludis/paludis_environment.cc
View File

@ -342,17 +342,17 @@ namespace
{
}
char key() const
char key() const override
{
return 'B';
}
const std::string description() const
const std::string description() const override
{
return "breaks Portage";
}
const std::string explanation() const
const std::string explanation() const override
{
return breakages;
}
@ -370,12 +370,12 @@ namespace
{
}
char key() const
char key() const override
{
return _overridden ? 'u' : 'U';
}
const std::string description() const
const std::string description() const override
{
return _overridden ? "user (overridden)" : "user";
}

94
paludis/filter.cc
View File

@ -125,7 +125,7 @@ namespace
struct AllFilterHandler :
AllFilterHandlerBase
{
virtual std::string as_string() const
std::string as_string() const override
{
return "all matches";
}
@ -135,9 +135,9 @@ namespace
struct SupportsActionFilterHandler :
AllFilterHandlerBase
{
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos) const
const std::shared_ptr<const RepositoryNameSet> & repos) const override
{
std::shared_ptr<RepositoryNameSet> result(std::make_shared<RepositoryNameSet>());
@ -151,9 +151,9 @@ namespace
return result;
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -167,7 +167,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "supports action " + stringify(ActionNames<A_>::value);
}
@ -176,14 +176,14 @@ namespace
struct NotMaskedFilterHandler :
AllFilterHandlerBase
{
virtual const RepositoryContentMayExcludes may_excludes() const
const RepositoryContentMayExcludes may_excludes() const override
{
return { rcme_masked };
}
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos) const
const std::shared_ptr<const RepositoryNameSet> & repos) const override
{
std::shared_ptr<RepositoryNameSet> result(std::make_shared<RepositoryNameSet>());
@ -197,9 +197,9 @@ namespace
return result;
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -211,7 +211,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "not masked";
}
@ -229,14 +229,14 @@ namespace
{
}
virtual const RepositoryContentMayExcludes may_excludes() const
const RepositoryContentMayExcludes may_excludes() const override
{
return { rcme_not_installed };
}
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos) const
const std::shared_ptr<const RepositoryNameSet> & repos) const override
{
std::shared_ptr<RepositoryNameSet> result(std::make_shared<RepositoryNameSet>());
@ -251,9 +251,9 @@ namespace
return result;
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -264,7 +264,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "installed " + std::string(equal ? "" : "not ") + "at root " + stringify(root);
}
@ -282,43 +282,43 @@ namespace
{
}
virtual const RepositoryContentMayExcludes may_excludes() const
const RepositoryContentMayExcludes may_excludes() const override
{
/* we can exclude anything either filter would reject */
return f1.may_excludes() | f2.may_excludes();
}
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & s) const
const std::shared_ptr<const RepositoryNameSet> & s) const override
{
return f2.repositories(env, f1.repositories(env, s));
}
virtual std::shared_ptr<const CategoryNamePartSet> categories(
std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & r,
const std::shared_ptr<const CategoryNamePartSet> & c) const
const std::shared_ptr<const CategoryNamePartSet> & c) const override
{
return f2.categories(env, r, f1.categories(env, r, c));
}
virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & r,
const std::shared_ptr<const QualifiedPackageNameSet> & q) const
const std::shared_ptr<const QualifiedPackageNameSet> & q) const override
{
return f2.packages(env, r, f1.packages(env, r, q));
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const env,
const std::shared_ptr<const PackageIDSet> & s) const
const std::shared_ptr<const PackageIDSet> & s) const override
{
return f2.ids(env, f1.ids(env, s));
}
virtual std::string as_string() const
std::string as_string() const override
{
return stringify(f1) + " filtered through " + stringify(f2);
}
@ -334,14 +334,14 @@ namespace
{
}
virtual const RepositoryContentMayExcludes may_excludes() const
const RepositoryContentMayExcludes may_excludes() const override
{
return { };
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -361,7 +361,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "same slot as " + stringify(*as_id);
}
@ -377,14 +377,14 @@ namespace
{
}
virtual const RepositoryContentMayExcludes may_excludes() const
const RepositoryContentMayExcludes may_excludes() const override
{
return { };
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -396,7 +396,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "slot is " + stringify(slot);
}
@ -405,9 +405,9 @@ namespace
struct NoSlotHandler :
AllFilterHandlerBase
{
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -419,12 +419,12 @@ namespace
return result;
}
virtual const RepositoryContentMayExcludes may_excludes() const
const RepositoryContentMayExcludes may_excludes() const override
{
return { };
}
virtual std::string as_string() const
std::string as_string() const override
{
return "has no slot";
}
@ -444,14 +444,14 @@ namespace
{
}
virtual const RepositoryContentMayExcludes may_excludes() const
const RepositoryContentMayExcludes may_excludes() const override
{
return { };
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const env,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -465,7 +465,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
std::string suffix;
if (options[mpo_ignore_additional_requirements])
@ -486,9 +486,9 @@ namespace
{
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -502,7 +502,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return desc;
}

2
paludis/filter_TEST.cc
View File

@ -54,7 +54,7 @@ namespace
TestEnvironment env;
TestInfo info;
void SetUp()
void SetUp() override
{
info = GetParam();
}

24
paludis/fs_merger_TEST.cc
View File

@ -70,10 +70,10 @@ namespace
public:
HookTestEnvironment(const FSPath & hooks);
virtual ~HookTestEnvironment();
~HookTestEnvironment() override;
virtual HookResult perform_hook(const Hook &, const std::shared_ptr<OutputManager> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
HookResult perform_hook(const Hook &, const std::shared_ptr<OutputManager> &) const
override PALUDIS_ATTRIBUTE((warn_unused_result));
};
HookTestEnvironment::HookTestEnvironment(const FSPath & hooks)
@ -107,23 +107,23 @@ namespace
{
}
void record_install_file(const FSPath &, const FSPath &, const std::string &, const FSMergerStatusFlags &)
void record_install_file(const FSPath &, const FSPath &, const std::string &, const FSMergerStatusFlags &) override
{
}
void record_install_dir(const FSPath &, const FSPath &, const FSMergerStatusFlags &)
void record_install_dir(const FSPath &, const FSPath &, const FSMergerStatusFlags &) override
{
}
void record_install_sym(const FSPath &, const FSPath &, const FSMergerStatusFlags &)
void record_install_sym(const FSPath &, const FSPath &, const FSMergerStatusFlags &) override
{
}
virtual void record_install_under_dir(const FSPath &, const FSMergerStatusFlags &)
void record_install_under_dir(const FSPath &, const FSMergerStatusFlags &) override
{
}
void on_error(bool is_check, const std::string & s)
void on_error(bool is_check, const std::string & s) override
{
if (is_check)
make_check_fail();
@ -131,20 +131,20 @@ namespace
throw FSMergerError(s);
}
void on_warn(bool, const std::string &)
void on_warn(bool, const std::string &) override
{
}
void display_override(const std::string &) const
void display_override(const std::string &) const override
{
}
bool config_protected(const FSPath &, const FSPath &)
bool config_protected(const FSPath &, const FSPath &) override
{
return false;
}
std::string make_config_protect_name(const FSPath & src, const FSPath &)
std::string make_config_protect_name(const FSPath & src, const FSPath &) override
{
return src.basename() + ".cfgpro";
}

6
paludis/fuzzy_finder.cc
View File

@ -79,12 +79,12 @@ namespace
{
}
virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const,
const std::shared_ptr<const RepositoryNameSet> &,
const std::shared_ptr<const QualifiedPackageNameSet> &) const;
const std::shared_ptr<const QualifiedPackageNameSet> &) const override;
virtual std::string as_string() const
std::string as_string() const override
{
return "packages fuzzily like " + _package;
}

108
paludis/generator.cc
View File

@ -139,9 +139,9 @@ namespace
{
}
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const RepositoryContentMayExcludes &) const
const RepositoryContentMayExcludes &) const override
{
using namespace std::placeholders;
std::shared_ptr<RepositoryNameSet> result(std::make_shared<RepositoryNameSet>());
@ -150,7 +150,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "packages with repository " + stringify(name);
}
@ -166,11 +166,11 @@ namespace
{
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const std::shared_ptr<const QualifiedPackageNameSet> & qpns,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -195,7 +195,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "packages originally from repository " + stringify(name);
}
@ -211,11 +211,11 @@ namespace
{
}
virtual std::shared_ptr<const CategoryNamePartSet> categories(
std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const RepositoryContentMayExcludes & x
) const
) const override
{
std::shared_ptr<CategoryNamePartSet> result(std::make_shared<CategoryNamePartSet>());
@ -230,7 +230,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "packages with category " + stringify(name);
}
@ -246,11 +246,11 @@ namespace
{
}
virtual std::shared_ptr<const CategoryNamePartSet> categories(
std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const RepositoryContentMayExcludes & x
) const
) const override
{
std::shared_ptr<CategoryNamePartSet> result(std::make_shared<CategoryNamePartSet>());
@ -265,11 +265,11 @@ namespace
return result;
}
virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const std::shared_ptr<const CategoryNamePartSet> & cats,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<QualifiedPackageNameSet> result(std::make_shared<QualifiedPackageNameSet>());
for (RepositoryNameSet::ConstIterator r(repos->begin()), r_end(repos->end()) ;
@ -282,7 +282,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "packages named " + stringify(name);
}
@ -302,9 +302,9 @@ namespace
{
}
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
if (package_dep_spec_has_properties(spec, make_named_values<PackageDepSpecProperties>(
n::has_additional_requirements() = indeterminate,
@ -364,10 +364,10 @@ namespace
return result;
}
virtual std::shared_ptr<const CategoryNamePartSet> categories(
std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
if (spec.category_name_part_ptr())
{
@ -413,11 +413,11 @@ namespace
return AllGeneratorHandlerBase::categories(env, repos, x);
}
virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const std::shared_ptr<const CategoryNamePartSet> & cats,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
if (spec.package_name_part_ptr())
{
@ -448,11 +448,11 @@ namespace
return AllGeneratorHandlerBase::packages(env, repos, cats, x);
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const std::shared_ptr<const QualifiedPackageNameSet> & qpns,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -474,7 +474,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
std::string suffix;
if (options[mpo_ignore_additional_requirements])
@ -495,9 +495,9 @@ namespace
{
}
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<const RepositoryNameSet> r1(g1.repositories(env, x));
if (r1->empty())
@ -515,10 +515,10 @@ namespace
return result;
}
virtual std::shared_ptr<const CategoryNamePartSet> categories(
std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<const CategoryNamePartSet> c1(g1.categories(env, repos, x));
if (c1->empty())
@ -536,11 +536,11 @@ namespace
return result;
}
virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const std::shared_ptr<const CategoryNamePartSet> & cats,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<const QualifiedPackageNameSet> q1(g1.packages(env, repos, cats, x));
if (q1->empty())
@ -558,11 +558,11 @@ namespace
return result;
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const std::shared_ptr<const QualifiedPackageNameSet> & qpns,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<const PackageIDSet> i1(g1.ids(env, repos, qpns, x));
if (i1->empty())
@ -581,7 +581,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return stringify(g1) + " intersected with " + stringify(g2);
}
@ -599,9 +599,9 @@ namespace
{
}
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<const RepositoryNameSet> r1(g1.repositories(env, x));
std::shared_ptr<const RepositoryNameSet> r2(g2.repositories(env, x));
@ -613,10 +613,10 @@ namespace
return result;
}
virtual std::shared_ptr<const CategoryNamePartSet> categories(
std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<const CategoryNamePartSet> c1(g1.categories(env, repos, x));
std::shared_ptr<const CategoryNamePartSet> c2(g2.categories(env, repos, x));
@ -628,11 +628,11 @@ namespace
return result;
}
virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const std::shared_ptr<const CategoryNamePartSet> & cats,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<const QualifiedPackageNameSet> q1(g1.packages(env, repos, cats, x));
std::shared_ptr<const QualifiedPackageNameSet> q2(g2.packages(env, repos, cats, x));
@ -644,11 +644,11 @@ namespace
return result;
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const env,
const std::shared_ptr<const RepositoryNameSet> & repos,
const std::shared_ptr<const QualifiedPackageNameSet> & qpns,
const RepositoryContentMayExcludes & x) const
const RepositoryContentMayExcludes & x) const override
{
std::shared_ptr<const PackageIDSet> i1(g1.ids(env, repos, qpns, x));
std::shared_ptr<const PackageIDSet> i2(g2.ids(env, repos, qpns, x));
@ -661,7 +661,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return stringify(g1) + " unioned with " + stringify(g2);
}
@ -670,7 +670,7 @@ namespace
struct AllGeneratorHandler :
AllGeneratorHandlerBase
{
virtual std::string as_string() const
std::string as_string() const override
{
return "all packages";
}
@ -680,9 +680,9 @@ namespace
struct SomeIDsMightSupportActionGeneratorHandler :
AllGeneratorHandlerBase
{
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const RepositoryContentMayExcludes &) const
const RepositoryContentMayExcludes &) const override
{
std::shared_ptr<RepositoryNameSet> result(std::make_shared<RepositoryNameSet>());
for (auto i(env->begin_repositories()),
@ -693,7 +693,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "packages that might support action " + stringify(ActionNames<A_>::value);
}
@ -702,40 +702,40 @@ namespace
struct NothingGeneratorHandler :
GeneratorHandler
{
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const,
const RepositoryContentMayExcludes &) const
const RepositoryContentMayExcludes &) const override
{
return std::make_shared<RepositoryNameSet>();
}
virtual std::shared_ptr<const CategoryNamePartSet> categories(
std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const,
const std::shared_ptr<const RepositoryNameSet> &,
const RepositoryContentMayExcludes &) const
const RepositoryContentMayExcludes &) const override
{
return std::make_shared<CategoryNamePartSet>();
}
virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const,
const std::shared_ptr<const RepositoryNameSet> &,
const std::shared_ptr<const CategoryNamePartSet> &,
const RepositoryContentMayExcludes &) const
const RepositoryContentMayExcludes &) const override
{
return std::make_shared<QualifiedPackageNameSet>();
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const RepositoryNameSet> &,
const std::shared_ptr<const QualifiedPackageNameSet> &,
const RepositoryContentMayExcludes &) const
const RepositoryContentMayExcludes &) const override
{
return std::make_shared<PackageIDSet>();
}
virtual std::string as_string() const
std::string as_string() const override
{
return "no packages";
}

4
paludis/generator_TEST.cc
View File

@ -52,12 +52,12 @@ namespace
{
TestInfo info;
void SetUp()
void SetUp() override
{
info = GetParam();
}
void TearDown()
void TearDown() override
{
}
};

30
paludis/hooker.cc
View File

@ -77,20 +77,20 @@ namespace
{
}
virtual HookResult run(
HookResult run(
const Hook &,
const std::shared_ptr<OutputManager> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
const std::shared_ptr<OutputManager> &) const override PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const FSPath file_name() const
const FSPath file_name() const override
{
return _file_name;
}
virtual void add_dependencies(const Hook &, DirectedGraph<std::string, int> &)
void add_dependencies(const Hook &, DirectedGraph<std::string, int> &) override
{
}
virtual const std::shared_ptr<const Sequence<std::string> > auto_hook_names() const
const std::shared_ptr<const Sequence<std::string> > auto_hook_names() const override
{
return std::make_shared<Sequence<std::string>>();
}
@ -114,18 +114,18 @@ namespace
{
}
virtual HookResult run(
HookResult run(
const Hook &,
const std::shared_ptr<OutputManager> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
const std::shared_ptr<OutputManager> &) const override PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const FSPath file_name() const
const FSPath file_name() const override
{
return _file_name;
}
virtual void add_dependencies(const Hook &, DirectedGraph<std::string, int> &);
void add_dependencies(const Hook &, DirectedGraph<std::string, int> &) override;
virtual const std::shared_ptr<const Sequence<std::string> > auto_hook_names() const;
const std::shared_ptr<const Sequence<std::string> > auto_hook_names() const override;
};
class SoHookFile :
@ -143,18 +143,18 @@ namespace
public:
SoHookFile(const FSPath &, const bool, const Environment * const);
virtual HookResult run(
HookResult run(
const Hook &,
const std::shared_ptr<OutputManager> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
const std::shared_ptr<OutputManager> &) const override PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const FSPath file_name() const
const FSPath file_name() const override
{
return _file_name;
}
virtual void add_dependencies(const Hook &, DirectedGraph<std::string, int> &);
void add_dependencies(const Hook &, DirectedGraph<std::string, int> &) override;
virtual const std::shared_ptr<const Sequence<std::string> > auto_hook_names() const;
const std::shared_ptr<const Sequence<std::string> > auto_hook_names() const override;
};
}

28
paludis/partially_made_package_dep_spec.cc
View File

@ -111,7 +111,7 @@ namespace
{
}
virtual std::string as_string() const
std::string as_string() const override
{
std::ostringstream s;
@ -277,67 +277,67 @@ namespace
return s.str();
}
virtual std::shared_ptr<const QualifiedPackageName> package_ptr() const
std::shared_ptr<const QualifiedPackageName> package_ptr() const override
{
return package;
}
virtual std::shared_ptr<const PackageNamePart> package_name_part_ptr() const
std::shared_ptr<const PackageNamePart> package_name_part_ptr() const override
{
return package_name_part;
}
virtual std::shared_ptr<const CategoryNamePart> category_name_part_ptr() const
std::shared_ptr<const CategoryNamePart> category_name_part_ptr() const override
{
return category_name_part;
}
virtual std::shared_ptr<const VersionRequirements> version_requirements_ptr() const
std::shared_ptr<const VersionRequirements> version_requirements_ptr() const override
{
return version_requirements;
}
virtual VersionRequirementsMode version_requirements_mode() const
VersionRequirementsMode version_requirements_mode() const override
{
return version_requirements_mode_v;
}
virtual std::shared_ptr<const SlotRequirement> slot_requirement_ptr() const
std::shared_ptr<const SlotRequirement> slot_requirement_ptr() const override
{
return slot;
}
virtual std::shared_ptr<const RepositoryName> in_repository_ptr() const
std::shared_ptr<const RepositoryName> in_repository_ptr() const override
{
return in_repository;
}
virtual std::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const
std::shared_ptr<const InstallableToRepository> installable_to_repository_ptr() const override
{
return installable_to_repository;
}
virtual std::shared_ptr<const RepositoryName> from_repository_ptr() const
std::shared_ptr<const RepositoryName> from_repository_ptr() const override
{
return from_repository;
}
virtual std::shared_ptr<const FSPath> installed_at_path_ptr() const
std::shared_ptr<const FSPath> installed_at_path_ptr() const override
{
return installed_at_path;
}
virtual std::shared_ptr<const InstallableToPath> installable_to_path_ptr() const
std::shared_ptr<const InstallableToPath> installable_to_path_ptr() const override
{
return installable_to_path;
}
virtual std::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const
std::shared_ptr<const AdditionalPackageDepSpecRequirements> additional_requirements_ptr() const override
{
return additional_requirements;
}
virtual const PartiallyMadePackageDepSpecOptions options_for_partially_made_package_dep_spec() const
const PartiallyMadePackageDepSpecOptions options_for_partially_made_package_dep_spec() const override
{
return options_for_partially_made_package_dep_spec_v;
}

2
paludis/repositories/e/depend_rdepend_TEST.cc
View File

@ -83,7 +83,7 @@ namespace
std::string eapi;
bool special;
void SetUp()
void SetUp() override
{
eapi = GetParam().eapi;
special = GetParam().special;

20
paludis/repositories/e/e_choice_value.cc
View File

@ -37,16 +37,16 @@ namespace
public:
EChoiceValue(const EChoiceValueParams &);
const UnprefixedChoiceName unprefixed_name() const;
const ChoiceNameWithPrefix name_with_prefix() const;
bool enabled() const;
bool enabled_by_default() const;
bool locked() const;
const std::string description() const;
ChoiceOrigin origin() const;
const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result));
const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const PALUDIS_ATTRIBUTE((warn_unused_result));
bool presumed() const PALUDIS_ATTRIBUTE((warn_unused_result));
const UnprefixedChoiceName unprefixed_name() const override;
const ChoiceNameWithPrefix name_with_prefix() const override;
bool enabled() const override;
bool enabled_by_default() const override;
bool locked() const override;
const std::string description() const override;
ChoiceOrigin origin() const override;
const std::string parameter() const override PALUDIS_ATTRIBUTE((warn_unused_result));
const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const override PALUDIS_ATTRIBUTE((warn_unused_result));
bool presumed() const override PALUDIS_ATTRIBUTE((warn_unused_result));
};
}

14
paludis/repositories/e/e_keywords_key.cc
View File

@ -59,33 +59,33 @@ namespace
{
}
~EKeywordsKey()
~EKeywordsKey() override
{
}
const std::shared_ptr<const Set<KeywordName> > parse_value() const
const std::shared_ptr<const Set<KeywordName> > parse_value() const override
{
return parsed_value;
}
const std::string raw_name() const
const std::string raw_name() const override
{
return variable->name();
}
const std::string human_name() const
const std::string human_name() const override
{
return variable->description();
}
virtual MetadataKeyType type() const
MetadataKeyType type() const override
{
return key_type;
}
virtual const std::string pretty_print_value(
const std::string pretty_print_value(
const PrettyPrinter & p,
const PrettyPrintOptions &) const
const PrettyPrintOptions &) const override
{
return join(parsed_value->begin(), parsed_value->end(), " ", CallPrettyPrinter(p));
}

8
paludis/repositories/e/e_mask.cc
View File

@ -38,11 +38,11 @@ namespace
public:
EUnacceptedMask(const char, const std::string &, const std::string &);
~EUnacceptedMask();
~EUnacceptedMask() override;
char key() const;
const std::string description() const;
const std::string unaccepted_key_name() const;
char key() const override;
const std::string description() const override;
const std::string unaccepted_key_name() const override;
};
}

2
paludis/repositories/e/e_repository_TEST_ever.cc
View File

@ -90,7 +90,7 @@ namespace
{
std::string test;
void SetUp()
void SetUp() override
{
test = GetParam();
}

2
paludis/repositories/e/e_repository_TEST_exlibs.cc
View File

@ -104,7 +104,7 @@ namespace
{
TestInfo info;
void SetUp()
void SetUp() override
{
info = GetParam();
}

2
paludis/repositories/e/e_repository_TEST_pbin.cc
View File

@ -92,7 +92,7 @@ namespace
{
std::string base_eapi;
void SetUp()
void SetUp() override
{
base_eapi = GetParam();
}

2
paludis/repositories/e/e_repository_TEST_phases.cc
View File

@ -99,7 +99,7 @@ namespace
{
TestInfo info;
void SetUp()
void SetUp() override
{
info = GetParam();
}

2
paludis/repositories/e/e_repository_TEST_replacing.cc
View File

@ -95,7 +95,7 @@ namespace
{
TestInfo info;
void SetUp()
void SetUp() override
{
info = GetParam();
}

10
paludis/repositories/e/e_slot_key.cc
View File

@ -51,26 +51,26 @@ namespace
{
}
~ESlotKey()
~ESlotKey() override
{
}
virtual const Slot parse_value() const
const Slot parse_value() const override
{
return slot_value;
}
virtual const std::string raw_name() const
const std::string raw_name() const override
{
return variable->name();
}
virtual const std::string human_name() const
const std::string human_name() const override
{
return variable->description();
}
virtual MetadataKeyType type() const
MetadataKeyType type() const override
{
return key_type;
}

14
paludis/repositories/e/e_string_set_key.cc
View File

@ -58,33 +58,33 @@ namespace
{
}
~EStringSetKey()
~EStringSetKey() override
{
}
const std::shared_ptr<const Set<std::string> > parse_value() const
const std::shared_ptr<const Set<std::string> > parse_value() const override
{
return parsed_value;
}
const std::string raw_name() const
const std::string raw_name() const override
{
return variable->name();
}
const std::string human_name() const
const std::string human_name() const override
{
return variable->description();
}
virtual MetadataKeyType type() const
MetadataKeyType type() const override
{
return key_type;
}
virtual const std::string pretty_print_value(
const std::string pretty_print_value(
const PrettyPrinter & p,
const PrettyPrintOptions &) const
const PrettyPrintOptions &) const override
{
return join(parsed_value->begin(), parsed_value->end(), " ", CallPrettyPrinter(p));
}

4
paludis/repositories/e/parse_dependency_label.cc
View File

@ -84,12 +84,12 @@ namespace
{
}
virtual bool enabled(const Environment * const env, const std::shared_ptr<const PackageID> & id) const
bool enabled(const Environment * const env, const std::shared_ptr<const PackageID> & id) const override
{
return enabled_if_option(env, id, label_text, choice_name);
}
virtual const std::string text() const
const std::string text() const override
{
return label_text;
}

10
paludis/repositories/e/vdb_merger_TEST.cc
View File

@ -45,7 +45,7 @@ namespace
public VDBMerger
{
private:
void display_override(const std::string &) const
void display_override(const std::string &) const override
{
}
@ -55,12 +55,12 @@ namespace
{
}
bool check()
bool check() override
{
return FSMerger::check();
}
void on_enter_dir(bool, const FSPath)
void on_enter_dir(bool, const FSPath) override
{
}
};
@ -97,7 +97,7 @@ namespace
{
}
void SetUp()
void SetUp() override
{
target = GetParam();
root_dir = FSPath::cwd() / "vdb_merger_TEST_dir" / (target + "_dir") / "root";
@ -118,7 +118,7 @@ namespace
));
}
void TearDown()
void TearDown() override
{
merger.reset();
}

4
paludis/repositories/e/vdb_repository_TEST_eapis.cc
View File

@ -92,7 +92,7 @@ namespace
{
std::string eapi;
void SetUp()
void SetUp() override
{
eapi = GetParam();
}
@ -219,7 +219,7 @@ namespace
{
std::string eapi;
void SetUp()
void SetUp() override
{
eapi = GetParam();
}

4
paludis/repositories/e/vdb_unmerger_TEST.cc
View File

@ -67,7 +67,7 @@ namespace
{
protected:
void display(const std::string &) const
void display(const std::string &) const override
{
}
@ -102,7 +102,7 @@ namespace
{
}
void SetUp()
void SetUp() override
{
what = GetParam();
target = what;

20
paludis/repositories/fake/fake_package_id.cc
View File

@ -425,52 +425,52 @@ namespace
{
}
const UnprefixedChoiceName unprefixed_name() const
const UnprefixedChoiceName unprefixed_name() const override
{
return value_name;
}
virtual const ChoiceNameWithPrefix name_with_prefix() const
const ChoiceNameWithPrefix name_with_prefix() const override
{
return ChoiceNameWithPrefix((choice->prefix().value().empty() ? "" : stringify(choice->prefix()) + ":") + stringify(value_name));
}
virtual bool enabled() const
bool enabled() const override
{
return env->want_choice_enabled(id, choice, value_name).is_true();
}
virtual bool enabled_by_default() const
bool enabled_by_default() const override
{
return false;
}
virtual bool locked() const
bool locked() const override
{
return false;
}
virtual const std::string description() const
const std::string description() const override
{
return "monkey";
}
virtual ChoiceOrigin origin() const
ChoiceOrigin origin() const override
{
return co_explicit;
}
virtual const std::string parameter() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string parameter() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return env->value_for_choice_parameter(id, choice, value_name);
}
virtual const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const
const std::shared_ptr<const PermittedChoiceValueParameterValues> permitted_parameter_values() const override
{
return nullptr;
}
virtual bool presumed() const PALUDIS_ATTRIBUTE((warn_unused_result))
bool presumed() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return false;
}

50
paludis/repositories/unpackaged/installed_id.cc
View File

@ -94,22 +94,22 @@ namespace
{
}
const FSPath parse_value() const
const FSPath parse_value() const override
{
return _location;
}
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return "location";
}
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return "Location";
}
virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result))
MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return mkt_internal;
}
@ -127,22 +127,22 @@ namespace
{
}
Timestamp parse_value() const
Timestamp parse_value() const override
{
return _time;
}
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return "installed_time";
}
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return "Installed time";
}
virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result))
MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return mkt_normal;
}
@ -169,7 +169,7 @@ namespace
{
}
const std::string parse_value() const
const std::string parse_value() const override
{
std::unique_lock<std::mutex> l(_mutex);
if (_v)
@ -182,17 +182,17 @@ namespace
return *_v;
}
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _raw_name;
}
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _human_name;
}
virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result))
MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _type;
}
@ -223,7 +223,7 @@ namespace
_f.push_back(f);
}
const std::shared_ptr<const Set<std::string> > parse_value() const
const std::shared_ptr<const Set<std::string> > parse_value() const override
{
std::unique_lock<std::mutex> l(_mutex);
if (_v)
@ -240,24 +240,24 @@ namespace
return _v;
}
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _raw_name;
}
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _human_name;
}
virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result))
MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _type;
}
virtual const std::string pretty_print_value(
const std::string pretty_print_value(
const PrettyPrinter & pretty_printer,
const PrettyPrintOptions &) const
const PrettyPrintOptions &) const override
{
auto v(parse_value());
return join(v->begin(), v->end(), " ", CallPrettyPrinter(pretty_printer));
@ -291,7 +291,7 @@ namespace
{
}
const std::shared_ptr<const DependencySpecTree> parse_value() const
const std::shared_ptr<const DependencySpecTree> parse_value() const override
{
std::unique_lock<std::mutex> l(_mutex);
if (_v)
@ -305,29 +305,29 @@ namespace
return _v;
}
const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const
const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const override
{
return _labels;
}
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _raw_name;
}
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _human_name;
}
virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result))
MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _type;
}
virtual const std::string pretty_print_value(
const std::string pretty_print_value(
const PrettyPrinter & printer,
const PrettyPrintOptions & options) const
const PrettyPrintOptions & options) const override
{
CommaSeparatedDepPrettyPrinter p(printer, options);
parse_value()->top()->accept(p);

12
paludis/repositories/unwritten/unwritten_repository_file.cc
View File

@ -134,29 +134,29 @@ namespace
{
}
const std::shared_ptr<const SimpleURISpecTree> parse_value() const
const std::shared_ptr<const SimpleURISpecTree> parse_value() const override
{
return vv;
}
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _raw_name;
}
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _human_name;
}
virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result))
MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return _type;
}
virtual const std::string pretty_print_value(
const std::string pretty_print_value(
const PrettyPrinter & pretty_printer,
const PrettyPrintOptions &) const
const PrettyPrintOptions &) const override
{
UnwrittenHomepagePrettyPrinter p(pretty_printer);
parse_value()->top()->accept(p);

6
paludis/resolver/destination_utils.cc
View File

@ -65,9 +65,9 @@ namespace
struct BinaryDestinationGeneratorHandler :
AllGeneratorHandlerBase
{
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const env,
const RepositoryContentMayExcludes &) const
const RepositoryContentMayExcludes &) const override
{
using namespace std::placeholders;
std::shared_ptr<RepositoryNameSet> result(std::make_shared<RepositoryNameSet>());
@ -80,7 +80,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "binary destination repositories";
}

2
paludis/resolver/get_sameness.cc
View File

@ -45,7 +45,7 @@ namespace
{
using UnformattedPrettyPrinter::prettify;
const std::string prettify(const PackageDepSpec & s) const
const std::string prettify(const PackageDepSpec & s) const override
{
/* cat/pkg[foo][bar] and cat/pkg[bar][foo] are the same, and := deps
* are weird */

6
paludis/resolver/make_origin_filtered_generator_helper.cc
View File

@ -65,9 +65,9 @@ namespace
struct BinaryableFilterHandler :
AllFilterHandlerBase
{
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -79,7 +79,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "binaryable";
}

6
paludis/resolver/make_unmaskable_filter_helper.cc
View File

@ -66,9 +66,9 @@ namespace
struct UnmaskableFilterHandler :
AllFilterHandlerBase
{
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & id) const
const std::shared_ptr<const PackageIDSet> & id) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@ -80,7 +80,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "unmaskable";
}

4
paludis/resolver/resolver_TEST_any.cc
View File

@ -57,13 +57,13 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("any", "exheres-0", "exheres");
data->get_use_existing_nothing_helper.set_use_existing_for_dependencies(ue_never);
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_binaries.cc
View File

@ -56,14 +56,14 @@ namespace
{
std::shared_ptr<ResolverWithBinaryTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverWithBinaryTestData>("binaries", "exheres-0", "exheres");
data->get_use_existing_nothing_helper.set_use_existing_for_dependencies(ue_never);
data->get_resolvents_for_helper.set_target_destination_type(dt_create_binary);
}
void TearDown()
void TearDown() override
{
data.reset();
}

8
paludis/resolver/resolver_TEST_blockers.cc
View File

@ -58,13 +58,13 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("blockers", "exheres-0", "exheres");
data->get_use_existing_nothing_helper.set_use_existing_for_dependencies(ue_never);
}
void TearDown()
void TearDown() override
{
data.reset();
}
@ -75,13 +75,13 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("blockers", "0", "exheres");
data->get_use_existing_nothing_helper.set_use_existing_for_dependencies(ue_never);
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_continue_on_failure.cc
View File

@ -64,12 +64,12 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("continue_on_failure", "exheres-0", "exheres");
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_cycles.cc
View File

@ -56,13 +56,13 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("cycles", "exheres-0", "exheres");
data->get_use_existing_nothing_helper.set_use_existing_for_dependencies(ue_never);
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_errors.cc
View File

@ -56,12 +56,12 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("errors", "exheres-0", "exheres");
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_fetches.cc
View File

@ -62,12 +62,12 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("fetch", "exheres-0", "exheres");
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_promote_binaries.cc
View File

@ -54,8 +54,8 @@ namespace
std::shared_ptr<ResolverWithBinaryTestData> data;
static bool bin_created;
void SetUp();
void TearDown();
void SetUp() override;
void TearDown() override;
std::shared_ptr<const PackageID> get_origin_id(std::shared_ptr<const Resolved> resolved)
{

4
paludis/resolver/resolver_TEST_purges.cc
View File

@ -56,12 +56,12 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("purges", "exheres-0", "exheres");
}
void TearDown()
void TearDown() override
{
}
};

4
paludis/resolver/resolver_TEST_serialisation.cc
View File

@ -57,12 +57,12 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("serialisation", "exheres-0", "exheres");
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_simple.cc
View File

@ -55,12 +55,12 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("simple", "exheres-0", "exheres");
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_subslots.cc
View File

@ -34,12 +34,12 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("subslots", "exheres-0", "exheres");
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_suggestions.cc
View File

@ -55,12 +55,12 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("suggestions", "exheres-0", "exheres");
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/resolver_TEST_uninstalls.cc
View File

@ -58,12 +58,12 @@ namespace
{
std::shared_ptr<ResolverTestData> data;
void SetUp()
void SetUp() override
{
data = std::make_shared<ResolverTestData>("uninstalls", "exheres-0", "exheres");
}
void TearDown()
void TearDown() override
{
data.reset();
}

4
paludis/resolver/selection_with_promotion.cc
View File

@ -48,7 +48,7 @@ namespace
{
}
virtual std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const
std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const override
{
std::shared_ptr<PackageIDSequence> result(std::make_shared<PackageIDSequence>());
RepositoryContentMayExcludes may_excludes(_fg.filter().may_excludes());
@ -72,7 +72,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "all versions sorted from " + stringify(_fg);
}

28
paludis/selection.cc
View File

@ -118,7 +118,7 @@ namespace
{
}
virtual std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const
std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const override
{
std::shared_ptr<PackageIDSequence> result(std::make_shared<PackageIDSequence>());
RepositoryContentMayExcludes may_excludes(_fg.filter().may_excludes());
@ -150,7 +150,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "some arbitrary version from " + stringify(_fg);
}
@ -165,7 +165,7 @@ namespace
{
}
virtual std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const
std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const override
{
using namespace std::placeholders;
@ -196,7 +196,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "best version of each package from " + stringify(_fg);
}
@ -211,7 +211,7 @@ namespace
{
}
virtual std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const
std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const override
{
using namespace std::placeholders;
@ -237,7 +237,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "all versions sorted from " + stringify(_fg);
}
@ -252,7 +252,7 @@ namespace
{
}
virtual std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const
std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const override
{
using namespace std::placeholders;
@ -277,7 +277,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "all versions in some arbitrary order from " + stringify(_fg);
}
@ -292,7 +292,7 @@ namespace
{
}
virtual std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const
std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const override
{
using namespace std::placeholders;
@ -343,7 +343,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "all versions grouped by slot from " + stringify(_fg);
}
@ -358,7 +358,7 @@ namespace
{
}
virtual std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const
std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const override
{
using namespace std::placeholders;
@ -409,7 +409,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "best version in each slot from " + stringify(_fg);
}
@ -424,7 +424,7 @@ namespace
{
}
virtual std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const
std::shared_ptr<PackageIDSequence> perform_select(const Environment * const env) const override
{
using namespace std::placeholders;
@ -453,7 +453,7 @@ namespace
return result;
}
virtual std::string as_string() const
std::string as_string() const override
{
return "the single version from " + stringify(_fg);
}

24
paludis/set_file.cc
View File

@ -83,10 +83,10 @@ namespace
public:
PaludisConfHandler(const SetFileParams &);
virtual std::shared_ptr<SetSpecTree> contents() const;
virtual bool add(const std::string &);
virtual bool remove(const std::string &);
virtual void rewrite() const;
std::shared_ptr<SetSpecTree> contents() const override;
bool add(const std::string &) override;
bool remove(const std::string &) override;
void rewrite() const override;
};
class PaludisBashHandler :
@ -99,10 +99,10 @@ namespace
public:
PaludisBashHandler(const SetFileParams &);
virtual std::shared_ptr<SetSpecTree> contents() const;
virtual bool add(const std::string &) PALUDIS_ATTRIBUTE((noreturn));
virtual bool remove(const std::string &) PALUDIS_ATTRIBUTE((noreturn));
virtual void rewrite() const PALUDIS_ATTRIBUTE((noreturn));
std::shared_ptr<SetSpecTree> contents() const override;
bool add(const std::string &) override PALUDIS_ATTRIBUTE((noreturn));
bool remove(const std::string &) override PALUDIS_ATTRIBUTE((noreturn));
void rewrite() const override PALUDIS_ATTRIBUTE((noreturn));
};
class SimpleHandler :
@ -120,10 +120,10 @@ namespace
public:
SimpleHandler(const SetFileParams &);
virtual std::shared_ptr<SetSpecTree> contents() const;
virtual bool add(const std::string &);
virtual bool remove(const std::string &);
virtual void rewrite() const;
std::shared_ptr<SetSpecTree> contents() const override;
bool add(const std::string &) override;
bool remove(const std::string &) override;
void rewrite() const override;
};
std::shared_ptr<SetFileHandler>

12
paludis/stripper_TEST.cc
View File

@ -33,28 +33,28 @@ namespace
struct TestStripper :
Stripper
{
virtual void on_enter_dir(const FSPath &)
void on_enter_dir(const FSPath &) override
{
}
virtual void on_leave_dir(const FSPath &)
void on_leave_dir(const FSPath &) override
{
}
virtual void on_strip(const FSPath &)
void on_strip(const FSPath &) override
{
}
virtual void on_split(const FSPath &, const FSPath &)
void on_split(const FSPath &, const FSPath &) override
{
}
virtual void on_dwarf_compress(const FSPath &)
void on_dwarf_compress(const FSPath &) override
{
}
virtual void on_unknown(const FSPath &)
void on_unknown(const FSPath &) override
{
}

10
paludis/tar_merger_TEST.cc
View File

@ -56,7 +56,7 @@ namespace
{
}
virtual void on_error(bool is_check, const std::string & s)
void on_error(bool is_check, const std::string & s) override
{
if (is_check)
make_check_fail();
@ -64,19 +64,19 @@ namespace
throw MergerError(s);
}
void on_warn(bool, const std::string &)
void on_warn(bool, const std::string &) override
{
}
void display_override(const std::string &) const
void display_override(const std::string &) const override
{
}
void track_install_file(const FSPath &, const FSPath &)
void track_install_file(const FSPath &, const FSPath &) override
{
}
void track_install_sym(const FSPath &, const FSPath &)
void track_install_sym(const FSPath &, const FSPath &) override
{
}
};

10
paludis/unchoices_key.cc
View File

@ -50,26 +50,26 @@ namespace
)));
}
~UnChoicesKey()
~UnChoicesKey() override
{
}
const std::shared_ptr<const Choices> parse_value() const
const std::shared_ptr<const Choices> parse_value() const override
{
return _value;
}
virtual const std::string human_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string human_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return "Choices";
}
virtual const std::string raw_name() const PALUDIS_ATTRIBUTE((warn_unused_result))
const std::string raw_name() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return "PALUDIS_CHOICES";
}
virtual MetadataKeyType type() const PALUDIS_ATTRIBUTE((warn_unused_result))
MetadataKeyType type() const override PALUDIS_ATTRIBUTE((warn_unused_result))
{
return mkt_internal;
}

6
src/clients/cave/cmd_config.cc
View File

@ -52,17 +52,17 @@ namespace
struct ConfigCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave config";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Perform post-install configuration on a package.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Perform post-install configuration on a package. Note that most packages do "
"not provide a post-install configuration script.";

6
src/clients/cave/cmd_contents.cc
View File

@ -56,17 +56,17 @@ namespace
struct ContentsCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave contents";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints the contents of a package ID.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Display the contents of (files installed by) a given package ID.";
}

6
src/clients/cave/cmd_digest.cc
View File

@ -64,17 +64,17 @@ namespace
struct DigestCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave digest";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Generates a digest file for a particular package in a particular repository.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Generates a digest file for a particular package in a particular repository.";
}

8
src/clients/cave/cmd_display_resolution.cc
View File

@ -124,17 +124,17 @@ namespace
"The file descriptor on which the serialised resolution can be found.");
}
virtual std::string app_name() const
std::string app_name() const override
{
return "cave display-resolution";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Displays a dependency resolution created using 'cave resolve'.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Displays a dependency resolution created using 'cave resolve'. Mostly for "
"internal use; most users will not use this command directly.";
@ -1056,7 +1056,7 @@ namespace
{
}
void will_fetch(const FSPath & destination, const unsigned long size_in_bytes)
void will_fetch(const FSPath & destination, const unsigned long size_in_bytes) override
{
if (totals->download_files.end() != totals->download_files.find(destination))
return;

6
src/clients/cave/cmd_dump_cave_formats_conf.cc
View File

@ -159,17 +159,17 @@ namespace
struct DumpCaveFormatsConfCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave dump-cave-formats-conf";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Output a ~/.cave/formats.conf";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Outputs suitable contents for ~/.cave/formats.conf. This file can be used to "
"customise the output format for many cave commands (although not commands designed "

6
src/clients/cave/cmd_executables.cc
View File

@ -48,17 +48,17 @@ namespace
struct ExecutablesCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave executables";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Display executables belonging to an ID.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Display executables belonging to an ID.";
}

20
src/clients/cave/cmd_execute_resolution.cc
View File

@ -127,17 +127,17 @@ namespace
"The file descriptor on which the serialised resolution can be found.");
}
virtual std::string app_name() const
std::string app_name() const override
{
return "cave execute-resolution";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Executes a dependency resolution created using 'cave resolve'.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Execute a dependency resolution created using 'cave resolve'. Mostly for "
"internal use; most users will not use this command directly.";
@ -1215,7 +1215,7 @@ namespace
{
}
std::string queue_name() const
std::string queue_name() const override
{
if (0 != n_fetch_jobs)
return visitor_cast<const FetchJob>(*job) ? "fetch" : "execute";
@ -1223,7 +1223,7 @@ namespace
return "execute";
}
std::string unique_id() const
std::string unique_id() const override
{
return job->make_accept_returning(
[&] (const UninstallJob & j) {
@ -1242,7 +1242,7 @@ namespace
);
}
bool can_run() const
bool can_run() const override
{
for (JobRequirements::ConstIterator r(job->requirements()->begin()), r_end(job->requirements()->end()) ;
r != r_end ; ++r)
@ -1264,7 +1264,7 @@ namespace
return true;
}
void pre_execute_exclusive()
void pre_execute_exclusive() override
{
last_flushed = Timestamp::now();
last_output = last_flushed;
@ -1352,7 +1352,7 @@ namespace
}
}
void execute_threaded()
void execute_threaded() override
{
if (want)
{
@ -1417,7 +1417,7 @@ namespace
}
}
void flush_threaded()
void flush_threaded() override
{
std::unique_lock<std::recursive_mutex> lock(job_mutex);
const std::shared_ptr<OutputManager> output_manager(
@ -1434,7 +1434,7 @@ namespace
}
}
void post_execute_exclusive()
void post_execute_exclusive() override
{
if (want)
{

6
src/clients/cave/cmd_find_candidates.cc
View File

@ -62,17 +62,17 @@ namespace
struct FindCandidatesCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave find-candidates";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Find a list of candidate packages for a search.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Finds a list of candidate packages for a search. Used by 'cave search'; not generally called "
"directly by end users. Note that this command will often select candidates that do not actually "

6
src/clients/cave/cmd_fix_cache.cc
View File

@ -48,17 +48,17 @@ namespace
struct FixCacheCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave fix-cache";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Fix on-disk caches.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Fixes on-disk caches. Normally this is handled automatically when needed (e.g. after a sync, "
"or when a package is installed), but a forced fix-cache is required after a different package "

12
src/clients/cave/cmd_fix_linkage.cc
View File

@ -79,17 +79,17 @@ namespace
"override this, use '-- --no-lazy --no-preserve-world'.");
}
std::string app_name() const
std::string app_name() const override
{
return "cave fix-linkage";
}
std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Identify packages with broken linkage that can be fixed by rebuilds.";
}
std::string app_description() const
std::string app_description() const override
{
return "Identifies packages with broken linkage that can be fixed by rebuilds. "
"If instructed, then executes the relevant install and uninstall actions to "
@ -115,17 +115,17 @@ namespace
{
}
std::string app_name() const
std::string app_name() const override
{
return "";
}
std::string app_synopsis() const
std::string app_synopsis() const override
{
return "";
}
std::string app_description() const
std::string app_description() const override
{
return "";
}

6
src/clients/cave/cmd_generate_metadata.cc
View File

@ -61,17 +61,17 @@ namespace
struct GenerateMetadataCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave generate-metadata";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Pregenerate metadata for a set of IDs.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Pregenerates metadata for a set of IDs.";
}

6
src/clients/cave/cmd_graph_jobs.cc
View File

@ -67,17 +67,17 @@ namespace
"The file descriptor on which the serialised resolution can be found.");
}
virtual std::string app_name() const
std::string app_name() const override
{
return "cave graph-jobs";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Creates a Graphviz graph for jobs in a resolution created using 'cave resolve'.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Creates a Graphviz graph for jobs in a resolution created using 'cave resolve'. Mostly for "
"internal use; most users will not use this command directly.";

6
src/clients/cave/cmd_has_version.cc
View File

@ -53,17 +53,17 @@ namespace
struct HasVersionCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave has-version";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Returns success if there is an installed package matching a particular spec.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Returns success if there is an installed package matching a particular spec. Suitable "
"for use in scripts.";

6
src/clients/cave/cmd_help.cc
View File

@ -52,17 +52,17 @@ namespace
add_usage_line("[-a|--all] [COMMAND]");
}
virtual std::string app_name() const
std::string app_name() const override
{
return "cave help";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "display help information";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Display help information for a particular command.";
}

12
src/clients/cave/cmd_import.cc
View File

@ -54,17 +54,17 @@ namespace
struct ImportCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave import";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Import a package from a directory containing its image.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Import a package from a directory containing its image. A named directory "
"is treated as holding the contents to install, and a dummy package name is "
@ -155,17 +155,17 @@ namespace
{
}
std::string app_name() const
std::string app_name() const override
{
return "";
}
std::string app_synopsis() const
std::string app_synopsis() const override
{
return "";
}
std::string app_description() const
std::string app_description() const override
{
return "";
}

6
src/clients/cave/cmd_info.cc
View File

@ -68,17 +68,17 @@ namespace
struct InfoCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave info";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Display a summary of configuration and package information.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Displays a formatted summary of configuration and package information, e.g. for "
"use when submitting bug reports. The package names of any relevant packages for bug "

6
src/clients/cave/cmd_manage_search_index.cc
View File

@ -199,17 +199,17 @@ namespace
args::ArgsGroup g_actions;
args::SwitchArg a_create;
virtual std::string app_name() const
std::string app_name() const override
{
return "cave manage-search-index";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Manages a search index for use by cave search.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Manages a search index for use by cave search. A search index is only valid until "
"a package is installed or uninstalled, or a sync is performed, or configuration is "

6
src/clients/cave/cmd_match.cc
View File

@ -95,17 +95,17 @@ namespace
struct MatchCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave match";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Determine whether a particular package version has certain properties";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Determines whether a particular package version has certain properties. Mostly for "
"use by 'cave search'; not generally for use by end users.";

6
src/clients/cave/cmd_mirror.cc
View File

@ -65,17 +65,17 @@ namespace
struct MirrorCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave mirror";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Fetches files for a set of IDs.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Fetches files for a set of IDs.";
}

6
src/clients/cave/cmd_owner.cc
View File

@ -50,17 +50,17 @@ namespace
struct OwnerCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave owner";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Shows package IDs owning a given file.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Shows package IDs owning a given file.";
}

8
src/clients/cave/cmd_perform.cc
View File

@ -62,17 +62,17 @@ namespace
struct PerformCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave perform";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Perform an action upon a package.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Perform an action upon a package. Not suitable for direct use, although it "
"may be useful in some more complex scripts.";
@ -369,7 +369,7 @@ namespace
{
}
void will_fetch(const FSPath & destination, const unsigned long size_in_bytes)
void will_fetch(const FSPath & destination, const unsigned long size_in_bytes) override
{
if (already_downloaded.end() != already_downloaded.find(destination))
return;

6
src/clients/cave/cmd_print_best_version.cc
View File

@ -53,17 +53,17 @@ namespace
struct PrintBestVersionCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-best-version";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints the best installed version matching a particular spec.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints the best installed version matching a particular spec. No "
"formatting is used, making the output suitable for parsing by scripts.";

6
src/clients/cave/cmd_print_categories.cc
View File

@ -43,17 +43,17 @@ namespace
struct PrintCategoriesCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-categories";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of known categories.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of known categories. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_checksum.cc
View File

@ -56,17 +56,17 @@ namespace
add_see_also("cave-print-checksum-algorithms", 1);
}
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-checksum";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "prints cryptographic checksums";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints the checksum of the specified input using the specified algorithm. No formatting "
"is used, making the output suitable for parsing by scripts.";

6
src/clients/cave/cmd_print_checksum_algorithms.cc
View File

@ -41,17 +41,17 @@ namespace
add_see_also("cave-print-checksum", 1);
}
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-checksum-algorithms";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "prints supported cryptographic checksum algorithms";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of supported checksum algorithms. No formatting "
"is used, making the output suitable for parsing by scripts.";

6
src/clients/cave/cmd_print_commands.cc
View File

@ -39,17 +39,17 @@ namespace
struct PrintCommandsCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-commands";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of known cave commands.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of known cave commands. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_dependent_ids.cc
View File

@ -58,17 +58,17 @@ namespace
struct PrintDependentIDsCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-dependent-ids";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of installed IDs that are dependent upon another installed ID.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of installed IDs that are dependent upon another installed ID. "
"No formatting is used, making the output suitable for parsing by scripts.";

6
src/clients/cave/cmd_print_environment_metadata.cc
View File

@ -41,17 +41,17 @@ namespace
struct PrintEnvironmentMetadataCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-environment-metadata";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints environment metadata.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints environment metadata. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_id_actions.cc
View File

@ -49,17 +49,17 @@ namespace
struct PrintIDActionsCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-id-actions";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints ID actions.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints ID actions. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_id_contents.cc
View File

@ -51,17 +51,17 @@ namespace
struct PrintContentsCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-id-contents";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints the contents of a package ID.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of the contents of a given ID. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_id_environment_variable.cc
View File

@ -46,17 +46,17 @@ namespace
struct PrintIDEnvironmentVariableCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-id-environment-variable";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints ID environment variables.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints ID environment variables. No formatting is used, "
"making the output suitable for parsing by scripts.";

6
src/clients/cave/cmd_print_id_executables.cc
View File

@ -43,17 +43,17 @@ namespace
struct PrintIDExecutablesCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-id-executables";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of executables belonging to an ID.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of executables belonging to an ID. "
"No formating is used, making the script suitable for parsing by scripts.";

6
src/clients/cave/cmd_print_id_masks.cc
View File

@ -53,17 +53,17 @@ namespace
struct PrintIDMasksCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-id-masks";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints ID masks.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints ID masks. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_id_metadata.cc
View File

@ -49,17 +49,17 @@ namespace
struct PrintIDMetadataCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-id-metadata";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints ID metadata.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints ID metadata. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_id_size.cc
View File

@ -35,17 +35,17 @@ namespace
struct PrintIDSizeCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-id-size";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints the size of files installed by a package.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints the size of files installed by a package. No formatting is used, making the output suitable for parsing by scripts.";
}

26
src/clients/cave/cmd_print_ids.cc
View File

@ -55,17 +55,17 @@ namespace
struct PrintIDsCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-ids";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of known IDs.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of known IDs. No formatting is used, making the output suitable for "
"parsing by scripts.";
@ -131,42 +131,42 @@ namespace
{
}
virtual const RepositoryContentMayExcludes may_excludes() const
const RepositoryContentMayExcludes may_excludes() const override
{
return { };
}
virtual std::string as_string() const
std::string as_string() const override
{
return "with mask '" + mask + "'";
}
virtual std::shared_ptr<const RepositoryNameSet> repositories(
std::shared_ptr<const RepositoryNameSet> repositories(
const Environment * const,
const std::shared_ptr<const RepositoryNameSet> & r) const
const std::shared_ptr<const RepositoryNameSet> & r) const override
{
return r;
}
virtual std::shared_ptr<const CategoryNamePartSet> categories(
std::shared_ptr<const CategoryNamePartSet> categories(
const Environment * const,
const std::shared_ptr<const RepositoryNameSet> &,
const std::shared_ptr<const CategoryNamePartSet> & c) const
const std::shared_ptr<const CategoryNamePartSet> & c) const override
{
return c;
}
virtual std::shared_ptr<const QualifiedPackageNameSet> packages(
std::shared_ptr<const QualifiedPackageNameSet> packages(
const Environment * const,
const std::shared_ptr<const RepositoryNameSet> &,
const std::shared_ptr<const QualifiedPackageNameSet> & q) const
const std::shared_ptr<const QualifiedPackageNameSet> & q) const override
{
return q;
}
virtual std::shared_ptr<const PackageIDSet> ids(
std::shared_ptr<const PackageIDSet> ids(
const Environment * const,
const std::shared_ptr<const PackageIDSet> & c) const
const std::shared_ptr<const PackageIDSet> & c) const override
{
std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());

6
src/clients/cave/cmd_print_owners.cc
View File

@ -45,17 +45,17 @@ namespace
struct PrintOwnersCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-owners";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of package IDs owning a given file.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of package IDs owning a given file. No formatting is used, making the output suitable for parsing by scripts.";
}

6
src/clients/cave/cmd_print_packages.cc
View File

@ -44,17 +44,17 @@ namespace
struct PrintPackagesCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-packages";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of package names.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of package names. No formatting is used, making the output suitable for parsing by scripts.";
}

6
src/clients/cave/cmd_print_repositories.cc
View File

@ -45,17 +45,17 @@ namespace
struct PrintRepositoriesCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-repositories";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of repositories.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of repositories. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_repository_formats.cc
View File

@ -42,17 +42,17 @@ namespace
struct PrintRepositoryFormatsCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-repository-formats";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of available repository formats.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of available repository formats. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_repository_metadata.cc
View File

@ -44,17 +44,17 @@ namespace
struct PrintRepositoryMetadataCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-repository-metadata";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints repository metadata.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints repository metadata. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_resolution_required_confirmations.cc
View File

@ -111,17 +111,17 @@ namespace
"The file descriptor on which the serialised resolution can be found.");
}
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-resolution-required-confirmations";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Displays a machine-readable description of changes required for a resolution created using 'cave resolve'.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Displays a a machine-readable description of changes required for a resolution created by "
"'cave resolve'. Mostly for internal use; most users will not use this command directly.";

6
src/clients/cave/cmd_print_set.cc
View File

@ -49,17 +49,17 @@ namespace
struct PrintSetCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-set";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints the contents of a set.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints the contents (packages or other sets) of a given set.";
}

6
src/clients/cave/cmd_print_sets.cc
View File

@ -43,17 +43,17 @@ namespace
struct PrintSetsCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-sets";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a list of sets.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Prints a list of sets. No formatting is used, making the output suitable for "
"parsing by scripts.";

6
src/clients/cave/cmd_print_spec.cc
View File

@ -54,17 +54,17 @@ namespace
struct PrintSpecCommandLine :
CaveCommandCommandLine
{
virtual std::string app_name() const
std::string app_name() const override
{
return "cave print-spec";
}
virtual std::string app_synopsis() const
std::string app_synopsis() const override
{
return "Prints a dependency spec.";
}
virtual std::string app_description() const
std::string app_description() const override
{
return "Parses a dependency spec and prints it out, possibly after applying certain modifications. No "
"formatting is used, making the output suitable for parsing by scripts.";

Some files were not shown because too many files have changed in this diff Show More