Merge branch 'develop'

Author: 5cript

parse/jsd_generic_parser.h

@@ -18,6 +18,7 @@ namespace JSON
 
 		PropertyTree(boost::property_tree::ptree tree = {});
 	};
+
 	PropertyTree parse_json(std::istream& stream);
 	PropertyTree parse_json(std::string const& str);
 	boost::optional<PropertyTree> parse_auto(std::istream& stream);

utility/xml_converter.cpp

@@ -0,0 +1,18 @@
+#include "xml_converter.h"
+#include "../parse/jsd_generic_parser.h"
+
+#include <boost/property_tree/xml_parser.hpp>
+
+#include <iostream>
+
+namespace JSON
+{
+    std::ostream& convertJsonToXml(std::ostream& ostream, std::istream& istream)
+    {
+        auto tree = parse_json(istream);
+
+        boost::property_tree::write_xml(ostream, tree.tree);
+
+        return ostream;
+    }
+}

utility/xml_converter.h

@@ -0,0 +1,20 @@
+#ifndef XML_CONVERTER_H_INCLUDED
+#define XML_CONVERTER_H_INCLUDED
+
+#include <iosfwd>
+
+namespace JSON
+{
+    /**
+     *  Converts the json istream contents to xml and writes it to the ostream.
+     *  It is not defined, what happens when streams overlap.
+     *
+     *  @param ostream A stream to write to
+     *  @param istream A stream to read from
+     *
+     *  @return The ostream passed as parameter;
+     */
+    std::ostream& convertJsonToXml(std::ostream& ostream, std::istream& istream);
+}
+
+#endif // XML_CONVERTER_H_INCLUDED