Follow the changes in XMLTree API: xml_tree::subtree_elements() does

not require an extra array of attributes anymore.

diff --git a/src/tree.ml b/src/tree.ml
index ef2a082..f73e347 100644 (file)
--- a/src/tree.ml
+++ b/src/tree.ml
@@ -347,10 +347,10 @@ let rec iter_array_tag i a len tree node acc =
     iter_array_tag (i+1) a len tree node
       (acc - (tree_subtree_tags tree node a.(i)))
 
-external tree_subtree_elements : tree -> [`Tree] Node.t -> tag_list -> int = "caml_xml_tree_subtree_elements" "noalloc"
+external tree_subtree_elements : tree -> [`Tree] Node.t -> int = "caml_xml_tree_subtree_elements" "noalloc"
 
 let subtree_elements t node =
-  tree_subtree_elements t.doc node t.attribute_array
+  tree_subtree_elements t.doc node
 (*
 let subtree_elements t node =
   let size = tree_subtree_size t.doc node - 1 in

diff --git a/src/xml-tree_stub.cpp b/src/xml-tree_stub.cpp
index 54f5c9a..1d52a9d 100644 (file)
--- a/src/xml-tree_stub.cpp
+++ b/src/xml-tree_stub.cpp
@@ -77,11 +77,10 @@ caml_xml_tree_subtree_tags(value tree, value node, value tag)
                                               TAG(tag))));
 }
 
-NoAlloc extern "C" value caml_xml_tree_subtree_elements(value tree, value node,
-                                                       value atts)
+NoAlloc extern "C" value caml_xml_tree_subtree_elements(value tree,
+                                                        value node)
 {
-  return (Val_int(XMLTREE(tree)->subtree_elements(TREENODE(node),
-                                                 TAGLIST(atts))));
+  return (Val_int(XMLTREE(tree)->subtree_elements(TREENODE(node))));
 }
 
 NoAlloc extern "C" value caml_xml_tree_is_leaf(value tree, value node){