From 35c0c6aa5c2af37001c1118a96038c1e7812f5b3 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine@gmail.com"
<arseny.kapoulkine@gmail.com@99668b35-9821-0410-8761-19e4c4f06640>
Date: Fri, 23 Mar 2012 03:51:00 +0000
Subject: Fixed member shadowing warnings for gcc
git-svn-id: http://pugixml.googlecode.com/svn/trunk@878 99668b35-9821-0410-8761-19e4c4f06640
---
src/pugixml.cpp | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index b51055a..0513e0d 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -4740,8 +4740,8 @@ namespace pugi
PUGI__FN xml_node_struct* xml_text::_data_new()
{
- xml_node_struct* data = _data();
- if (data) return data;
+ xml_node_struct* d = _data();
+ if (d) return d;
return xml_node(_root).append_child(node_pcdata).internal_object();
}
@@ -4771,9 +4771,9 @@ namespace pugi
PUGI__FN const char_t* xml_text::get() const
{
- xml_node_struct* data = _data();
+ xml_node_struct* d = _data();
- return (data && data->value) ? data->value : PUGIXML_TEXT("");
+ return (d && d->value) ? d->value : PUGIXML_TEXT("");
}
PUGI__FN int xml_text::as_int() const
@@ -4803,37 +4803,37 @@ namespace pugi
PUGI__FN bool xml_text::set(const char_t* rhs)
{
- xml_node_struct* data = _data_new();
+ xml_node_struct* dn = _data_new();
- return data ? impl::strcpy_insitu(data->value, data->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+ return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
}
PUGI__FN bool xml_text::set(int rhs)
{
- xml_node_struct* data = _data_new();
+ xml_node_struct* dn = _data_new();
- return data ? impl::set_value_convert(data->value, data->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+ return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
}
PUGI__FN bool xml_text::set(unsigned int rhs)
{
- xml_node_struct* data = _data_new();
+ xml_node_struct* dn = _data_new();
- return data ? impl::set_value_convert(data->value, data->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+ return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
}
PUGI__FN bool xml_text::set(double rhs)
{
- xml_node_struct* data = _data_new();
+ xml_node_struct* dn = _data_new();
- return data ? impl::set_value_convert(data->value, data->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+ return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
}
PUGI__FN bool xml_text::set(bool rhs)
{
- xml_node_struct* data = _data_new();
+ xml_node_struct* dn = _data_new();
- return data ? impl::set_value_convert(data->value, data->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+ return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
}
PUGI__FN xml_text& xml_text::operator=(const char_t* rhs)
--
cgit v1.2.3