From b2220c0346e751d6820771a4c3c6528348dc3044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Thu, 15 Apr 2010 17:46:05 +0200 Subject: [PATCH] Preprocessor: rename a function argument to avoid name conflict with standard error filestream --- preprocessor/Shocks.cc | 6 +++--- preprocessor/Shocks.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/preprocessor/Shocks.cc b/preprocessor/Shocks.cc index 3eef89096..0fd26ea31 100644 --- a/preprocessor/Shocks.cc +++ b/preprocessor/Shocks.cc @@ -109,7 +109,7 @@ ShocksStatement::writeOutput(ostream &output, const string &basename) const void ShocksStatement::writeVarOrStdShock(ostream &output, var_and_std_shocks_type::const_iterator &it, - bool stderr) const + bool stddev) const { SymbolType type = symbol_table.getType(it->first); assert(type == eExogenous || symbol_table.isObservedVariable(it->first)); @@ -127,10 +127,10 @@ ShocksStatement::writeVarOrStdShock(ostream &output, var_and_std_shocks_type::co } output << id << ", " << id << ") = "; - if (stderr) + if (stddev) output << "("; it->second->writeOutput(output); - if (stderr) + if (stddev) output << ")^2"; output << ";" << endl; } diff --git a/preprocessor/Shocks.hh b/preprocessor/Shocks.hh index 069d82a14..287b9fbf3 100644 --- a/preprocessor/Shocks.hh +++ b/preprocessor/Shocks.hh @@ -60,7 +60,7 @@ public: private: const var_and_std_shocks_type var_shocks, std_shocks; const covar_and_corr_shocks_type covar_shocks, corr_shocks; - void writeVarOrStdShock(ostream &output, var_and_std_shocks_type::const_iterator &it, bool stderr) const; + void writeVarOrStdShock(ostream &output, var_and_std_shocks_type::const_iterator &it, bool stddev) const; void writeVarAndStdShocks(ostream &output) const; void writeCovarOrCorrShock(ostream &output, covar_and_corr_shocks_type::const_iterator &it, bool corr) const; void writeCovarAndCorrShocks(ostream &output) const;