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

Fixed missing attributes for some functions/classes, minor XPath error message changes

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@694 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-08-29 15:50:28 +00:00
parent 31b8e28997
commit 70115fa9ab
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pugixml.cpp
View File

@ -7541,7 +7541,7 @@ namespace pugi
case 'c': case 'c':
if (name == PUGIXML_TEXT("count") && argc == 1) if (name == PUGIXML_TEXT("count") && argc == 1)
{ {
if (args[0]->rettype() != xpath_type_node_set) throw_error("count() has to be applied to node set"); if (args[0]->rettype() != xpath_type_node_set) throw_error("Function has to be applied to node set");
return new (alloc_node()) xpath_ast_node(ast_func_count, xpath_type_number, args[0]); return new (alloc_node()) xpath_ast_node(ast_func_count, xpath_type_number, args[0]);
} }
else if (name == PUGIXML_TEXT("contains") && argc == 2) else if (name == PUGIXML_TEXT("contains") && argc == 2)
@ -7618,7 +7618,7 @@ namespace pugi
return new (alloc_node()) xpath_ast_node(argc == 2 ? ast_func_substring_2 : ast_func_substring_3, xpath_type_string, args[0], args[1]); return new (alloc_node()) xpath_ast_node(argc == 2 ? ast_func_substring_2 : ast_func_substring_3, xpath_type_string, args[0], args[1]);
else if (name == PUGIXML_TEXT("sum") && argc == 1) else if (name == PUGIXML_TEXT("sum") && argc == 1)
{ {
if (args[0]->rettype() != xpath_type_node_set) throw_error("sum() has to be applied to node set"); if (args[0]->rettype() != xpath_type_node_set) throw_error("Function has to be applied to node set");
return new (alloc_node()) xpath_ast_node(ast_func_sum, xpath_type_number, args[0]); return new (alloc_node()) xpath_ast_node(ast_func_sum, xpath_type_number, args[0]);
} }

12
src/pugixml.hpp
View File

@ -1784,7 +1784,7 @@ namespace pugi
/** /**
* A class that holds XPath variable * A class that holds XPath variable
*/ */
class xpath_variable class PUGIXML_CLASS xpath_variable
{ {
friend class xpath_variable_set; friend class xpath_variable_set;
@ -1817,7 +1817,7 @@ namespace pugi
/** /**
* A class that holds XPath variables * A class that holds XPath variables
*/ */
class xpath_variable_set class PUGIXML_CLASS xpath_variable_set
{ {
private: private:
// Non-copyable semantics // Non-copyable semantics
@ -2271,8 +2271,8 @@ namespace pugi
namespace std namespace std
{ {
// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier) // Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&); std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_node_iterator&);
std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&); std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_attribute_iterator&);
} }
#endif #endif
@ -2280,8 +2280,8 @@ namespace std
namespace std namespace std
{ {
// Workarounds for (non-standard) iterator category detection // Workarounds for (non-standard) iterator category detection
std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&); std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_node_iterator&);
std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&); std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_attribute_iterator&);
} }
#endif #endif