summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChrisTX <xpipe@hotmail.de>2013-09-09 23:50:21 +0200
committerattilamolnar <attilamolnar@hush.com>2013-09-13 18:00:19 +0200
commit718a87e7e4ca4541a3c808ccb633eb362c2ef5b3 (patch)
tree3ced40a84e8a889b11c0a9b60174506c892725c4
parentc0f946f2b7195e101cdaae9d5453e0027d4204b4 (diff)
Fix a shadow warning created by ConfigTag::create
-rw-r--r--include/configreader.h3
-rw-r--r--src/configparser.cpp4
2 files changed, 3 insertions, 4 deletions
diff --git a/include/configreader.h b/include/configreader.h
index 09d4e619d..1edacfe13 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -64,8 +64,7 @@ class CoreExport ConfigTag : public refcountbase
inline const std::vector<KeyVal>& getItems() const { return items; }
/** Create a new ConfigTag, giving access to the private KeyVal item list */
- static ConfigTag* create(const std::string& Tag, const std::string& file, int line,
- std::vector<KeyVal>*&items);
+ static ConfigTag* create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items);
private:
ConfigTag(const std::string& Tag, const std::string& file, int line);
};
diff --git a/src/configparser.cpp b/src/configparser.cpp
index 7d9eab651..825dfc966 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -472,10 +472,10 @@ std::string ConfigTag::getTagLocation()
return src_name + ":" + ConvToStr(src_line);
}
-ConfigTag* ConfigTag::create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*&items)
+ConfigTag* ConfigTag::create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items)
{
ConfigTag* rv = new ConfigTag(Tag, file, line);
- items = &rv->items;
+ Items = &rv->items;
return rv;
}