From 97316264895a7b28023fb769bd29ca4da2fd484a Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Wed, 20 Jan 2010 22:01:18 +0000 Subject: XPath: Removed variable shadowing (fixes warnings in static analyzers) git-svn-id: http://pugixml.googlecode.com/svn/trunk@238 99668b35-9821-0410-8761-19e4c4f06640 --- src/pugixpath.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pugixpath.cpp b/src/pugixpath.cpp index 30dc3af..41d7de9 100644 --- a/src/pugixpath.cpp +++ b/src/pugixpath.cpp @@ -1777,11 +1777,11 @@ namespace pugi xml_node p = it->parent(); if (p) { - size_t s = ns.size(); + size_t size = ns.size(); step_push(ns, p); - apply_predicates(ns, s, c); + apply_predicates(ns, size, c); } } } @@ -1805,12 +1805,12 @@ namespace pugi for (xpath_node_set::const_iterator it = s.begin(); it != s.end(); ++it) { - size_t s = ns.size(); + size_t size = ns.size(); if (it->attribute()) step_push(ns, it->attribute(), it->parent()); else step_push(ns, it->node()); - apply_predicates(ns, s, c); + apply_predicates(ns, size, c); } } else @@ -1834,14 +1834,14 @@ namespace pugi for (xpath_node_set::const_iterator it = s.begin(); it != s.end(); ++it) { - size_t s = ns.size(); + size_t size = ns.size(); if (it->node()) step_fill(ns, it->node(), v); else step_fill(ns, it->attribute(), it->parent(), v); - apply_predicates(ns, s, c); + apply_predicates(ns, size, c); } } else @@ -1868,12 +1868,12 @@ namespace pugi for (xpath_node_set::const_iterator it = s.begin(); it != s.end(); ++it) { - size_t s = ns.size(); + size_t size = ns.size(); if (it->node()) step_fill(ns, it->node(), v); - apply_predicates(ns, s, c); + apply_predicates(ns, size, c); } } else if (c.n.node()) -- cgit v1.2.3