GH #463: XML does not compile with XML_UNICODE_WCHAR_T

pocoproject · Jun 4, 2014 · ba0d983 · ba0d983
1 parent 7c6e402
commit ba0d983
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/XML/include/Poco/XML/XMLWriter.h b/XML/include/Poco/XML/XMLWriter.h
@@ -264,7 +264,7 @@ class XML_API XMLWriter: public ContentHandler, public LexicalHandler, public DT
 		/// Creates and returns a unique namespace prefix that
 		/// can be used with startPrefixMapping().
 
-	bool isNamespaceMapped(const std::string& namespc) const;
+	bool isNamespaceMapped(const XMLString& namespc) const;
 		/// Returns true if the given namespace has been mapped
 		/// to a prefix in the current element or its ancestors.
 

diff --git a/XML/src/AbstractContainerNode.cpp b/XML/src/AbstractContainerNode.cpp
@@ -22,6 +22,7 @@
 #include "Poco/DOM/ElementsByTagNameList.h"
 #include "Poco/DOM/AutoPtr.h"
 #include "Poco/NumberParser.h"
+#include "Poco/UnicodeConverter.h"
 
 
 namespace Poco {
@@ -417,7 +418,13 @@ const Node* AbstractContainerNode::findNode(XMLString::const_iterator& it, const
 				XMLString index;
 				while (it != end && *it != ']') index += *it++;
 				if (it != end) ++it;
+#ifdef XML_UNICODE_WCHAR_T
+				std::string idx;
+				Poco::UnicodeConverter::convert(index, idx);
+				return findNode(it, end, findElement(Poco::NumberParser::parse(idx), pNode, pNSMap), pNSMap);
+#else
 				return findNode(it, end, findElement(Poco::NumberParser::parse(index), pNode, pNSMap), pNSMap);
+#endif
 			}
 		}
 		else

diff --git a/XML/src/XMLWriter.cpp b/XML/src/XMLWriter.cpp
@@ -872,7 +872,7 @@ XMLString XMLWriter::uniquePrefix()
 }
 
 
-bool XMLWriter::isNamespaceMapped(const std::string& namespc) const
+bool XMLWriter::isNamespaceMapped(const XMLString& namespc) const
 {
 	return _namespaces.isMapped(namespc);
 }