summaryrefslogtreecommitdiff
path: root/boost/intrusive/bs_set.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/intrusive/bs_set.hpp')
-rw-r--r--boost/intrusive/bs_set.hpp62
1 files changed, 62 insertions, 0 deletions
diff --git a/boost/intrusive/bs_set.hpp b/boost/intrusive/bs_set.hpp
index 60f18a16a9..693b6d855c 100644
--- a/boost/intrusive/bs_set.hpp
+++ b/boost/intrusive/bs_set.hpp
@@ -23,6 +23,11 @@
# pragma once
#endif
+#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
+template<class ValueTraits, class VoidOrKeyOfValue, class Compare, class SizeType, bool ConstantTimeSize, typename HeaderHolder>
+class bs_multiset_impl;
+#endif
+
namespace boost {
namespace intrusive {
@@ -147,6 +152,15 @@ class bs_set_impl
//! @copydoc ::boost::intrusive::bstree::crend()const
const_reverse_iterator crend() const;
+ //! @copydoc ::boost::intrusive::bstree::root()
+ iterator root();
+
+ //! @copydoc ::boost::intrusive::bstree::root()const
+ const_iterator root() const;
+
+ //! @copydoc ::boost::intrusive::bstree::croot()const
+ const_iterator croot() const;
+
//! @copydoc ::boost::intrusive::bstree::container_from_end_iterator(iterator)
static bs_set_impl &container_from_end_iterator(iterator end_iterator);
@@ -396,6 +410,26 @@ class bs_set_impl
//! @copydoc ::boost::intrusive::bstree::remove_node
void remove_node(reference value);
+
+ //! @copydoc ::boost::intrusive::bstree::merge_unique
+ template<class ...Options2>
+ void merge(bs_set<T, Options2...> &source);
+
+ //! @copydoc ::boost::intrusive::bstree::merge_unique
+ template<class ...Options2>
+ void merge(bs_multiset<T, Options2...> &source);
+
+ #else
+
+ template<class Compare2>
+ void merge(bs_set_impl<ValueTraits, VoidOrKeyOfValue, Compare2, SizeType, ConstantTimeSize, HeaderHolder> &source)
+ { return tree_type::merge_unique(source); }
+
+
+ template<class Compare2>
+ void merge(bs_multiset_impl<ValueTraits, VoidOrKeyOfValue, Compare2, SizeType, ConstantTimeSize, HeaderHolder> &source)
+ { return tree_type::merge_unique(source); }
+
#endif //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
};
@@ -654,6 +688,15 @@ class bs_multiset_impl
//! @copydoc ::boost::intrusive::bstree::crend()const
const_reverse_iterator crend() const;
+ //! @copydoc ::boost::intrusive::bstree::root()
+ iterator root();
+
+ //! @copydoc ::boost::intrusive::bstree::root()const
+ const_iterator root() const;
+
+ //! @copydoc ::boost::intrusive::bstree::croot()const
+ const_iterator croot() const;
+
//! @copydoc ::boost::intrusive::bstree::container_from_end_iterator(iterator)
static bs_multiset_impl &container_from_end_iterator(iterator end_iterator);
@@ -861,6 +904,25 @@ class bs_multiset_impl
//! @copydoc ::boost::intrusive::bstree::remove_node
void remove_node(reference value);
+
+ //! @copydoc ::boost::intrusive::bstree::merge_equal
+ template<class ...Options2>
+ void merge(bs_multiset<T, Options2...> &source);
+
+ //! @copydoc ::boost::intrusive::bstree::merge_equal
+ template<class ...Options2>
+ void merge(bs_set<T, Options2...> &source);
+
+ #else
+
+ template<class Compare2>
+ void merge(bs_multiset_impl<ValueTraits, VoidOrKeyOfValue, Compare2, SizeType, ConstantTimeSize, HeaderHolder> &source)
+ { return tree_type::merge_equal(source); }
+
+ template<class Compare2>
+ void merge(bs_set_impl<ValueTraits, VoidOrKeyOfValue, Compare2, SizeType, ConstantTimeSize, HeaderHolder> &source)
+ { return tree_type::merge_equal(source); }
+
#endif //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
};