diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:41:18 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:43:11 +0900 |
commit | f763a99a501650eff2c60288aa6f10ef916d769e (patch) | |
tree | 02af7e13f9a38c888ebf340fe764cbe7dae99da9 /boost/intrusive/rbtree.hpp | |
parent | 5cde13f21d36c7224b0e13d11c4b49379ae5210d (diff) | |
download | boost-f763a99a501650eff2c60288aa6f10ef916d769e.tar.gz boost-f763a99a501650eff2c60288aa6f10ef916d769e.tar.bz2 boost-f763a99a501650eff2c60288aa6f10ef916d769e.zip |
Imported Upstream version 1.62.0upstream/1.62.0
Change-Id: I9d4c1ddb7b7d8f0069217ecc582700f9fda6dd4c
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/intrusive/rbtree.hpp')
-rw-r--r-- | boost/intrusive/rbtree.hpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/boost/intrusive/rbtree.hpp b/boost/intrusive/rbtree.hpp index 276362d2fc..4f5d86dd6a 100644 --- a/boost/intrusive/rbtree.hpp +++ b/boost/intrusive/rbtree.hpp @@ -188,6 +188,15 @@ class rbtree_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 rbtree_impl &container_from_end_iterator(iterator end_iterator); @@ -430,6 +439,14 @@ class rbtree_impl //! @copydoc ::boost::intrusive::bstree::remove_node void remove_node(reference value); + //! @copydoc ::boost::intrusive::bstree::merge_unique(bstree<T, Options2...>&) + template<class T, class ...Options2> + void merge_unique(rbtree<T, Options2...> &); + + //! @copydoc ::boost::intrusive::bstree::merge_equal(bstree<T, Options2...>&) + template<class T, class ...Options2> + void merge_equal(rbtree<T, Options2...> &); + friend bool operator< (const rbtree_impl &x, const rbtree_impl &y); friend bool operator==(const rbtree_impl &x, const rbtree_impl &y); |