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

XPath: Moved STL replacement algorithms to anonymous namespace

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@777 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-10-22 19:16:13 +00:00
parent 0e73657345
commit f7e6723b63
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pugixml.cpp
View File

@ -4757,7 +4757,7 @@ namespace std
#ifndef PUGIXML_NO_XPATH #ifndef PUGIXML_NO_XPATH
// STL replacements // STL replacements
namespace pstd namespace
{ {
struct equal_to struct equal_to
{ {
@ -6095,18 +6095,18 @@ namespace
// Internal node set class // Internal node set class
namespace namespace
{ {
xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool reverse) xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev)
{ {
xpath_node_set::type_t order = reverse ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted; xpath_node_set::type_t order = rev ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
if (type == xpath_node_set::type_unsorted) if (type == xpath_node_set::type_unsorted)
{ {
pstd::sort(begin, end, document_order_comparator()); sort(begin, end, document_order_comparator());
type = xpath_node_set::type_sorted; type = xpath_node_set::type_sorted;
} }
if (type != order) pstd::reverse(begin, end); if (type != order) reverse(begin, end);
return order; return order;
} }
@ -6124,7 +6124,7 @@ namespace
return *(end - 1); return *(end - 1);
case xpath_node_set::type_unsorted: case xpath_node_set::type_unsorted:
return *pstd::min_element(begin, end, document_order_comparator()); return *min_element(begin, end, document_order_comparator());
default: default:
assert(!"Invalid node set type"); assert(!"Invalid node set type");
@ -6213,7 +6213,7 @@ namespace
_end += count; _end += count;
} }
void sort() void sort_do()
{ {
_type = xpath_sort(_begin, _end, _type, false); _type = xpath_sort(_begin, _end, _type, false);
} }
@ -6228,9 +6228,9 @@ namespace
void remove_duplicates() void remove_duplicates()
{ {
if (_type == xpath_node_set::type_unsorted) if (_type == xpath_node_set::type_unsorted)
pstd::sort(_begin, _end, duplicate_comparator()); sort(_begin, _end, duplicate_comparator());
_end = pstd::unique(_begin, _end); _end = unique(_begin, _end);
} }
xpath_node_set::type_t type() const xpath_node_set::type_t type() const
@ -6783,8 +6783,8 @@ namespace
{ {
if (lt == xpath_type_node_set) if (lt == xpath_type_node_set)
{ {
pstd::swap(lhs, rhs); swap(lhs, rhs);
pstd::swap(lt, rt); swap(lt, rt);
} }
if (lt == xpath_type_boolean) if (lt == xpath_type_boolean)
@ -7364,22 +7364,22 @@ namespace
return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack); return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack);
case ast_op_equal: case ast_op_equal:
return compare_eq(_left, _right, c, stack, pstd::equal_to()); return compare_eq(_left, _right, c, stack, equal_to());
case ast_op_not_equal: case ast_op_not_equal:
return compare_eq(_left, _right, c, stack, pstd::not_equal_to()); return compare_eq(_left, _right, c, stack, not_equal_to());
case ast_op_less: case ast_op_less:
return compare_rel(_left, _right, c, stack, pstd::less()); return compare_rel(_left, _right, c, stack, less());
case ast_op_greater: case ast_op_greater:
return compare_rel(_right, _left, c, stack, pstd::less()); return compare_rel(_right, _left, c, stack, less());
case ast_op_less_or_equal: case ast_op_less_or_equal:
return compare_rel(_left, _right, c, stack, pstd::less_equal()); return compare_rel(_left, _right, c, stack, less_equal());
case ast_op_greater_or_equal: case ast_op_greater_or_equal:
return compare_rel(_right, _left, c, stack, pstd::less_equal()); return compare_rel(_right, _left, c, stack, less_equal());
case ast_func_starts_with: case ast_func_starts_with:
{ {
@ -7914,7 +7914,7 @@ namespace
xpath_node_set_raw set = _left->eval_node_set(c, stack); xpath_node_set_raw set = _left->eval_node_set(c, stack);
// either expression is a number or it contains position() call; sort by document order // either expression is a number or it contains position() call; sort by document order
if (_type == ast_filter) set.sort(); if (_type == ast_filter) set.sort_do();
apply_predicate(set, 0, _right, stack); apply_predicate(set, 0, _right, stack);