From 8b5e33b87aef0fbcbbe4d76e116d96e2fee26d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 1 Jun 2022 21:57:04 +0200
Subject: [PATCH] Avoid name clash between function parameter and class member
---
src/DynamicModel.cc | 6 +++---
src/DynamicModel.hh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 4bcd0c50..53dfd2cb 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -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
diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh
index e5cef471..74af0f2b 100644
--- a/src/DynamicModel.hh
+++ b/src/DynamicModel.hh
@@ -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;
--
GitLab