From 1089a223c46f9f171030dd065f3b35b74f49142c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 11 Oct 2018 17:08:44 +0200
Subject: [PATCH] Clean up default constructors/destructors
---
src/ComputingTasks.cc | 15 ---------------
src/ComputingTasks.hh | 9 ---------
src/DataTree.cc | 2 --
src/DataTree.hh | 3 +--
src/ExprNode.cc | 3 ---
src/ExprNode.hh | 3 +--
src/ExternalFunctionsTable.cc | 3 ---
src/ExternalFunctionsTable.hh | 1 -
src/Statement.cc | 3 ---
src/Statement.hh | 3 +--
src/WarningConsolidation.hh | 2 --
src/macro/MacroValue.hh | 7 ++-----
12 files changed, 5 insertions(+), 49 deletions(-)
diff --git a/src/ComputingTasks.cc b/src/ComputingTasks.cc
index 12f198ff..2f256a86 100644
--- a/src/ComputingTasks.cc
+++ b/src/ComputingTasks.cc
@@ -1263,9 +1263,6 @@ RplotStatement::writeJsonOutput(ostream &output) const
output << "}";
}
-UnitRootVarsStatement::UnitRootVarsStatement()
-= default;
-
void
UnitRootVarsStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
{
@@ -3306,9 +3303,6 @@ SvarStatement::writeJsonOutput(ostream &output) const
output << "}";
}
-SvarGlobalIdentificationCheckStatement::SvarGlobalIdentificationCheckStatement()
-= default;
-
void
SvarGlobalIdentificationCheckStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
{
@@ -3726,9 +3720,6 @@ JointPriorStatement::writeJsonOutput(ostream &output) const
output << "}";
}
-BasicPriorStatement::~BasicPriorStatement()
-= default;
-
BasicPriorStatement::BasicPriorStatement(string name_arg,
string subsample_name_arg,
PriorDistributions prior_shape_arg,
@@ -4270,9 +4261,6 @@ PriorEqualStatement::writeJsonOutput(ostream &output) const
<< "}";
}
-BasicOptionsStatement::~BasicOptionsStatement()
-= default;
-
BasicOptionsStatement::BasicOptionsStatement(string name_arg,
string subsample_name_arg,
OptionsList options_list_arg) :
@@ -4722,9 +4710,6 @@ ExtendedPathStatement::writeJsonOutput(ostream &output) const
output << "}";
}
-ModelDiagnosticsStatement::ModelDiagnosticsStatement()
-= default;
-
void
ModelDiagnosticsStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
{
diff --git a/src/ComputingTasks.hh b/src/ComputingTasks.hh
index 8d7982d7..09e52924 100644
--- a/src/ComputingTasks.hh
+++ b/src/ComputingTasks.hh
@@ -278,7 +278,6 @@ public:
class UnitRootVarsStatement : public Statement
{
public:
- UnitRootVarsStatement();
void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const override;
void writeJsonOutput(ostream &output) const override;
};
@@ -854,7 +853,6 @@ public:
class SvarGlobalIdentificationCheckStatement : public Statement
{
public:
- SvarGlobalIdentificationCheckStatement();
void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const override;
void writeJsonOutput(ostream &output) const override;
};
@@ -936,9 +934,6 @@ public:
class BasicPriorStatement : public Statement
{
-public:
-
- ~BasicPriorStatement() override;
protected:
const string name;
const string subsample_name;
@@ -1046,9 +1041,6 @@ public:
class BasicOptionsStatement : public Statement
{
-public:
-
- ~BasicOptionsStatement() override;
protected:
const string name;
const string subsample_name;
@@ -1138,7 +1130,6 @@ public:
class ModelDiagnosticsStatement : public Statement
{
public:
- ModelDiagnosticsStatement();
void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const override;
void writeJsonOutput(ostream &output) const override;
};
diff --git a/src/DataTree.cc b/src/DataTree.cc
index fb903727..78947a0d 100644
--- a/src/DataTree.cc
+++ b/src/DataTree.cc
@@ -54,8 +54,6 @@ DataTree::DataTree(SymbolTable &symbol_table_arg,
initConstants();
}
-DataTree::~DataTree() = default;
-
DataTree::DataTree(const DataTree &d) :
symbol_table {d.symbol_table},
num_constants {d.num_constants},
diff --git a/src/DataTree.hh b/src/DataTree.hh
index 8df7aed7..bc86662b 100644
--- a/src/DataTree.hh
+++ b/src/DataTree.hh
@@ -124,8 +124,7 @@ public:
ExternalFunctionsTable &external_functions_table_arg,
bool is_static_args = false);
- virtual
- ~DataTree();
+ virtual ~DataTree() = default;
DataTree(const DataTree &d);
DataTree(DataTree &&) = delete;
diff --git a/src/ExprNode.cc b/src/ExprNode.cc
index 37f74572..c627c9c5 100644
--- a/src/ExprNode.cc
+++ b/src/ExprNode.cc
@@ -34,9 +34,6 @@ ExprNode::ExprNode(DataTree &datatree_arg, int idx_arg) : datatree{datatree_arg}
{
}
-ExprNode::~ExprNode()
-= default;
-
expr_t
ExprNode::getDerivative(int deriv_id)
{
diff --git a/src/ExprNode.hh b/src/ExprNode.hh
index fade3ab6..1dec4819 100644
--- a/src/ExprNode.hh
+++ b/src/ExprNode.hh
@@ -207,8 +207,7 @@ class ExprNode
const temporary_terms_idxs_t &temporary_terms_idxs) const;
public:
ExprNode(DataTree &datatree_arg, int idx_arg);
- virtual
- ~ExprNode();
+ virtual ~ExprNode() = default;
ExprNode(const ExprNode &) = delete;
ExprNode(ExprNode &&) = delete;
diff --git a/src/ExternalFunctionsTable.cc b/src/ExternalFunctionsTable.cc
index 6bbc7d82..b25f5434 100644
--- a/src/ExternalFunctionsTable.cc
+++ b/src/ExternalFunctionsTable.cc
@@ -26,9 +26,6 @@
#include "ExternalFunctionsTable.hh"
#include "SymbolTable.hh"
-ExternalFunctionsTable::ExternalFunctionsTable()
-= default;
-
void
ExternalFunctionsTable::addExternalFunction(int symb_id, const external_function_options &external_function_options_arg, bool track_nargs)
{
diff --git a/src/ExternalFunctionsTable.hh b/src/ExternalFunctionsTable.hh
index 34719703..56c1ee74 100644
--- a/src/ExternalFunctionsTable.hh
+++ b/src/ExternalFunctionsTable.hh
@@ -62,7 +62,6 @@ private:
//! Map containing options provided to external_functions()
external_function_table_type externalFunctionTable;
public:
- ExternalFunctionsTable();
//! Adds an external function to the table as well as its derivative functions
void addExternalFunction(int symb_id, const external_function_options &external_function_options_arg, bool track_nargs);
//! See if the function exists in the External Functions Table
diff --git a/src/Statement.cc b/src/Statement.cc
index ffcc00b4..ee699124 100644
--- a/src/Statement.cc
+++ b/src/Statement.cc
@@ -25,9 +25,6 @@ ModFileStructure::ModFileStructure()
{
}
-Statement::~Statement()
-= default;
-
void
Statement::checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings)
{
diff --git a/src/Statement.hh b/src/Statement.hh
index a410c7d8..40adb8a3 100644
--- a/src/Statement.hh
+++ b/src/Statement.hh
@@ -133,8 +133,7 @@ class Statement
{
public:
Statement() = default;
- virtual
- ~Statement();
+ virtual ~Statement() = default;
Statement(const Statement &) = delete;
Statement(Statement &&) = delete;
diff --git a/src/WarningConsolidation.hh b/src/WarningConsolidation.hh
index ed52a4fa..6bde987c 100644
--- a/src/WarningConsolidation.hh
+++ b/src/WarningConsolidation.hh
@@ -37,8 +37,6 @@ public:
explicit WarningConsolidation(bool no_warn_arg) : no_warn{no_warn_arg}
{
};
- ~WarningConsolidation()
- = default;;
//! Add A Warning to the StringStream
friend WarningConsolidation &operator<<(WarningConsolidation &wcc, const string &warning);
diff --git a/src/macro/MacroValue.hh b/src/macro/MacroValue.hh
index 04ed062f..a39e5456 100644
--- a/src/macro/MacroValue.hh
+++ b/src/macro/MacroValue.hh
@@ -119,7 +119,6 @@ class IntMV : public MacroValue
{
public:
explicit IntMV(int value_arg);
- virtual ~IntMV() = default;
//! Underlying integer value
const int value;
@@ -158,7 +157,7 @@ class StringMV : public MacroValue
{
public:
explicit StringMV(string value_arg);
- virtual ~StringMV() = default;
+
//! Underlying string value
const string value;
@@ -178,7 +177,7 @@ class FuncMV : public MacroValue
{
public:
FuncMV(vector<string> args, string body_arg);
- virtual ~FuncMV() = default;
+
//! Function args & body
const vector<string> args;
const string body;
@@ -193,7 +192,6 @@ class ArrayMV : public MacroValue
{
public:
explicit ArrayMV(vector<MacroValuePtr> values_arg);
- virtual ~ArrayMV() = default;
//! Underlying vector
const vector<MacroValuePtr> values;
@@ -235,7 +233,6 @@ class TupleMV : public MacroValue
{
public:
explicit TupleMV(vector<MacroValuePtr> values_arg);
- virtual ~TupleMV() = default;
//! Underlying vector
const vector<MacroValuePtr> values;
--
GitLab