From e30c30ef7bbd8413ac0c8390abe574d5dd1cf5f7 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 10 Oct 2014 16:07:44 +0100
Subject: Adapt to new libcxml ARI.  Compiles but does not pass tests.

---
 src/util.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/util.h')

diff --git a/src/util.h b/src/util.h
index 857f872f..dc639404 100644
--- a/src/util.h
+++ b/src/util.h
@@ -25,6 +25,7 @@
  */
 
 #include "types.h"
+#include <libcxml/cxml.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/filesystem.hpp>
@@ -33,10 +34,6 @@
 #include <string>
 #include <stdint.h>
 
-namespace xmlpp {
-	class Element;
-}
-
 namespace dcp {
 
 class ARGBFrame;
@@ -81,9 +78,9 @@ extern bool ids_equal (std::string a, std::string b);
 
 extern void init ();
 
-extern void sign (xmlpp::Element* parent, CertificateChain const & certificates, boost::filesystem::path signer_key, Standard standard);
-extern void add_signature_value (xmlpp::Element* parent, CertificateChain const & certificates, boost::filesystem::path signer_key, std::string const & ns);
-extern void add_signer (xmlpp::Element* parent, CertificateChain const & certificates, std::string const & ns);
+extern void sign (cxml::NodePtr parent, CertificateChain const & certificates, boost::filesystem::path signer_key, Standard standard);
+extern void add_signature_value (cxml::NodePtr parent, CertificateChain const & certificates, boost::filesystem::path signer_key, std::string const & ns);
+extern void add_signer (cxml::NodePtr parent, CertificateChain const & certificates, std::string const & ns);
 
 extern int base64_decode (std::string const & in, unsigned char* out, int out_length);
 extern boost::optional<boost::filesystem::path> relative_to_root (boost::filesystem::path root, boost::filesystem::path file);
-- 
cgit v1.2.3