summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArseny Kapoulkine <arseny.kapoulkine@gmail.com>2017-06-22 09:13:10 -0700
committerArseny Kapoulkine <arseny.kapoulkine@gmail.com>2017-06-22 09:13:10 -0700
commit2252927c04cc61c95a58cf4c3c47a0aac4b05b61 (patch)
tree2c7fe93906b158ce0a4ada9768357f97ad1c334a /src
parent94ef7b3a033825c4bc3d3578b55f2349182745f0 (diff)
Deprecate xml_document::load(const char*) and xml_node::select_single_node
These functions were deprecated via comments in 1.5 but never got the deprecated attribute; now is the time! Using deprecated functions produces a warning; to silence it, this change moves the relevant tests to a separate translation unit that has deprecation disabled.
Diffstat (limited to 'src')
-rw-r--r--src/pugixml.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index 4d76bfa..5059c96 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -631,8 +631,8 @@ namespace pugi
xpath_node_set select_nodes(const xpath_query& query) const;
// (deprecated: use select_node instead) Select single node by evaluating XPath query.
- xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = 0) const;
- xpath_node select_single_node(const xpath_query& query) const;
+ PUGIXML_DEPRECATED xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = 0) const;
+ PUGIXML_DEPRECATED xpath_node select_single_node(const xpath_query& query) const;
#endif
@@ -1004,7 +1004,7 @@ namespace pugi
#endif
// (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied.
- xml_parse_result load(const char_t* contents, unsigned int options = parse_default);
+ PUGIXML_DEPRECATED xml_parse_result load(const char_t* contents, unsigned int options = parse_default);
// Load document from zero-terminated string. No encoding conversions are applied.
xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default);