aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
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 /paludis/repositories
parentd81457e4208ba6ed94b86e430c567e4c0e1f7046 (diff)
downloadpaludis-1ad5f5ce2025f1db0ea5dd1fcf72223430f143b4.tar.gz
paludis-1ad5f5ce2025f1db0ea5dd1fcf72223430f143b4.tar.xz
modernize: use override annotations
Automated addition of override to overridden functions. NFC.
Diffstat (limited to 'paludis/repositories')
-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
18 files changed, 91 insertions, 91 deletions
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);