Fix a libcds bug:

[SXSI/XMLTree.git] / xml-tree.hpp

diff --git a/xml-tree.hpp b/xml-tree.hpp
index 950f0ef..209ee56 100644 (file)
--- a/xml-tree.hpp
+++ b/xml-tree.hpp
@@ -3,7 +3,6 @@
 
 
 #include <cstdint>
-#include <unordered_set>
 #include <unordered_map>
 #include <bp/bp.h>
 #include <bp/bp-darray.h>
@@ -51,7 +50,7 @@ public:
   inline uint32_t num_tags() const;
   inline uint32_t subtree_size(node_t) const;
   inline uint32_t subtree_tags(node_t, tag_t) const;
-  uint32_t subtree_elements(node_t) const;
+  inline uint32_t subtree_elements(node_t, tag_t*) const;
   uint32_t num_children(node_t) const;
   uint32_t child_pos(node_t) const;
 
@@ -63,6 +62,7 @@ public:
   bool is_child(node_t, node_t) const;
   inline bool is_first_child(node_t) const;
   inline bool is_nil(node_t) const;
+  inline bool is_open(node_t) const;
 
   uint32_t depth(node_t) const;
   uint32_t preorder(node_t) const;
@@ -88,11 +88,10 @@ public:
   inline node_t tagged_following_before(node_t, tag_t, node_t) const;
   inline node_t tagged_child(node_t, tag_t) const;
   inline node_t tagged_sibling(node_t, tag_t) const;
-  node_t select_child(node_t, std::unordered_set<tag_t>*) const;
-  node_t select_descendant(node_t, std::unordered_set<tag_t>*) const;
-  node_t select_sibling(node_t, std::unordered_set<tag_t>*) const;
-  node_t select_following_before (node_t,
-                                  std::unordered_set<tag_t>*, node_t) const;
+  node_t select_child(node_t, tag_t*) const;
+  node_t select_descendant(node_t, tag_t*) const;
+  node_t select_sibling(node_t, tag_t*) const;
+  node_t select_following_before (node_t, tag_t*, node_t) const;
   inline node_t closing(node_t) const;
 
   //Text functions
@@ -111,7 +110,7 @@ public:
   //I/O functions
   void save(int, char*);
   static xml_tree* load(int, char*, bool, int);
-  void print(int, node_t, bool no_text=false);
+  void print(node_t, int, bool no_text=false);
   void flush(int);
 
 private: