External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix VC 14 warnings

Browse Source 
Fixes C4458: declaration of 'var' hides class member

git-svn-id: https://pugixml.googlecode.com/svn/trunk@1011 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
Arseny Kapoulkine 2014-09-15 02:41:42 +00:00
parent fbfe207fe6
commit 6e1c9ec7d1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pugixml.cpp
View File

@ -2806,7 +2806,7 @@ PUGI__NS_BEGIN
static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk) static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk)
{ {
// allocator object is a part of document object // allocator object is a part of document object
xml_allocator& alloc = *static_cast<xml_allocator*>(xmldoc); xml_allocator& alloc_ = *static_cast<xml_allocator*>(xmldoc);
// early-out for empty documents // early-out for empty documents
if (length == 0) if (length == 0)
@ -2816,7 +2816,7 @@ PUGI__NS_BEGIN
xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c : 0; xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c : 0;
// create parser on stack // create parser on stack
xml_parser parser(alloc); xml_parser parser(alloc_);
// save last character and make buffer zero-terminated (speeds up parsing) // save last character and make buffer zero-terminated (speeds up parsing)
char_t endch = buffer[length - 1]; char_t endch = buffer[length - 1];
@ -2829,7 +2829,7 @@ PUGI__NS_BEGIN
parser.parse_tree(buffer_data, root, optmsk, endch); parser.parse_tree(buffer_data, root, optmsk, endch);
// update allocator state // update allocator state
alloc = parser.alloc; alloc_ = parser.alloc;
xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0); xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0);
assert(result.offset >= 0 && static_cast<size_t>(result.offset) <= length); assert(result.offset >= 0 && static_cast<size_t>(result.offset) <= length);
@ -3818,9 +3818,11 @@ PUGI__NS_BEGIN
// free chunk chain // free chunk chain
while (chunk) while (chunk)
{ {
xml_stream_chunk* next = chunk->next; xml_stream_chunk* next_ = chunk->next;
xml_memory::deallocate(chunk); xml_memory::deallocate(chunk);
chunk = next;
chunk = next_;
} }
} }