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/xml.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/xml.h')

diff --git a/src/xml.h b/src/xml.h
index b89d8ccd..0e8c9c91 100644
--- a/src/xml.h
+++ b/src/xml.h
@@ -30,7 +30,7 @@ template <class T>
 boost::shared_ptr<T>
 optional_type_child (cxml::Node const & node, std::string name)
 {
-	std::list<boost::shared_ptr<cxml::Node> > n = node.node_children (name);
+	std::list<cxml::NodePtr > n = node.children (name);
 	if (n.size() > 1) {
 		throw XMLError ("duplicate XML tag");
 	} else if (n.empty ()) {
@@ -41,13 +41,13 @@ optional_type_child (cxml::Node const & node, std::string name)
 }
 
 template <class T>
-boost::shared_ptr<T> type_child (boost::shared_ptr<const cxml::Node> node, std::string name) {
-	return boost::shared_ptr<T> (new T (node->node_child (name)));
+boost::shared_ptr<T> type_child (cxml::ConstNodePtr node, std::string name) {
+	return boost::shared_ptr<T> (new T (node->child (name)));
 }
 	
 template <class T>
 boost::shared_ptr<T>
-optional_type_child (boost::shared_ptr<const cxml::Node> node, std::string name)
+optional_type_child (cxml::ConstNodePtr node, std::string name)
 {
 	return optional_type_child<T> (*node.get(), name);
 }
@@ -56,9 +56,9 @@ template <class T>
 std::list<boost::shared_ptr<T> >
 type_children (cxml::Node const & node, std::string name)
 {
-	std::list<boost::shared_ptr<cxml::Node> > n = node.node_children (name);
+	std::list<cxml::NodePtr > n = node.children (name);
         std::list<boost::shared_ptr<T> > r;
-        for (typename std::list<boost::shared_ptr<cxml::Node> >::iterator i = n.begin(); i != n.end(); ++i) {
+        for (typename std::list<cxml::NodePtr >::iterator i = n.begin(); i != n.end(); ++i) {
 		r.push_back (boost::shared_ptr<T> (new T (*i)));
 	}
 	return r;
@@ -66,7 +66,7 @@ type_children (cxml::Node const & node, std::string name)
 
 template <class T>
 std::list<boost::shared_ptr<T> >
-type_children (boost::shared_ptr<const cxml::Node> node, std::string name)
+type_children (cxml::ConstNodePtr node, std::string name)
 {
 	return type_children<T> (*node.get(), name);
 }
@@ -75,13 +75,13 @@ template <class T>
 std::list<boost::shared_ptr<T> >
 type_grand_children (cxml::Node const & node, std::string name, std::string sub)
 {
-	boost::shared_ptr<const cxml::Node> p = node.node_child (name);
+	cxml::ConstNodePtr p = node.child (name);
 	return type_children<T> (p, sub);
 }
 
 template <class T>
 std::list<boost::shared_ptr<T> >
-type_grand_children (boost::shared_ptr<const cxml::Node> node, std::string name, std::string sub)
+type_grand_children (cxml::ConstNodePtr node, std::string name, std::string sub)
 {
 	return type_grand_children<T> (*node.get(), name, sub);
 }
-- 
cgit v1.2.3