Fix stream operators.

diff --git a/xmltooling/util/XMLHelper.cpp b/xmltooling/util/XMLHelper.cpp
index 50f450e..bf52d5b 100644 (file)
--- a/xmltooling/util/XMLHelper.cpp
+++ b/xmltooling/util/XMLHelper.cpp
@@ -268,7 +268,7 @@ namespace {
     };
 };
 
-void XMLHelper::serialize(const DOMNode* n, std::ostream& out)
+ostream& XMLHelper::serialize(const DOMNode* n, ostream& out)
 {
     static const XMLCh impltype[] = { chLatin_L, chLatin_S, chNull };
     static const XMLCh UTF8[]={ chLatin_U, chLatin_T, chLatin_F, chDigit_8, chNull };
@@ -279,15 +279,15 @@ void XMLHelper::serialize(const DOMNode* n, std::ostream& out)
     StreamFormatTarget target(out);
     if (!serializer->writeNode(&target,*n))
         throw XMLParserException("unable to serialize XML");
+    return out;
 }
 
 ostream& xmltooling::operator<<(ostream& ostr, const DOMNode& node)
 {
-    XMLHelper::serialize(&node, ostr);
-    return ostr;
+    return XMLHelper::serialize(&node, ostr);
 }
 
 ostream& xmltooling::operator<<(ostream& ostr, const XMLObject& obj)
 {
-    return ostr << obj.marshall();
+    return ostr << *(obj.marshall());
 }

diff --git a/xmltooling/util/XMLHelper.h b/xmltooling/util/XMLHelper.h
index eaa7832..41b2e88 100644 (file)
--- a/xmltooling/util/XMLHelper.h
+++ b/xmltooling/util/XMLHelper.h
@@ -239,8 +239,9 @@ namespace xmltooling {
          * 
          * @param n     node to serialize
          * @param out   stream to serialize element into
+         * @return reference to output stream
          */
-        static void serialize(const DOMNode* n, std::ostream& out);
+        static std::ostream& serialize(const DOMNode* n, std::ostream& out);
     };
 
     /**