stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid name clash between function parameter and class member

master
Sébastien Villemot 2022-06-01 21:57:04 +02:00
parent cecf14f29d
commit 8b5e33b87a
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/DynamicModel.cc
View File

@ -6122,11 +6122,11 @@ DynamicModel::writeJsonVariableMapping(ostream &output) const
}
void
DynamicModel::writeJsonXrefsHelper(ostream &output, const map<pair<int, int>, set<int>> &xrefs) const
DynamicModel::writeJsonXrefsHelper(ostream &output, const map<pair<int, int>, set<int>> &xrefmap) const
{
for (auto it = xrefs.begin(); it != xrefs.end(); ++it)
for (auto it = xrefmap.begin(); it != xrefmap.end(); ++it)
{
if (it != xrefs.begin())
if (it != xrefmap.begin())
output << ", ";
output << R"({"name": ")" << symbol_table.getName(it->first.first) << R"(")"
<< R"(, "shift": )" << it->first.second

2
src/DynamicModel.hh
View File

@ -354,7 +354,7 @@ public:
//! Write cross reference output if the xref maps have been filed
void writeJsonXrefs(ostream &output) const;
void writeJsonXrefsHelper(ostream &output, const map<pair<int, int>, set<int>> &xrefs) const;
void writeJsonXrefsHelper(ostream &output, const map<pair<int, int>, set<int>> &xrefmap) const;
//! Print equations that have non-zero second derivatives
void printNonZeroHessianEquations(ostream &output) const;