aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-08-04 22:09:28 -0700
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-08-04 22:16:44 -0700
commit1ad5f5ce2025f1db0ea5dd1fcf72223430f143b4 (patch)
tree9cc653b6e2e4650168790a0dba9c86b2ce2a0ae1
parentd81457e4208ba6ed94b86e430c567e4c0e1f7046 (diff)
downloadpaludis-1ad5f5ce2025f1db0ea5dd1fcf72223430f143b4.tar.gz
paludis-1ad5f5ce2025f1db0ea5dd1fcf72223430f143b4.tar.xz
modernize: use override annotations
Automated addition of override to overridden functions. NFC.
-rw-r--r--paludis/args/args_TEST.cc8
-rw-r--r--paludis/elike_conditional_dep_spec.cc10
-rw-r--r--paludis/elike_use_requirement.cc100
-rw-r--r--paludis/environment_implementation_TEST.cc2
-rw-r--r--paludis/environments/paludis/paludis_environment.cc10
-rw-r--r--paludis/filter.cc94
-rw-r--r--paludis/filter_TEST.cc2
-rw-r--r--paludis/fs_merger_TEST.cc24
-rw-r--r--paludis/fuzzy_finder.cc6
-rw-r--r--paludis/generator.cc108
-rw-r--r--paludis/generator_TEST.cc4
-rw-r--r--paludis/hooker.cc30
-rw-r--r--paludis/partially_made_package_dep_spec.cc28
-rw-r--r--paludis/repositories/e/depend_rdepend_TEST.cc2
-rw-r--r--paludis/repositories/e/e_choice_value.cc20
-rw-r--r--paludis/repositories/e/e_keywords_key.cc14
-rw-r--r--paludis/repositories/e/e_mask.cc8
-rw-r--r--paludis/repositories/e/e_repository_TEST_ever.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_exlibs.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_pbin.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_phases.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_replacing.cc2
-rw-r--r--paludis/repositories/e/e_slot_key.cc10
-rw-r--r--paludis/repositories/e/e_string_set_key.cc14
-rw-r--r--paludis/repositories/e/parse_dependency_label.cc4
-rw-r--r--paludis/repositories/e/vdb_merger_TEST.cc10
-rw-r--r--paludis/repositories/e/vdb_repository_TEST_eapis.cc4
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc4
-rw-r--r--paludis/repositories/fake/fake_package_id.cc20
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc50
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_file.cc12
-rw-r--r--paludis/resolver/destination_utils.cc6
-rw-r--r--paludis/resolver/get_sameness.cc2
-rw-r--r--paludis/resolver/make_origin_filtered_generator_helper.cc6
-rw-r--r--paludis/resolver/make_unmaskable_filter_helper.cc6
-rw-r--r--paludis/resolver/resolver_TEST_any.cc4
-rw-r--r--paludis/resolver/resolver_TEST_binaries.cc4
-rw-r--r--paludis/resolver/resolver_TEST_blockers.cc8
-rw-r--r--paludis/resolver/resolver_TEST_continue_on_failure.cc4
-rw-r--r--paludis/resolver/resolver_TEST_cycles.cc4
-rw-r--r--paludis/resolver/resolver_TEST_errors.cc4
-rw-r--r--paludis/resolver/resolver_TEST_fetches.cc4
-rw-r--r--paludis/resolver/resolver_TEST_promote_binaries.cc4
-rw-r--r--paludis/resolver/resolver_TEST_purges.cc4
-rw-r--r--paludis/resolver/resolver_TEST_serialisation.cc4
-rw-r--r--paludis/resolver/resolver_TEST_simple.cc4
-rw-r--r--paludis/resolver/resolver_TEST_subslots.cc4
-rw-r--r--paludis/resolver/resolver_TEST_suggestions.cc4
-rw-r--r--paludis/resolver/resolver_TEST_uninstalls.cc4
-rw-r--r--paludis/resolver/selection_with_promotion.cc4
-rw-r--r--paludis/selection.cc28
-rw-r--r--paludis/set_file.cc24
-rw-r--r--paludis/stripper_TEST.cc12
-rw-r--r--paludis/tar_merger_TEST.cc10
-rw-r--r--paludis/unchoices_key.cc10
-rw-r--r--src/clients/cave/cmd_config.cc6
-rw-r--r--src/clients/cave/cmd_contents.cc6
-rw-r--r--src/clients/cave/cmd_digest.cc6
-rw-r--r--src/clients/cave/cmd_display_resolution.cc8
-rw-r--r--src/clients/cave/cmd_dump_cave_formats_conf.cc6
-rw-r--r--src/clients/cave/cmd_executables.cc6
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc20
-rw-r--r--src/clients/cave/cmd_find_candidates.cc6
-rw-r--r--src/clients/cave/cmd_fix_cache.cc6
-rw-r--r--src/clients/cave/cmd_fix_linkage.cc12
-rw-r--r--src/clients/cave/cmd_generate_metadata.cc6
-rw-r--r--src/clients/cave/cmd_graph_jobs.cc6
-rw-r--r--src/clients/cave/cmd_has_version.cc6
-rw-r--r--src/clients/cave/cmd_help.cc6
-rw-r--r--src/clients/cave/cmd_import.cc12
-rw-r--r--src/clients/cave/cmd_info.cc6
-rw-r--r--src/clients/cave/cmd_manage_search_index.cc6
-rw-r--r--src/clients/cave/cmd_match.cc6
-rw-r--r--src/clients/cave/cmd_mirror.cc6
-rw-r--r--src/clients/cave/cmd_owner.cc6
-rw-r--r--src/clients/cave/cmd_perform.cc8
-rw-r--r--src/clients/cave/cmd_print_best_version.cc6
-rw-r--r--src/clients/cave/cmd_print_categories.cc6
-rw-r--r--src/clients/cave/cmd_print_checksum.cc6
-rw-r--r--src/clients/cave/cmd_print_checksum_algorithms.cc6
-rw-r--r--src/clients/cave/cmd_print_commands.cc6
-rw-r--r--src/clients/cave/cmd_print_dependent_ids.cc6
-rw-r--r--src/clients/cave/cmd_print_environment_metadata.cc6
-rw-r--r--src/clients/cave/cmd_print_id_actions.cc6
-rw-r--r--src/clients/cave/cmd_print_id_contents.cc6
-rw-r--r--src/clients/cave/cmd_print_id_environment_variable.cc6
-rw-r--r--src/clients/cave/cmd_print_id_executables.cc6
-rw-r--r--src/clients/cave/cmd_print_id_masks.cc6
-rw-r--r--src/clients/cave/cmd_print_id_metadata.cc6
-rw-r--r--src/clients/cave/cmd_print_id_size.cc6
-rw-r--r--src/clients/cave/cmd_print_ids.cc26
-rw-r--r--src/clients/cave/cmd_print_owners.cc6
-rw-r--r--src/clients/cave/cmd_print_packages.cc6
-rw-r--r--src/clients/cave/cmd_print_repositories.cc6
-rw-r--r--src/clients/cave/cmd_print_repository_formats.cc6
-rw-r--r--src/clients/cave/cmd_print_repository_metadata.cc6
-rw-r--r--src/clients/cave/cmd_print_resolution_required_confirmations.cc6
-rw-r--r--src/clients/cave/cmd_print_set.cc6
-rw-r--r--src/clients/cave/cmd_print_sets.cc6
-rw-r--r--src/clients/cave/cmd_print_spec.cc6
-rw-r--r--src/clients/cave/cmd_print_sync_protocols.cc6
-rw-r--r--src/clients/cave/cmd_print_unmanaged_files.cc6
-rw-r--r--src/clients/cave/cmd_print_unused_distfiles.cc6
-rw-r--r--src/clients/cave/cmd_purge.cc6
-rw-r--r--src/clients/cave/cmd_report.cc6
-rw-r--r--src/clients/cave/cmd_resolve.cc6
-rw-r--r--src/clients/cave/cmd_resume.cc6
-rw-r--r--src/clients/cave/cmd_search.cc6
-rw-r--r--src/clients/cave/cmd_show.cc6
-rw-r--r--src/clients/cave/cmd_size.cc6
-rw-r--r--src/clients/cave/cmd_sync.cc20
-rw-r--r--src/clients/cave/cmd_sync_protocol_options.cc6
-rw-r--r--src/clients/cave/cmd_uninstall.cc6
-rw-r--r--src/clients/cave/cmd_update_world.cc6
-rw-r--r--src/clients/cave/cmd_verify.cc6
-rw-r--r--src/clients/cave/man_cave.cc6
116 files changed, 603 insertions, 603 deletions
diff --git a/paludis/args/args_TEST.cc b/paludis/args/args_TEST.cc
index 69d6b54ed..e161a480c 100644
--- a/paludis/args/args_TEST.cc
+++ b/paludis/args/args_TEST.cc
@@ -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";
}
diff --git a/paludis/elike_conditional_dep_spec.cc b/paludis/elike_conditional_dep_spec.cc
index 9fa97999d..ebc485575 100644
--- a/paludis/elike_conditional_dep_spec.cc
+++ b/paludis/elike_conditional_dep_spec.cc
@@ -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));
diff --git a/paludis/elike_use_requirement.cc b/paludis/elike_use_requirement.cc
index 31051c535..0a2888fe9 100644
--- a/paludis/elike_use_requirement.cc
+++ b/paludis/elike_use_requirement.cc
@@ -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 "";
}
diff --git a/paludis/environment_implementation_TEST.cc b/paludis/environment_implementation_TEST.cc
index a982fa25a..3dab1967a 100644
--- a/paludis/environment_implementation_TEST.cc
+++ b/paludis/environment_implementation_TEST.cc
@@ -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"));
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 033ce77a2..b4a8c66f1 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -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";
}
diff --git a/paludis/filter.cc b/paludis/filter.cc
index 46ef1ac04..b2c1ec1ec 100644
--- a/paludis/filter.cc
+++ b/paludis/filter.cc
@@ -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;
}
diff --git a/paludis/filter_TEST.cc b/paludis/filter_TEST.cc
index 531f92665..7de3c4b5b 100644
--- a/paludis/filter_TEST.cc
+++ b/paludis/filter_TEST.cc
@@ -54,7 +54,7 @@ namespace
TestEnvironment env;
TestInfo info;
- void SetUp()
+ void SetUp() override
{
info = GetParam();
}
diff --git a/paludis/fs_merger_TEST.cc b/paludis/fs_merger_TEST.cc
index 9d35e5b8f..b74736183 100644
--- a/paludis/fs_merger_TEST.cc
+++ b/paludis/fs_merger_TEST.cc
@@ -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";
}
diff --git a/paludis/fuzzy_finder.cc b/paludis/fuzzy_finder.cc
index 23d5cf289..cf50e1e26 100644
--- a/paludis/fuzzy_finder.cc
+++ b/paludis/fuzzy_finder.cc
@@ -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;
}
diff --git a/paludis/generator.cc b/paludis/generator.cc
index 862c398b1..1d9dffb17 100644
--- a/paludis/generator.cc
+++ b/paludis/generator.cc
@@ -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";
}
diff --git a/paludis/generator_TEST.cc b/paludis/generator_TEST.cc
index f141db4d3..b94fd81f9 100644
--- a/paludis/generator_TEST.cc
+++ b/paludis/generator_TEST.cc
@@ -52,12 +52,12 @@ namespace
{
TestInfo info;
- void SetUp()
+ void SetUp() override
{
info = GetParam();
}
- void TearDown()
+ void TearDown() override
{
}
};
diff --git a/paludis/hooker.cc b/paludis/hooker.cc
index d4a2be8e6..8423cec6a 100644
--- a/paludis/hooker.cc
+++ b/paludis/hooker.cc
@@ -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;
};
}
diff --git a/paludis/partially_made_package_dep_spec.cc b/paludis/partially_made_package_dep_spec.cc
index 4ffd0df4a..e3851a7fa 100644
--- a/paludis/partially_made_package_dep_spec.cc
+++ b/paludis/partially_made_package_dep_spec.cc
@@ -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;
}
diff --git a/paludis/repositories/e/depend_rdepend_TEST.cc b/paludis/repositories/e/depend_rdepend_TEST.cc
index b85100b76..b14274674 100644
--- a/paludis/repositories/e/depend_rdepend_TEST.cc
+++ b/paludis/repositories/e/depend_rdepend_TEST.cc
@@ -83,7 +83,7 @@ namespace
std::string eapi;
bool special;
- void SetUp()
+ void SetUp() override
{
eapi = GetParam().eapi;
special = GetParam().special;
diff --git a/paludis/repositories/e/e_choice_value.cc b/paludis/repositories/e/e_choice_value.cc
index f1abf5b4d..06eace3ec 100644
--- a/paludis/repositories/e/e_choice_value.cc
+++ b/paludis/repositories/e/e_choice_value.cc
@@ -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));
};
}
diff --git a/paludis/repositories/e/e_keywords_key.cc b/paludis/repositories/e/e_keywords_key.cc
index d5f0c1415..f77c06bb2 100644
--- a/paludis/repositories/e/e_keywords_key.cc
+++ b/paludis/repositories/e/e_keywords_key.cc
@@ -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));
}
diff --git a/paludis/repositories/e/e_mask.cc b/paludis/repositories/e/e_mask.cc
index 96d411280..36499d315 100644
--- a/paludis/repositories/e/e_mask.cc
+++ b/paludis/repositories/e/e_mask.cc
@@ -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;
};
}
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index 5d6ecf7bf..81740bdfd 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -90,7 +90,7 @@ namespace
{
std::string test;
- void SetUp()
+ void SetUp() override
{
test = GetParam();
}
diff --git a/paludis/repositories/e/e_repository_TEST_exlibs.cc b/paludis/repositories/e/e_repository_TEST_exlibs.cc
index 305393609..da4cc4072 100644
--- a/paludis/repositories/e/e_repository_TEST_exlibs.cc
+++ b/paludis/repositories/e/e_repository_TEST_exlibs.cc
@@ -104,7 +104,7 @@ namespace
{
TestInfo info;
- void SetUp()
+ void SetUp() override
{
info = GetParam();
}
diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc
index fecd05f0a..71edda543 100644
--- a/paludis/repositories/e/e_repository_TEST_pbin.cc
+++ b/paludis/repositories/e/e_repository_TEST_pbin.cc
@@ -92,7 +92,7 @@ namespace
{
std::string base_eapi;
- void SetUp()
+ void SetUp() override
{
base_eapi = GetParam();
}
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index 187fb8555..9c802171e 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -99,7 +99,7 @@ namespace
{
TestInfo info;
- void SetUp()
+ void SetUp() override
{
info = GetParam();
}
diff --git a/paludis/repositories/e/e_repository_TEST_replacing.cc b/paludis/repositories/e/e_repository_TEST_replacing.cc
index a3a89b589..d974c7759 100644
--- a/paludis/repositories/e/e_repository_TEST_replacing.cc
+++ b/paludis/repositories/e/e_repository_TEST_replacing.cc
@@ -95,7 +95,7 @@ namespace
{
TestInfo info;
- void SetUp()
+ void SetUp() override
{
info = GetParam();
}
diff --git a/paludis/repositories/e/e_slot_key.cc b/paludis/repositories/e/e_slot_key.cc
index 4ecdbae03..0db85e062 100644
--- a/paludis/repositories/e/e_slot_key.cc
+++ b/paludis/repositories/e/e_slot_key.cc
@@ -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;
}
diff --git a/paludis/repositories/e/e_string_set_key.cc b/paludis/repositories/e/e_string_set_key.cc
index 0252666e0..b70090924 100644
--- a/paludis/repositories/e/e_string_set_key.cc
+++ b/paludis/repositories/e/e_string_set_key.cc
@@ -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));
}
diff --git a/paludis/repositories/e/parse_dependency_label.cc b/paludis/repositories/e/parse_dependency_label.cc
index 021cc3e06..fde8e0440 100644
--- a/paludis/repositories/e/parse_dependency_label.cc
+++ b/paludis/repositories/e/parse_dependency_label.cc
@@ -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;
}
diff --git a/paludis/repositories/e/vdb_merger_TEST.cc b/paludis/repositories/e/vdb_merger_TEST.cc
index 91bd85fa0..0d778a185 100644
--- a/paludis/repositories/e/vdb_merger_TEST.cc
+++ b/paludis/repositories/e/vdb_merger_TEST.cc
@@ -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();
}
diff --git a/paludis/repositories/e/vdb_repository_TEST_eapis.cc b/paludis/repositories/e/vdb_repository_TEST_eapis.cc
index 66cc1adf1..9e2448b52 100644
--- a/paludis/repositories/e/vdb_repository_TEST_eapis.cc
+++ b/paludis/repositories/e/vdb_repository_TEST_eapis.cc
@@ -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();
}
diff --git a/paludis/repositories/e/vdb_unmerger_TEST.cc b/paludis/repositories/e/vdb_unmerger_TEST.cc
index 199f63063..e7c165e80 100644
--- a/paludis/repositories/e/vdb_unmerger_TEST.cc
+++ b/paludis/repositories/e/vdb_unmerger_TEST.cc
@@ -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;
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index bc3a0ec67..f33804192 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -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;
}
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 6f7eb7516..3fbace967 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -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);
diff --git a/paludis/repositories/unwritten/unwritten_repository_file.cc b/paludis/repositories/unwritten/unwritten_repository_file.cc
index 285249e4a..83debb902 100644
--- a/paludis/repositories/unwritten/unwritten_repository_file.cc
+++ b/paludis/repositories/unwritten/unwritten_repository_file.cc
@@ -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);
diff --git a/paludis/resolver/destination_utils.cc b/paludis/resolver/destination_utils.cc
index b7d6968f2..0a02e606b 100644
--- a/paludis/resolver/destination_utils.cc
+++ b/paludis/resolver/destination_utils.cc
@@ -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";
}
diff --git a/paludis/resolver/get_sameness.cc b/paludis/resolver/get_sameness.cc
index 6f95f083e..4a07ba6c7 100644
--- a/paludis/resolver/get_sameness.cc
+++ b/paludis/resolver/get_sameness.cc
@@ -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 */
diff --git a/paludis/resolver/make_origin_filtered_generator_helper.cc b/paludis/resolver/make_origin_filtered_generator_helper.cc
index 06af49f3f..fb022c419 100644
--- a/paludis/resolver/make_origin_filtered_generator_helper.cc
+++ b/paludis/resolver/make_origin_filtered_generator_helper.cc
@@ -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";
}
diff --git a/paludis/resolver/make_unmaskable_filter_helper.cc b/paludis/resolver/make_unmaskable_filter_helper.cc
index 4b0ec38e1..452b9da8d 100644
--- a/paludis/resolver/make_unmaskable_filter_helper.cc
+++ b/paludis/resolver/make_unmaskable_filter_helper.cc
@@ -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";
}
diff --git a/paludis/resolver/resolver_TEST_any.cc b/paludis/resolver/resolver_TEST_any.cc
index 7c1755c6f..156326a33 100644
--- a/paludis/resolver/resolver_TEST_any.cc
+++ b/paludis/resolver/resolver_TEST_any.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_binaries.cc b/paludis/resolver/resolver_TEST_binaries.cc
index babb22ea9..98a8c8640 100644
--- a/paludis/resolver/resolver_TEST_binaries.cc
+++ b/paludis/resolver/resolver_TEST_binaries.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_blockers.cc b/paludis/resolver/resolver_TEST_blockers.cc
index d1fd8ae84..b7e29c26d 100644
--- a/paludis/resolver/resolver_TEST_blockers.cc
+++ b/paludis/resolver/resolver_TEST_blockers.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_continue_on_failure.cc b/paludis/resolver/resolver_TEST_continue_on_failure.cc
index 6ea7de2c0..46e9122c4 100644
--- a/paludis/resolver/resolver_TEST_continue_on_failure.cc
+++ b/paludis/resolver/resolver_TEST_continue_on_failure.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_cycles.cc b/paludis/resolver/resolver_TEST_cycles.cc
index 0923958a0..4959097b7 100644
--- a/paludis/resolver/resolver_TEST_cycles.cc
+++ b/paludis/resolver/resolver_TEST_cycles.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_errors.cc b/paludis/resolver/resolver_TEST_errors.cc
index fe7faf5ff..137440d40 100644
--- a/paludis/resolver/resolver_TEST_errors.cc
+++ b/paludis/resolver/resolver_TEST_errors.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_fetches.cc b/paludis/resolver/resolver_TEST_fetches.cc
index 4ecd4fc9b..3fcedb14c 100644
--- a/paludis/resolver/resolver_TEST_fetches.cc
+++ b/paludis/resolver/resolver_TEST_fetches.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_promote_binaries.cc b/paludis/resolver/resolver_TEST_promote_binaries.cc
index 4c732d5b2..466507b3a 100644
--- a/paludis/resolver/resolver_TEST_promote_binaries.cc
+++ b/paludis/resolver/resolver_TEST_promote_binaries.cc
@@ -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)
{
diff --git a/paludis/resolver/resolver_TEST_purges.cc b/paludis/resolver/resolver_TEST_purges.cc
index ddb9d7db6..ef6a8f9a1 100644
--- a/paludis/resolver/resolver_TEST_purges.cc
+++ b/paludis/resolver/resolver_TEST_purges.cc
@@ -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
{
}
};
diff --git a/paludis/resolver/resolver_TEST_serialisation.cc b/paludis/resolver/resolver_TEST_serialisation.cc
index 65a14afbc..e8fcbd671 100644
--- a/paludis/resolver/resolver_TEST_serialisation.cc
+++ b/paludis/resolver/resolver_TEST_serialisation.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_simple.cc b/paludis/resolver/resolver_TEST_simple.cc
index abdd052f6..a2a0c6813 100644
--- a/paludis/resolver/resolver_TEST_simple.cc
+++ b/paludis/resolver/resolver_TEST_simple.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_subslots.cc b/paludis/resolver/resolver_TEST_subslots.cc
index 71d9d049b..7192880c8 100644
--- a/paludis/resolver/resolver_TEST_subslots.cc
+++ b/paludis/resolver/resolver_TEST_subslots.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_suggestions.cc b/paludis/resolver/resolver_TEST_suggestions.cc
index 96faa5df1..566fbbf59 100644
--- a/paludis/resolver/resolver_TEST_suggestions.cc
+++ b/paludis/resolver/resolver_TEST_suggestions.cc
@@ -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();
}
diff --git a/paludis/resolver/resolver_TEST_uninstalls.cc b/paludis/resolver/resolver_TEST_uninstalls.cc
index 654ee7cba..10918198e 100644
--- a/paludis/resolver/resolver_TEST_uninstalls.cc
+++ b/paludis/resolver/resolver_TEST_uninstalls.cc
@@ -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();
}
diff --git a/paludis/resolver/selection_with_promotion.cc b/paludis/resolver/selection_with_promotion.cc
index 1bcd2b008..af180919a 100644
--- a/paludis/resolver/selection_with_promotion.cc
+++ b/paludis/resolver/selection_with_promotion.cc
@@ -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);
}
diff --git a/paludis/selection.cc b/paludis/selection.cc
index 74e7c5f4b..fed052803 100644
--- a/paludis/selection.cc
+++ b/paludis/selection.cc
@@ -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);
}
diff --git a/paludis/set_file.cc b/paludis/set_file.cc
index 00a5747f7..70c55abda 100644
--- a/paludis/set_file.cc
+++ b/paludis/set_file.cc
@@ -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>
diff --git a/paludis/stripper_TEST.cc b/paludis/stripper_TEST.cc
index 7bd54b2b9..662d68850 100644
--- a/paludis/stripper_TEST.cc
+++ b/paludis/stripper_TEST.cc
@@ -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
{
}
diff --git a/paludis/tar_merger_TEST.cc b/paludis/tar_merger_TEST.cc
index 2312bd509..933609074 100644
--- a/paludis/tar_merger_TEST.cc
+++ b/paludis/tar_merger_TEST.cc
@@ -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
{
}
};
diff --git a/paludis/unchoices_key.cc b/paludis/unchoices_key.cc
index 51a16e27a..1e5d0be01 100644
--- a/paludis/unchoices_key.cc
+++ b/paludis/unchoices_key.cc
@@ -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;
}
diff --git a/src/clients/cave/cmd_config.cc b/src/clients/cave/cmd_config.cc
index 8e4c94979..05766eab3 100644
--- a/src/clients/cave/cmd_config.cc
+++ b/src/clients/cave/cmd_config.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_contents.cc b/src/clients/cave/cmd_contents.cc
index 46e35c4fe..5af7a54ed 100644
--- a/src/clients/cave/cmd_contents.cc
+++ b/src/clients/cave/cmd_contents.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_digest.cc b/src/clients/cave/cmd_digest.cc
index 039eb1f0e..8a64fb822 100644
--- a/src/clients/cave/cmd_digest.cc
+++ b/src/clients/cave/cmd_digest.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 39736d53f..bd8fff5ae 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -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;
diff --git a/src/clients/cave/cmd_dump_cave_formats_conf.cc b/src/clients/cave/cmd_dump_cave_formats_conf.cc
index c9bc557af..b9526e711 100644
--- a/src/clients/cave/cmd_dump_cave_formats_conf.cc
+++ b/src/clients/cave/cmd_dump_cave_formats_conf.cc
@@ -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 "
diff --git a/src/clients/cave/cmd_executables.cc b/src/clients/cave/cmd_executables.cc
index 4130225a6..0e6a948fc 100644
--- a/src/clients/cave/cmd_executables.cc
+++ b/src/clients/cave/cmd_executables.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index 6fbc6a14a..700946144 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -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)
{
diff --git a/src/clients/cave/cmd_find_candidates.cc b/src/clients/cave/cmd_find_candidates.cc
index f7b1dd39c..684a92348 100644
--- a/src/clients/cave/cmd_find_candidates.cc
+++ b/src/clients/cave/cmd_find_candidates.cc
@@ -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 "
diff --git a/src/clients/cave/cmd_fix_cache.cc b/src/clients/cave/cmd_fix_cache.cc
index 01d580b3c..cb1ac303f 100644
--- a/src/clients/cave/cmd_fix_cache.cc
+++ b/src/clients/cave/cmd_fix_cache.cc
@@ -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 "
diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc
index 9bb8efa5f..bb284e82b 100644
--- a/src/clients/cave/cmd_fix_linkage.cc
+++ b/src/clients/cave/cmd_fix_linkage.cc
@@ -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 "";
}
diff --git a/src/clients/cave/cmd_generate_metadata.cc b/src/clients/cave/cmd_generate_metadata.cc
index b5b29649b..213f2b5d6 100644
--- a/src/clients/cave/cmd_generate_metadata.cc
+++ b/src/clients/cave/cmd_generate_metadata.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_graph_jobs.cc b/src/clients/cave/cmd_graph_jobs.cc
index c01cfc114..351bbe449 100644
--- a/src/clients/cave/cmd_graph_jobs.cc
+++ b/src/clients/cave/cmd_graph_jobs.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_has_version.cc b/src/clients/cave/cmd_has_version.cc
index 2bf5210a2..3a3cf0919 100644
--- a/src/clients/cave/cmd_has_version.cc
+++ b/src/clients/cave/cmd_has_version.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_help.cc b/src/clients/cave/cmd_help.cc
index 71cfb1aa9..68fa5c582 100644
--- a/src/clients/cave/cmd_help.cc
+++ b/src/clients/cave/cmd_help.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_import.cc b/src/clients/cave/cmd_import.cc
index 535937f6c..b1931be40 100644
--- a/src/clients/cave/cmd_import.cc
+++ b/src/clients/cave/cmd_import.cc
@@ -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 "";
}
diff --git a/src/clients/cave/cmd_info.cc b/src/clients/cave/cmd_info.cc
index 6a722a044..72a755e73 100644
--- a/src/clients/cave/cmd_info.cc
+++ b/src/clients/cave/cmd_info.cc
@@ -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 "
diff --git a/src/clients/cave/cmd_manage_search_index.cc b/src/clients/cave/cmd_manage_search_index.cc
index 58337dec8..103b090d6 100644
--- a/src/clients/cave/cmd_manage_search_index.cc
+++ b/src/clients/cave/cmd_manage_search_index.cc
@@ -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 "
diff --git a/src/clients/cave/cmd_match.cc b/src/clients/cave/cmd_match.cc
index 60b08bb2d..adc8eefc8 100644
--- a/src/clients/cave/cmd_match.cc
+++ b/src/clients/cave/cmd_match.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_mirror.cc b/src/clients/cave/cmd_mirror.cc
index cead6747d..8655d19c0 100644
--- a/src/clients/cave/cmd_mirror.cc
+++ b/src/clients/cave/cmd_mirror.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_owner.cc b/src/clients/cave/cmd_owner.cc
index 5d582cd6f..ee790b328 100644
--- a/src/clients/cave/cmd_owner.cc
+++ b/src/clients/cave/cmd_owner.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_perform.cc b/src/clients/cave/cmd_perform.cc
index 96b6eba12..cf38b80fd 100644
--- a/src/clients/cave/cmd_perform.cc
+++ b/src/clients/cave/cmd_perform.cc
@@ -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;
diff --git a/src/clients/cave/cmd_print_best_version.cc b/src/clients/cave/cmd_print_best_version.cc
index 41d115aed..222e9716e 100644
--- a/src/clients/cave/cmd_print_best_version.cc
+++ b/src/clients/cave/cmd_print_best_version.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_categories.cc b/src/clients/cave/cmd_print_categories.cc
index 312704d03..f27693357 100644
--- a/src/clients/cave/cmd_print_categories.cc
+++ b/src/clients/cave/cmd_print_categories.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_checksum.cc b/src/clients/cave/cmd_print_checksum.cc
index c22624361..cc0c62279 100644
--- a/src/clients/cave/cmd_print_checksum.cc
+++ b/src/clients/cave/cmd_print_checksum.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_checksum_algorithms.cc b/src/clients/cave/cmd_print_checksum_algorithms.cc
index a7001894b..5d95e4339 100644
--- a/src/clients/cave/cmd_print_checksum_algorithms.cc
+++ b/src/clients/cave/cmd_print_checksum_algorithms.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_commands.cc b/src/clients/cave/cmd_print_commands.cc
index f32c0c590..0b2e00f7d 100644
--- a/src/clients/cave/cmd_print_commands.cc
+++ b/src/clients/cave/cmd_print_commands.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_dependent_ids.cc b/src/clients/cave/cmd_print_dependent_ids.cc
index d1fbad7b4..ba5817d4c 100644
--- a/src/clients/cave/cmd_print_dependent_ids.cc
+++ b/src/clients/cave/cmd_print_dependent_ids.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_environment_metadata.cc b/src/clients/cave/cmd_print_environment_metadata.cc
index c5ee16ab1..e0e2fd832 100644
--- a/src/clients/cave/cmd_print_environment_metadata.cc
+++ b/src/clients/cave/cmd_print_environment_metadata.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_id_actions.cc b/src/clients/cave/cmd_print_id_actions.cc
index aab4d9c3a..8bc8b1b3c 100644
--- a/src/clients/cave/cmd_print_id_actions.cc
+++ b/src/clients/cave/cmd_print_id_actions.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_id_contents.cc b/src/clients/cave/cmd_print_id_contents.cc
index e7d0aad13..f8d81f4f4 100644
--- a/src/clients/cave/cmd_print_id_contents.cc
+++ b/src/clients/cave/cmd_print_id_contents.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_id_environment_variable.cc b/src/clients/cave/cmd_print_id_environment_variable.cc
index ae1bea63d..ad4f2bedf 100644
--- a/src/clients/cave/cmd_print_id_environment_variable.cc
+++ b/src/clients/cave/cmd_print_id_environment_variable.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_id_executables.cc b/src/clients/cave/cmd_print_id_executables.cc
index 898e9c8cf..d7903083c 100644
--- a/src/clients/cave/cmd_print_id_executables.cc
+++ b/src/clients/cave/cmd_print_id_executables.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_id_masks.cc b/src/clients/cave/cmd_print_id_masks.cc
index 02f735e7d..acd0a166b 100644
--- a/src/clients/cave/cmd_print_id_masks.cc
+++ b/src/clients/cave/cmd_print_id_masks.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_id_metadata.cc b/src/clients/cave/cmd_print_id_metadata.cc
index 139c4403d..e18d54658 100644
--- a/src/clients/cave/cmd_print_id_metadata.cc
+++ b/src/clients/cave/cmd_print_id_metadata.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_id_size.cc b/src/clients/cave/cmd_print_id_size.cc
index 563310d1a..d4cf34608 100644
--- a/src/clients/cave/cmd_print_id_size.cc
+++ b/src/clients/cave/cmd_print_id_size.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_print_ids.cc b/src/clients/cave/cmd_print_ids.cc
index 0dc3d57d7..bf8e12886 100644
--- a/src/clients/cave/cmd_print_ids.cc
+++ b/src/clients/cave/cmd_print_ids.cc
@@ -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>());
diff --git a/src/clients/cave/cmd_print_owners.cc b/src/clients/cave/cmd_print_owners.cc
index 6e24247f1..a90047cba 100644
--- a/src/clients/cave/cmd_print_owners.cc
+++ b/src/clients/cave/cmd_print_owners.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_print_packages.cc b/src/clients/cave/cmd_print_packages.cc
index 59ef434a2..278f2e413 100644
--- a/src/clients/cave/cmd_print_packages.cc
+++ b/src/clients/cave/cmd_print_packages.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_print_repositories.cc b/src/clients/cave/cmd_print_repositories.cc
index c5afef7b7..ea8b45412 100644
--- a/src/clients/cave/cmd_print_repositories.cc
+++ b/src/clients/cave/cmd_print_repositories.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_repository_formats.cc b/src/clients/cave/cmd_print_repository_formats.cc
index 942c9bb9d..0c7134323 100644
--- a/src/clients/cave/cmd_print_repository_formats.cc
+++ b/src/clients/cave/cmd_print_repository_formats.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_repository_metadata.cc b/src/clients/cave/cmd_print_repository_metadata.cc
index abeed8a96..2a30d7638 100644
--- a/src/clients/cave/cmd_print_repository_metadata.cc
+++ b/src/clients/cave/cmd_print_repository_metadata.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_resolution_required_confirmations.cc b/src/clients/cave/cmd_print_resolution_required_confirmations.cc
index 9e47a69c1..f8250bf81 100644
--- a/src/clients/cave/cmd_print_resolution_required_confirmations.cc
+++ b/src/clients/cave/cmd_print_resolution_required_confirmations.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_set.cc b/src/clients/cave/cmd_print_set.cc
index 7d74578ab..63a1703f6 100644
--- a/src/clients/cave/cmd_print_set.cc
+++ b/src/clients/cave/cmd_print_set.cc
@@ -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.";
}
diff --git a/src/clients/cave/cmd_print_sets.cc b/src/clients/cave/cmd_print_sets.cc
index 18b915cf0..572c62548 100644
--- a/src/clients/cave/cmd_print_sets.cc
+++ b/src/clients/cave/cmd_print_sets.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_spec.cc b/src/clients/cave/cmd_print_spec.cc
index 399e848ab..21fb4b975 100644
--- a/src/clients/cave/cmd_print_spec.cc
+++ b/src/clients/cave/cmd_print_spec.cc
@@ -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.";
diff --git a/src/clients/cave/cmd_print_sync_protocols.cc b/src/clients/cave/cmd_print_sync_protocols.cc
index 529e94f08..ce262f896 100644
--- a/src/clients/cave/cmd_print_sync_protocols.cc
+++ b/src/clients/cave/cmd_print_sync_protocols.cc
@@ -42,17 +42,17 @@ namespace
struct PrintSyncProtocolsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-sync-protocols";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of sync protocols.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints a list of sync protocols. No formatting is used, making the output suitable for "
"parsing by scripts.";
diff --git a/src/clients/cave/cmd_print_unmanaged_files.cc b/src/clients/cave/cmd_print_unmanaged_files.cc
index ce27736e8..ed3f25888 100644
--- a/src/clients/cave/cmd_print_unmanaged_files.cc
+++ b/src/clients/cave/cmd_print_unmanaged_files.cc
@@ -53,17 +53,17 @@ namespace
struct PrintUnmanagedFilesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-unmanaged-files";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints a list of unmanaged files.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints all files under a specified root which is not owned "
"by an installed package. No formatting is used, making the "
diff --git a/src/clients/cave/cmd_print_unused_distfiles.cc b/src/clients/cave/cmd_print_unused_distfiles.cc
index 08af2718c..6bea3554a 100644
--- a/src/clients/cave/cmd_print_unused_distfiles.cc
+++ b/src/clients/cave/cmd_print_unused_distfiles.cc
@@ -57,17 +57,17 @@ namespace
struct PrintUnusedDistfilesCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave print-unused-distfiles";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Prints unused distfiles.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Prints all distfiles not used by any installed package. No "
"formatting is used, making the output suitable for parsing by scripts.";
diff --git a/src/clients/cave/cmd_purge.cc b/src/clients/cave/cmd_purge.cc
index 4e664cba3..ba99247d3 100644
--- a/src/clients/cave/cmd_purge.cc
+++ b/src/clients/cave/cmd_purge.cc
@@ -64,17 +64,17 @@ namespace
add_note("All options available for 'cave resolve' are also permitted. See 'man cave-resolve' for details.");
}
- std::string app_name() const
+ std::string app_name() const override
{
return "cave purge";
}
- std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Uninstall unused packages.";
}
- std::string app_description() const
+ std::string app_description() const override
{
return "Uninstalls any package that is not either in 'world' or a dependency of a package "
"in 'world'.";
diff --git a/src/clients/cave/cmd_report.cc b/src/clients/cave/cmd_report.cc
index e25c87a09..436b30921 100644
--- a/src/clients/cave/cmd_report.cc
+++ b/src/clients/cave/cmd_report.cc
@@ -72,17 +72,17 @@ namespace
struct ReportCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave report";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Display a summary of potential problems with installed packages.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Displays a formatted summary of potential problems with installed packages.";
}
diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
index 01680e58c..53a75b7b1 100644
--- a/src/clients/cave/cmd_resolve.cc
+++ b/src/clients/cave/cmd_resolve.cc
@@ -53,18 +53,18 @@ namespace
add_usage_line("[ -x|--execute ] !spec ...");
}
- std::string app_name() const
+ std::string app_name() const override
{
return "cave resolve";
}
- std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Display how to resolve one or more targets, and possibly then "
"perform that resolution.";
}
- std::string app_description() const
+ std::string app_description() const override
{
return "Displays how to resolve one or more targets. If instructed, then "
"executes the relevant install and uninstall actions to perform that "
diff --git a/src/clients/cave/cmd_resume.cc b/src/clients/cave/cmd_resume.cc
index 48f87df55..375ba0b02 100644
--- a/src/clients/cave/cmd_resume.cc
+++ b/src/clients/cave/cmd_resume.cc
@@ -84,17 +84,17 @@ namespace
add_usage_line("--resume-file state [ --retry-failed ] [ --retry-skipped ]");
}
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave resume";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Resume a failed resolution from 'cave resolve'";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Resumes a failed resultion from 'cave resolve'. To enable resumes, use "
"'cave resolve --resume-file state --execute', and then if errors occur, use "
diff --git a/src/clients/cave/cmd_search.cc b/src/clients/cave/cmd_search.cc
index 89f5b038d..3679e1155 100644
--- a/src/clients/cave/cmd_search.cc
+++ b/src/clients/cave/cmd_search.cc
@@ -68,17 +68,17 @@ namespace
struct SearchCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave search";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Search for packages with particular characteristics.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Searches for packages with particular characteristics.";
}
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index 8fb2b6e74..966a7b28f 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -76,17 +76,17 @@ namespace
struct ShowCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave show";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Display a summary of a given object.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Displays a formatted summary of a given object. If the object is a set, the set's "
"contents are listed. If the object is a repository name, information about the repository "
diff --git a/src/clients/cave/cmd_size.cc b/src/clients/cave/cmd_size.cc
index fed10c289..048d63cc3 100644
--- a/src/clients/cave/cmd_size.cc
+++ b/src/clients/cave/cmd_size.cc
@@ -42,17 +42,17 @@ namespace
struct SizeCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave size";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Shows the size of files installed by a package.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Shows the size of files installed by a package.";
}
diff --git a/src/clients/cave/cmd_sync.cc b/src/clients/cave/cmd_sync.cc
index 2395b0ae5..5ca1f9de2 100644
--- a/src/clients/cave/cmd_sync.cc
+++ b/src/clients/cave/cmd_sync.cc
@@ -67,17 +67,17 @@ namespace
args::AliasArg a_suffix;
args::StringArg a_revision;
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave sync";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Sync all or specified repositories.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Syncs repositories. If any repository names are specified, these repositories "
"are synced. Otherwise, all syncable repositories are synced.";
@@ -131,7 +131,7 @@ namespace
{
}
- virtual std::string queue_name() const
+ std::string queue_name() const override
{
/* if we're sequential, there's just one queue */
if (cmdline.a_sequential.specified())
@@ -149,17 +149,17 @@ namespace
return "";
}
- virtual std::string unique_id() const
+ std::string unique_id() const override
{
return stringify(name);
}
- virtual bool can_run() const
+ bool can_run() const override
{
return true;
}
- virtual void pre_execute_exclusive()
+ void pre_execute_exclusive() override
{
try
{
@@ -196,7 +196,7 @@ namespace
}
}
- virtual void execute_threaded()
+ void execute_threaded() override
{
if (abort)
return;
@@ -247,7 +247,7 @@ namespace
}
}
- virtual void flush_threaded()
+ void flush_threaded() override
{
if (output_manager->want_to_flush())
display_active();
@@ -260,7 +260,7 @@ namespace
}
}
- virtual void post_execute_exclusive()
+ void post_execute_exclusive() override
{
try
{
diff --git a/src/clients/cave/cmd_sync_protocol_options.cc b/src/clients/cave/cmd_sync_protocol_options.cc
index 46b01c0fb..d412ec5e8 100644
--- a/src/clients/cave/cmd_sync_protocol_options.cc
+++ b/src/clients/cave/cmd_sync_protocol_options.cc
@@ -49,17 +49,17 @@ namespace
struct SyncProtocolOptionsCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave sync-protocol-options";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Displays options for a given sync protocol.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Displays options for a given sync protocol.";
}
diff --git a/src/clients/cave/cmd_uninstall.cc b/src/clients/cave/cmd_uninstall.cc
index 04f030d6f..de907f0e4 100644
--- a/src/clients/cave/cmd_uninstall.cc
+++ b/src/clients/cave/cmd_uninstall.cc
@@ -75,17 +75,17 @@ namespace
add_note("All options available for 'cave resolve' are also permitted. See 'man cave-resolve' for details.");
}
- std::string app_name() const
+ std::string app_name() const override
{
return "cave uninstall";
}
- std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Uninstall one or more packages.";
}
- std::string app_description() const
+ std::string app_description() const override
{
return "Uninstalls one or more packages. Note that 'cave uninstall' simply rewrites the supplied "
"dependency specifications and then uses 'cave resolve' to do the work; 'cave uninstall foo' is "
diff --git a/src/clients/cave/cmd_update_world.cc b/src/clients/cave/cmd_update_world.cc
index afc5a26d9..2b0e975a1 100644
--- a/src/clients/cave/cmd_update_world.cc
+++ b/src/clients/cave/cmd_update_world.cc
@@ -49,17 +49,17 @@ namespace
struct UpdateWorldCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave update-world";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Updates the world set.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Adds or removes items from the world set. This command is only for changing the contents "
"of the world set; it does not install or uninstall anything.";
diff --git a/src/clients/cave/cmd_verify.cc b/src/clients/cave/cmd_verify.cc
index c22b7ec24..83392fc75 100644
--- a/src/clients/cave/cmd_verify.cc
+++ b/src/clients/cave/cmd_verify.cc
@@ -65,17 +65,17 @@ namespace
struct VerifyCommandLine :
CaveCommandCommandLine
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "cave verify";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "Verify that an installed package's files haven't changed.";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "Verify than an installed package's files haven't changed. Note that there are "
"legitimate reasons for some files (such as configuration files) to have been "
diff --git a/src/clients/cave/man_cave.cc b/src/clients/cave/man_cave.cc
index 586d9fcf3..4adb61eb6 100644
--- a/src/clients/cave/man_cave.cc
+++ b/src/clients/cave/man_cave.cc
@@ -36,17 +36,17 @@ namespace
struct ManCommandLine :
paludis::args::ArgsHandler
{
- virtual std::string app_name() const
+ std::string app_name() const override
{
return "";
}
- virtual std::string app_description() const
+ std::string app_description() const override
{
return "";
}
- virtual std::string app_synopsis() const
+ std::string app_synopsis() const override
{
return "";
}