aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-08-05 23:51:36 -0700
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-08-06 11:58:04 -0700
commit64ba7d5be854122e1a5ec2c17949634abebca250 (patch)
tree23a645693d6bfea50c5c7d2c32da5d194944609b /paludis/environments/paludis
parent1ad5f5ce2025f1db0ea5dd1fcf72223430f143b4 (diff)
downloadpaludis-64ba7d5be854122e1a5ec2c17949634abebca250.tar.gz
paludis-64ba7d5be854122e1a5ec2c17949634abebca250.tar.xz
modernize: use default method synthesis
Convert a number of destructors to default synthesized functions. Try to inline a few instances into the header. It should be possible to inline all of them, however, gcc seems to emit a number of warnings. Furthermore, some of the destructors are pure-virtualed, but provide an implementation. Placing the definition into the header causes ODR violations.
Diffstat (limited to 'paludis/environments/paludis')
-rw-r--r--paludis/environments/paludis/keywords_conf.cc4
-rw-r--r--paludis/environments/paludis/licenses_conf.cc4
-rw-r--r--paludis/environments/paludis/mirrors_conf.cc4
-rw-r--r--paludis/environments/paludis/output_conf.cc4
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc4
-rw-r--r--paludis/environments/paludis/paludis_config.cc4
-rw-r--r--paludis/environments/paludis/paludis_environment.cc4
-rw-r--r--paludis/environments/paludis/suggestions_conf.cc4
-rw-r--r--paludis/environments/paludis/use_conf.cc4
-rw-r--r--paludis/environments/paludis/world.cc4
10 files changed, 10 insertions, 30 deletions
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