From 5e3a8a9764f3fa0c599729cef85a728ba7f313fd Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 9 Nov 2018 14:24:16 +0000
Subject: [PATCH] Rename parameter hiding class member

Visual Studio now warns when using the same name for a parameter that a class
member already has.
---
 src/util/xml.cpp | 8 ++++----
 src/util/xml.h   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/util/xml.cpp b/src/util/xml.cpp
index 54a3187fa0b..bef696903c8 100644
--- a/src/util/xml.cpp
+++ b/src/util/xml.cpp
@@ -150,23 +150,23 @@ void xmlt::do_indent(std::ostream &out, unsigned indent)
   out << std::string(indent, ' ');
 }
 
-xmlt::elementst::const_iterator xmlt::find(const std::string &name) const
+xmlt::elementst::const_iterator xmlt::find(const std::string &key) const
 {
   for(elementst::const_iterator it=elements.begin();
       it!=elements.end();
       it++)
-    if(it->name==name)
+    if(it->name == key)
       return it;
 
   return elements.end();
 }
 
-xmlt::elementst::iterator xmlt::find(const std::string &name)
+xmlt::elementst::iterator xmlt::find(const std::string &key)
 {
   for(elementst::iterator it=elements.begin();
       it!=elements.end();
       it++)
-    if(it->name==name)
+    if(it->name == key)
       return it;
 
   return elements.end();
diff --git a/src/util/xml.h b/src/util/xml.h
index 28a52f59c30..17dea427664 100644
--- a/src/util/xml.h
+++ b/src/util/xml.h
@@ -32,8 +32,8 @@ class xmlt
   attributest attributes;
   elementst elements;
 
-  elementst::const_iterator find(const std::string &name) const;
-  elementst::iterator find(const std::string &name);
+  elementst::const_iterator find(const std::string &key) const;
+  elementst::iterator find(const std::string &key);
 
   void set_attribute(
     const std::string &attribute,
@@ -83,10 +83,10 @@ class xmlt
     return "";
   }
 
-  xmlt &new_element(const std::string &name)
+  xmlt &new_element(const std::string &key)
   {
     elements.push_back(xmlt());
-    elements.back().name=name;
+    elements.back().name = key;
     return elements.back();
   }