From 053a4c0ea79fa2b18d693ad683b8dd22ffea9f49 Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Sun, 29 Aug 2010 15:22:54 +0000 Subject: XPath: Introduced new evaluate_string API (without STL), enabled XPath without STL git-svn-id: http://pugixml.googlecode.com/svn/trunk@659 99668b35-9821-0410-8761-19e4c4f06640 --- src/pugixml.hpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/pugixml.hpp') diff --git a/src/pugixml.hpp b/src/pugixml.hpp index d3dfea6..cb6180c 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -56,11 +56,6 @@ namespace std # endif #endif -// No XPath without STL -#if !defined(PUGIXML_NO_XPATH) && defined(PUGIXML_NO_STL) -# define PUGIXML_NO_XPATH -#endif - // Include exception header for XPath #if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS) # include @@ -2017,6 +2012,7 @@ namespace pugi */ double evaluate_number(const xml_node& n) const; + #ifndef PUGIXML_NO_STL /** * Evaluate expression as string value for the context node \a n. * If expression does not directly evaluate to string, the expression result is converted @@ -2027,7 +2023,19 @@ namespace pugi * \return evaluation result */ string_t evaluate_string(const xml_node& n) const; + #endif + /** + * Evaluate expression as string value for the context node \a n. + * If expression does not directly evaluate to string, the expression result is converted + * as through string() XPath function call. + * Throws std::bad_alloc on out of memory error. + * + * \param n - context node + * \return evaluation result + */ + size_t evaluate_string(char_t* buffer, size_t capacity, const xml_node& n) const; + /** * Evaluate expression as node set for the context node \a n. * If expression does not directly evaluate to node set, throws xpath_exception. -- cgit v1.2.3