Merge branch 'master' into julia

time-shift
Houtan Bastani 2015-07-21 17:51:26 +02:00
commit f7ad244247
3 changed files with 1 additions and 4 deletions

View File

@ -469,7 +469,6 @@ public:
}; };
bool isModelLocalVariableUsed() const; bool isModelLocalVariableUsed() const;
// in ExternalFiles.cc
//! Writes model initialization and lead/lag incidence matrix to C output //! Writes model initialization and lead/lag incidence matrix to C output
void writeCOutput(ostream &output, const string &basename, bool block, bool byte_code, bool use_dll, int order, bool estimation_present) const; void writeCOutput(ostream &output, const string &basename, bool block, bool byte_code, bool use_dll, int order, bool estimation_present) const;
//! Writes model initialization and lead/lag incidence matrix to Cpp output //! Writes model initialization and lead/lag incidence matrix to Cpp output

View File

@ -152,7 +152,6 @@ public:
, bool cygwin, bool msvc , bool cygwin, bool msvc
#endif #endif
) const; ) const;
// Functions located in ExternalFiles.cc
void writeExternalFiles(const string &basename, FileOutputType output, LanguageOutputType language) const; void writeExternalFiles(const string &basename, FileOutputType output, LanguageOutputType language) const;
void writeExternalFilesC(const string &basename, FileOutputType output) const; void writeExternalFilesC(const string &basename, FileOutputType output) const;
void writeExternalFilesCC(const string &basename, FileOutputType output) const; void writeExternalFilesCC(const string &basename, FileOutputType output) const;

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2014 Dynare Team * Copyright (C) 2010-2015 Dynare Team
* *
* This file is part of Dynare. * This file is part of Dynare.
* *
@ -49,7 +49,6 @@ public:
\param[in] ramsey_model Is there a Ramsey model in the MOD file? If yes, then use the "ys" in argument of the steady state file as initial values \param[in] ramsey_model Is there a Ramsey model in the MOD file? If yes, then use the "ys" in argument of the steady state file as initial values
*/ */
void writeSteadyStateFile(const string &basename, bool ramsey_model) const; void writeSteadyStateFile(const string &basename, bool ramsey_model) const;
// in ExternalFiles.cc
void writeSteadyStateFileC(const string &basename, bool ramsey_model) const; void writeSteadyStateFileC(const string &basename, bool ramsey_model) const;
}; };