diff options
196 files changed, 290 insertions, 923 deletions
diff --git a/doc/api/cplusplus/examples/example_command_line.cc b/doc/api/cplusplus/examples/example_command_line.cc index cfd07ce1e..b19dd2e63 100644 --- a/doc/api/cplusplus/examples/example_command_line.cc +++ b/doc/api/cplusplus/examples/example_command_line.cc @@ -50,9 +50,7 @@ CommandLine::app_description() const return "This is an example program."; } -CommandLine::~CommandLine() -{ -} +CommandLine::~CommandLine() = default; void examples::show_help_and_exit(const char * const argv[]) diff --git a/paludis/about_metadata.cc b/paludis/about_metadata.cc index fd220dfa4..3f850b7ce 100644 --- a/paludis/about_metadata.cc +++ b/paludis/about_metadata.cc @@ -72,9 +72,7 @@ AboutMetadata::AboutMetadata() : add_metadata_key(_imp->build_date_key); } -AboutMetadata::~AboutMetadata() -{ -} +AboutMetadata::~AboutMetadata() = default; void AboutMetadata::need_keys_added() const diff --git a/paludis/action.cc b/paludis/action.cc index 38f7d31e5..18abb0878 100644 --- a/paludis/action.cc +++ b/paludis/action.cc @@ -32,9 +32,7 @@ using namespace paludis; #include <paludis/action-se.cc> -Action::~Action() -{ -} +Action::~Action() = default; namespace paludis { @@ -56,9 +54,7 @@ InstallAction::InstallAction(const InstallActionOptions & o) : { } -InstallAction::~InstallAction() -{ -} +InstallAction::~InstallAction() = default; namespace paludis { @@ -80,9 +76,7 @@ FetchAction::FetchAction(const FetchActionOptions & o) : { } -FetchAction::~FetchAction() -{ -} +FetchAction::~FetchAction() = default; namespace paludis { @@ -104,9 +98,7 @@ UninstallAction::UninstallAction(const UninstallActionOptions & o) : { } -UninstallAction::~UninstallAction() -{ -} +UninstallAction::~UninstallAction() = default; namespace paludis { @@ -130,9 +122,7 @@ PretendAction::PretendAction(const PretendActionOptions & o) : { } -PretendAction::~PretendAction() -{ -} +PretendAction::~PretendAction() = default; bool PretendAction::failed() const @@ -166,9 +156,7 @@ PretendFetchAction::PretendFetchAction(const FetchActionOptions & o) : { } -PretendFetchAction::~PretendFetchAction() -{ -} +PretendFetchAction::~PretendFetchAction() = default; namespace paludis { @@ -190,9 +178,7 @@ InfoAction::InfoAction(const InfoActionOptions & o) : { } -InfoAction::~InfoAction() -{ -} +InfoAction::~InfoAction() = default; namespace paludis { @@ -214,13 +200,9 @@ ConfigAction::ConfigAction(const ConfigActionOptions & o) : { } -ConfigAction::~ConfigAction() -{ -} +ConfigAction::~ConfigAction() = default; -SupportsActionTestBase::~SupportsActionTestBase() -{ -} +SupportsActionTestBase::~SupportsActionTestBase() = default; ActionFailedError::ActionFailedError(const std::string & msg) noexcept : Exception(msg) diff --git a/paludis/args/args_TEST.cc b/paludis/args/args_TEST.cc index e161a480c..539613aa4 100644 --- a/paludis/args/args_TEST.cc +++ b/paludis/args/args_TEST.cc @@ -97,9 +97,7 @@ CommandLine::CommandLine() : { } -CommandLine::~CommandLine() -{ -} +CommandLine::~CommandLine() = default; TEST(Args, Simple) { diff --git a/paludis/args/args_group.cc b/paludis/args/args_group.cc index 8b0c61785..9ad4d560e 100644 --- a/paludis/args/args_group.cc +++ b/paludis/args/args_group.cc @@ -77,9 +77,7 @@ ArgsGroup::remove(ArgsOption * const value) remove(); } -ArgsGroup::~ArgsGroup() -{ -} +ArgsGroup::~ArgsGroup() = default; ArgsGroup::ConstIterator ArgsGroup::begin() const diff --git a/paludis/args/args_handler.cc b/paludis/args/args_handler.cc index 89195eb4f..9e973529e 100644 --- a/paludis/args/args_handler.cc +++ b/paludis/args/args_handler.cc @@ -133,9 +133,7 @@ ArgsHandler::ArgsHandler() : { } -ArgsHandler::~ArgsHandler() -{ -} +ArgsHandler::~ArgsHandler() = default; void ArgsHandler::add_usage_line(const std::string & l) diff --git a/paludis/args/args_option.cc b/paludis/args/args_option.cc index 3d786d722..4ae2e07f9 100644 --- a/paludis/args/args_option.cc +++ b/paludis/args/args_option.cc @@ -70,10 +70,6 @@ ArgsOption::ArgsOption(ArgsGroup * const g, const std::string & our_long_name, g->section()->handler()->add_option(this, our_long_name, our_short_name); } -ArgsOption::~ArgsOption() -{ -} - void ArgsOption::remove() { @@ -88,10 +84,6 @@ SwitchArg::SwitchArg(ArgsGroup * const our_group, const std::string & our_long_n { } -SwitchArg::~SwitchArg() -{ -} - const std::string SwitchArg::forwardable_string() const { @@ -294,9 +286,7 @@ StringSequenceArg::StringSequenceArg(ArgsGroup * const g, const std::string & ou { } -StringSequenceArg::~StringSequenceArg() -{ -} +StringSequenceArg::~StringSequenceArg() = default; StringSequenceArg::ConstIterator StringSequenceArg::begin_args() const @@ -411,9 +401,7 @@ StringSetArg::StringSetArgOptions::StringSetArgOptions(const StringSetArg::Strin std::back_inserter(_imp->options)); } -StringSetArg::StringSetArgOptions::~StringSetArgOptions() -{ -} +StringSetArg::StringSetArgOptions::~StringSetArgOptions() = default; StringSetArg::StringSetArgOptions::StringSetArgOptions() : _imp() @@ -444,9 +432,7 @@ StringArg::set_argument(const std::string & arg) _argument = arg; } -EnumArg::~EnumArg() -{ -} +EnumArg::~EnumArg() = default; EnumArg::EnumArgOptions::EnumArgOptions(const std::string & opt, const std::string & desc) : _imp() @@ -490,9 +476,7 @@ EnumArg::EnumArgOptions::operator() (const std::string & opt, const char s, cons return *this; } -EnumArg::EnumArgOptions::~EnumArgOptions() -{ -} +EnumArg::EnumArgOptions::~EnumArgOptions() = default; EnumArg::EnumArg(ArgsGroup * const our_group, const std::string & our_long_name, const char our_short_name, const std::string & our_description, @@ -545,9 +529,7 @@ EnumArg::forwardable_args() const return result; } -StringSetArg::~StringSetArg() -{ -} +StringSetArg::~StringSetArg() = default; StringSetArg::AllowedArgConstIterator StringSetArg::begin_allowed_args() const diff --git a/paludis/args/args_option.hh b/paludis/args/args_option.hh index cea351f1c..96858594c 100644 --- a/paludis/args/args_option.hh +++ b/paludis/args/args_option.hh @@ -99,7 +99,7 @@ namespace paludis /** * Destructor. */ - virtual ~ArgsOption(); + virtual ~ArgsOption() = default; public: /** @@ -217,7 +217,7 @@ namespace paludis SwitchArg(ArgsGroup * const group, const std::string & long_name, char short_name, const std::string & description, const bool can_be_negated); - ~SwitchArg(); + ~SwitchArg() = default; virtual bool can_be_negated() const; diff --git a/paludis/args/args_section.cc b/paludis/args/args_section.cc index 0e65b8460..aa3c2e5d6 100644 --- a/paludis/args/args_section.cc +++ b/paludis/args/args_section.cc @@ -56,9 +56,7 @@ ArgsSection::ArgsSection(ArgsHandler * const h, const std::string & s) : h->add(this); } -ArgsSection::~ArgsSection() -{ -} +ArgsSection::~ArgsSection() = default; ArgsSection::GroupsConstIterator ArgsSection::begin() const diff --git a/paludis/args/args_visitor.cc b/paludis/args/args_visitor.cc index 76b533656..6db28ef28 100644 --- a/paludis/args/args_visitor.cc +++ b/paludis/args/args_visitor.cc @@ -72,9 +72,7 @@ ArgsVisitor::ArgsVisitor(ArgsHandler::ArgsIterator * ai, ArgsHandler::ArgsIterat { } -ArgsVisitor::~ArgsVisitor() -{ -} +ArgsVisitor::~ArgsVisitor() = default; const std::string & ArgsVisitor::get_param(const ArgsOption & arg) diff --git a/paludis/args/log_level_arg.cc b/paludis/args/log_level_arg.cc index 294b653f3..239d7e011 100644 --- a/paludis/args/log_level_arg.cc +++ b/paludis/args/log_level_arg.cc @@ -35,10 +35,6 @@ LogLevelArg::LogLevelArg(ArgsGroup * const grp, const std::string & ln, { } -LogLevelArg::~LogLevelArg() -{ -} - LogLevel LogLevelArg::option() const { diff --git a/paludis/args/log_level_arg.hh b/paludis/args/log_level_arg.hh index fb6610cb0..40c3c7415 100644 --- a/paludis/args/log_level_arg.hh +++ b/paludis/args/log_level_arg.hh @@ -52,7 +52,7 @@ namespace paludis ///\{ LogLevelArg(ArgsGroup * const, const std::string &, char); - ~LogLevelArg(); + ~LogLevelArg() = default; ///\} diff --git a/paludis/args/man.cc b/paludis/args/man.cc index c79632da7..9dc8d77ce 100644 --- a/paludis/args/man.cc +++ b/paludis/args/man.cc @@ -185,9 +185,7 @@ paludis::args::generate_doc(DocWriter & dw, const ArgsHandler * const h) } } -DocWriter::~DocWriter() -{ -} +DocWriter::~DocWriter() = default; namespace { @@ -219,10 +217,6 @@ AsciidocWriter::AsciidocWriter(std::ostream & os) : { } -AsciidocWriter::~AsciidocWriter() -{ -} - void AsciidocWriter::heading(const std::string & name, const std::string & section_, const std::string & synopsis) { diff --git a/paludis/args/man.hh b/paludis/args/man.hh index 9451c4b5a..fe77eecdd 100644 --- a/paludis/args/man.hh +++ b/paludis/args/man.hh @@ -115,7 +115,7 @@ namespace paludis ///\name Basic operations ///\{ AsciidocWriter(std::ostream & os); - ~AsciidocWriter(); + ~AsciidocWriter() = default; ///\} void heading(const std::string & name, const std::string & section, diff --git a/paludis/broken_linkage_configuration.cc b/paludis/broken_linkage_configuration.cc index 86f1bb560..dcec9766d 100644 --- a/paludis/broken_linkage_configuration.cc +++ b/paludis/broken_linkage_configuration.cc @@ -218,9 +218,7 @@ BrokenLinkageConfiguration::BrokenLinkageConfiguration(const FSPath & root) : join(_imp->ld_so_conf.begin(), _imp->ld_so_conf.end(), " ") << "\""; } -BrokenLinkageConfiguration::~BrokenLinkageConfiguration() -{ -} +BrokenLinkageConfiguration::~BrokenLinkageConfiguration() = default; void Imp<BrokenLinkageConfiguration>::load_from_environment() diff --git a/paludis/broken_linkage_finder.cc b/paludis/broken_linkage_finder.cc index 169c97a50..fbe8623db 100644 --- a/paludis/broken_linkage_finder.cc +++ b/paludis/broken_linkage_finder.cc @@ -191,9 +191,7 @@ BrokenLinkageFinder::BrokenLinkageFinder(const Environment * env, const std::sha _imp->checkers.clear(); } -BrokenLinkageFinder::~BrokenLinkageFinder() -{ -} +BrokenLinkageFinder::~BrokenLinkageFinder() = default; void Imp<BrokenLinkageFinder>::search_directory(const FSPath & directory) diff --git a/paludis/choice.cc b/paludis/choice.cc index 88d614874..8c3c398bf 100644 --- a/paludis/choice.cc +++ b/paludis/choice.cc @@ -173,9 +173,7 @@ Choices::Choices() : { } -Choices::~Choices() -{ -} +Choices::~Choices() = default; void Choices::add(const std::shared_ptr<const Choice> & c) @@ -259,9 +257,7 @@ Choice::Choice(const ChoiceParams & p) : { } -Choice::~Choice() -{ -} +Choice::~Choice() = default; void Choice::add(const std::shared_ptr<const ChoiceValue> & v) @@ -329,9 +325,7 @@ Choice::end() const return ConstIterator(_imp->values.end()); } -ChoiceValue::~ChoiceValue() -{ -} +ChoiceValue::~ChoiceValue() = default; namespace paludis { diff --git a/paludis/comma_separated_dep_pretty_printer.cc b/paludis/comma_separated_dep_pretty_printer.cc index 5d7784458..da6b1b1cc 100644 --- a/paludis/comma_separated_dep_pretty_printer.cc +++ b/paludis/comma_separated_dep_pretty_printer.cc @@ -57,9 +57,7 @@ CommaSeparatedDepPrettyPrinter::CommaSeparatedDepPrettyPrinter( { } -CommaSeparatedDepPrettyPrinter::~CommaSeparatedDepPrettyPrinter() -{ -} +CommaSeparatedDepPrettyPrinter::~CommaSeparatedDepPrettyPrinter() = default; void CommaSeparatedDepPrettyPrinter::visit(const DependencySpecTree::NodeType<PackageDepSpec>::Type & node) diff --git a/paludis/contents.cc b/paludis/contents.cc index b53a755be..ed1fc8368 100644 --- a/paludis/contents.cc +++ b/paludis/contents.cc @@ -47,9 +47,7 @@ ContentsEntry::ContentsEntry(const FSPath & n) : add_metadata_key(_imp->location_key); } -ContentsEntry::~ContentsEntry() -{ -} +ContentsEntry::~ContentsEntry() = default; void ContentsEntry::need_keys_added() const @@ -86,9 +84,7 @@ ContentsFileEntry::ContentsFileEntry(const FSPath & our_name, add_metadata_key(_imp->part_key); } -ContentsFileEntry::~ContentsFileEntry() -{ -} +ContentsFileEntry::~ContentsFileEntry() = default; const std::shared_ptr<const MetadataValueKey<std::string> > ContentsFileEntry::part_key() const @@ -134,9 +130,7 @@ ContentsSymEntry::ContentsSymEntry(const FSPath & our_name, add_metadata_key(_imp->part_key); } -ContentsSymEntry::~ContentsSymEntry() -{ -} +ContentsSymEntry::~ContentsSymEntry() = default; const std::shared_ptr<const MetadataValueKey<std::string> > ContentsSymEntry::target_key() const @@ -170,9 +164,7 @@ Contents::Contents() : { } -Contents::~Contents() -{ -} +Contents::~Contents() = default; void Contents::add(const std::shared_ptr<const ContentsEntry> & c) diff --git a/paludis/create_output_manager_info.cc b/paludis/create_output_manager_info.cc index 34a6c0d4a..e23fd796c 100644 --- a/paludis/create_output_manager_info.cc +++ b/paludis/create_output_manager_info.cc @@ -124,9 +124,7 @@ CreateOutputManagerForPackageIDActionInfo::CreateOutputManagerForPackageIDAction { } -CreateOutputManagerForPackageIDActionInfo::~CreateOutputManagerForPackageIDActionInfo() -{ -} +CreateOutputManagerForPackageIDActionInfo::~CreateOutputManagerForPackageIDActionInfo() = default; const std::shared_ptr<const PackageID> CreateOutputManagerForPackageIDActionInfo::package_id() const @@ -195,9 +193,7 @@ CreateOutputManagerForRepositorySyncInfo::CreateOutputManagerForRepositorySyncIn { } -CreateOutputManagerForRepositorySyncInfo::~CreateOutputManagerForRepositorySyncInfo() -{ -} +CreateOutputManagerForRepositorySyncInfo::~CreateOutputManagerForRepositorySyncInfo() = default; const RepositoryName CreateOutputManagerForRepositorySyncInfo::repository_name() const diff --git a/paludis/dep_label.cc b/paludis/dep_label.cc index eb1df38d1..59a614f60 100644 --- a/paludis/dep_label.cc +++ b/paludis/dep_label.cc @@ -45,9 +45,7 @@ paludis::operator<< (std::ostream & s, const DependenciesLabel & l) return s; } -URILabel::~URILabel() -{ -} +URILabel::~URILabel() = default; template <typename T_> SpecificURILabel<T_>::SpecificURILabel(const std::string & t) : @@ -67,9 +65,7 @@ SpecificURILabel<T_>::text() const return _text; } -DependenciesLabel::~DependenciesLabel() -{ -} +DependenciesLabel::~DependenciesLabel() = default; namespace paludis { diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc index 239e6843b..8cc369cb8 100644 --- a/paludis/dep_spec.cc +++ b/paludis/dep_spec.cc @@ -57,9 +57,7 @@ DepSpec::DepSpec() : { } -DepSpec::~DepSpec() -{ -} +DepSpec::~DepSpec() = default; const std::shared_ptr<const DepSpecAnnotations> DepSpec::maybe_annotations() const @@ -159,9 +157,7 @@ ConditionalDepSpec::ConditionalDepSpec(const ConditionalDepSpec & other) : set_annotations(other.maybe_annotations()); } -ConditionalDepSpec::~ConditionalDepSpec() -{ -} +ConditionalDepSpec::~ConditionalDepSpec() = default; bool ConditionalDepSpec::condition_met(const Environment * const env, const std::shared_ptr<const PackageID> & id) const @@ -338,9 +334,7 @@ StringDepSpec::StringDepSpec(const std::string & s) : { } -StringDepSpec::~StringDepSpec() -{ -} +StringDepSpec::~StringDepSpec() = default; PlainTextDepSpec::PlainTextDepSpec(const std::string & s) : @@ -361,9 +355,7 @@ PlainTextLabelDepSpec::PlainTextLabelDepSpec(const std::string & s) : { } -PlainTextLabelDepSpec::~PlainTextLabelDepSpec() -{ -} +PlainTextLabelDepSpec::~PlainTextLabelDepSpec() = default; std::shared_ptr<DepSpec> PlainTextLabelDepSpec::clone() const @@ -552,9 +544,7 @@ PackageDepSpec::PackageDepSpec(const std::shared_ptr<const PackageDepSpecData> & { } -PackageDepSpec::~PackageDepSpec() -{ -} +PackageDepSpec::~PackageDepSpec() = default; PackageDepSpec::PackageDepSpec(const PackageDepSpec & d) : Cloneable<DepSpec>(d), diff --git a/paludis/distribution.cc b/paludis/distribution.cc index 726cf4565..08dbfb0c2 100644 --- a/paludis/distribution.cc +++ b/paludis/distribution.cc @@ -85,9 +85,7 @@ DistributionData::DistributionData() : { } -DistributionData::~DistributionData() -{ -} +DistributionData::~DistributionData() = default; std::shared_ptr<const Distribution> DistributionData::distribution_from_string(const std::string & s) const diff --git a/paludis/elf_linkage_checker.cc b/paludis/elf_linkage_checker.cc index d378e2f0f..c4e2cdfdb 100644 --- a/paludis/elf_linkage_checker.cc +++ b/paludis/elf_linkage_checker.cc @@ -137,9 +137,7 @@ ElfLinkageChecker::ElfLinkageChecker(const FSPath & root, const std::shared_ptr< { } -ElfLinkageChecker::~ElfLinkageChecker() -{ -} +ElfLinkageChecker::~ElfLinkageChecker() = default; bool ElfLinkageChecker::check_file(const FSPath & file) diff --git a/paludis/elike_use_requirement.cc b/paludis/elike_use_requirement.cc index 0a2888fe9..4ad9b0bde 100644 --- a/paludis/elike_use_requirement.cc +++ b/paludis/elike_use_requirement.cc @@ -98,9 +98,7 @@ namespace { } - virtual ~UseRequirement() - { - } + virtual ~UseRequirement() = default; virtual bool one_requirement_met_base( const Environment * const, diff --git a/paludis/environment.cc b/paludis/environment.cc index b1d169880..5a6f0c7cf 100644 --- a/paludis/environment.cc +++ b/paludis/environment.cc @@ -30,9 +30,7 @@ using namespace paludis; -Environment::~Environment() -{ -} +Environment::~Environment() = default; const Filter & Environment::all_filter() @@ -67,9 +65,7 @@ NoSuchRepositoryError::NoSuchRepositoryError(const RepositoryName & n) noexcept { } -NoSuchRepositoryError::~NoSuchRepositoryError() -{ -} +NoSuchRepositoryError::~NoSuchRepositoryError() = default; RepositoryName NoSuchRepositoryError::name() const diff --git a/paludis/environment_factory.cc b/paludis/environment_factory.cc index 2b1082937..fceb7c4d4 100644 --- a/paludis/environment_factory.cc +++ b/paludis/environment_factory.cc @@ -83,9 +83,7 @@ EnvironmentFactory::EnvironmentFactory() : register_environment(static_cast<const TypeOrNoType<ENVIRONMENT_GROUP_IF_test>::Type *>(nullptr), this); } -EnvironmentFactory::~EnvironmentFactory() -{ -} +EnvironmentFactory::~EnvironmentFactory() = default; const std::shared_ptr<Environment> EnvironmentFactory::create(const std::string & s) const diff --git a/paludis/environment_implementation.cc b/paludis/environment_implementation.cc index f4d535784..e6894f136 100644 --- a/paludis/environment_implementation.cc +++ b/paludis/environment_implementation.cc @@ -75,11 +75,7 @@ namespace { } - CombineSets(const CombineSets & other) : - top(other.top), - tree(other.tree) - { - } + CombineSets(const CombineSets & other) = default; std::shared_ptr<const SetSpecTree> result() const { @@ -148,9 +144,7 @@ EnvironmentImplementation::EnvironmentImplementation() : { } -EnvironmentImplementation::~EnvironmentImplementation() -{ -} +EnvironmentImplementation::~EnvironmentImplementation() = default; std::shared_ptr<const FSPathSequence> diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc index defcb97f6..31a9c90df 100644 --- a/paludis/environments/paludis/keywords_conf.cc +++ b/paludis/environments/paludis/keywords_conf.cc @@ -77,9 +77,7 @@ KeywordsConf::KeywordsConf(const PaludisEnvironment * const e) : { } -KeywordsConf::~KeywordsConf() -{ -} +KeywordsConf::~KeywordsConf() = default; void KeywordsConf::add(const FSPath & filename) diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc index 0d6bfba97..b3a000daf 100644 --- a/paludis/environments/paludis/licenses_conf.cc +++ b/paludis/environments/paludis/licenses_conf.cc @@ -80,9 +80,7 @@ LicensesConf::LicensesConf(const PaludisEnvironment * const e) : { } -LicensesConf::~LicensesConf() -{ -} +LicensesConf::~LicensesConf() = default; void LicensesConf::add(const FSPath & filename) diff --git a/paludis/environments/paludis/mirrors_conf.cc b/paludis/environments/paludis/mirrors_conf.cc index 2f36bd20a..002cd2eed 100644 --- a/paludis/environments/paludis/mirrors_conf.cc +++ b/paludis/environments/paludis/mirrors_conf.cc @@ -65,9 +65,7 @@ MirrorsConf::MirrorsConf(const PaludisEnvironment * const e) : { } -MirrorsConf::~MirrorsConf() -{ -} +MirrorsConf::~MirrorsConf() = default; void MirrorsConf::add(const FSPath & filename) diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc index 6886b9646..4c102be37 100644 --- a/paludis/environments/paludis/output_conf.cc +++ b/paludis/environments/paludis/output_conf.cc @@ -123,9 +123,7 @@ OutputConf::OutputConf(const PaludisEnvironment * const e) : { } -OutputConf::~OutputConf() -{ -} +OutputConf::~OutputConf() = default; namespace { diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc index 6a6e01ac5..7c259cc6e 100644 --- a/paludis/environments/paludis/package_mask_conf.cc +++ b/paludis/environments/paludis/package_mask_conf.cc @@ -71,9 +71,7 @@ PackageMaskConf::PackageMaskConf(const PaludisEnvironment * const e, const bool { } -PackageMaskConf::~PackageMaskConf() -{ -} +PackageMaskConf::~PackageMaskConf() = default; void PackageMaskConf::add(const FSPath & filename) diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc index bf542005d..a7b159e0e 100644 --- a/paludis/environments/paludis/paludis_config.cc +++ b/paludis/environments/paludis/paludis_config.cc @@ -849,9 +849,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s _imp->bashrc_files->push_back(_imp->local_config_dir / dist->bashrc_filename()); } -PaludisConfig::~PaludisConfig() -{ -} +PaludisConfig::~PaludisConfig() = default; namespace { diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc index b4a8c66f1..485964357 100644 --- a/paludis/environments/paludis/paludis_environment.cc +++ b/paludis/environments/paludis/paludis_environment.cc @@ -165,9 +165,7 @@ PaludisEnvironment::PaludisEnvironment(const std::string & s) : add_metadata_key(_imp->system_root_key); } -PaludisEnvironment::~PaludisEnvironment() -{ -} +PaludisEnvironment::~PaludisEnvironment() = default; bool PaludisEnvironment::accept_keywords(const std::shared_ptr<const KeywordNameSet> & k, diff --git a/paludis/environments/paludis/suggestions_conf.cc b/paludis/environments/paludis/suggestions_conf.cc index 89529da6b..8525b9c7d 100644 --- a/paludis/environments/paludis/suggestions_conf.cc +++ b/paludis/environments/paludis/suggestions_conf.cc @@ -118,9 +118,7 @@ SuggestionsConf::SuggestionsConf(const PaludisEnvironment * const e) : { } -SuggestionsConf::~SuggestionsConf() -{ -} +SuggestionsConf::~SuggestionsConf() = default; void SuggestionsConf::add(const FSPath & filename) diff --git a/paludis/environments/paludis/use_conf.cc b/paludis/environments/paludis/use_conf.cc index 46dfcb665..f5f38168f 100644 --- a/paludis/environments/paludis/use_conf.cc +++ b/paludis/environments/paludis/use_conf.cc @@ -57,9 +57,7 @@ UseConf::UseConf(const PaludisEnvironment * const e) : { } -UseConf::~UseConf() -{ -} +UseConf::~UseConf() = default; void UseConf::add(const FSPath & filename) diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc index 5d5af6ca0..62d751c6f 100644 --- a/paludis/environments/paludis/world.cc +++ b/paludis/environments/paludis/world.cc @@ -55,9 +55,7 @@ World::World(const Environment * const e, const std::shared_ptr<const FSPath> & { } -World::~World() -{ -} +World::~World() = default; bool World::add_to_world(const SetName & s) const diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc index 2e8b77cb4..78223cc1b 100644 --- a/paludis/environments/test/test_environment.cc +++ b/paludis/environments/test/test_environment.cc @@ -100,9 +100,7 @@ TestEnvironment::TestEnvironment(const FSPath & r, bool au) : add_metadata_key(_imp->system_root_key); } -TestEnvironment::~TestEnvironment() -{ -} +TestEnvironment::~TestEnvironment() = default; bool TestEnvironment::accept_keywords(const std::shared_ptr<const KeywordNameSet> & k, const std::shared_ptr<const PackageID> &) const diff --git a/paludis/filter.cc b/paludis/filter.cc index b2c1ec1ec..0d6cf1697 100644 --- a/paludis/filter.cc +++ b/paludis/filter.cc @@ -70,9 +70,7 @@ Filter::operator= (const Filter & other) return *this; } -Filter::~Filter() -{ -} +Filter::~Filter() = default; std::shared_ptr<const RepositoryNameSet> Filter::repositories( diff --git a/paludis/filter_handler.cc b/paludis/filter_handler.cc index 91e59edfd..445543890 100644 --- a/paludis/filter_handler.cc +++ b/paludis/filter_handler.cc @@ -22,9 +22,7 @@ using namespace paludis; -FilterHandler::~FilterHandler() -{ -} +FilterHandler::~FilterHandler() = default; std::shared_ptr<const RepositoryNameSet> AllFilterHandlerBase::repositories(const Environment * const, diff --git a/paludis/filtered_generator.cc b/paludis/filtered_generator.cc index 816ae4f14..ed3b1df27 100644 --- a/paludis/filtered_generator.cc +++ b/paludis/filtered_generator.cc @@ -56,9 +56,7 @@ FilteredGenerator::FilteredGenerator(const FilteredGenerator & g, const Filter & { } -FilteredGenerator::~FilteredGenerator() -{ -} +FilteredGenerator::~FilteredGenerator() = default; FilteredGenerator & FilteredGenerator::operator= (const FilteredGenerator & other) diff --git a/paludis/format_messages_output_manager.cc b/paludis/format_messages_output_manager.cc index 0dbcc678c..9629bcde9 100644 --- a/paludis/format_messages_output_manager.cc +++ b/paludis/format_messages_output_manager.cc @@ -92,9 +92,7 @@ FormatMessagesOutputManager::FormatMessagesOutputManager( { } -FormatMessagesOutputManager::~FormatMessagesOutputManager() -{ -} +FormatMessagesOutputManager::~FormatMessagesOutputManager() = default; std::ostream & FormatMessagesOutputManager::stdout_stream() diff --git a/paludis/fs_merger.cc b/paludis/fs_merger.cc index 28132d229..e39551429 100644 --- a/paludis/fs_merger.cc +++ b/paludis/fs_merger.cc @@ -121,9 +121,7 @@ FSMerger::FSMerger(const FSMergerParams & p) : { } -FSMerger::~FSMerger() -{ -} +FSMerger::~FSMerger() = default; void FSMerger::merge() diff --git a/paludis/fs_merger_TEST.cc b/paludis/fs_merger_TEST.cc index b74736183..a6b9d31b7 100644 --- a/paludis/fs_merger_TEST.cc +++ b/paludis/fs_merger_TEST.cc @@ -82,9 +82,7 @@ namespace hook_dirs.push_back(std::make_pair(hooks, false)); } - HookTestEnvironment::~HookTestEnvironment() - { - } + HookTestEnvironment::~HookTestEnvironment() = default; HookResult HookTestEnvironment::perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> & optional_output_manager) const diff --git a/paludis/fuzzy_finder.cc b/paludis/fuzzy_finder.cc index cf50e1e26..7a6caf1d8 100644 --- a/paludis/fuzzy_finder.cc +++ b/paludis/fuzzy_finder.cc @@ -163,9 +163,7 @@ FuzzyCandidatesFinder::FuzzyCandidatesFinder(const Environment & e, const std::s _imp->candidates.push_back((*i)->name()); } -FuzzyCandidatesFinder::~FuzzyCandidatesFinder() -{ -} +FuzzyCandidatesFinder::~FuzzyCandidatesFinder() = default; FuzzyCandidatesFinder::CandidatesConstIterator FuzzyCandidatesFinder::begin() const @@ -216,9 +214,7 @@ FuzzyRepositoriesFinder::FuzzyRepositoriesFinder(const Environment & e, const st _imp->candidates.push_back((*r)->name()); } -FuzzyRepositoriesFinder::~FuzzyRepositoriesFinder() -{ -} +FuzzyRepositoriesFinder::~FuzzyRepositoriesFinder() = default; FuzzyRepositoriesFinder::RepositoriesConstIterator FuzzyRepositoriesFinder::begin() const diff --git a/paludis/generator.cc b/paludis/generator.cc index 1d9dffb17..a37b2f129 100644 --- a/paludis/generator.cc +++ b/paludis/generator.cc @@ -75,9 +75,7 @@ Generator::operator= (const Generator & other) return *this; } -Generator::~Generator() -{ -} +Generator::~Generator() = default; Generator::operator FilteredGenerator () const { diff --git a/paludis/generator_handler.cc b/paludis/generator_handler.cc index 8ce53c9a3..2d89c580d 100644 --- a/paludis/generator_handler.cc +++ b/paludis/generator_handler.cc @@ -32,9 +32,7 @@ using namespace paludis; -GeneratorHandler::~GeneratorHandler() -{ -} +GeneratorHandler::~GeneratorHandler() = default; std::shared_ptr<const RepositoryNameSet> AllGeneratorHandlerBase::repositories( diff --git a/paludis/hook.cc b/paludis/hook.cc index 3cc5188ed..76b9f9c05 100644 --- a/paludis/hook.cc +++ b/paludis/hook.cc @@ -73,9 +73,7 @@ Hook::AllowedOutputValues::AllowedOutputValues(const AllowedOutputValues & other _imp->allowed_values = other._imp->allowed_values; } -Hook::AllowedOutputValues::~AllowedOutputValues() -{ -} +Hook::AllowedOutputValues::~AllowedOutputValues() = default; Hook::AllowedOutputValues Hook::AllowedOutputValues::operator() (const std::string & v) const @@ -97,9 +95,7 @@ Hook::Hook(const Hook & h) : { } -Hook::~Hook() -{ -} +Hook::~Hook() = default; Hook Hook::operator() (const std::string & k, const std::string & v) const diff --git a/paludis/hooker.cc b/paludis/hooker.cc index 8423cec6a..efd461fb6 100644 --- a/paludis/hooker.cc +++ b/paludis/hooker.cc @@ -52,9 +52,7 @@ using namespace paludis; -HookFile::~HookFile() -{ -} +HookFile::~HookFile() = default; namespace { @@ -534,9 +532,7 @@ Hooker::Hooker(const Environment * const e) : { } -Hooker::~Hooker() -{ -} +Hooker::~Hooker() = default; void Hooker::add_dir(const FSPath & dir, const bool v) diff --git a/paludis/ipc_output_manager.cc b/paludis/ipc_output_manager.cc index 24285debe..c6070ba4d 100644 --- a/paludis/ipc_output_manager.cc +++ b/paludis/ipc_output_manager.cc @@ -491,9 +491,7 @@ OutputManagerFromIPC::OutputManagerFromIPC(const Environment * const e, { } -OutputManagerFromIPC::~OutputManagerFromIPC() -{ -} +OutputManagerFromIPC::~OutputManagerFromIPC() = default; const std::shared_ptr<OutputManager> OutputManagerFromIPC::operator() (const Action & a) diff --git a/paludis/libtool_linkage_checker.cc b/paludis/libtool_linkage_checker.cc index 5b6969b81..faab3be1d 100644 --- a/paludis/libtool_linkage_checker.cc +++ b/paludis/libtool_linkage_checker.cc @@ -76,9 +76,7 @@ LibtoolLinkageChecker::LibtoolLinkageChecker(const FSPath & root) : { } -LibtoolLinkageChecker::~LibtoolLinkageChecker() -{ -} +LibtoolLinkageChecker::~LibtoolLinkageChecker() = default; bool LibtoolLinkageChecker::check_file(const FSPath & file) diff --git a/paludis/linkage_checker.cc b/paludis/linkage_checker.cc index 80d1caa23..d2ee7b66f 100644 --- a/paludis/linkage_checker.cc +++ b/paludis/linkage_checker.cc @@ -21,11 +21,7 @@ using namespace paludis; -LinkageChecker::LinkageChecker() -{ -} +LinkageChecker::LinkageChecker() = default; -LinkageChecker::~LinkageChecker() -{ -} +LinkageChecker::~LinkageChecker() = default; diff --git a/paludis/literal_metadata_key.cc b/paludis/literal_metadata_key.cc index ec8fa290e..86df4d673 100644 --- a/paludis/literal_metadata_key.cc +++ b/paludis/literal_metadata_key.cc @@ -150,9 +150,7 @@ LiteralMetadataFSPathSequenceKey::LiteralMetadataFSPathSequenceKey(const std::st { } -LiteralMetadataFSPathSequenceKey::~LiteralMetadataFSPathSequenceKey() -{ -} +LiteralMetadataFSPathSequenceKey::~LiteralMetadataFSPathSequenceKey() = default; const std::shared_ptr<const FSPathSequence> LiteralMetadataFSPathSequenceKey::parse_value() const @@ -191,9 +189,7 @@ LiteralMetadataStringSetKey::LiteralMetadataStringSetKey(const std::string & r, { } -LiteralMetadataStringSetKey::~LiteralMetadataStringSetKey() -{ -} +LiteralMetadataStringSetKey::~LiteralMetadataStringSetKey() = default; const std::shared_ptr<const Set<std::string> > LiteralMetadataStringSetKey::parse_value() const @@ -207,9 +203,7 @@ LiteralMetadataStringStringMapKey::LiteralMetadataStringStringMapKey(const std:: { } -LiteralMetadataStringStringMapKey::~LiteralMetadataStringStringMapKey() -{ -} +LiteralMetadataStringStringMapKey::~LiteralMetadataStringStringMapKey() = default; const std::shared_ptr<const Map<std::string, std::string> > LiteralMetadataStringStringMapKey::parse_value() const @@ -223,9 +217,7 @@ LiteralMetadataStringSequenceKey::LiteralMetadataStringSequenceKey(const std::st { } -LiteralMetadataStringSequenceKey::~LiteralMetadataStringSequenceKey() -{ -} +LiteralMetadataStringSequenceKey::~LiteralMetadataStringSequenceKey() = default; const std::shared_ptr<const Sequence<std::string> > LiteralMetadataStringSequenceKey::parse_value() const @@ -390,9 +382,7 @@ LiteralMetadataTimeKey::LiteralMetadataTimeKey( { } -LiteralMetadataTimeKey::~LiteralMetadataTimeKey() -{ -} +LiteralMetadataTimeKey::~LiteralMetadataTimeKey() = default; const std::string LiteralMetadataTimeKey::human_name() const @@ -424,9 +414,7 @@ LiteralMetadataMaintainersKey::LiteralMetadataMaintainersKey(const std::string & { } -LiteralMetadataMaintainersKey::~LiteralMetadataMaintainersKey() -{ -} +LiteralMetadataMaintainersKey::~LiteralMetadataMaintainersKey() = default; const std::shared_ptr<const Maintainers> LiteralMetadataMaintainersKey::parse_value() const diff --git a/paludis/mask.cc b/paludis/mask.cc index 17a731fc1..ae4d2f671 100644 --- a/paludis/mask.cc +++ b/paludis/mask.cc @@ -27,9 +27,7 @@ using namespace paludis; #include <paludis/mask-se.cc> -Mask::~Mask() -{ -} +Mask::~Mask() = default; const std::string UserMask::token() const diff --git a/paludis/metadata_key.cc b/paludis/metadata_key.cc index b66db7e4f..79f6d1e15 100644 --- a/paludis/metadata_key.cc +++ b/paludis/metadata_key.cc @@ -32,17 +32,11 @@ using namespace paludis; #include <paludis/metadata_key-se.cc> -MetadataKey::~MetadataKey() -{ -} +MetadataKey::~MetadataKey() = default; -MetadataSectionKey::~MetadataSectionKey() -{ -} +MetadataSectionKey::~MetadataSectionKey() = default; -MetadataTimeKey::~MetadataTimeKey() -{ -} +MetadataTimeKey::~MetadataTimeKey() = default; template <typename T_> MetadataCollectionKey<T_>::~MetadataCollectionKey() @@ -59,13 +53,9 @@ MetadataValueKey<T_>::~MetadataValueKey() { } -MetadataSpecTreeKey<FetchableURISpecTree>::~MetadataSpecTreeKey() -{ -} +MetadataSpecTreeKey<FetchableURISpecTree>::~MetadataSpecTreeKey() = default; -MetadataSpecTreeKey<DependencySpecTree>::~MetadataSpecTreeKey() -{ -} +MetadataSpecTreeKey<DependencySpecTree>::~MetadataSpecTreeKey() = default; namespace paludis { diff --git a/paludis/metadata_key_holder.cc b/paludis/metadata_key_holder.cc index bfc813514..1a19d41d4 100644 --- a/paludis/metadata_key_holder.cc +++ b/paludis/metadata_key_holder.cc @@ -50,9 +50,7 @@ MetadataKeyHolder::MetadataKeyHolder() : { } -MetadataKeyHolder::~MetadataKeyHolder() -{ -} +MetadataKeyHolder::~MetadataKeyHolder() = default; void MetadataKeyHolder::add_metadata_key(const std::shared_ptr<const MetadataKey> & k) const diff --git a/paludis/ndbam.cc b/paludis/ndbam.cc index bdf9f59d5..abe72f858 100644 --- a/paludis/ndbam.cc +++ b/paludis/ndbam.cc @@ -138,9 +138,7 @@ NDBAM::NDBAM(const FSPath & l, } } -NDBAM::~NDBAM() -{ -} +NDBAM::~NDBAM() = default; std::shared_ptr<const CategoryNamePartSet> NDBAM::category_names() diff --git a/paludis/ndbam_merger.cc b/paludis/ndbam_merger.cc index 1b61f226c..61790751e 100644 --- a/paludis/ndbam_merger.cc +++ b/paludis/ndbam_merger.cc @@ -93,9 +93,7 @@ NDBAMMerger::NDBAMMerger(const NDBAMMergerParams & p) : { } -NDBAMMerger::~NDBAMMerger() -{ -} +NDBAMMerger::~NDBAMMerger() = default; Hook NDBAMMerger::extend_hook(const Hook & h) diff --git a/paludis/ndbam_unmerger.cc b/paludis/ndbam_unmerger.cc index 165735e5e..f1cdd8442 100644 --- a/paludis/ndbam_unmerger.cc +++ b/paludis/ndbam_unmerger.cc @@ -82,9 +82,7 @@ NDBAMUnmerger::NDBAMUnmerger(const NDBAMUnmergerOptions & o) : { } -NDBAMUnmerger::~NDBAMUnmerger() -{ -} +NDBAMUnmerger::~NDBAMUnmerger() = default; Hook NDBAMUnmerger::extend_hook(const Hook & h) const diff --git a/paludis/output_manager.cc b/paludis/output_manager.cc index 3bb13d9ac..0db94ef17 100644 --- a/paludis/output_manager.cc +++ b/paludis/output_manager.cc @@ -28,9 +28,7 @@ using namespace paludis; #include <paludis/output_manager-se.cc> -OutputManager::~OutputManager() -{ -} +OutputManager::~OutputManager() = default; namespace paludis { diff --git a/paludis/output_manager_factory.cc b/paludis/output_manager_factory.cc index 6fb539d3c..cb6497b07 100644 --- a/paludis/output_manager_factory.cc +++ b/paludis/output_manager_factory.cc @@ -102,9 +102,7 @@ OutputManagerFactory::OutputManagerFactory() : add_manager(TeeOutputManager::factory_managers(), TeeOutputManager::factory_create); } -OutputManagerFactory::~OutputManagerFactory() -{ -} +OutputManagerFactory::~OutputManagerFactory() = default; const std::shared_ptr<OutputManager> OutputManagerFactory::create( diff --git a/paludis/output_manager_from_environment.cc b/paludis/output_manager_from_environment.cc index da7ce48ae..3d356c8bf 100644 --- a/paludis/output_manager_from_environment.cc +++ b/paludis/output_manager_from_environment.cc @@ -59,9 +59,7 @@ OutputManagerFromEnvironment::OutputManagerFromEnvironment( { } -OutputManagerFromEnvironment::~OutputManagerFromEnvironment() -{ -} +OutputManagerFromEnvironment::~OutputManagerFromEnvironment() = default; const std::shared_ptr<OutputManager> OutputManagerFromEnvironment::operator() (const Action & a) diff --git a/paludis/package_id.cc b/paludis/package_id.cc index b870c2e82..abc0157b5 100644 --- a/paludis/package_id.cc +++ b/paludis/package_id.cc @@ -71,9 +71,7 @@ PackageID::PackageID() : { } -PackageID::~PackageID() -{ -} +PackageID::~PackageID() = default; void PackageID::add_mask(const std::shared_ptr<const Mask> & k) const @@ -186,9 +184,7 @@ PackageIDComparator::PackageIDComparator(const PackageIDComparator & other) : _imp->m = other._imp->m; } -PackageIDComparator::~PackageIDComparator() -{ -} +PackageIDComparator::~PackageIDComparator() = default; bool PackageIDComparator::operator() (const std::shared_ptr<const PackageID> & a, diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc index 68465aa63..5b79c92dd 100644 --- a/paludis/paludislike_options_conf.cc +++ b/paludis/paludislike_options_conf.cc @@ -170,9 +170,7 @@ PaludisLikeOptionsConf::PaludisLikeOptionsConf(const PaludisLikeOptionsConfParam { } -PaludisLikeOptionsConf::~PaludisLikeOptionsConf() -{ -} +PaludisLikeOptionsConf::~PaludisLikeOptionsConf() = default; void PaludisLikeOptionsConf::add_file(const FSPath & f) diff --git a/paludis/partially_made_package_dep_spec.cc b/paludis/partially_made_package_dep_spec.cc index e3851a7fa..82ed7b042 100644 --- a/paludis/partially_made_package_dep_spec.cc +++ b/paludis/partially_made_package_dep_spec.cc @@ -93,23 +93,7 @@ namespace additional_requirements->back_inserter()); } - PartiallyMadePackageDepSpecData(const PartiallyMadePackageDepSpecData & other) : - PackageDepSpecData(other), - package(other.package), - package_name_part(other.package_name_part), - category_name_part(other.category_name_part), - version_requirements(other.version_requirements), - version_requirements_mode_v(other.version_requirements_mode_v), - slot(other.slot), - in_repository(other.in_repository), - from_repository(other.from_repository), - installable_to_repository(other.installable_to_repository), - installed_at_path(other.installed_at_path), - installable_to_path(other.installable_to_path), - additional_requirements(other.additional_requirements), - options_for_partially_made_package_dep_spec_v(other.options_for_partially_made_package_dep_spec_v) - { - } + PartiallyMadePackageDepSpecData(const PartiallyMadePackageDepSpecData & other) = default; std::string as_string() const override { @@ -383,9 +367,7 @@ PartiallyMadePackageDepSpec::PartiallyMadePackageDepSpec(const PackageDepSpec & { } -PartiallyMadePackageDepSpec::~PartiallyMadePackageDepSpec() -{ -} +PartiallyMadePackageDepSpec::~PartiallyMadePackageDepSpec() = default; PartiallyMadePackageDepSpec & PartiallyMadePackageDepSpec::package(const QualifiedPackageName & name) diff --git a/paludis/repositories/e/aa_visitor.cc b/paludis/repositories/e/aa_visitor.cc index ba99fa9e4..95daa59e1 100644 --- a/paludis/repositories/e/aa_visitor.cc +++ b/paludis/repositories/e/aa_visitor.cc @@ -54,9 +54,7 @@ AAVisitor::AAVisitor() : { } -AAVisitor::~AAVisitor() -{ -} +AAVisitor::~AAVisitor() = default; void AAVisitor::visit(const FetchableURISpecTree::NodeType<FetchableURIDepSpec>::Type & node) diff --git a/paludis/repositories/e/check_fetched_files_visitor.cc b/paludis/repositories/e/check_fetched_files_visitor.cc index bdf48e229..444f2d525 100644 --- a/paludis/repositories/e/check_fetched_files_visitor.cc +++ b/paludis/repositories/e/check_fetched_files_visitor.cc @@ -119,9 +119,7 @@ CheckFetchedFilesVisitor::CheckFetchedFilesVisitor( { } -CheckFetchedFilesVisitor::~CheckFetchedFilesVisitor() -{ -} +CheckFetchedFilesVisitor::~CheckFetchedFilesVisitor() = default; void CheckFetchedFilesVisitor::visit(const FetchableURISpecTree::NodeType<ConditionalDepSpec>::Type & node) diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc index e55570b1a..d02af2df9 100644 --- a/paludis/repositories/e/e_choices_key.cc +++ b/paludis/repositories/e/e_choices_key.cc @@ -97,9 +97,7 @@ EChoicesKey::EChoicesKey( { } -EChoicesKey::~EChoicesKey() -{ -} +EChoicesKey::~EChoicesKey() = default; namespace { diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc index 8be557d41..395985df2 100644 --- a/paludis/repositories/e/e_installed_repository.cc +++ b/paludis/repositories/e/e_installed_repository.cc @@ -80,9 +80,7 @@ EInstalledRepository::EInstalledRepository(const EInstalledRepositoryParams & p, { } -EInstalledRepository::~EInstalledRepository() -{ -} +EInstalledRepository::~EInstalledRepository() = default; bool EInstalledRepository::some_ids_might_support_action(const SupportsActionTestBase & test) const diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc index c8ef487a0..6fb73d36e 100644 --- a/paludis/repositories/e/e_installed_repository_id.cc +++ b/paludis/repositories/e/e_installed_repository_id.cc @@ -178,9 +178,7 @@ EInstalledRepositoryID::EInstalledRepositoryID(const QualifiedPackageName & q, c { } -EInstalledRepositoryID::~EInstalledRepositoryID() -{ -} +EInstalledRepositoryID::~EInstalledRepositoryID() = default; void EInstalledRepositoryID::need_keys_added() const diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc index 51bf0e3ba..aeb6a0788 100644 --- a/paludis/repositories/e/e_key.cc +++ b/paludis/repositories/e/e_key.cc @@ -96,9 +96,7 @@ EDependenciesKey::EDependenciesKey( { } -EDependenciesKey::~EDependenciesKey() -{ -} +EDependenciesKey::~EDependenciesKey() = default; const std::shared_ptr<const DependencySpecTree> EDependenciesKey::parse_value() const @@ -181,9 +179,7 @@ ELicenseKey::ELicenseKey( { } -ELicenseKey::~ELicenseKey() -{ -} +ELicenseKey::~ELicenseKey() = default; const std::shared_ptr<const LicenseSpecTree> ELicenseKey::parse_value() const @@ -251,9 +247,7 @@ EFetchableURIKey::EFetchableURIKey(const Environment * const e, { } -EFetchableURIKey::~EFetchableURIKey() -{ -} +EFetchableURIKey::~EFetchableURIKey() = default; const std::shared_ptr<const FetchableURISpecTree> EFetchableURIKey::parse_value() const @@ -361,9 +355,7 @@ ESimpleURIKey::ESimpleURIKey(const Environment * const e, { } -ESimpleURIKey::~ESimpleURIKey() -{ -} +ESimpleURIKey::~ESimpleURIKey() = default; const std::shared_ptr<const SimpleURISpecTree> ESimpleURIKey::parse_value() const @@ -435,9 +427,7 @@ EPlainTextSpecKey::EPlainTextSpecKey(const Environment * const e, { } -EPlainTextSpecKey::~EPlainTextSpecKey() -{ -} +EPlainTextSpecKey::~EPlainTextSpecKey() = default; const std::shared_ptr<const PlainTextSpecTree> EPlainTextSpecKey::parse_value() const @@ -513,9 +503,7 @@ EMyOptionsKey::EMyOptionsKey( { } -EMyOptionsKey::~EMyOptionsKey() -{ -} +EMyOptionsKey::~EMyOptionsKey() = default; const std::shared_ptr<const PlainTextSpecTree> EMyOptionsKey::parse_value() const @@ -592,9 +580,7 @@ ERequiredUseKey::ERequiredUseKey( { } -ERequiredUseKey::~ERequiredUseKey() -{ -} +ERequiredUseKey::~ERequiredUseKey() = default; const std::shared_ptr<const RequiredUseSpecTree> ERequiredUseKey::parse_value() const @@ -683,9 +669,7 @@ EMTimeKey::EMTimeKey(const std::string & r, const std::string & h, const FSPath { } -EMTimeKey::~EMTimeKey() -{ -} +EMTimeKey::~EMTimeKey() = default; Timestamp EMTimeKey::parse_value() const diff --git a/paludis/repositories/e/e_keywords_key.cc b/paludis/repositories/e/e_keywords_key.cc index f77c06bb2..e0dda0c28 100644 --- a/paludis/repositories/e/e_keywords_key.cc +++ b/paludis/repositories/e/e_keywords_key.cc @@ -59,9 +59,7 @@ namespace { } - ~EKeywordsKey() override - { - } + ~EKeywordsKey() override = default; const std::shared_ptr<const Set<KeywordName> > parse_value() const override { diff --git a/paludis/repositories/e/e_mask.cc b/paludis/repositories/e/e_mask.cc index 36499d315..cafee131a 100644 --- a/paludis/repositories/e/e_mask.cc +++ b/paludis/repositories/e/e_mask.cc @@ -53,9 +53,7 @@ EUnacceptedMask::EUnacceptedMask(const char k, const std::string & d, const std: { } -EUnacceptedMask::~EUnacceptedMask() -{ -} +EUnacceptedMask::~EUnacceptedMask() = default; char EUnacceptedMask::key() const @@ -98,9 +96,7 @@ EUnsupportedMask::EUnsupportedMask(const char k, const std::string & d, const st { } -EUnsupportedMask::~EUnsupportedMask() -{ -} +EUnsupportedMask::~EUnsupportedMask() = default; char EUnsupportedMask::key() const @@ -150,9 +146,7 @@ ERepositoryMask::ERepositoryMask(const char k, const std::string & d, const std: { } -ERepositoryMask::~ERepositoryMask() -{ -} +ERepositoryMask::~ERepositoryMask() = default; char ERepositoryMask::key() const diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc index b491af36c..95d2b440a 100644 --- a/paludis/repositories/e/e_repository.cc +++ b/paludis/repositories/e/e_repository.cc @@ -411,9 +411,7 @@ namespace paludis sync_hosts->insert(i->first, extract_host_from_url(i->second)); } - Imp<ERepository>::~Imp() - { - } + Imp<ERepository>::~Imp() = default; void Imp<ERepository>::need_profiles() const @@ -543,9 +541,7 @@ ERepository::ERepository(const ERepositoryParams & p) : _add_metadata_keys(); } -ERepository::~ERepository() -{ -} +ERepository::~ERepository() = default; void ERepository::_add_metadata_keys() const diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc index a90e65ea6..8a1689373 100644 --- a/paludis/repositories/e/e_repository_news.cc +++ b/paludis/repositories/e/e_repository_news.cc @@ -114,9 +114,7 @@ ERepositoryNews::ERepositoryNews(const Environment * const e, const ERepository { } -ERepositoryNews::~ERepositoryNews() -{ -} +ERepositoryNews::~ERepositoryNews() = default; void ERepositoryNews::update_news() const @@ -350,9 +348,7 @@ NewsFile::NewsFile(const FSPath & our_filename) : throw NewsError(our_filename, "No Revision header specified"); } -NewsFile::~NewsFile() -{ -} +NewsFile::~NewsFile() = default; NewsFile::DisplayIfInstalledConstIterator NewsFile::begin_display_if_installed() const diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc index a7c332ecb..9c1867740 100644 --- a/paludis/repositories/e/e_repository_sets.cc +++ b/paludis/repositories/e/e_repository_sets.cc @@ -96,9 +96,7 @@ ERepositorySets::ERepositorySets(const Environment * const e, const ERepository { } -ERepositorySets::~ERepositorySets() -{ -} +ERepositorySets::~ERepositorySets() = default; const std::shared_ptr<const SetSpecTree> ERepositorySets::package_set(const SetName & ss) const diff --git a/paludis/repositories/e/e_slot_key.cc b/paludis/repositories/e/e_slot_key.cc index 0db85e062..0b6affc06 100644 --- a/paludis/repositories/e/e_slot_key.cc +++ b/paludis/repositories/e/e_slot_key.cc @@ -51,9 +51,7 @@ namespace { } - ~ESlotKey() override - { - } + ~ESlotKey() override = default; const Slot parse_value() const override { diff --git a/paludis/repositories/e/e_string_set_key.cc b/paludis/repositories/e/e_string_set_key.cc index b70090924..abbb37b6b 100644 --- a/paludis/repositories/e/e_string_set_key.cc +++ b/paludis/repositories/e/e_string_set_key.cc @@ -58,9 +58,7 @@ namespace { } - ~EStringSetKey() override - { - } + ~EStringSetKey() override = default; const std::shared_ptr<const Set<std::string> > parse_value() const override { diff --git a/paludis/repositories/e/e_stripper.cc b/paludis/repositories/e/e_stripper.cc index 053e05962..d480d7d78 100644 --- a/paludis/repositories/e/e_stripper.cc +++ b/paludis/repositories/e/e_stripper.cc @@ -53,9 +53,7 @@ EStripper::EStripper(const EStripperOptions & options) : { } -EStripper::~EStripper() -{ -} +EStripper::~EStripper() = default; void EStripper::on_enter_dir(const FSPath &) diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc index d1ab40e18..96d1b51da 100644 --- a/paludis/repositories/e/eapi.cc +++ b/paludis/repositories/e/eapi.cc @@ -455,9 +455,7 @@ EAPIData::EAPIData() : { } -EAPIData::~EAPIData() -{ -} +EAPIData::~EAPIData() = default; std::shared_ptr<const EAPI> EAPIData::eapi_from_string(const std::string & s) const @@ -525,9 +523,7 @@ EAPILabels::EAPILabels(const EAPILabels & other) : { } -EAPILabels::~EAPILabels() -{ -} +EAPILabels::~EAPILabels() = default; const std::string EAPILabels::class_for_label(const std::string & l) const diff --git a/paludis/repositories/e/eapi_phase.cc b/paludis/repositories/e/eapi_phase.cc index c6277dedd..8f1beb8f1 100644 --- a/paludis/repositories/e/eapi_phase.cc +++ b/paludis/repositories/e/eapi_phase.cc @@ -77,9 +77,7 @@ EAPIPhase::EAPIPhase(const std::string & s) : std::copy(next(t), tokens.end(), std::back_inserter(_imp->commands)); } -EAPIPhase::~EAPIPhase() -{ -} +EAPIPhase::~EAPIPhase() = default; bool EAPIPhase::option(const std::string & s) const @@ -121,9 +119,7 @@ EAPIPhases::EAPIPhases(const std::string & s) : _imp->phases.push_back(std::make_shared<EAPIPhase>(*t)); } -EAPIPhases::~EAPIPhases() -{ -} +EAPIPhases::~EAPIPhases() = default; EAPIPhases::ConstIterator EAPIPhases::begin_phases() const diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc index 33266e3d8..421e27771 100644 --- a/paludis/repositories/e/ebuild.cc +++ b/paludis/repositories/e/ebuild.cc @@ -74,9 +74,7 @@ EbuildCommand::EbuildCommand(const EbuildCommandParams & p) : { } -EbuildCommand::~EbuildCommand() -{ -} +EbuildCommand::~EbuildCommand() = default; bool EbuildCommand::success() @@ -383,9 +381,7 @@ EbuildMetadataCommand::EbuildMetadataCommand(const EbuildCommandParams & p) : { } -EbuildMetadataCommand::~EbuildMetadataCommand() -{ -} +EbuildMetadataCommand::~EbuildMetadataCommand() = default; std::string EbuildMetadataCommand::commands() const diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc index 57b9baf2c..192dfc8d3 100644 --- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc +++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc @@ -310,9 +310,7 @@ EbuildFlatMetadataCache::EbuildFlatMetadataCache(const Environment * const v, co { } -EbuildFlatMetadataCache::~EbuildFlatMetadataCache() -{ -} +EbuildFlatMetadataCache::~EbuildFlatMetadataCache() = default; bool EbuildFlatMetadataCache::load(const std::shared_ptr<const EbuildID> & id, const bool silent_on_stale) diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc index 42582cb48..cc1262f53 100644 --- a/paludis/repositories/e/ebuild_id.cc +++ b/paludis/repositories/e/ebuild_id.cc @@ -221,9 +221,7 @@ EbuildID::EbuildID(const QualifiedPackageName & q, const VersionSpec & v, { } -EbuildID::~EbuildID() -{ -} +EbuildID::~EbuildID() = default; void EbuildID::need_non_xml_keys_added() const diff --git a/paludis/repositories/e/eclass_mtimes.cc b/paludis/repositories/e/eclass_mtimes.cc index 6955171d1..854889de3 100644 --- a/paludis/repositories/e/eclass_mtimes.cc +++ b/paludis/repositories/e/eclass_mtimes.cc @@ -92,9 +92,7 @@ EclassMtimes::EclassMtimes(const ERepository * r, const std::shared_ptr<const FS { } -EclassMtimes::~EclassMtimes() -{ -} +EclassMtimes::~EclassMtimes() = default; const std::pair<FSPath, FSStat> * EclassMtimes::eclass(const std::string & e) const diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc index 502301fc3..882d04b97 100644 --- a/paludis/repositories/e/exheres_layout.cc +++ b/paludis/repositories/e/exheres_layout.cc @@ -175,9 +175,7 @@ ExheresLayout::ExheresLayout(const Environment * const e, const ERepository * co } } -ExheresLayout::~ExheresLayout() -{ -} +ExheresLayout::~ExheresLayout() = default; FSPath ExheresLayout::categories_file() const diff --git a/paludis/repositories/e/exheres_mask_store.cc b/paludis/repositories/e/exheres_mask_store.cc index 6b2b70db9..0af5e9068 100644 --- a/paludis/repositories/e/exheres_mask_store.cc +++ b/paludis/repositories/e/exheres_mask_store.cc @@ -79,9 +79,7 @@ ExheresMaskStore::ExheresMaskStore( _populate(); } -ExheresMaskStore::~ExheresMaskStore() -{ -} +ExheresMaskStore::~ExheresMaskStore() = default; namespace { diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc index 51ae4c019..2dce5d97f 100644 --- a/paludis/repositories/e/exheres_profile.cc +++ b/paludis/repositories/e/exheres_profile.cc @@ -158,9 +158,7 @@ ExheresProfile::ExheresProfile( _imp->use_expand_no_describe->insert(stringify(suboption)); } -ExheresProfile::~ExheresProfile() -{ -} +ExheresProfile::~ExheresProfile() = default; void ExheresProfile::_load_dir(const FSPath & f) diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc index 54e5bee07..88bbfdf82 100644 --- a/paludis/repositories/e/exndbam_repository.cc +++ b/paludis/repositories/e/exndbam_repository.cc @@ -120,9 +120,7 @@ ExndbamRepository::ExndbamRepository(const RepositoryName & n, const ExndbamRepo _add_metadata_keys(); } -ExndbamRepository::~ExndbamRepository() -{ -} +ExndbamRepository::~ExndbamRepository() = default; void ExndbamRepository::_add_metadata_keys() const diff --git a/paludis/repositories/e/fetch_visitor.cc b/paludis/repositories/e/fetch_visitor.cc index b3d3d2b3d..83f27aa92 100644 --- a/paludis/repositories/e/fetch_visitor.cc +++ b/paludis/repositories/e/fetch_visitor.cc @@ -113,9 +113,7 @@ FetchVisitor::FetchVisitor( { } -FetchVisitor::~FetchVisitor() -{ -} +FetchVisitor::~FetchVisitor() = default; void FetchVisitor::visit(const FetchableURISpecTree::NodeType<ConditionalDepSpec>::Type & node) diff --git a/paludis/repositories/e/glsa.cc b/paludis/repositories/e/glsa.cc index 62ad2a2f7..8db372c97 100644 --- a/paludis/repositories/e/glsa.cc +++ b/paludis/repositories/e/glsa.cc @@ -83,9 +83,7 @@ GLSAPackage::GLSAPackage(const QualifiedPackageName & n) : { } -GLSAPackage::~GLSAPackage() -{ -} +GLSAPackage::~GLSAPackage() = default; GLSAPackage::ArchsConstIterator GLSAPackage::begin_archs() const @@ -152,9 +150,7 @@ GLSA::GLSA() : { } -GLSA::~GLSA() -{ -} +GLSA::~GLSA() = default; GLSA::PackagesConstIterator GLSA::begin_packages() const diff --git a/paludis/repositories/e/info_metadata_key.cc b/paludis/repositories/e/info_metadata_key.cc index 8a8fa83ee..e06d43e1b 100644 --- a/paludis/repositories/e/info_metadata_key.cc +++ b/paludis/repositories/e/info_metadata_key.cc @@ -93,9 +93,7 @@ InfoVarsMetadataKey::InfoVarsMetadataKey(const std::shared_ptr<const FSPathSeque { } -InfoVarsMetadataKey::~InfoVarsMetadataKey() -{ -} +InfoVarsMetadataKey::~InfoVarsMetadataKey() = default; const std::shared_ptr<const Set<std::string> > InfoVarsMetadataKey::parse_value() const @@ -148,9 +146,7 @@ InfoPkgsMetadataKey::InfoPkgsMetadataKey(const Environment * const e, { } -InfoPkgsMetadataKey::~InfoPkgsMetadataKey() -{ -} +InfoPkgsMetadataKey::~InfoPkgsMetadataKey() = default; void InfoPkgsMetadataKey::need_keys_added() const diff --git a/paludis/repositories/e/layout.cc b/paludis/repositories/e/layout.cc index d53e08a08..8415dd454 100644 --- a/paludis/repositories/e/layout.cc +++ b/paludis/repositories/e/layout.cc @@ -34,9 +34,7 @@ Layout::Layout(const std::shared_ptr<const FSPathSequence> & l) : { } -Layout::~Layout() -{ -} +Layout::~Layout() = default; const std::shared_ptr<const FSPathSequence> Layout::master_repositories_locations() const diff --git a/paludis/repositories/e/licence_groups.cc b/paludis/repositories/e/licence_groups.cc index 609a2f16f..aafb6bc62 100644 --- a/paludis/repositories/e/licence_groups.cc +++ b/paludis/repositories/e/licence_groups.cc @@ -47,9 +47,7 @@ LicenceGroups::LicenceGroups() : { } -LicenceGroups::~LicenceGroups() -{ -} +LicenceGroups::~LicenceGroups() = default; void LicenceGroups::add(const FSPath & p) diff --git a/paludis/repositories/e/manifest2_reader.cc b/paludis/repositories/e/manifest2_reader.cc index 96a33832d..e3080897f 100644 --- a/paludis/repositories/e/manifest2_reader.cc +++ b/paludis/repositories/e/manifest2_reader.cc @@ -128,9 +128,7 @@ Manifest2Reader::Manifest2Reader(const FSPath & f) : } } -Manifest2Reader::~Manifest2Reader() -{ -} +Manifest2Reader::~Manifest2Reader() = default; Manifest2Reader::ConstIterator Manifest2Reader::begin() const diff --git a/paludis/repositories/e/memoised_hashes.cc b/paludis/repositories/e/memoised_hashes.cc index 290790856..f1bace05d 100644 --- a/paludis/repositories/e/memoised_hashes.cc +++ b/paludis/repositories/e/memoised_hashes.cc @@ -53,9 +53,7 @@ MemoisedHashes::MemoisedHashes() : { } -MemoisedHashes::~MemoisedHashes() -{ -} +MemoisedHashes::~MemoisedHashes() = default; const std::string MemoisedHashes::get(const std::string & algo, const FSPath & file, SafeIFStream & stream) const diff --git a/paludis/repositories/e/metadata_xml.cc b/paludis/repositories/e/metadata_xml.cc index 216ab0a35..607e338fd 100644 --- a/paludis/repositories/e/metadata_xml.cc +++ b/paludis/repositories/e/metadata_xml.cc @@ -50,9 +50,7 @@ MetadataXMLPool::MetadataXMLPool() : { } -MetadataXMLPool::~MetadataXMLPool() -{ -} +MetadataXMLPool::~MetadataXMLPool() = default; const std::shared_ptr<const MetadataXML> MetadataXMLPool::metadata_if_exists(const FSPath & f) const diff --git a/paludis/repositories/e/myoptions_requirements_verifier.cc b/paludis/repositories/e/myoptions_requirements_verifier.cc index 7abddcfc2..f5764055b 100644 --- a/paludis/repositories/e/myoptions_requirements_verifier.cc +++ b/paludis/repositories/e/myoptions_requirements_verifier.cc @@ -73,9 +73,7 @@ MyOptionsRequirementsVerifier::MyOptionsRequirementsVerifier( { } -MyOptionsRequirementsVerifier::~MyOptionsRequirementsVerifier() -{ -} +MyOptionsRequirementsVerifier::~MyOptionsRequirementsVerifier() = default; const std::shared_ptr<const Sequence<std::string> > MyOptionsRequirementsVerifier::unmet_requirements() const diff --git a/paludis/repositories/e/pretend_fetch_visitor.cc b/paludis/repositories/e/pretend_fetch_visitor.cc index b556733f7..d217eee3a 100644 --- a/paludis/repositories/e/pretend_fetch_visitor.cc +++ b/paludis/repositories/e/pretend_fetch_visitor.cc @@ -91,9 +91,7 @@ PretendFetchVisitor::PretendFetchVisitor( { } -PretendFetchVisitor::~PretendFetchVisitor() -{ -} +PretendFetchVisitor::~PretendFetchVisitor() = default; void PretendFetchVisitor::visit(const FetchableURISpecTree::NodeType<ConditionalDepSpec>::Type & node) diff --git a/paludis/repositories/e/profile.cc b/paludis/repositories/e/profile.cc index a80945aa5..8dad550de 100644 --- a/paludis/repositories/e/profile.cc +++ b/paludis/repositories/e/profile.cc @@ -29,9 +29,7 @@ using namespace paludis; using namespace paludis::erepository; -Profile::~Profile() -{ -} +Profile::~Profile() = default; ProfileFactory::ProfileFactory() { diff --git a/paludis/repositories/e/source_uri_finder.cc b/paludis/repositories/e/source_uri_finder.cc index 7dfc568b8..3aee1d90b 100644 --- a/paludis/repositories/e/source_uri_finder.cc +++ b/paludis/repositories/e/source_uri_finder.cc @@ -75,9 +75,7 @@ SourceURIFinder::SourceURIFinder(const Environment * const e, const Repository * { } -SourceURIFinder::~SourceURIFinder() -{ -} +SourceURIFinder::~SourceURIFinder() = default; SourceURIFinder::ConstIterator SourceURIFinder::begin() const diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc index 33b78a06e..10c2e4d18 100644 --- a/paludis/repositories/e/traditional_layout.cc +++ b/paludis/repositories/e/traditional_layout.cc @@ -173,9 +173,7 @@ TraditionalLayout::TraditionalLayout( } } -TraditionalLayout::~TraditionalLayout() -{ -} +TraditionalLayout::~TraditionalLayout() = default; FSPath TraditionalLayout::categories_file() const diff --git a/paludis/repositories/e/traditional_mask_file.cc b/paludis/repositories/e/traditional_mask_file.cc index 7c8e269b0..ac316f2ee 100644 --- a/paludis/repositories/e/traditional_mask_file.cc +++ b/paludis/repositories/e/traditional_mask_file.cc @@ -133,9 +133,7 @@ TraditionalMaskFile::end() const return ConstIterator(_imp->lines.end()); } -TraditionalMaskFile::~TraditionalMaskFile() -{ -} +TraditionalMaskFile::~TraditionalMaskFile() = default; namespace paludis { diff --git a/paludis/repositories/e/traditional_mask_store.cc b/paludis/repositories/e/traditional_mask_store.cc index 66d72c207..b6394af82 100644 --- a/paludis/repositories/e/traditional_mask_store.cc +++ b/paludis/repositories/e/traditional_mask_store.cc @@ -73,9 +73,7 @@ TraditionalMaskStore::TraditionalMaskStore( _populate(); } -TraditionalMaskStore::~TraditionalMaskStore() -{ -} +TraditionalMaskStore::~TraditionalMaskStore() = default; void TraditionalMaskStore::_populate() diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc index 46e4d4d25..f5a502772 100644 --- a/paludis/repositories/e/traditional_profile.cc +++ b/paludis/repositories/e/traditional_profile.cc @@ -790,9 +790,7 @@ TraditionalProfile::TraditionalProfile( handle_profile_arch_var(_imp, arch_var_if_special); } -TraditionalProfile::~TraditionalProfile() -{ -} +TraditionalProfile::~TraditionalProfile() = default; std::shared_ptr<const FSPathSequence> TraditionalProfile::profiles_with_parents() const diff --git a/paludis/repositories/e/use_desc.cc b/paludis/repositories/e/use_desc.cc index f6e283077..7e219ac5f 100644 --- a/paludis/repositories/e/use_desc.cc +++ b/paludis/repositories/e/use_desc.cc @@ -84,9 +84,7 @@ UseDesc::UseDesc(const std::shared_ptr<const UseDescFileInfoSequence> & f) : { } -UseDesc::~UseDesc() -{ -} +UseDesc::~UseDesc() = default; const std::string UseDesc::describe( diff --git a/paludis/repositories/e/vdb_merger.cc b/paludis/repositories/e/vdb_merger.cc index 395a119d9..ebdfcdf0a 100644 --- a/paludis/repositories/e/vdb_merger.cc +++ b/paludis/repositories/e/vdb_merger.cc @@ -107,9 +107,7 @@ VDBMerger::VDBMerger(const VDBMergerParams & p) : { } -VDBMerger::~VDBMerger() -{ -} +VDBMerger::~VDBMerger() = default; Hook VDBMerger::extend_hook(const Hook & h) diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc index 5f59a4ff5..bcdb7e07d 100644 --- a/paludis/repositories/e/vdb_repository.cc +++ b/paludis/repositories/e/vdb_repository.cc @@ -148,9 +148,7 @@ namespace paludis { } - Imp<VDBRepository>::~Imp() - { - } + Imp<VDBRepository>::~Imp() = default; } VDBRepository::VDBRepository(const VDBRepositoryParams & p) : @@ -171,9 +169,7 @@ VDBRepository::VDBRepository(const VDBRepositoryParams & p) : _add_metadata_keys(); } -VDBRepository::~VDBRepository() -{ -} +VDBRepository::~VDBRepository() = default; void VDBRepository::_add_metadata_keys() const diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc index 5061682ca..cdb0aa185 100644 --- a/paludis/repositories/e/vdb_unmerger.cc +++ b/paludis/repositories/e/vdb_unmerger.cc @@ -82,9 +82,7 @@ VDBUnmerger::VDBUnmerger(const VDBUnmergerOptions & o) : { } -VDBUnmerger::~VDBUnmerger() -{ -} +VDBUnmerger::~VDBUnmerger() = default; Hook VDBUnmerger::extend_hook(const Hook & h) const diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc index 2982dfc06..a3499db8d 100644 --- a/paludis/repositories/fake/fake_installed_repository.cc +++ b/paludis/repositories/fake/fake_installed_repository.cc @@ -68,9 +68,7 @@ FakeInstalledRepository::FakeInstalledRepository(const FakeInstalledRepositoryPa add_metadata_key(_imp->installed_root_key); } -FakeInstalledRepository::~FakeInstalledRepository() -{ -} +FakeInstalledRepository::~FakeInstalledRepository() = default; bool FakeInstalledRepository::is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc index f33804192..8e02ad361 100644 --- a/paludis/repositories/fake/fake_package_id.cc +++ b/paludis/repositories/fake/fake_package_id.cc @@ -282,9 +282,7 @@ FakeMetadataSpecTreeKey<FetchableURISpecTree>::FakeMetadataSpecTreeKey(const std set_from_string(v); } -FakeMetadataSpecTreeKey<FetchableURISpecTree>::~FakeMetadataSpecTreeKey() -{ -} +FakeMetadataSpecTreeKey<FetchableURISpecTree>::~FakeMetadataSpecTreeKey() = default; void FakeMetadataSpecTreeKey<FetchableURISpecTree>::set_from_string(const std::string & s) @@ -337,9 +335,7 @@ FakeMetadataSpecTreeKey<DependencySpecTree>::FakeMetadataSpecTreeKey(const std:: set_from_string(v); } -FakeMetadataSpecTreeKey<DependencySpecTree>::~FakeMetadataSpecTreeKey() -{ -} +FakeMetadataSpecTreeKey<DependencySpecTree>::~FakeMetadataSpecTreeKey() = default; void FakeMetadataSpecTreeKey<DependencySpecTree>::set_from_string(const std::string & s) @@ -483,9 +479,7 @@ FakeMetadataChoicesKey::FakeMetadataChoicesKey(const Environment * const e, { } -FakeMetadataChoicesKey::~FakeMetadataChoicesKey() -{ -} +FakeMetadataChoicesKey::~FakeMetadataChoicesKey() = default; void FakeMetadataChoicesKey::add(const std::string & n, const std::string & v) @@ -557,9 +551,7 @@ FakeUnacceptedMask::FakeUnacceptedMask(const char c, const std::string & s, cons { } -FakeUnacceptedMask::~FakeUnacceptedMask() -{ -} +FakeUnacceptedMask::~FakeUnacceptedMask() = default; char FakeUnacceptedMask::key() const @@ -583,9 +575,7 @@ FakeUnsupportedMask::FakeUnsupportedMask() { } -FakeUnsupportedMask::~FakeUnsupportedMask() -{ -} +FakeUnsupportedMask::~FakeUnsupportedMask() = default; char FakeUnsupportedMask::key() const @@ -681,9 +671,7 @@ FakePackageID::FakePackageID(const Environment * const e, const RepositoryName & { } -FakePackageID::~FakePackageID() -{ -} +FakePackageID::~FakePackageID() = default; const std::string FakePackageID::canonical_form(const PackageIDCanonicalForm f) const diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc index 676897798..db7c8ae53 100644 --- a/paludis/repositories/fake/fake_repository.cc +++ b/paludis/repositories/fake/fake_repository.cc @@ -60,9 +60,7 @@ FakeRepository::FakeRepository(const FakeRepositoryParams & params) : add_metadata_key(_imp->format_key); } -FakeRepository::~FakeRepository() -{ -} +FakeRepository::~FakeRepository() = default; namespace paludis { diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc index 1c5e24e23..578b5f4bc 100644 --- a/paludis/repositories/fake/fake_repository_base.cc +++ b/paludis/repositories/fake/fake_repository_base.cc @@ -68,9 +68,7 @@ FakeRepositoryBase::FakeRepositoryBase(const Environment * const e, { } -FakeRepositoryBase::~FakeRepositoryBase() -{ -} +FakeRepositoryBase::~FakeRepositoryBase() = default; bool FakeRepositoryBase::has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const diff --git a/paludis/repositories/repository/repository_id.cc b/paludis/repositories/repository/repository_id.cc index 96f7d0f04..b8831658c 100644 --- a/paludis/repositories/repository/repository_id.cc +++ b/paludis/repositories/repository/repository_id.cc @@ -84,9 +84,7 @@ RepositoryID::RepositoryID(const RepositoryIDParams & entry) : add_metadata_key(_imp->behaviours_key); } -RepositoryID::~RepositoryID() -{ -} +RepositoryID::~RepositoryID() = default; void RepositoryID::need_keys_added() const diff --git a/paludis/repositories/repository/repository_repository.cc b/paludis/repositories/repository/repository_repository.cc index 1472a3e0e..d4f5baf90 100644 --- a/paludis/repositories/repository/repository_repository.cc +++ b/paludis/repositories/repository/repository_repository.cc @@ -101,9 +101,7 @@ RepositoryRepository::RepositoryRepository(const RepositoryRepositoryParams & p) _add_metadata_keys(); } -RepositoryRepository::~RepositoryRepository() -{ -} +RepositoryRepository::~RepositoryRepository() = default; const bool RepositoryRepository::is_unimportant() const diff --git a/paludis/repositories/repository/repository_repository_store.cc b/paludis/repositories/repository/repository_repository_store.cc index 682ede2fc..bf8fe417a 100644 --- a/paludis/repositories/repository/repository_repository_store.cc +++ b/paludis/repositories/repository/repository_repository_store.cc @@ -76,9 +76,7 @@ RepositoryRepositoryStore::RepositoryRepositoryStore( _populate(); } -RepositoryRepositoryStore::~RepositoryRepositoryStore() -{ -} +RepositoryRepositoryStore::~RepositoryRepositoryStore() = default; void RepositoryRepositoryStore::_populate() diff --git a/paludis/repositories/unavailable/unavailable_package_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc index a77119d57..5d5132655 100644 --- a/paludis/repositories/unavailable/unavailable_package_id.cc +++ b/paludis/repositories/unavailable/unavailable_package_id.cc @@ -88,9 +88,7 @@ UnavailablePackageID::UnavailablePackageID(const UnavailablePackageIDParams & en add_mask(_imp->mask); } -UnavailablePackageID::~UnavailablePackageID() -{ -} +UnavailablePackageID::~UnavailablePackageID() = default; void UnavailablePackageID::need_keys_added() const diff --git a/paludis/repositories/unavailable/unavailable_repository.cc b/paludis/repositories/unavailable/unavailable_repository.cc index aad388325..460191383 100644 --- a/paludis/repositories/unavailable/unavailable_repository.cc +++ b/paludis/repositories/unavailable/unavailable_repository.cc @@ -110,9 +110,7 @@ UnavailableRepository::UnavailableRepository(const UnavailableRepositoryParams & _add_metadata_keys(); } -UnavailableRepository::~UnavailableRepository() -{ -} +UnavailableRepository::~UnavailableRepository() = default; const bool UnavailableRepository::is_unimportant() const diff --git a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc index 9b5839ab1..f03a6579e 100644 --- a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc +++ b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc @@ -79,9 +79,7 @@ UnavailableRepositoryDependenciesKey::UnavailableRepositoryDependenciesKey(const { } -UnavailableRepositoryDependenciesKey::~UnavailableRepositoryDependenciesKey() -{ -} +UnavailableRepositoryDependenciesKey::~UnavailableRepositoryDependenciesKey() = default; const std::shared_ptr<const DependencySpecTree> UnavailableRepositoryDependenciesKey::parse_value() const diff --git a/paludis/repositories/unavailable/unavailable_repository_file.cc b/paludis/repositories/unavailable/unavailable_repository_file.cc index 648077114..c08b8b989 100644 --- a/paludis/repositories/unavailable/unavailable_repository_file.cc +++ b/paludis/repositories/unavailable/unavailable_repository_file.cc @@ -65,9 +65,7 @@ UnavailableRepositoryFile::UnavailableRepositoryFile(const FSPath & f) : _load(f); } -UnavailableRepositoryFile::~UnavailableRepositoryFile() -{ -} +UnavailableRepositoryFile::~UnavailableRepositoryFile() = default; UnavailableRepositoryFile::ConstIterator UnavailableRepositoryFile::begin() const diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc index 0005a18ed..fe514a7f7 100644 --- a/paludis/repositories/unavailable/unavailable_repository_id.cc +++ b/paludis/repositories/unavailable/unavailable_repository_id.cc @@ -112,9 +112,7 @@ UnavailableRepositoryID::UnavailableRepositoryID(const UnavailableRepositoryIDPa add_mask(_imp->mask); } -UnavailableRepositoryID::~UnavailableRepositoryID() -{ -} +UnavailableRepositoryID::~UnavailableRepositoryID() = default; void UnavailableRepositoryID::need_keys_added() const diff --git a/paludis/repositories/unavailable/unavailable_repository_store.cc b/paludis/repositories/unavailable/unavailable_repository_store.cc index 4434465ec..843357d36 100644 --- a/paludis/repositories/unavailable/unavailable_repository_store.cc +++ b/paludis/repositories/unavailable/unavailable_repository_store.cc @@ -82,9 +82,7 @@ UnavailableRepositoryStore::UnavailableRepositoryStore( _populate(env, f); } -UnavailableRepositoryStore::~UnavailableRepositoryStore() -{ -} +UnavailableRepositoryStore::~UnavailableRepositoryStore() = default; void UnavailableRepositoryStore::_populate(const Environment * const env, const FSPath & f) diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc index 3fbace967..efb271e8a 100644 --- a/paludis/repositories/unpackaged/installed_id.cc +++ b/paludis/repositories/unpackaged/installed_id.cc @@ -426,9 +426,7 @@ InstalledUnpackagedID::InstalledUnpackagedID(const Environment * const e, const add_metadata_key(_imp->behaviours_key); } -InstalledUnpackagedID::~InstalledUnpackagedID() -{ -} +InstalledUnpackagedID::~InstalledUnpackagedID() = default; void InstalledUnpackagedID::need_keys_added() const diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc index fb350bb87..f9c51fe39 100644 --- a/paludis/repositories/unpackaged/installed_repository.cc +++ b/paludis/repositories/unpackaged/installed_repository.cc @@ -104,9 +104,7 @@ InstalledUnpackagedRepository::InstalledUnpackagedRepository( _add_metadata_keys(); } -InstalledUnpackagedRepository::~InstalledUnpackagedRepository() -{ -} +InstalledUnpackagedRepository::~InstalledUnpackagedRepository() = default; void InstalledUnpackagedRepository::_add_metadata_keys() const diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc index 118ece886..c4dab961d 100644 --- a/paludis/repositories/unpackaged/unpackaged_id.cc +++ b/paludis/repositories/unpackaged/unpackaged_id.cc @@ -139,9 +139,7 @@ UnpackagedID::UnpackagedID(const Environment * const e, const QualifiedPackageNa add_metadata_key(_imp->preserve_work_key); } -UnpackagedID::~UnpackagedID() -{ -} +UnpackagedID::~UnpackagedID() = default; void UnpackagedID::need_keys_added() const diff --git a/paludis/repositories/unpackaged/unpackaged_key.cc b/paludis/repositories/unpackaged/unpackaged_key.cc index 388a01b59..6b679e3b7 100644 --- a/paludis/repositories/unpackaged/unpackaged_key.cc +++ b/paludis/repositories/unpackaged/unpackaged_key.cc @@ -67,9 +67,7 @@ UnpackagedDependencyKey::UnpackagedDependencyKey(const Environment * const env, { } -UnpackagedDependencyKey::~UnpackagedDependencyKey() -{ -} +UnpackagedDependencyKey::~UnpackagedDependencyKey() = default; const std::shared_ptr<const DependencySpecTree> UnpackagedDependencyKey::parse_value() const @@ -143,9 +141,7 @@ UnpackagedChoicesKey::UnpackagedChoicesKey(const Environment * const env, const { } -UnpackagedChoicesKey::~UnpackagedChoicesKey() -{ -} +UnpackagedChoicesKey::~UnpackagedChoicesKey() = default; const std::shared_ptr<const Choices> UnpackagedChoicesKey::parse_value() const diff --git a/paludis/repositories/unpackaged/unpackaged_repository.cc b/paludis/repositories/unpackaged/unpackaged_repository.cc index 00d2853c9..97c187ea5 100644 --- a/paludis/repositories/unpackaged/unpackaged_repository.cc +++ b/paludis/repositories/unpackaged/unpackaged_repository.cc @@ -103,9 +103,7 @@ UnpackagedRepository::UnpackagedRepository(const RepositoryName & n, _add_metadata_keys(); } -UnpackagedRepository::~UnpackagedRepository() -{ -} +UnpackagedRepository::~UnpackagedRepository() = default; void UnpackagedRepository::_add_metadata_keys() const diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.cc b/paludis/repositories/unpackaged/unpackaged_stripper.cc index 49e086b54..9f3290800 100644 --- a/paludis/repositories/unpackaged/unpackaged_stripper.cc +++ b/paludis/repositories/unpackaged/unpackaged_stripper.cc @@ -53,9 +53,7 @@ UnpackagedStripper::UnpackagedStripper(const UnpackagedStripperOptions & options { } -UnpackagedStripper::~UnpackagedStripper() -{ -} +UnpackagedStripper::~UnpackagedStripper() = default; void UnpackagedStripper::on_enter_dir(const FSPath &) diff --git a/paludis/repositories/unwritten/unwritten_id.cc b/paludis/repositories/unwritten/unwritten_id.cc index 9a6f60b12..e1b0d6fc9 100644 --- a/paludis/repositories/unwritten/unwritten_id.cc +++ b/paludis/repositories/unwritten/unwritten_id.cc @@ -107,9 +107,7 @@ UnwrittenID::UnwrittenID(const UnwrittenIDParams & entry) : add_mask(_imp->mask); } -UnwrittenID::~UnwrittenID() -{ -} +UnwrittenID::~UnwrittenID() = default; void UnwrittenID::need_keys_added() const diff --git a/paludis/repositories/unwritten/unwritten_repository.cc b/paludis/repositories/unwritten/unwritten_repository.cc index a1bbf3142..a738b6d23 100644 --- a/paludis/repositories/unwritten/unwritten_repository.cc +++ b/paludis/repositories/unwritten/unwritten_repository.cc @@ -104,9 +104,7 @@ UnwrittenRepository::UnwrittenRepository(const UnwrittenRepositoryParams & p) : _add_metadata_keys(); } -UnwrittenRepository::~UnwrittenRepository() -{ -} +UnwrittenRepository::~UnwrittenRepository() = default; const bool UnwrittenRepository::is_unimportant() const diff --git a/paludis/repositories/unwritten/unwritten_repository_file.cc b/paludis/repositories/unwritten/unwritten_repository_file.cc index 83debb902..ca6edbb70 100644 --- a/paludis/repositories/unwritten/unwritten_repository_file.cc +++ b/paludis/repositories/unwritten/unwritten_repository_file.cc @@ -70,9 +70,7 @@ UnwrittenRepositoryFile::UnwrittenRepositoryFile(const FSPath & f) : _load(f); } -UnwrittenRepositoryFile::~UnwrittenRepositoryFile() -{ -} +UnwrittenRepositoryFile::~UnwrittenRepositoryFile() = default; UnwrittenRepositoryFile::ConstIterator UnwrittenRepositoryFile::begin() const diff --git a/paludis/repositories/unwritten/unwritten_repository_store.cc b/paludis/repositories/unwritten/unwritten_repository_store.cc index 744706676..9029d0565 100644 --- a/paludis/repositories/unwritten/unwritten_repository_store.cc +++ b/paludis/repositories/unwritten/unwritten_repository_store.cc @@ -97,9 +97,7 @@ UnwrittenRepositoryStore::UnwrittenRepositoryStore( _populate(env, f); } -UnwrittenRepositoryStore::~UnwrittenRepositoryStore() -{ -} +UnwrittenRepositoryStore::~UnwrittenRepositoryStore() = default; void UnwrittenRepositoryStore::_populate(const Environment * const env, const FSPath & f) diff --git a/paludis/repository.cc b/paludis/repository.cc index e1b247a09..db8d25540 100644 --- a/paludis/repository.cc +++ b/paludis/repository.cc @@ -51,9 +51,7 @@ NoSuchSetError::NoSuchSetError(const std::string & our_name) noexcept : { } -NoSuchSetError::~NoSuchSetError() -{ -} +NoSuchSetError::~NoSuchSetError() = default; RecursivelyDefinedSetError::RecursivelyDefinedSetError(const std::string & our_name) noexcept : Exception("Set '" + our_name + "' is recursively defined"), @@ -61,9 +59,7 @@ RecursivelyDefinedSetError::RecursivelyDefinedSetError(const std::string & our_n { } -RecursivelyDefinedSetError::~RecursivelyDefinedSetError() -{ -} +RecursivelyDefinedSetError::~RecursivelyDefinedSetError() = default; namespace paludis { @@ -134,9 +130,7 @@ Repository::Repository( << "' is blacklisted with reason '" << reason << "'."; } -Repository::~Repository() -{ -} +Repository::~Repository() = default; const RepositoryName Repository::name() const noexcept @@ -169,17 +163,11 @@ Repository::purge_invalid_cache() const { } -RepositoryEnvironmentVariableInterface::~RepositoryEnvironmentVariableInterface() -{ -} +RepositoryEnvironmentVariableInterface::~RepositoryEnvironmentVariableInterface() = default; -RepositoryDestinationInterface::~RepositoryDestinationInterface() -{ -} +RepositoryDestinationInterface::~RepositoryDestinationInterface() = default; -RepositoryManifestInterface::~RepositoryManifestInterface() -{ -} +RepositoryManifestInterface::~RepositoryManifestInterface() = default; std::shared_ptr<const CategoryNamePartSet> Repository::unimportant_category_names(const RepositoryContentMayExcludes &) const diff --git a/paludis/repository_factory.cc b/paludis/repository_factory.cc index d800408a6..5763939cf 100644 --- a/paludis/repository_factory.cc +++ b/paludis/repository_factory.cc @@ -126,9 +126,7 @@ RepositoryFactory::RepositoryFactory() : register_repositories(static_cast<const TypeOrNoType<REPOSITORY_GROUP_IF_unpackaged>::Type *>(nullptr), this); } -RepositoryFactory::~RepositoryFactory() -{ -} +RepositoryFactory::~RepositoryFactory() = default; const std::shared_ptr<Repository> RepositoryFactory::create( diff --git a/paludis/repository_name_cache.cc b/paludis/repository_name_cache.cc index a47e1c4d3..9edc77c6d 100644 --- a/paludis/repository_name_cache.cc +++ b/paludis/repository_name_cache.cc @@ -185,9 +185,7 @@ RepositoryNameCache::RepositoryNameCache( { } -RepositoryNameCache::~RepositoryNameCache() -{ -} +RepositoryNameCache::~RepositoryNameCache() = default; std::shared_ptr<const CategoryNamePartSet> RepositoryNameCache::category_names_containing_package(const PackageNamePart & p) const diff --git a/paludis/resolver/constraint.cc b/paludis/resolver/constraint.cc index 703e7be67..0f32844f6 100644 --- a/paludis/resolver/constraint.cc +++ b/paludis/resolver/constraint.cc @@ -66,9 +66,7 @@ Constraints::Constraints() : { } -Constraints::~Constraints() -{ -} +Constraints::~Constraints() = default; bool Constraints::all_untaken() const diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 5c932a214..4a20df9b2 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -110,9 +110,7 @@ Decider::Decider(const Environment * const e, const ResolverFunctions & f, { } -Decider::~Decider() -{ -} +Decider::~Decider() = default; void Decider::_resolve_decide_with_dependencies() diff --git a/paludis/resolver/job.cc b/paludis/resolver/job.cc index 211e72822..d12a9a0bf 100644 --- a/paludis/resolver/job.cc +++ b/paludis/resolver/job.cc @@ -55,9 +55,7 @@ PretendJob::PretendJob(const PackageDepSpec & o, const RepositoryName & r, const { } -PretendJob::~PretendJob() -{ -} +PretendJob::~PretendJob() = default; const PackageDepSpec PretendJob::origin_id_spec() const @@ -99,10 +97,6 @@ PretendJob::serialise(Serialiser & s) const ; } -ExecuteJob::~ExecuteJob() -{ -} - const std::shared_ptr<ExecuteJob> ExecuteJob::deserialise(Deserialisation & d) { @@ -146,9 +140,7 @@ FetchJob::FetchJob( { } -FetchJob::~FetchJob() -{ -} +FetchJob::~FetchJob() = default; const PackageDepSpec FetchJob::origin_id_spec() const @@ -258,9 +250,7 @@ InstallJob::InstallJob( { } -InstallJob::~InstallJob() -{ -} +InstallJob::~InstallJob() = default; const PackageDepSpec InstallJob::origin_id_spec() const @@ -397,9 +387,7 @@ UninstallJob::UninstallJob( { } -UninstallJob::~UninstallJob() -{ -} +UninstallJob::~UninstallJob() = default; const std::shared_ptr<const Sequence<PackageDepSpec> > UninstallJob::ids_to_remove_specs() const diff --git a/paludis/resolver/job.hh b/paludis/resolver/job.hh index 58a4974ce..71918c01c 100644 --- a/paludis/resolver/job.hh +++ b/paludis/resolver/job.hh @@ -62,7 +62,7 @@ namespace paludis FetchJob, InstallJob, UninstallJob>::Type> { public: - virtual ~ExecuteJob(); + virtual ~ExecuteJob() = default; virtual const std::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; virtual void set_state(const std::shared_ptr<JobState> &) = 0; diff --git a/paludis/resolver/job_state.cc b/paludis/resolver/job_state.cc index c7f7d0d81..f2e6e0b7d 100644 --- a/paludis/resolver/job_state.cc +++ b/paludis/resolver/job_state.cc @@ -55,9 +55,7 @@ namespace paludis }; } -JobState::~JobState() -{ -} +JobState::~JobState() = default; const std::shared_ptr<JobState> JobState::deserialise(Deserialisation & d) @@ -111,9 +109,7 @@ JobActiveState::JobActiveState() : { } -JobActiveState::~JobActiveState() -{ -} +JobActiveState::~JobActiveState() = default; void JobActiveState::set_output_manager(const std::shared_ptr<OutputManager> & m) @@ -159,9 +155,7 @@ JobSucceededState::JobSucceededState(const std::shared_ptr<OutputManager> & m) : { } -JobSucceededState::~JobSucceededState() -{ -} +JobSucceededState::~JobSucceededState() = default; const std::shared_ptr<OutputManager> JobSucceededState::output_manager() const @@ -189,9 +183,7 @@ JobFailedState::JobFailedState(const std::shared_ptr<OutputManager> & m) : { } -JobFailedState::~JobFailedState() -{ -} +JobFailedState::~JobFailedState() = default; const std::shared_ptr<OutputManager> JobFailedState::output_manager() const diff --git a/paludis/resolver/nag.cc b/paludis/resolver/nag.cc index 31a09e64f..20e1d7cdc 100644 --- a/paludis/resolver/nag.cc +++ b/paludis/resolver/nag.cc @@ -132,9 +132,7 @@ NAG::NAG() : { } -NAG::~NAG() -{ -} +NAG::~NAG() = default; void NAG::add_node(const NAGIndex & r) diff --git a/paludis/resolver/orderer.cc b/paludis/resolver/orderer.cc index 9134177dd..88675ebef 100644 --- a/paludis/resolver/orderer.cc +++ b/paludis/resolver/orderer.cc @@ -105,9 +105,7 @@ Orderer::Orderer( { } -Orderer::~Orderer() -{ -} +Orderer::~Orderer() = default; namespace { diff --git a/paludis/resolver/package_id_comparator_with_promotion.cc b/paludis/resolver/package_id_comparator_with_promotion.cc index ea984b991..8baa353b3 100644 --- a/paludis/resolver/package_id_comparator_with_promotion.cc +++ b/paludis/resolver/package_id_comparator_with_promotion.cc @@ -60,9 +60,7 @@ PackageIDComparatorWithPromotion::PackageIDComparatorWithPromotion(const Package _imp->m = other._imp->m; } -PackageIDComparatorWithPromotion::~PackageIDComparatorWithPromotion() -{ -} +PackageIDComparatorWithPromotion::~PackageIDComparatorWithPromotion() = default; bool PackageIDComparatorWithPromotion::operator() (const std::shared_ptr<const PackageID> & a, diff --git a/paludis/resolver/reason.cc b/paludis/resolver/reason.cc index c34904edf..a41851121 100644 --- a/paludis/resolver/reason.cc +++ b/paludis/resolver/reason.cc @@ -35,9 +35,7 @@ using namespace paludis; using namespace paludis::resolver; -Reason::~Reason() -{ -} +Reason::~Reason() = default; namespace paludis { @@ -58,9 +56,7 @@ TargetReason::TargetReason(const std::string & x) : { } -TargetReason::~TargetReason() -{ -} +TargetReason::~TargetReason() = default; const std::string TargetReason::extra_information() const @@ -109,9 +105,7 @@ DependencyReason::DependencyReason(const std::shared_ptr<const PackageID> & i, { } -DependencyReason::~DependencyReason() -{ -} +DependencyReason::~DependencyReason() = default; const std::shared_ptr<const PackageID> DependencyReason::from_id() const @@ -174,9 +168,7 @@ DependentReason::DependentReason(const DependentPackageID & i) : { } -DependentReason::~DependentReason() -{ -} +DependentReason::~DependentReason() = default; const DependentPackageID DependentReason::dependent_upon() const @@ -211,9 +203,7 @@ WasUsedByReason::WasUsedByReason(const std::shared_ptr<const ChangeByResolventSe { } -WasUsedByReason::~WasUsedByReason() -{ -} +WasUsedByReason::~WasUsedByReason() = default; const std::shared_ptr<const ChangeByResolventSequence> WasUsedByReason::ids_and_resolvents_being_removed() const @@ -250,9 +240,7 @@ PresetReason::PresetReason(const std::string & m, const std::shared_ptr<const Re { } -PresetReason::~PresetReason() -{ -} +PresetReason::~PresetReason() = default; const std::shared_ptr<const Reason> PresetReason::maybe_reason_for_preset() const @@ -296,9 +284,7 @@ SetReason::SetReason(const SetName & s, const std::shared_ptr<const Reason> & r) { } -SetReason::~SetReason() -{ -} +SetReason::~SetReason() = default; const SetName SetReason::set_name() const @@ -342,9 +328,7 @@ LikeOtherDestinationTypeReason::LikeOtherDestinationTypeReason(const Resolvent & { } -LikeOtherDestinationTypeReason::~LikeOtherDestinationTypeReason() -{ -} +LikeOtherDestinationTypeReason::~LikeOtherDestinationTypeReason() = default; const Resolvent LikeOtherDestinationTypeReason::other_resolvent() const @@ -386,9 +370,7 @@ ViaBinaryReason::ViaBinaryReason(const Resolvent & r) : { } -ViaBinaryReason::~ViaBinaryReason() -{ -} +ViaBinaryReason::~ViaBinaryReason() = default; const Resolvent ViaBinaryReason::other_resolvent() const diff --git a/paludis/resolver/resolutions_by_resolvent.cc b/paludis/resolver/resolutions_by_resolvent.cc index dba6f12fe..134d87aac 100644 --- a/paludis/resolver/resolutions_by_resolvent.cc +++ b/paludis/resolver/resolutions_by_resolvent.cc @@ -58,9 +58,7 @@ ResolutionsByResolvent::ResolutionsByResolvent() : { } -ResolutionsByResolvent::~ResolutionsByResolvent() -{ -} +ResolutionsByResolvent::~ResolutionsByResolvent() = default; ResolutionsByResolvent::ConstIterator ResolutionsByResolvent::begin() const diff --git a/paludis/resolver/resolver.cc b/paludis/resolver/resolver.cc index 542b25482..24c612b53 100644 --- a/paludis/resolver/resolver.cc +++ b/paludis/resolver/resolver.cc @@ -88,9 +88,7 @@ Resolver::Resolver(const Environment * const e, const ResolverFunctions & f) : { } -Resolver::~Resolver() -{ -} +Resolver::~Resolver() = default; void Resolver::add_target(const PackageOrBlockDepSpec & spec, const std::string & extra_information) diff --git a/paludis/resolver/sanitised_dependencies.cc b/paludis/resolver/sanitised_dependencies.cc index deb3b533b..05bad5590 100644 --- a/paludis/resolver/sanitised_dependencies.cc +++ b/paludis/resolver/sanitised_dependencies.cc @@ -477,9 +477,7 @@ SanitisedDependencies::SanitisedDependencies() : { } -SanitisedDependencies::~SanitisedDependencies() -{ -} +SanitisedDependencies::~SanitisedDependencies() = default; void SanitisedDependencies::_populate_one( diff --git a/paludis/resolver/suggest_restart.cc b/paludis/resolver/suggest_restart.cc index c06fb08cf..edaf72642 100644 --- a/paludis/resolver/suggest_restart.cc +++ b/paludis/resolver/suggest_restart.cc @@ -70,9 +70,7 @@ SuggestRestart::SuggestRestart(const SuggestRestart & o) : { } -SuggestRestart::~SuggestRestart() -{ -} +SuggestRestart::~SuggestRestart() = default; const Resolvent SuggestRestart::resolvent() const diff --git a/paludis/selection.cc b/paludis/selection.cc index fed052803..f0f28d787 100644 --- a/paludis/selection.cc +++ b/paludis/selection.cc @@ -74,9 +74,7 @@ Selection::Selection(const Selection & other) : { } -Selection::~Selection() -{ -} +Selection::~Selection() = default; Selection & Selection::operator= (const Selection & other) diff --git a/paludis/selection_handler.cc b/paludis/selection_handler.cc index 40b7529f6..10d53382d 100644 --- a/paludis/selection_handler.cc +++ b/paludis/selection_handler.cc @@ -21,7 +21,5 @@ using namespace paludis; -SelectionHandler::~SelectionHandler() -{ -} +SelectionHandler::~SelectionHandler() = default; diff --git a/paludis/selinux/security_context.cc b/paludis/selinux/security_context.cc index 480141adb..ab1378ab1 100644 --- a/paludis/selinux/security_context.cc +++ b/paludis/selinux/security_context.cc @@ -174,9 +174,7 @@ SecurityContext::SecurityContext() : { } -SecurityContext::~SecurityContext() -{ -} +SecurityContext::~SecurityContext() = default; std::shared_ptr<const SecurityContext> SecurityContext::current_context() { @@ -228,9 +226,7 @@ MatchPathCon::MatchPathCon() _good=true; } -MatchPathCon::~MatchPathCon() -{ -} +MatchPathCon::~MatchPathCon() = default; bool MatchPathCon::good() const { diff --git a/paludis/serialise.cc b/paludis/serialise.cc index 6d17c36a6..24663b270 100644 --- a/paludis/serialise.cc +++ b/paludis/serialise.cc @@ -51,9 +51,7 @@ Serialiser::Serialiser(std::ostream & s) : { } -Serialiser::~Serialiser() -{ -} +Serialiser::~Serialiser() = default; std::ostream & Serialiser::raw_stream() @@ -175,9 +173,7 @@ Deserialiser::Deserialiser(const Environment * const e, std::istream & s) : { } -Deserialiser::~Deserialiser() -{ -} +Deserialiser::~Deserialiser() = default; std::istream & Deserialiser::stream() @@ -280,9 +276,7 @@ Deserialisation::Deserialisation(const std::string & i, Deserialiser & d) : } } -Deserialisation::~Deserialisation() -{ -} +Deserialisation::~Deserialisation() = default; const std::string Deserialisation::item_name() const diff --git a/paludis/set_file.cc b/paludis/set_file.cc index 70c55abda..cfd360624 100644 --- a/paludis/set_file.cc +++ b/paludis/set_file.cc @@ -294,13 +294,9 @@ namespace } } -SetFileHandler::SetFileHandler() -{ -} +SetFileHandler::SetFileHandler() = default; -SetFileHandler::~SetFileHandler() -{ -} +SetFileHandler::~SetFileHandler() = default; SimpleHandler::SimpleHandler(const SetFileParams & p) : _p(p) @@ -593,9 +589,7 @@ SetFile::SetFile(const SetFileParams & p) : { } -SetFile::~SetFile() -{ -} +SetFile::~SetFile() = default; const std::shared_ptr<const SetSpecTree> SetFile::contents() const diff --git a/paludis/standard_output_manager.cc b/paludis/standard_output_manager.cc index 87d7c9dd8..32f60b928 100644 --- a/paludis/standard_output_manager.cc +++ b/paludis/standard_output_manager.cc @@ -27,9 +27,7 @@ StandardOutputManager::StandardOutputManager() { } -StandardOutputManager::~StandardOutputManager() -{ -} +StandardOutputManager::~StandardOutputManager() = default; std::ostream & StandardOutputManager::stdout_stream() diff --git a/paludis/stripper.cc b/paludis/stripper.cc index b2a59990f..c9d2a9d3c 100644 --- a/paludis/stripper.cc +++ b/paludis/stripper.cc @@ -155,9 +155,7 @@ Stripper::Stripper(const StripperOptions & options) : { } -Stripper::~Stripper() -{ -} +Stripper::~Stripper() = default; void Stripper::strip() diff --git a/paludis/syncer.cc b/paludis/syncer.cc index 4c94f8b39..34185af21 100644 --- a/paludis/syncer.cc +++ b/paludis/syncer.cc @@ -119,15 +119,9 @@ DefaultSyncer::sync(const SyncOptions & opts) const throw SyncFailedError(_local, _remote); } -Syncer::Syncer() -{ -} +Syncer::Syncer() = default; -Syncer::~Syncer() -{ -} +Syncer::~Syncer() = default; -DefaultSyncer::~DefaultSyncer() -{ -} +DefaultSyncer::~DefaultSyncer() = default; diff --git a/paludis/tee_output_manager.cc b/paludis/tee_output_manager.cc index 21bf20e30..382e71ba1 100644 --- a/paludis/tee_output_manager.cc +++ b/paludis/tee_output_manager.cc @@ -93,9 +93,7 @@ TeeOutputManager::TeeOutputManager( _imp->stderr_stream.add_stream(&(*i)->stderr_stream()); } -TeeOutputManager::~TeeOutputManager() -{ -} +TeeOutputManager::~TeeOutputManager() = default; std::ostream & TeeOutputManager::stdout_stream() diff --git a/paludis/unchoices_key.cc b/paludis/unchoices_key.cc index 1e5d0be01..a60c48fb4 100644 --- a/paludis/unchoices_key.cc +++ b/paludis/unchoices_key.cc @@ -50,9 +50,7 @@ namespace ))); } - ~UnChoicesKey() override - { - } + ~UnChoicesKey() override = default; const std::shared_ptr<const Choices> parse_value() const override { diff --git a/paludis/unmerger.cc b/paludis/unmerger.cc index 3bad8861c..4126f9de9 100644 --- a/paludis/unmerger.cc +++ b/paludis/unmerger.cc @@ -62,9 +62,7 @@ Unmerger::Unmerger(const UnmergerOptions & o) : { } -Unmerger::~Unmerger() -{ -} +Unmerger::~Unmerger() = default; void Unmerger::add_unmerge_entry(const EntryType et, const std::shared_ptr<const ContentsEntry> & e) diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc index b23a0c5c5..346b404b4 100644 --- a/paludis/user_dep_spec.cc +++ b/paludis/user_dep_spec.cc @@ -506,9 +506,7 @@ UserKeyRequirement::UserKeyRequirement(const std::string & s) : { } -UserKeyRequirement::~UserKeyRequirement() -{ -} +UserKeyRequirement::~UserKeyRequirement() = default; namespace { @@ -1174,9 +1172,7 @@ ExcludeRequirement::ExcludeRequirement(const PackageDepSpec & s) : { } -ExcludeRequirement::~ExcludeRequirement() -{ -} +ExcludeRequirement::~ExcludeRequirement() = default; const std::pair<bool, std::string> ExcludeRequirement::requirement_met( diff --git a/paludis/util/buffer_output_stream.cc b/paludis/util/buffer_output_stream.cc index 46b97a3bf..eabf1035d 100644 --- a/paludis/util/buffer_output_stream.cc +++ b/paludis/util/buffer_output_stream.cc @@ -47,9 +47,7 @@ BufferOutputStreamBuf::BufferOutputStreamBuf() : setg(nullptr, nullptr, nullptr); } -BufferOutputStreamBuf::~BufferOutputStreamBuf() -{ -} +BufferOutputStreamBuf::~BufferOutputStreamBuf() = default; BufferOutputStreamBuf::int_type BufferOutputStreamBuf::overflow(int_type c) @@ -112,19 +110,11 @@ BufferOutputStreamBase::BufferOutputStreamBase() { } -BufferOutputStreamBase::~BufferOutputStreamBase() -{ -} - BufferOutputStream::BufferOutputStream() : std::ostream(&buf) { } -BufferOutputStream::~BufferOutputStream() -{ -} - void BufferOutputStream::unbuffer(std::ostream & s) { diff --git a/paludis/util/buffer_output_stream.hh b/paludis/util/buffer_output_stream.hh index 1aafc70bd..4ba27cb54 100644 --- a/paludis/util/buffer_output_stream.hh +++ b/paludis/util/buffer_output_stream.hh @@ -52,7 +52,7 @@ namespace paludis public: BufferOutputStreamBase(); - ~BufferOutputStreamBase(); + ~BufferOutputStreamBase() = default; }; class PALUDIS_VISIBLE BufferOutputStream : @@ -61,7 +61,7 @@ namespace paludis { public: BufferOutputStream(); - ~BufferOutputStream(); + ~BufferOutputStream() = default; void unbuffer(std::ostream &); bool anything_to_unbuffer() const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/util/channel.cc b/paludis/util/channel.cc index a745509d6..009f01c6a 100644 --- a/paludis/util/channel.cc +++ b/paludis/util/channel.cc @@ -28,10 +28,6 @@ using namespace paludis; -Channel::Channel() -{ -} - Channel::~Channel() { Context context("When destroying channel FDs '" + stringify(read_fd()) + "', '" + stringify(write_fd()) + "'"); diff --git a/paludis/util/channel.hh b/paludis/util/channel.hh index 10654f782..6db97051a 100644 --- a/paludis/util/channel.hh +++ b/paludis/util/channel.hh @@ -50,7 +50,7 @@ namespace paludis ///\name Basic operations ///\{ - Channel(); + Channel() = default; virtual ~Channel(); diff --git a/paludis/util/config_file.cc b/paludis/util/config_file.cc index c9b497781..dbff8ff7b 100644 --- a/paludis/util/config_file.cc +++ b/paludis/util/config_file.cc @@ -141,9 +141,7 @@ ConfigFile::Source::operator= (const ConfigFile::Source & other) return *this; } -ConfigFile::Source::~Source() -{ -} +ConfigFile::Source::~Source() = default; const std::string & ConfigFile::Source::text() const @@ -157,9 +155,7 @@ ConfigFile::Source::filename() const return _imp->filename; } -ConfigFile::~ConfigFile() -{ -} +ConfigFile::~ConfigFile() = default; namespace paludis { @@ -304,9 +300,7 @@ LineConfigFile::LineConfigFile(const Source & sr, const LineConfigFileOptions & } } -LineConfigFile::~LineConfigFile() -{ -} +LineConfigFile::~LineConfigFile() = default; LineConfigFile::ConstIterator LineConfigFile::begin() const @@ -819,9 +813,7 @@ KeyValueConfigFile::KeyValueConfigFile( _imp->active_key_prefix = ""; } -KeyValueConfigFile::~KeyValueConfigFile() -{ -} +KeyValueConfigFile::~KeyValueConfigFile() = default; KeyValueConfigFile::ConstIterator KeyValueConfigFile::begin() const diff --git a/paludis/util/damerau_levenshtein.cc b/paludis/util/damerau_levenshtein.cc index 1de895ece..4b99bbe60 100644 --- a/paludis/util/damerau_levenshtein.cc +++ b/paludis/util/damerau_levenshtein.cc @@ -44,9 +44,7 @@ DamerauLevenshtein::DamerauLevenshtein(const std::string & name) : { } -DamerauLevenshtein::~DamerauLevenshtein() -{ -} +DamerauLevenshtein::~DamerauLevenshtein() = default; unsigned DamerauLevenshtein::distance_with(const std::string & candidate) const diff --git a/paludis/util/digest_registry.cc b/paludis/util/digest_registry.cc index 6994b8fb1..906959519 100644 --- a/paludis/util/digest_registry.cc +++ b/paludis/util/digest_registry.cc @@ -49,9 +49,7 @@ DigestRegistry::DigestRegistry() { } -DigestRegistry::~DigestRegistry() -{ -} +DigestRegistry::~DigestRegistry() = default; DigestRegistry::Function DigestRegistry::get(const std::string & algo) const diff --git a/paludis/util/elf.cc b/paludis/util/elf.cc index f7a0a6fd8..fae6d21b0 100644 --- a/paludis/util/elf.cc +++ b/paludis/util/elf.cc @@ -215,11 +215,6 @@ namespace paludis } } -InvalidElfFileError::InvalidElfFileError(const InvalidElfFileError & other) : - Exception(other) -{ -} - InvalidElfFileError::InvalidElfFileError(const std::string & s) noexcept: Exception(s) { diff --git a/paludis/util/elf.hh b/paludis/util/elf.hh index e4410a500..e98c01979 100644 --- a/paludis/util/elf.hh +++ b/paludis/util/elf.hh @@ -35,7 +35,7 @@ namespace paludis public paludis::Exception { public: - InvalidElfFileError(const InvalidElfFileError &); + InvalidElfFileError(const InvalidElfFileError &) = default; InvalidElfFileError(const std::string &) noexcept; }; diff --git a/paludis/util/elf_dynamic_section.cc b/paludis/util/elf_dynamic_section.cc index 1b13d3e43..1dd9385b1 100644 --- a/paludis/util/elf_dynamic_section.cc +++ b/paludis/util/elf_dynamic_section.cc @@ -200,9 +200,7 @@ DynamicEntryValue<ElfType_>::DynamicEntryValue(const std::string & name) : } template <typename ElfType_> -DynamicEntryValue<ElfType_>::~DynamicEntryValue() -{ -} +DynamicEntryValue<ElfType_>::~DynamicEntryValue() = default; template <typename ElfType_> void diff --git a/paludis/util/exception.cc b/paludis/util/exception.cc index c6908ea61..1cf4b6dac 100644 --- a/paludis/util/exception.cc +++ b/paludis/util/exception.cc @@ -70,10 +70,7 @@ namespace paludis local_context.assign(context.begin(), context.end()); } - ContextData(const ContextData & other) : - local_context(other.local_context) - { - } + ContextData(const ContextData & other) = default; }; } diff --git a/paludis/util/executor.cc b/paludis/util/executor.cc index 621146e51..aca881fcd 100644 --- a/paludis/util/executor.cc +++ b/paludis/util/executor.cc @@ -34,9 +34,7 @@ typedef std::list<std::shared_ptr<Executive> > ExecutiveList; typedef std::map<std::string, ExecutiveList> Queues; typedef std::list<std::shared_ptr<Executive> > ReadyForPost; -Executive::~Executive() -{ -} +Executive::~Executive() = default; namespace paludis { @@ -68,9 +66,7 @@ Executor::Executor(int ms_update_interval) : { } -Executor::~Executor() -{ -} +Executor::~Executor() = default; void Executor::_one(const std::shared_ptr<Executive> executive) diff --git a/paludis/util/fs_iterator.cc b/paludis/util/fs_iterator.cc index b1845142f..68763850c 100644 --- a/paludis/util/fs_iterator.cc +++ b/paludis/util/fs_iterator.cc @@ -184,9 +184,7 @@ FSIterator::FSIterator() : _imp->iter = _imp->items->end(); } -FSIterator::~FSIterator() -{ -} +FSIterator::~FSIterator() = default; FSIterator & FSIterator::operator= (const FSIterator & other) diff --git a/paludis/util/graph.cc b/paludis/util/graph.cc index a01a00a6f..74635328a 100644 --- a/paludis/util/graph.cc +++ b/paludis/util/graph.cc @@ -40,7 +40,3 @@ NoGraphTopologicalOrderExistsError::remaining_nodes() const return _remaining_nodes; } -NoGraphTopologicalOrderExistsError::~NoGraphTopologicalOrderExistsError() -{ -} - diff --git a/paludis/util/graph.hh b/paludis/util/graph.hh index 1becae926..50806fe56 100644 --- a/paludis/util/graph.hh +++ b/paludis/util/graph.hh @@ -130,7 +130,7 @@ namespace paludis ///\{ NoGraphTopologicalOrderExistsError(const std::shared_ptr<const RemainingNodes> &) noexcept; - ~NoGraphTopologicalOrderExistsError(); + ~NoGraphTopologicalOrderExistsError() = default; ///\} diff --git a/paludis/util/log.cc b/paludis/util/log.cc index fb8d38593..291309183 100644 --- a/paludis/util/log.cc +++ b/paludis/util/log.cc @@ -128,9 +128,7 @@ Log::Log() : { } -Log::~Log() -{ -} +Log::~Log() = default; void Log::set_log_level(const LogLevel l) diff --git a/paludis/util/options.cc b/paludis/util/options.cc index d3c0f40c3..9969d6856 100644 --- a/paludis/util/options.cc +++ b/paludis/util/options.cc @@ -28,22 +28,6 @@ OptionsStore::OptionsStore() : { } -OptionsStore::OptionsStore(const OptionsStore & s) : - _bits(s._bits) -{ -} - -const OptionsStore & -OptionsStore::operator= (const OptionsStore & s) -{ - _bits = s._bits; - return *this; -} - -OptionsStore::~OptionsStore() -{ -} - void OptionsStore::add(const unsigned e) { diff --git a/paludis/util/options.hh b/paludis/util/options.hh index 4ac2e07bf..7af372297 100644 --- a/paludis/util/options.hh +++ b/paludis/util/options.hh @@ -55,9 +55,10 @@ namespace paludis ///\{ OptionsStore(); - OptionsStore(const OptionsStore &); - const OptionsStore & operator= (const OptionsStore &); - ~OptionsStore(); + OptionsStore(const OptionsStore &) = default; + ~OptionsStore() = default; + + OptionsStore & operator= (const OptionsStore &) = default; ///\} diff --git a/paludis/util/pipe.cc b/paludis/util/pipe.cc index 4538cf700..39672342a 100644 --- a/paludis/util/pipe.cc +++ b/paludis/util/pipe.cc @@ -52,7 +52,3 @@ Pipe::Pipe(const bool close_exec) } } -Pipe::~Pipe() -{ -} - diff --git a/paludis/util/pipe.hh b/paludis/util/pipe.hh index 928c889ef..3e5710bec 100644 --- a/paludis/util/pipe.hh +++ b/paludis/util/pipe.hh @@ -52,7 +52,7 @@ namespace paludis explicit Pipe(const bool close_exec); - virtual ~Pipe(); + virtual ~Pipe() = default; ///\} diff --git a/paludis/util/process.cc b/paludis/util/process.cc index fa9bf8902..a159f9bfe 100644 --- a/paludis/util/process.cc +++ b/paludis/util/process.cc @@ -554,9 +554,7 @@ Process::Process(ProcessCommand && c) : { } -Process::~Process() -{ -} +Process::~Process() = default; RunningProcessHandle Process::run() diff --git a/paludis/util/pty.cc b/paludis/util/pty.cc index e5ac7ed01..80dfb8317 100644 --- a/paludis/util/pty.cc +++ b/paludis/util/pty.cc @@ -110,7 +110,3 @@ Pty::Pty(const bool close_exec, const unsigned short columns, const unsigned sho } } -Pty::~Pty() -{ -} - diff --git a/paludis/util/pty.hh b/paludis/util/pty.hh index 9ce95a501..f32961209 100644 --- a/paludis/util/pty.hh +++ b/paludis/util/pty.hh @@ -72,7 +72,7 @@ namespace paludis explicit Pty(const bool close_exec); explicit Pty(const bool close_exec, const unsigned short columns, const unsigned short lines); - virtual ~Pty(); + virtual ~Pty() = default; ///\} diff --git a/paludis/util/safe_ofstream.cc b/paludis/util/safe_ofstream.cc index d060f6188..221d3dbf8 100644 --- a/paludis/util/safe_ofstream.cc +++ b/paludis/util/safe_ofstream.cc @@ -46,9 +46,7 @@ SafeOFStreamBuf::SafeOFStreamBuf(const int f, const bool buffer) : _imp->buffered_text = std::make_shared<std::string>(); } -SafeOFStreamBuf::~SafeOFStreamBuf() -{ -} +SafeOFStreamBuf::~SafeOFStreamBuf() = default; SafeOFStreamBuf::int_type SafeOFStreamBuf::overflow(int_type c) diff --git a/paludis/util/simple_parser.cc b/paludis/util/simple_parser.cc index d67466d56..049b1c1ed 100644 --- a/paludis/util/simple_parser.cc +++ b/paludis/util/simple_parser.cc @@ -239,9 +239,7 @@ SimpleParser::SimpleParser(const std::string & s) : { } -SimpleParser::~SimpleParser() -{ -} +SimpleParser::~SimpleParser() = default; bool SimpleParser::consume(const SimpleParserExpression & e1) diff --git a/paludis/util/string_list_stream.cc b/paludis/util/string_list_stream.cc index a42f3dc45..f0757d820 100644 --- a/paludis/util/string_list_stream.cc +++ b/paludis/util/string_list_stream.cc @@ -52,9 +52,7 @@ StringListStreamBuf::StringListStreamBuf() : setg(nullptr, nullptr, nullptr); } -StringListStreamBuf::~StringListStreamBuf() -{ -} +StringListStreamBuf::~StringListStreamBuf() = default; StringListStreamBuf::int_type StringListStreamBuf::overflow(int_type c) @@ -122,20 +120,12 @@ StringListStreamBase::StringListStreamBase() { } -StringListStreamBase::~StringListStreamBase() -{ -} - StringListStream::StringListStream() : std::istream(&buf), std::ostream(&buf) { } -StringListStream::~StringListStream() -{ -} - void StringListStream::nothing_more_to_write() { diff --git a/paludis/util/string_list_stream.hh b/paludis/util/string_list_stream.hh index ded1717a9..4f1ead564 100644 --- a/paludis/util/string_list_stream.hh +++ b/paludis/util/string_list_stream.hh @@ -54,7 +54,7 @@ namespace paludis public: StringListStreamBase(); - ~StringListStreamBase(); + ~StringListStreamBase() = default; }; class PALUDIS_VISIBLE StringListStream : @@ -64,7 +64,7 @@ namespace paludis { public: StringListStream(); - ~StringListStream(); + ~StringListStream() = default; void nothing_more_to_write(); }; diff --git a/paludis/util/tail_output_stream.cc b/paludis/util/tail_output_stream.cc index b51c04a2f..4940b690f 100644 --- a/paludis/util/tail_output_stream.cc +++ b/paludis/util/tail_output_stream.cc @@ -52,9 +52,7 @@ TailOutputStreamBuf::TailOutputStreamBuf(const unsigned int n) : { } -TailOutputStreamBuf::~TailOutputStreamBuf() -{ -} +TailOutputStreamBuf::~TailOutputStreamBuf() = default; TailOutputStreamBuf::int_type TailOutputStreamBuf::overflow(int_type c) diff --git a/paludis/util/tee_output_stream.cc b/paludis/util/tee_output_stream.cc index d0ee0beb8..0e953923d 100644 --- a/paludis/util/tee_output_stream.cc +++ b/paludis/util/tee_output_stream.cc @@ -37,9 +37,7 @@ TeeOutputStreamBuf::TeeOutputStreamBuf() : { } -TeeOutputStreamBuf::~TeeOutputStreamBuf() -{ -} +TeeOutputStreamBuf::~TeeOutputStreamBuf() = default; TeeOutputStreamBuf::int_type TeeOutputStreamBuf::overflow(int_type c) diff --git a/paludis/util/wildcard_expander.cc b/paludis/util/wildcard_expander.cc index bfa639608..6a34e215d 100644 --- a/paludis/util/wildcard_expander.cc +++ b/paludis/util/wildcard_expander.cc @@ -134,9 +134,7 @@ WildcardExpander::WildcardExpander(const WildcardExpander & other) : { } -WildcardExpander::~WildcardExpander() -{ -} +WildcardExpander::~WildcardExpander() = default; WildcardExpander & WildcardExpander::operator= (const WildcardExpander & other) diff --git a/paludis/version_spec.cc b/paludis/version_spec.cc index a043fed8d..522b719c8 100644 --- a/paludis/version_spec.cc +++ b/paludis/version_spec.cc @@ -349,9 +349,7 @@ VersionSpec::operator= (const VersionSpec & other) return *this; } -VersionSpec::~VersionSpec() -{ -} +VersionSpec::~VersionSpec() = default; namespace { diff --git a/src/clients/cave/cmd_print_unmanaged_files.cc b/src/clients/cave/cmd_print_unmanaged_files.cc index ed3f25888..b5bba1f15 100644 --- a/src/clients/cave/cmd_print_unmanaged_files.cc +++ b/src/clients/cave/cmd_print_unmanaged_files.cc @@ -90,9 +90,7 @@ namespace { } - ~CollectRecursiveDirectoryContents() - { - } + ~CollectRecursiveDirectoryContents() = default; void operator()(const FSPath& path) { @@ -125,9 +123,7 @@ namespace { } - ~CollectPackageContents() - { - } + ~CollectPackageContents() = default; void operator()(const std::shared_ptr<const PackageID>& package) { diff --git a/src/clients/cave/command.cc b/src/clients/cave/command.cc index 659b4c1e3..7b58c6180 100644 --- a/src/clients/cave/command.cc +++ b/src/clients/cave/command.cc @@ -22,7 +22,5 @@ using namespace paludis; using namespace cave; -Command::~Command() -{ -} +Command::~Command() = default; diff --git a/src/clients/cave/command_factory.cc b/src/clients/cave/command_factory.cc index e1e7d5c34..269e89330 100644 --- a/src/clients/cave/command_factory.cc +++ b/src/clients/cave/command_factory.cc @@ -221,9 +221,7 @@ CommandFactory::CommandFactory() : _imp->handlers.insert(std::make_pair("verify", std::bind(&make_command<VerifyCommand>))); } -CommandFactory::~CommandFactory() -{ -} +CommandFactory::~CommandFactory() = default; const std::shared_ptr<cave::Command> CommandFactory::create(const std::string & s) const diff --git a/src/clients/cave/script_command.cc b/src/clients/cave/script_command.cc index e09411ca6..00deec5f6 100644 --- a/src/clients/cave/script_command.cc +++ b/src/clients/cave/script_command.cc @@ -56,9 +56,7 @@ ScriptCommand::ScriptCommand(const std::string &, const FSPath & e) : { } -ScriptCommand::~ScriptCommand() -{ -} +ScriptCommand::~ScriptCommand() = default; int ScriptCommand::run( |