diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-08-29 15:50:28 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-08-29 15:50:28 +0000 |
| commit | 70115fa9ab6933292dea9c76b6a753f1703248ea (patch) | |
| tree | 8baff1e858202f791950759a14e76ac83c2b751a /src | |
| parent | 31b8e28997767d152e93df900adddde8f244ccdf (diff) | |
Fixed missing attributes for some functions/classes, minor XPath error message changes
git-svn-id: http://pugixml.googlecode.com/svn/trunk@694 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src')
| -rw-r--r-- | src/pugixml.cpp | 4 | ||||
| -rw-r--r-- | src/pugixml.hpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp index f21ab7f..977a295 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -7541,7 +7541,7 @@ namespace pugi case 'c': 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]); } 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]); 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]); } diff --git a/src/pugixml.hpp b/src/pugixml.hpp index cdbf455..07f6308 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -1784,7 +1784,7 @@ namespace pugi /** * A class that holds XPath variable */ - class xpath_variable + class PUGIXML_CLASS xpath_variable { friend class xpath_variable_set; @@ -1817,7 +1817,7 @@ namespace pugi /** * A class that holds XPath variables */ - class xpath_variable_set + class PUGIXML_CLASS xpath_variable_set { private: // Non-copyable semantics @@ -2271,8 +2271,8 @@ namespace pugi namespace std { // 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 _Iter_cat(const pugi::xml_attribute_iterator&); + std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_node_iterator&); + std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_attribute_iterator&); } #endif @@ -2280,8 +2280,8 @@ namespace std namespace std { // Workarounds for (non-standard) iterator category detection - std::bidirectional_iterator_tag __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_node_iterator&); + std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_attribute_iterator&); } #endif |