Skip to content
Snippets Groups Projects
Commit 96513df4 authored by Houtan Bastani's avatar Houtan Bastani Committed by MichelJuillard
Browse files

rebase fixes

parent 0e469dc6
Branches
Tags
No related merge requests found
...@@ -2310,10 +2310,6 @@ CorrPriorStatement::writeCOutput(ostream &output, const string &basename) ...@@ -2310,10 +2310,6 @@ CorrPriorStatement::writeCOutput(ostream &output, const string &basename)
output << endl <<" index, index1, shape, mean, mode, stdev, variance, domain));" << endl; output << endl <<" index, index1, shape, mean, mode, stdev, variance, domain));" << endl;
} }
BasicOptionsStatement::~BasicOptionsStatement()
{
}
void void
PriorEqualStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings) PriorEqualStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings)
{ {
......
...@@ -712,6 +712,7 @@ public: ...@@ -712,6 +712,7 @@ public:
const SymbolTable &symbol_table_arg); const SymbolTable &symbol_table_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename) const; virtual void writeOutput(ostream &output, const string &basename) const;
virtual void writeCOutput(ostream &output, const string &basename);
}; };
class PriorEqualStatement : public Statement class PriorEqualStatement : public Statement
...@@ -739,7 +740,6 @@ public: ...@@ -739,7 +740,6 @@ public:
void get_base_name(const SymbolType symb_type, string &lhs_field) const; void get_base_name(const SymbolType symb_type, string &lhs_field) const;
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename) const; virtual void writeOutput(ostream &output, const string &basename) const;
virtual void writeCOutput(ostream &output, const string &basename);
}; };
class BasicOptionsStatement : public Statement class BasicOptionsStatement : public Statement
...@@ -797,6 +797,7 @@ public: ...@@ -797,6 +797,7 @@ public:
const SymbolTable &symbol_table_arg); const SymbolTable &symbol_table_arg);
virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings); virtual void checkPass(ModFileStructure &mod_file_struct, WarningConsolidation &warnings);
virtual void writeOutput(ostream &output, const string &basename) const; virtual void writeOutput(ostream &output, const string &basename) const;
virtual void writeCOutput(ostream &output, const string &basename);
}; };
class OptionsEqualStatement : public Statement class OptionsEqualStatement : public Statement
...@@ -831,7 +832,6 @@ class ModelDiagnosticsStatement : public Statement ...@@ -831,7 +832,6 @@ class ModelDiagnosticsStatement : public Statement
public: public:
ModelDiagnosticsStatement(); ModelDiagnosticsStatement();
virtual void writeOutput(ostream &output, const string &basename) const; virtual void writeOutput(ostream &output, const string &basename) const;
virtual void writeCOutput(ostream &output, const string &basename);
}; };
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment