GH pocoproject#463: XML does not compile with XML_UNICODE_WCHAR_T

aleks-f · aleks-f · commit ba0d9830eb28 · 2014-06-03T22:50:07.000-05:00
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);
 }

Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,7 @@ XMLString XMLWriter::uniquePrefix()`
`872`	`872`	`}`
`873`	`873`
`874`	`874`
`875`		`-bool XMLWriter::isNamespaceMapped(const std::string& namespc) const`
	`875`	`+bool XMLWriter::isNamespaceMapped(const XMLString& namespc) const`
`876`	`876`	`{`
`877`	`877`	`return _namespaces.isMapped(namespc);`
`878`	`878`	`}`