Merge branch remove-virtual

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

diff --git a/xml-tree.hpp b/xml-tree.hpp
index 209ee56..4f40dd1 100644 (file)
--- a/xml-tree.hpp
+++ b/xml-tree.hpp
@@ -83,15 +83,16 @@ public:
   inline node_t prev_sibling(node_t) const;
   inline node_t first_element(node_t) const;
   inline node_t next_element(node_t) const;
+  inline node_t tagged_next_close(node_t, tag_t) const;
   inline node_t tagged_next(node_t, tag_t) const;
   inline node_t tagged_descendant(node_t, tag_t) const;
   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, tag_t*) const;
-  node_t select_descendant(node_t, tag_t*) const;
+  inline 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 select_following_before (node_t, tag_t*, node_t) const;
   inline node_t closing(node_t) const;
 
   //Text functions
@@ -127,7 +128,7 @@ private:
   //Parenthesis sequence
   bp *par;
   //tag sequence
-  static_sequence *tags;
+  std::vector<static_bitsequence_sdarray*> tags;
   uint32_t *tag_seq;
   uint32_t tag_seq_len;
   uint32_t bits_per_tag;