Avoid name clash between function parameter and class member
parent
cecf14f29d
commit
8b5e33b87a
|
@ -6122,11 +6122,11 @@ DynamicModel::writeJsonVariableMapping(ostream &output) const
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
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 << ", ";
|
||||||
output << R"({"name": ")" << symbol_table.getName(it->first.first) << R"(")"
|
output << R"({"name": ")" << symbol_table.getName(it->first.first) << R"(")"
|
||||||
<< R"(, "shift": )" << it->first.second
|
<< R"(, "shift": )" << it->first.second
|
||||||
|
|
|
@ -354,7 +354,7 @@ public:
|
||||||
|
|
||||||
//! Write cross reference output if the xref maps have been filed
|
//! Write cross reference output if the xref maps have been filed
|
||||||
void writeJsonXrefs(ostream &output) const;
|
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
|
//! Print equations that have non-zero second derivatives
|
||||||
void printNonZeroHessianEquations(ostream &output) const;
|
void printNonZeroHessianEquations(ostream &output) const;
|
||||||
|
|
Loading…
Reference in New Issue