diff --git a/icu4c/source/tools/toolutil/xmlparser.cpp b/icu4c/source/tools/toolutil/xmlparser.cpp index a9df760b82..68097d4117 100644 --- a/icu4c/source/tools/toolutil/xmlparser.cpp +++ b/icu4c/source/tools/toolutil/xmlparser.cpp @@ -21,9 +21,6 @@ #include "filestrm.h" #include "xmlparser.h" -UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UXMLParser) -UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UXMLElement) - // character constants enum { x_QUOT=0x22, @@ -48,6 +45,11 @@ enum { // XML #6 #define XML_NAME XML_NAMESTARTCHAR "(?:" XML_NAMECHAR ")*" +U_NAMESPACE_BEGIN + +UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UXMLParser) +UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UXMLElement) + // // UXMLParser constructor. Mostly just initializes the ICU regexes that are // used for parsing. @@ -809,3 +811,5 @@ UXMLElement::getChildElement(const UnicodeString &name) const { } return NULL; } + +U_NAMESPACE_END diff --git a/icu4c/source/tools/toolutil/xmlparser.h b/icu4c/source/tools/toolutil/xmlparser.h index 483333a198..0ab7483008 100644 --- a/icu4c/source/tools/toolutil/xmlparser.h +++ b/icu4c/source/tools/toolutil/xmlparser.h @@ -36,6 +36,10 @@ enum UXMLNodeType { UXML_NODE_TYPE_COUNT }; +U_NAMESPACE_BEGIN + +class UXMLParser; + /** * This class represents an element node in a parsed XML tree. */ @@ -153,7 +157,7 @@ private: * The parse methods parse whole documents and return the parse trees via their * root elements. */ -class U_TOOLUTIL_API UXMLParser : public UObject { +class U_TOOLUTIL_API UXMLParser : public UObject { public: /** * Create an XML parser. @@ -233,4 +237,6 @@ private: UnicodeString fOneLF; }; +U_NAMESPACE_END + #endif