From 96513df4bf1a43430bbadab5357b837128f40064 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Tue, 6 Aug 2013 16:01:03 -0400
Subject: [PATCH] rebase fixes
---
ComputingTasks.cc | 4 ----
ComputingTasks.hh | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/ComputingTasks.cc b/ComputingTasks.cc
index fc368d8e..d189e34f 100644
--- a/ComputingTasks.cc
+++ b/ComputingTasks.cc
@@ -2310,10 +2310,6 @@ CorrPriorStatement::writeCOutput(ostream &output, const string &basename)
output << endl <<" index, index1, shape, mean, mode, stdev, variance, domain));" << endl;
}
-BasicOptionsStatement::~BasicOptionsStatement()
-{
-}
-
void
PriorEqualStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings)
{
diff --git a/ComputingTasks.hh b/ComputingTasks.hh
index cefa8487..8882f2ce 100644
--- a/ComputingTasks.hh
+++ b/ComputingTasks.hh
@@ -712,6 +712,7 @@ public:
const SymbolTable &symbol_table_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename) const;
+ virtual void writeCOutput(ostream &output, const string &basename);
};
class PriorEqualStatement : public Statement
@@ -739,7 +740,6 @@ public:
void get_base_name(const SymbolType symb_type, string &lhs_field) const;
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename) const;
- virtual void writeCOutput(ostream &output, const string &basename);
};
class BasicOptionsStatement : public Statement
@@ -797,6 +797,7 @@ public:
const SymbolTable &symbol_table_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename) const;
+ virtual void writeCOutput(ostream &output, const string &basename);
};
class OptionsEqualStatement : public Statement
@@ -831,7 +832,6 @@ class ModelDiagnosticsStatement : public Statement
public:
ModelDiagnosticsStatement();
virtual void writeOutput(ostream &output, const string &basename) const;
- virtual void writeCOutput(ostream &output, const string &basename);
};
#endif
--
GitLab