From 718a87e7e4ca4541a3c808ccb633eb362c2ef5b3 Mon Sep 17 00:00:00 2001 From: ChrisTX Date: Mon, 9 Sep 2013 23:50:21 +0200 Subject: Fix a shadow warning created by ConfigTag::create --- include/configreader.h | 3 +-- src/configparser.cpp | 4 ++-- 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& 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*&items); + static ConfigTag* create(const std::string& Tag, const std::string& file, int line, std::vector*& 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*&items) +ConfigTag* ConfigTag::create(const std::string& Tag, const std::string& file, int line, std::vector*& Items) { ConfigTag* rv = new ConfigTag(Tag, file, line); - items = &rv->items; + Items = &rv->items; return rv; } -- cgit v1.2.3