boostorg/intrusive
1
0
Fork 1
mirror of https://github.com/boostorg/intrusive.git synced 2025-08-02 22:14:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk for 1.38

Browse Source 
[SVN r50332]
This commit is contained in:
Ion Gaztañaga
2008-12-20 19:50:13 +00:00
parent 883a8bd0cc
commit cb66b9cd97
51 changed files with 5918 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/intrusive/any_hook.hpp
View File

@@ -309,7 +309,7 @@ struct any_to_set_hook
{}; {};
//!This option setter specifies that //!This option setter specifies that
//!any hook should behave as a set hook //!any hook should behave as an avl_set hook
template<class BaseHook> template<class BaseHook>
struct any_to_avl_set_hook struct any_to_avl_set_hook
/// @cond /// @cond
@@ -318,7 +318,7 @@ struct any_to_avl_set_hook
{}; {};
//!This option setter specifies that any //!This option setter specifies that any
//!hook should behave as a set hook //!hook should behave as a bs_set hook
template<class BaseHook> template<class BaseHook>
struct any_to_bs_set_hook struct any_to_bs_set_hook
/// @cond /// @cond

63
include/boost/intrusive/avl_set.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -15,6 +15,7 @@
#include <boost/intrusive/detail/config_begin.hpp> #include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/intrusive_fwd.hpp> #include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/avltree.hpp> #include <boost/intrusive/avltree.hpp>
#include <boost/intrusive/detail/mpl.hpp>
#include <iterator> #include <iterator>
namespace boost { namespace boost {
@@ -342,7 +343,7 @@ class avl_set_impl
//! <b>Requires</b>: value must be an lvalue //! <b>Requires</b>: value must be an lvalue
//! //!
//! <b>Effects</b>: Tries to inserts value into the avl_set. //! <b>Effects</b>: Treaps to inserts value into the avl_set.
//! //!
//! <b>Returns</b>: If the value //! <b>Returns</b>: If the value
//! is not already present inserts it and returns a pair containing the //! is not already present inserts it and returns a pair containing the
@@ -362,7 +363,7 @@ class avl_set_impl
//! <b>Requires</b>: value must be an lvalue //! <b>Requires</b>: value must be an lvalue
//! //!
//! <b>Effects</b>: Tries to to insert x into the avl_set, using "hint" //! <b>Effects</b>: Treaps to to insert x into the avl_set, using "hint"
//! as a hint to where it will be inserted. //! as a hint to where it will be inserted.
//! //!
//! <b>Returns</b>: An iterator that points to the position where the //! <b>Returns</b>: An iterator that points to the position where the
@@ -380,7 +381,7 @@ class avl_set_impl
//! <b>Requires</b>: key_value_comp must be a comparison function that induces //! <b>Requires</b>: key_value_comp must be a comparison function that induces
//! the same strict weak ordering as value_compare. The difference is that //! the same strict weak ordering as value_compare. The difference is that
//! key_value_comp compares an aavlitrary key with the contained values. //! key_value_comp compares an arbitrary key with the contained values.
//! //!
//! <b>Effects</b>: Checks if a value can be inserted in the avl_set, using //! <b>Effects</b>: Checks if a value can be inserted in the avl_set, using
//! a user provided key instead of the value itself. //! a user provided key instead of the value itself.
@@ -415,7 +416,7 @@ class avl_set_impl
//! <b>Requires</b>: key_value_comp must be a comparison function that induces //! <b>Requires</b>: key_value_comp must be a comparison function that induces
//! the same strict weak ordering as value_compare. The difference is that //! the same strict weak ordering as value_compare. The difference is that
//! key_value_comp compares an aavlitrary key with the contained values. //! key_value_comp compares an arbitrary key with the contained values.
//! //!
//! <b>Effects</b>: Checks if a value can be inserted in the avl_set, using //! <b>Effects</b>: Checks if a value can be inserted in the avl_set, using
//! a user provided key instead of the value itself, using "hint" //! a user provided key instead of the value itself, using "hint"
@@ -498,7 +499,7 @@ class avl_set_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ return tree_.erase(i); } { return tree_.erase(i); }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -512,7 +513,7 @@ class avl_set_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ return tree_.erase(b, e); } { return tree_.erase(b, e); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -540,7 +541,11 @@ class avl_set_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase(key, comp); } { return tree_.erase(key, comp); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -557,9 +562,15 @@ class avl_set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return tree_.erase_and_dispose(i, disposer); } { return tree_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -575,7 +586,7 @@ class avl_set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ return tree_.erase_and_dispose(b, e, disposer); } { return tree_.erase_and_dispose(b, e, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -610,7 +621,11 @@ class avl_set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase_and_dispose(key, comp, disposer); } { return tree_.erase_and_dispose(key, comp, disposer); }
//! <b>Effects</b>: Erases all the elements of the container. //! <b>Effects</b>: Erases all the elements of the container.
@@ -1527,7 +1542,7 @@ class avl_multiset_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ return tree_.erase(i); } { return tree_.erase(i); }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -1541,7 +1556,7 @@ class avl_multiset_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ return tree_.erase(b, e); } { return tree_.erase(b, e); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -1569,7 +1584,11 @@ class avl_multiset_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase(key, comp); } { return tree_.erase(key, comp); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -1586,9 +1605,15 @@ class avl_multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return tree_.erase_and_dispose(i, disposer); } { return tree_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Returns</b>: An iterator to the element after the erased elements. //! <b>Returns</b>: An iterator to the element after the erased elements.
@@ -1604,7 +1629,7 @@ class avl_multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ return tree_.erase_and_dispose(b, e, disposer); } { return tree_.erase_and_dispose(b, e, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -1639,7 +1664,11 @@ class avl_multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase_and_dispose(key, comp, disposer); } { return tree_.erase_and_dispose(key, comp, disposer); }
//! <b>Effects</b>: Erases all the elements of the container. //! <b>Effects</b>: Erases all the elements of the container.

2
include/boost/intrusive/avl_set_hook.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

169
include/boost/intrusive/avltree.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -26,7 +26,9 @@
#include <boost/intrusive/detail/avltree_node.hpp> #include <boost/intrusive/detail/avltree_node.hpp>
#include <boost/intrusive/detail/tree_node.hpp> #include <boost/intrusive/detail/tree_node.hpp>
#include <boost/intrusive/detail/ebo_functor_holder.hpp> #include <boost/intrusive/detail/ebo_functor_holder.hpp>
#include <boost/intrusive/detail/mpl.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp> #include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/detail/clear_on_destructor_base.hpp>
#include <boost/intrusive/options.hpp> #include <boost/intrusive/options.hpp>
#include <boost/intrusive/avltree_algorithms.hpp> #include <boost/intrusive/avltree_algorithms.hpp>
#include <boost/intrusive/link_mode.hpp> #include <boost/intrusive/link_mode.hpp>
@@ -77,7 +79,9 @@ template<class T, class ...Options>
template<class Config> template<class Config>
#endif #endif
class avltree_impl class avltree_impl
: private detail::clear_on_destructor_base<avltree_impl<Config> >
{ {
template<class C> friend class detail::clear_on_destructor_base;
public: public:
typedef typename Config::value_traits value_traits; typedef typename Config::value_traits value_traits;
/// @cond /// @cond
@@ -200,9 +204,11 @@ class avltree_impl
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
//! <b>Throws</b>: Nothing unless the copy constructor of the value_compare object throws. //! <b>Throws</b>: If value_traits::node_traits::node
avltree_impl( value_compare cmp = value_compare() //! constructor throws (this does not happen with predefined Boost.Intrusive hooks)
, const value_traits &v_traits = value_traits()) //! or the copy constructor of the value_compare object throws. Basic guarantee.
avltree_impl( const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits())
: data_(cmp, v_traits) : data_(cmp, v_traits)
{ {
node_algorithms::init_header(&priv_header()); node_algorithms::init_header(&priv_header());
@@ -218,10 +224,12 @@ class avltree_impl
//! <b>Complexity</b>: Linear in N if [b, e) is already sorted using //! <b>Complexity</b>: Linear in N if [b, e) is already sorted using
//! comp and otherwise N * log N, where N is the distance between first and last. //! comp and otherwise N * log N, where N is the distance between first and last.
//! //!
//! <b>Throws</b>: Nothing unless the copy constructor of the value_compare object throws. //! <b>Throws</b>: If value_traits::node_traits::node
//! constructor throws (this does not happen with predefined Boost.Intrusive hooks)
//! or the copy constructor/operator() of the value_compare object throws. Basic guarantee.
template<class Iterator> template<class Iterator>
avltree_impl( bool unique, Iterator b, Iterator e avltree_impl( bool unique, Iterator b, Iterator e
, value_compare cmp = value_compare() , const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits()) , const value_traits &v_traits = value_traits())
: data_(cmp, v_traits) : data_(cmp, v_traits)
{ {
@@ -237,11 +245,11 @@ class avltree_impl
//! are not deleted (i.e. no destructors are called), but the nodes according to //! are not deleted (i.e. no destructors are called), but the nodes according to
//! the value_traits template parameter are reinitialized and thus can be reused. //! the value_traits template parameter are reinitialized and thus can be reused.
//! //!
//! <b>Complexity</b>: Linear to elements contained in *this. //! <b>Complexity</b>: Linear to elements contained in *this.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: Nothing.
~avltree_impl() ~avltree_impl()
{ this->clear(); } {}
//! <b>Effects</b>: Returns an iterator pointing to the beginning of the tree. //! <b>Effects</b>: Returns an iterator pointing to the beginning of the tree.
//! //!
@@ -397,7 +405,7 @@ class avltree_impl
value_compare value_comp() const value_compare value_comp() const
{ return priv_comp(); } { return priv_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -407,7 +415,8 @@ class avltree_impl
//! <b>Effects</b>: Returns the number of elements stored in the tree. //! <b>Effects</b>: Returns the number of elements stored in the tree.
//! //!
//! <b>Complexity</b>: Linear to elements contained in *this. //! <b>Complexity</b>: Linear to elements contained in *this
//! if constant-time size option is disabled. Constant time otherwise.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: Nothing.
size_type size() const size_type size() const
@@ -419,7 +428,7 @@ class avltree_impl
} }
} }
//! <b>Effects</b>: Swaps the contents of two multisets. //! <b>Effects</b>: Swaps the contents of two avltrees.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -445,7 +454,7 @@ class avltree_impl
//! <b>Complexity</b>: Average complexity for insert element is at //! <b>Complexity</b>: Average complexity for insert element is at
//! most logarithmic. //! most logarithmic.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: If the internal value_compare ordering function throws. Strong guarantee.
//! //!
//! <b>Note</b>: Does not affect the validity of iterators and references. //! <b>Note</b>: Does not affect the validity of iterators and references.
//! No copy-constructors are called. //! No copy-constructors are called.
@@ -471,7 +480,7 @@ class avltree_impl
//! <b>Complexity</b>: Logarithmic in general, but it is amortized //! <b>Complexity</b>: Logarithmic in general, but it is amortized
//! constant time if t is inserted immediately before hint. //! constant time if t is inserted immediately before hint.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: If the internal value_compare ordering function throws. Strong guarantee.
//! //!
//! <b>Note</b>: Does not affect the validity of iterators and references. //! <b>Note</b>: Does not affect the validity of iterators and references.
//! No copy-constructors are called. //! No copy-constructors are called.
@@ -524,7 +533,7 @@ class avltree_impl
std::pair<iterator, bool> insert_unique(reference value) std::pair<iterator, bool> insert_unique(reference value)
{ {
insert_commit_data commit_data; insert_commit_data commit_data;
std::pair<iterator, bool> ret = insert_unique_check(value, commit_data); std::pair<iterator, bool> ret = insert_unique_check(value, priv_comp(), commit_data);
if(!ret.second) if(!ret.second)
return ret; return ret;
return std::pair<iterator, bool> (insert_unique_commit(value, commit_data), true); return std::pair<iterator, bool> (insert_unique_commit(value, commit_data), true);
@@ -547,7 +556,7 @@ class avltree_impl
iterator insert_unique(const_iterator hint, reference value) iterator insert_unique(const_iterator hint, reference value)
{ {
insert_commit_data commit_data; insert_commit_data commit_data;
std::pair<iterator, bool> ret = insert_unique_check(hint, value, commit_data); std::pair<iterator, bool> ret = insert_unique_check(hint, value, priv_comp(), commit_data);
if(!ret.second) if(!ret.second)
return ret.first; return ret.first;
return insert_unique_commit(value, commit_data); return insert_unique_commit(value, commit_data);
@@ -580,10 +589,36 @@ class avltree_impl
} }
} }
std::pair<iterator, bool> insert_unique_check //! <b>Requires</b>: key_value_comp must be a comparison function that induces
(const_reference value, insert_commit_data &commit_data) //! the same strict weak ordering as value_compare. The difference is that
{ return insert_unique_check(value, priv_comp(), commit_data); } //! key_value_comp compares an arbitrary key with the contained values.
//!
//! <b>Effects</b>: Checks if a value can be inserted in the container, using
//! a user provided key instead of the value itself.
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing an iterator to the already present value
//! and false. If the value can be inserted returns true in the returned
//! pair boolean and fills "commit_data" that is meant to be used with
//! the "insert_commit" function.
//!
//! <b>Complexity</b>: Average complexity is at most logarithmic.
//!
//! <b>Throws</b>: If the key_value_comp ordering function throws. Strong guarantee.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a value_type is expensive: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! node that is used to impose the order is much cheaper to construct
//! than the value_type and this function offers the possibility to use that
//! part to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the value_type and use
//! "insert_commit" to insert the object in constant-time. This gives a total
//! logarithmic complexity to the insertion: check(O(log(N)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_commit" only if no more
//! objects are inserted or erased from the container.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
std::pair<iterator, bool> insert_unique_check std::pair<iterator, bool> insert_unique_check
(const KeyType &key, KeyValueCompare key_value_comp, insert_commit_data &commit_data) (const KeyType &key, KeyValueCompare key_value_comp, insert_commit_data &commit_data)
@@ -596,10 +631,38 @@ class avltree_impl
return std::pair<iterator, bool>(iterator(ret.first, this), ret.second); return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
} }
std::pair<iterator, bool> insert_unique_check //! <b>Requires</b>: key_value_comp must be a comparison function that induces
(const_iterator hint, const_reference value, insert_commit_data &commit_data) //! the same strict weak ordering as value_compare. The difference is that
{ return insert_unique_check(hint, value, priv_comp(), commit_data); } //! key_value_comp compares an arbitrary key with the contained values.
//!
//! <b>Effects</b>: Checks if a value can be inserted in the container, using
//! a user provided key instead of the value itself, using "hint"
//! as a hint to where it will be inserted.
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing an iterator to the already present value
//! and false. If the value can be inserted returns true in the returned
//! pair boolean and fills "commit_data" that is meant to be used with
//! the "insert_commit" function.
//!
//! <b>Complexity</b>: Logarithmic in general, but it's amortized
//! constant time if t is inserted immediately before hint.
//!
//! <b>Throws</b>: If the key_value_comp ordering function throws. Strong guarantee.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a value_type is expensive: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! constructing that is used to impose the order is much cheaper to construct
//! than the value_type and this function offers the possibility to use that key
//! to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the value_type and use
//! "insert_commit" to insert the object in constant-time. This can give a total
//! constant-time complexity to the insertion: check(O(1)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_commit" only if no more
//! objects are inserted or erased from the container.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
std::pair<iterator, bool> insert_unique_check std::pair<iterator, bool> insert_unique_check
(const_iterator hint, const KeyType &key (const_iterator hint, const KeyType &key
@@ -613,6 +676,23 @@ class avltree_impl
return std::pair<iterator, bool>(iterator(ret.first, this), ret.second); return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
} }
//! <b>Requires</b>: value must be an lvalue of type value_type. commit_data
//! must have been obtained from a previous call to "insert_check".
//! No objects should have been inserted or erased from the container between
//! the "insert_check" that filled "commit_data" and the call to "insert_commit".
//!
//! <b>Effects</b>: Inserts the value in the avl_set using the information obtained
//! from the "commit_data" that a previous "insert_check" filled.
//!
//! <b>Returns</b>: An iterator to the newly inserted object.
//!
//! <b>Complexity</b>: Constant time.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Notes</b>: This function has only sense if a "insert_check" has been
//! previously executed to fill "commit_data". No value should be inserted or
//! erased between the "insert_check" and "insert_commit" calls.
iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) iterator insert_unique_commit(reference value, const insert_commit_data &commit_data)
{ {
node_ptr to_insert(get_real_value_traits().to_node_ptr(value)); node_ptr to_insert(get_real_value_traits().to_node_ptr(value));
@@ -632,9 +712,9 @@ class avltree_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ {
iterator ret(i); const_iterator ret(i);
++ret; ++ret;
node_ptr to_erase(i.pointed_node()); node_ptr to_erase(i.pointed_node());
if(safemode_or_autounlink) if(safemode_or_autounlink)
@@ -643,7 +723,7 @@ class avltree_impl
this->priv_size_traits().decrement(); this->priv_size_traits().decrement();
if(safemode_or_autounlink) if(safemode_or_autounlink)
node_algorithms::init(to_erase); node_algorithms::init(to_erase);
return ret; return ret.unconst();
} }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -655,7 +735,7 @@ class avltree_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ size_type n; return private_erase(b, e, n); } { size_type n; return private_erase(b, e, n); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -683,7 +763,11 @@ class avltree_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ {
std::pair<iterator,iterator> p = this->equal_range(key, comp); std::pair<iterator,iterator> p = this->equal_range(key, comp);
size_type n; size_type n;
@@ -703,7 +787,7 @@ class avltree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ {
node_ptr to_erase(i.pointed_node()); node_ptr to_erase(i.pointed_node());
iterator ret(this->erase(i)); iterator ret(this->erase(i));
@@ -711,6 +795,12 @@ class avltree_impl
return ret; return ret;
} }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -724,7 +814,7 @@ class avltree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ size_type n; return private_erase(b, e, n, disposer); } { size_type n; return private_erase(b, e, n, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -764,7 +854,11 @@ class avltree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ {
std::pair<iterator,iterator> p = this->equal_range(key, comp); std::pair<iterator,iterator> p = this->equal_range(key, comp);
size_type n; size_type n;
@@ -1212,20 +1306,21 @@ class avltree_impl
*/ */
/// @cond /// @cond
private: private:
template<class Disposer> template<class Disposer>
iterator private_erase(iterator b, iterator e, size_type &n, Disposer disposer) iterator private_erase(const_iterator b, const_iterator e, size_type &n, Disposer disposer)
{ {
for(n = 0; b != e; ++n) for(n = 0; b != e; ++n)
this->erase_and_dispose(b++, disposer); this->erase_and_dispose(b++, disposer);
return b; return b.unconst();
} }
iterator private_erase(iterator b, iterator e, size_type &n) iterator private_erase(const_iterator b, const_iterator e, size_type &n)
{ {
for(n = 0; b != e; ++n) for(n = 0; b != e; ++n)
this->erase(b++); this->erase(b++);
return b; return b.unconst();
} }
/// @endcond /// @endcond
@@ -1446,8 +1541,8 @@ class avltree
//Assert if passed value traits are compatible with the type //Assert if passed value traits are compatible with the type
BOOST_STATIC_ASSERT((detail::is_same<typename real_value_traits::value_type, T>::value)); BOOST_STATIC_ASSERT((detail::is_same<typename real_value_traits::value_type, T>::value));
avltree( const value_compare &cmp = value_compare() avltree( const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits()) , const value_traits &v_traits = value_traits())
: Base(cmp, v_traits) : Base(cmp, v_traits)
{} {}

2
include/boost/intrusive/bs_set_hook.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/circular_list_algorithms.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/circular_slist_algorithms.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/derivation_value_traits.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/detail/assert.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

36
include/boost/intrusive/detail/clear_on_destructor_base.hpp Normal file
View File

@@ -0,0 +1,36 @@
//////} // ///////////////////////////////////////////////////////////////////////
//
// (C) Copyright Ion Gaztanaga 2008-2008. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_INTRUSIVE_DETAIL_CLEAR_ON_DESTRUCTOR_HPP
#define BOOST_INTRUSIVE_DETAIL_CLEAR_ON_DESTRUCTOR_HPP
#include <boost/intrusive/detail/config_begin.hpp>
namespace boost {
namespace intrusive {
namespace detail {
template<class Derived>
class clear_on_destructor_base
{
protected:
~clear_on_destructor_base()
{
static_cast<Derived*>(this)->clear();
}
};
} // namespace detail {
} // namespace intrusive {
} // namespace boost {
#include <boost/intrusive/detail/config_end.hpp>
#endif //#ifndef BOOST_INTRUSIVE_DETAIL_CLEAR_ON_DESTRUCTOR_HPP

4
include/boost/intrusive/detail/config_begin.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -44,6 +44,8 @@
#pragma warning (disable : 4267) //conversion from 'X' to 'Y', possible loss of data #pragma warning (disable : 4267) //conversion from 'X' to 'Y', possible loss of data
#pragma warning (disable : 4127) //conditional expression is constant #pragma warning (disable : 4127) //conditional expression is constant
#pragma warning (disable : 4706) //assignment within conditional expression #pragma warning (disable : 4706) //assignment within conditional expression
#pragma warning (disable : 4541) //'typeid' used on polymorphic type 'boost::exception' with /GR-
#pragma warning (disable : 4512) //'typeid' used on polymorphic type 'boost::exception' with /GR-
#endif #endif
//#define BOOST_INTRUSIVE_USE_ITERATOR_FACADE //#define BOOST_INTRUSIVE_USE_ITERATOR_FACADE

2
include/boost/intrusive/detail/config_end.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/detail/ebo_functor_holder.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Joaquin M Lopez Munoz 2006-2007 // (C) Copyright Joaquin M Lopez Munoz 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/detail/generic_hook.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/detail/hashtable_node.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/detail/list_node.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

4
include/boost/intrusive/detail/mpl.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -129,7 +129,7 @@ struct identity
#define BOOST_INTRUSIVE_TT_DECL #define BOOST_INTRUSIVE_TT_DECL
#endif #endif
#if defined(_MSC_EXTENSIONS) && !defined(__BORLAND__) #if defined(_MSC_EXTENSIONS) && !defined(__BORLAND__) && !defined(_WIN64)
#define BOOST_INTRUSIVE_TT_TEST_MSC_FUNC_SIGS #define BOOST_INTRUSIVE_TT_TEST_MSC_FUNC_SIGS
#endif #endif

2
include/boost/intrusive/detail/parent_from_member.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/detail/rbtree_node.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007. // (C) Copyright Ion Gaztanaga 2006-2008.
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/detail/slist_node.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/detail/transform_iterator.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

162
include/boost/intrusive/detail/tree_algorithms.hpp
View File

@@ -721,22 +721,6 @@ class tree_algorithms
static bool is_header(const_node_ptr p) static bool is_header(const_node_ptr p)
{ {
/*
node_ptr p_parent = NodeTraits::get_parent(p);
if(!p_parent)
return true;
if(!NodeTraits::get_parent(p_parent) != p)
return false;
if(NodeTraits::get_left(p) != 0){
if(NodeTraits::get_parent(NodeTraits::get_left(p)) != p){
is_header = true;
}
if(NodeTraits::get_parent(p) == NodeTraits::get_left(p)){
is_header = true;
}
}
*/
bool is_header = false; bool is_header = false;
if(NodeTraits::get_parent(p) == p){ if(NodeTraits::get_parent(p) == p){
is_header = true; is_header = true;
@@ -1015,42 +999,71 @@ class tree_algorithms
} }
} }
//! <b>Requires</b>: "header" must be the header node of a tree.
//! NodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. NodePtrCompare compares two node_ptrs. "hint" is node from
//! the "header"'s tree.
//!
//! <b>Effects</b>: Inserts new_node into the tree, using "hint" as a hint to
//! where it will be inserted. If "hint" is the upper_bound
//! the insertion takes constant time (two comparisons in the worst case).
//!
//! <b>Complexity</b>: Logarithmic in general, but it is amortized
//! constant time if new_node is inserted immediately before "hint".
//!
//! <b>Throws</b>: If "comp" throws.
template<class NodePtrCompare> template<class NodePtrCompare>
static node_ptr insert_equal static void insert_equal_check
(node_ptr header, node_ptr hint, node_ptr new_node, NodePtrCompare comp, std::size_t *pdepth = 0) ( node_ptr header, node_ptr hint, node_ptr new_node, NodePtrCompare comp
, insert_commit_data &commit_data, std::size_t *pdepth = 0)
{ {
if(hint == header || !comp(hint, new_node)){ if(hint == header || !comp(hint, new_node)){
node_ptr prev(hint); node_ptr prev(hint);
if(hint == NodeTraits::get_left(header) || if(hint == NodeTraits::get_left(header) ||
!comp(new_node, (prev = prev_node(hint)))){ !comp(new_node, (prev = prev_node(hint)))){
bool link_left = unique(header) || !NodeTraits::get_left(hint); bool link_left = unique(header) || !NodeTraits::get_left(hint);
link(header, new_node, link_left ? hint : prev, link_left); commit_data.link_left = link_left;
if(pdepth) *pdepth = depth(new_node) + 1; commit_data.node = link_left ? hint : prev;
return new_node; if(pdepth){
*pdepth = commit_data.node == header ? 0 : depth(commit_data.node) + 1;
}
} }
else{ else{
return insert_equal_upper_bound(header, new_node, comp, pdepth); insert_equal_upper_bound_check(header, new_node, comp, commit_data, pdepth);
} }
} }
else{ else{
return insert_equal_lower_bound(header, new_node, comp, pdepth); insert_equal_lower_bound_check(header, new_node, comp, commit_data, pdepth);
} }
} }
template<class NodePtrCompare>
static void insert_equal_upper_bound_check
(node_ptr h, node_ptr new_node, NodePtrCompare comp, insert_commit_data & commit_data, std::size_t *pdepth = 0)
{ insert_equal_check_impl(true, h, new_node, comp, commit_data, pdepth); }
template<class NodePtrCompare>
static void insert_equal_lower_bound_check
(node_ptr h, node_ptr new_node, NodePtrCompare comp, insert_commit_data & commit_data, std::size_t *pdepth = 0)
{ insert_equal_check_impl(false, h, new_node, comp, commit_data, pdepth); }
template<class NodePtrCompare>
static node_ptr insert_equal
(node_ptr h, node_ptr hint, node_ptr new_node, NodePtrCompare comp, std::size_t *pdepth = 0)
{
insert_commit_data commit_data;
insert_equal_check(h, hint, new_node, comp, commit_data, pdepth);
link(h, new_node, commit_data.node, commit_data.link_left);
return new_node;
}
template<class NodePtrCompare>
static node_ptr insert_equal_upper_bound
(node_ptr h, node_ptr new_node, NodePtrCompare comp, std::size_t *pdepth = 0)
{
insert_commit_data commit_data;
insert_equal_upper_bound_check(h, new_node, comp, commit_data, pdepth);
link(h, new_node, commit_data.node, commit_data.link_left);
return new_node;
}
template<class NodePtrCompare>
static node_ptr insert_equal_lower_bound
(node_ptr h, node_ptr new_node, NodePtrCompare comp, std::size_t *pdepth = 0)
{
insert_commit_data commit_data;
insert_equal_lower_bound_check(h, new_node, comp, commit_data, pdepth);
link(h, new_node, commit_data.node, commit_data.link_left);
return new_node;
}
//! <b>Requires</b>: p can't be a header node. //! <b>Requires</b>: p can't be a header node.
//! //!
//! <b>Effects</b>: Calculates the depth of a node: the depth of a //! <b>Effects</b>: Calculates the depth of a node: the depth of a
@@ -1071,48 +1084,6 @@ class tree_algorithms
return depth; return depth;
} }
template<class NodePtrCompare>
static node_ptr insert_equal_upper_bound
(node_ptr h, node_ptr new_node, NodePtrCompare comp, std::size_t *pdepth = 0)
{
std::size_t depth = 0;
node_ptr y(h);
node_ptr x(NodeTraits::get_parent(y));
while(x){
++depth;
y = x;
x = comp(new_node, x) ?
NodeTraits::get_left(x) : NodeTraits::get_right(x);
}
bool link_left = (y == h) || comp(new_node, y);
link(h, new_node, y, link_left);
if(pdepth) *pdepth = depth;
return new_node;
}
template<class NodePtrCompare>
static node_ptr insert_equal_lower_bound
(node_ptr h, node_ptr new_node, NodePtrCompare comp, std::size_t *pdepth = 0)
{
std::size_t depth = 0;
node_ptr y(h);
node_ptr x(NodeTraits::get_parent(y));
while(x){
++depth;
y = x;
x = !comp(x, new_node) ?
NodeTraits::get_left(x) : NodeTraits::get_right(x);
}
bool link_left = (y == h) || !comp(y, new_node);
link(h, new_node, y, link_left);
if(pdepth) *pdepth = depth;
return new_node;
}
//! <b>Requires</b>: "cloner" must be a function //! <b>Requires</b>: "cloner" must be a function
//! object taking a node_ptr and returning a new cloned node of it. "disposer" must //! object taking a node_ptr and returning a new cloned node of it. "disposer" must
//! take a node_ptr and shouldn't throw. //! take a node_ptr and shouldn't throw.
@@ -1557,6 +1528,39 @@ class tree_algorithms
} }
private: private:
template<class NodePtrCompare>
static void insert_equal_check_impl
(bool upper, node_ptr h, node_ptr new_node, NodePtrCompare comp, insert_commit_data & commit_data, std::size_t *pdepth = 0)
{
std::size_t depth = 0;
node_ptr y(h);
node_ptr x(NodeTraits::get_parent(y));
bool link_left;
if(upper){
while(x){
++depth;
y = x;
x = comp(new_node, x) ?
NodeTraits::get_left(x) : NodeTraits::get_right(x);
}
link_left = (y == h) || comp(new_node, y);
}
else{
while(x){
++depth;
y = x;
x = !comp(x, new_node) ?
NodeTraits::get_left(x) : NodeTraits::get_right(x);
}
link_left = (y == h) || !comp(y, new_node);
}
commit_data.link_left = link_left;
commit_data.node = y;
if(pdepth) *pdepth = depth;
}
static void erase_impl(node_ptr header, node_ptr z, data_for_rebalance &info) static void erase_impl(node_ptr header, node_ptr z, data_for_rebalance &info)
{ {
node_ptr y(z); node_ptr y(z);

3
include/boost/intrusive/detail/tree_node.hpp
View File

@@ -173,6 +173,9 @@ class tree_iterator
return tree_iterator(node_algorithms::get_header(this->pointed_node()), this->get_container()); return tree_iterator(node_algorithms::get_header(this->pointed_node()), this->get_container());
} }
tree_iterator<Container, false> unconst() const
{ return tree_iterator<Container, false>(this->pointed_node(), this->get_container()); }
private: private:
struct members struct members
: public detail::select_constptr : public detail::select_constptr

13
include/boost/intrusive/detail/utilities.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -211,20 +211,25 @@ struct key_nodeptr_comp
{ {
typedef typename Container::real_value_traits real_value_traits; typedef typename Container::real_value_traits real_value_traits;
typedef typename real_value_traits::node_ptr node_ptr; typedef typename real_value_traits::node_ptr node_ptr;
typedef typename real_value_traits::const_node_ptr const_node_ptr;
typedef detail::ebo_functor_holder<KeyValueCompare> base_t; typedef detail::ebo_functor_holder<KeyValueCompare> base_t;
key_nodeptr_comp(KeyValueCompare kcomp, const Container *cont) key_nodeptr_comp(KeyValueCompare kcomp, const Container *cont)
: base_t(kcomp), cont_(cont) : base_t(kcomp), cont_(cont)
{} {}
template<class KeyType> template<class KeyType>
bool operator()(node_ptr node, const KeyType &key) const bool operator()( const_node_ptr node, const KeyType &key
, typename enable_if_c
<!is_convertible<KeyType, const_node_ptr>::value>::type * = 0) const
{ return base_t::get()(*cont_->get_real_value_traits().to_value_ptr(node), key); } { return base_t::get()(*cont_->get_real_value_traits().to_value_ptr(node), key); }
template<class KeyType> template<class KeyType>
bool operator()(const KeyType &key, node_ptr node) const bool operator()(const KeyType &key, const_node_ptr node
, typename enable_if_c
<!is_convertible<KeyType, const_node_ptr>::value>::type * = 0) const
{ return base_t::get()(key, *cont_->get_real_value_traits().to_value_ptr(node)); } { return base_t::get()(key, *cont_->get_real_value_traits().to_value_ptr(node)); }
bool operator()(node_ptr node1, node_ptr node2) const bool operator()(const_node_ptr node1, const_node_ptr node2) const
{ {
return base_t::get() return base_t::get()
( *cont_->get_real_value_traits().to_value_ptr(node1) ( *cont_->get_real_value_traits().to_value_ptr(node1)

41
include/boost/intrusive/hashtable.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -30,6 +30,7 @@
#include <boost/intrusive/detail/transform_iterator.hpp> #include <boost/intrusive/detail/transform_iterator.hpp>
#include <boost/intrusive/link_mode.hpp> #include <boost/intrusive/link_mode.hpp>
#include <boost/intrusive/detail/ebo_functor_holder.hpp> #include <boost/intrusive/detail/ebo_functor_holder.hpp>
#include <boost/intrusive/detail/clear_on_destructor_base.hpp>
//Implementation utilities //Implementation utilities
#include <boost/intrusive/trivial_value_traits.hpp> #include <boost/intrusive/trivial_value_traits.hpp>
#include <boost/intrusive/unordered_set_hook.hpp> #include <boost/intrusive/unordered_set_hook.hpp>
@@ -572,7 +573,9 @@ template<class T, class ...Options>
template<class Config> template<class Config>
#endif #endif
class hashtable_impl class hashtable_impl
: private detail::clear_on_destructor_base<hashtable_impl<Config> >
{ {
template<class C> friend class detail::clear_on_destructor_base;
public: public:
typedef typename Config::value_traits value_traits; typedef typename Config::value_traits value_traits;
@@ -795,7 +798,7 @@ class hashtable_impl
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: Nothing.
~hashtable_impl() ~hashtable_impl()
{ this->clear(); } {}
//! <b>Effects</b>: Returns an iterator pointing to the beginning of the unordered_set. //! <b>Effects</b>: Returns an iterator pointing to the beginning of the unordered_set.
//! //!
@@ -866,7 +869,7 @@ class hashtable_impl
key_equal key_eq() const key_equal key_eq() const
{ return this->priv_equal(); } { return this->priv_equal(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: if constant-time size and cache_last options are disabled, //! <b>Complexity</b>: if constant-time size and cache_last options are disabled,
//! average constant time (worst case, with empty() == true: O(this->bucket_count()). //! average constant time (worst case, with empty() == true: O(this->bucket_count()).
@@ -1045,6 +1048,18 @@ class hashtable_impl
} }
} }
//! <b>Requires</b>: value must be an lvalue
//!
//! <b>Effects</b>: Inserts the value into the unordered_set.
//!
//! <b>Returns</b>: An iterator to the inserted value.
//!
//! <b>Complexity</b>: Average case O(1), worst case O(this->size()).
//!
//! <b>Throws</b>: If the internal hasher or the equality functor throws. Strong guarantee.
//!
//! <b>Note</b>: Does not affect the validity of iterators and references.
//! No copy-constructors are called.
iterator insert_equal(reference value) iterator insert_equal(reference value)
{ {
size_type bucket_num; size_type bucket_num;
@@ -1055,6 +1070,18 @@ class hashtable_impl
return priv_insert_equal_find(value, bucket_num, hash_value, it); return priv_insert_equal_find(value, bucket_num, hash_value, it);
} }
//! <b>Requires</b>: Dereferencing iterator must yield an lvalue
//! of type value_type.
//!
//! <b>Effects</b>: Equivalent to this->insert_equal(t) for each element in [b, e).
//!
//! <b>Complexity</b>: Average case O(N), where N is std::distance(b, e).
//! Worst case O(N*this->size()).
//!
//! <b>Throws</b>: If the internal hasher or the equality functor throws. Basic guarantee.
//!
//! <b>Note</b>: Does not affect the validity of iterators and references.
//! No copy-constructors are called.
template<class Iterator> template<class Iterator>
void insert_equal(Iterator b, Iterator e) void insert_equal(Iterator b, Iterator e)
{ {
@@ -1092,7 +1119,7 @@ class hashtable_impl
//! <b>Requires</b>: Dereferencing iterator must yield an lvalue //! <b>Requires</b>: Dereferencing iterator must yield an lvalue
//! of type value_type. //! of type value_type.
//! //!
//! <b>Effects</b>: Equivalent to this->insert(t) for each element in [b, e). //! <b>Effects</b>: Equivalent to this->insert_unique(t) for each element in [b, e).
//! //!
//! <b>Complexity</b>: Average case O(N), where N is std::distance(b, e). //! <b>Complexity</b>: Average case O(N), where N is std::distance(b, e).
//! Worst case O(N*this->size()). //! Worst case O(N*this->size()).
@@ -1275,6 +1302,12 @@ class hashtable_impl
priv_erasure_update_cache(); priv_erasure_update_cache();
} }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.

47
include/boost/intrusive/intrusive_fwd.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -311,6 +311,51 @@ template<class ...Options>
#endif #endif
class avl_set_member_hook; class avl_set_member_hook;
//treap/treap_set/treap_multiset
#ifndef BOOST_INTRUSIVE_VARIADIC_TEMPLATES
template
< class T
, class O1 = none
, class O2 = none
, class O3 = none
, class O4 = none
>
#else
template<class T, class ...Options>
#endif
class treap;
#ifndef BOOST_INTRUSIVE_VARIADIC_TEMPLATES
template
< class T
, class O1 = none
, class O2 = none
, class O3 = none
, class O4 = none
>
#else
template<class T, class ...Options>
#endif
class treap_set;
#ifndef BOOST_INTRUSIVE_VARIADIC_TEMPLATES
template
< class T
, class O1 = none
, class O2 = none
, class O3 = none
, class O4 = none
>
#else
template<class T, class ...Options>
#endif
class treap_multiset;
//Default priority comparison functor
template <class T>
struct priority_compare;
//sgtree/sg_set/sg_multiset //sgtree/sg_set/sg_multiset
#ifndef BOOST_INTRUSIVE_VARIADIC_TEMPLATES #ifndef BOOST_INTRUSIVE_VARIADIC_TEMPLATES
template template

2
include/boost/intrusive/linear_slist_algorithms.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/link_mode.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

17
include/boost/intrusive/list.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -20,6 +20,7 @@
#include <boost/intrusive/list_hook.hpp> #include <boost/intrusive/list_hook.hpp>
#include <boost/intrusive/circular_list_algorithms.hpp> #include <boost/intrusive/circular_list_algorithms.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp> #include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/detail/clear_on_destructor_base.hpp>
#include <boost/intrusive/detail/mpl.hpp> #include <boost/intrusive/detail/mpl.hpp>
#include <boost/intrusive/link_mode.hpp> #include <boost/intrusive/link_mode.hpp>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
@@ -72,7 +73,9 @@ template<class T, class ...Options>
template<class Config> template<class Config>
#endif #endif
class list_impl class list_impl
: private detail::clear_on_destructor_base< list_impl<Config> >
{ {
template<class C> friend class detail::clear_on_destructor_base;
//Public typedefs //Public typedefs
public: public:
typedef typename Config::value_traits value_traits; typedef typename Config::value_traits value_traits;
@@ -219,11 +222,7 @@ class list_impl
//! <b>Complexity</b>: Linear to the number of elements in the list, if //! <b>Complexity</b>: Linear to the number of elements in the list, if
//! it's a safe-mode or auto-unlink value . Otherwise constant. //! it's a safe-mode or auto-unlink value . Otherwise constant.
~list_impl() ~list_impl()
{ {}
if(safemode_or_autounlink){
this->clear();
}
}
//! <b>Requires</b>: value must be an lvalue. //! <b>Requires</b>: value must be an lvalue.
//! //!
@@ -651,6 +650,12 @@ class list_impl
return i.unconst(); return i.unconst();
} }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the element range pointed by b and e //! <b>Effects</b>: Erases the element range pointed by b and e

2
include/boost/intrusive/list_hook.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

2
include/boost/intrusive/member_value_traits.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

16
include/boost/intrusive/options.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -278,6 +278,20 @@ struct equal
/// @endcond /// @endcond
}; };
//!This option setter specifies the equality
//!functor for the value type
template<class Priority>
struct priority
{
/// @cond
template<class Base>
struct pack : Base
{
typedef Priority priority;
};
/// @endcond
};
//!This option setter specifies the hash //!This option setter specifies the hash
//!functor for the value type //!functor for the value type
template<class Hash> template<class Hash>

2
include/boost/intrusive/pointer_plus_bits.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

39
include/boost/intrusive/priority_compare.hpp Normal file
View File

@@ -0,0 +1,39 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Ion Gaztanaga 2008
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_INTRUSIVE_PRIORITY_COMPARE_HPP
#define BOOST_INTRUSIVE_PRIORITY_COMPARE_HPP
#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/intrusive_fwd.hpp>
#include <functional>
namespace boost {
namespace intrusive {
template <class T>
struct priority_compare
: public std::binary_function<T, T, bool>
{
bool operator()(const T &val, const T &val2) const
{
return priority_order(val, val2);
}
};
} //namespace intrusive
} //namespace boost
#include <boost/intrusive/detail/config_end.hpp>
#endif //BOOST_INTRUSIVE_PRIORITY_COMPARE_HPP

186
include/boost/intrusive/rbtree.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -26,7 +26,9 @@
#include <boost/intrusive/detail/rbtree_node.hpp> #include <boost/intrusive/detail/rbtree_node.hpp>
#include <boost/intrusive/detail/tree_node.hpp> #include <boost/intrusive/detail/tree_node.hpp>
#include <boost/intrusive/detail/ebo_functor_holder.hpp> #include <boost/intrusive/detail/ebo_functor_holder.hpp>
#include <boost/intrusive/detail/mpl.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp> #include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/detail/clear_on_destructor_base.hpp>
#include <boost/intrusive/options.hpp> #include <boost/intrusive/options.hpp>
#include <boost/intrusive/rbtree_algorithms.hpp> #include <boost/intrusive/rbtree_algorithms.hpp>
#include <boost/intrusive/link_mode.hpp> #include <boost/intrusive/link_mode.hpp>
@@ -77,7 +79,9 @@ template<class T, class ...Options>
template<class Config> template<class Config>
#endif #endif
class rbtree_impl class rbtree_impl
: private detail::clear_on_destructor_base<rbtree_impl<Config> >
{ {
template<class C> friend class detail::clear_on_destructor_base;
public: public:
typedef typename Config::value_traits value_traits; typedef typename Config::value_traits value_traits;
/// @cond /// @cond
@@ -200,8 +204,10 @@ class rbtree_impl
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
//! <b>Throws</b>: Nothing unless the copy constructor of the value_compare object throws. //! <b>Throws</b>: If value_traits::node_traits::node
rbtree_impl( value_compare cmp = value_compare() //! constructor throws (this does not happen with predefined Boost.Intrusive hooks)
//! or the copy constructorof the value_compare object throws. Basic guarantee.
rbtree_impl( const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits()) , const value_traits &v_traits = value_traits())
: data_(cmp, v_traits) : data_(cmp, v_traits)
{ {
@@ -218,10 +224,12 @@ class rbtree_impl
//! <b>Complexity</b>: Linear in N if [b, e) is already sorted using //! <b>Complexity</b>: Linear in N if [b, e) is already sorted using
//! comp and otherwise N * log N, where N is the distance between first and last. //! comp and otherwise N * log N, where N is the distance between first and last.
//! //!
//! <b>Throws</b>: Nothing unless the copy constructor of the value_compare object throws. //! <b>Throws</b>: If value_traits::node_traits::node
//! constructor throws (this does not happen with predefined Boost.Intrusive hooks)
//! or the copy constructor/operator() of the value_compare object throws. Basic guarantee.
template<class Iterator> template<class Iterator>
rbtree_impl( bool unique, Iterator b, Iterator e rbtree_impl( bool unique, Iterator b, Iterator e
, value_compare cmp = value_compare() , const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits()) , const value_traits &v_traits = value_traits())
: data_(cmp, v_traits) : data_(cmp, v_traits)
{ {
@@ -241,7 +249,7 @@ class rbtree_impl
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: Nothing.
~rbtree_impl() ~rbtree_impl()
{ this->clear(); } {}
//! <b>Effects</b>: Returns an iterator pointing to the beginning of the tree. //! <b>Effects</b>: Returns an iterator pointing to the beginning of the tree.
//! //!
@@ -397,7 +405,7 @@ class rbtree_impl
value_compare value_comp() const value_compare value_comp() const
{ return priv_comp(); } { return priv_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -407,7 +415,8 @@ class rbtree_impl
//! <b>Effects</b>: Returns the number of elements stored in the tree. //! <b>Effects</b>: Returns the number of elements stored in the tree.
//! //!
//! <b>Complexity</b>: Linear to elements contained in *this. //! <b>Complexity</b>: Linear to elements contained in *this
//! if constant-time size option is disabled. Constant time otherwise.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: Nothing.
size_type size() const size_type size() const
@@ -419,7 +428,7 @@ class rbtree_impl
} }
} }
//! <b>Effects</b>: Swaps the contents of two multisets. //! <b>Effects</b>: Swaps the contents of two rbtrees.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -445,7 +454,7 @@ class rbtree_impl
//! <b>Complexity</b>: Average complexity for insert element is at //! <b>Complexity</b>: Average complexity for insert element is at
//! most logarithmic. //! most logarithmic.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: If the internal value_compare ordering function throws. Strong guarantee.
//! //!
//! <b>Note</b>: Does not affect the validity of iterators and references. //! <b>Note</b>: Does not affect the validity of iterators and references.
//! No copy-constructors are called. //! No copy-constructors are called.
@@ -471,7 +480,7 @@ class rbtree_impl
//! <b>Complexity</b>: Logarithmic in general, but it is amortized //! <b>Complexity</b>: Logarithmic in general, but it is amortized
//! constant time if t is inserted immediately before hint. //! constant time if t is inserted immediately before hint.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: If the internal value_compare ordering function throws. Strong guarantee.
//! //!
//! <b>Note</b>: Does not affect the validity of iterators and references. //! <b>Note</b>: Does not affect the validity of iterators and references.
//! No copy-constructors are called. //! No copy-constructors are called.
@@ -524,7 +533,7 @@ class rbtree_impl
std::pair<iterator, bool> insert_unique(reference value) std::pair<iterator, bool> insert_unique(reference value)
{ {
insert_commit_data commit_data; insert_commit_data commit_data;
std::pair<iterator, bool> ret = insert_unique_check(value, commit_data); std::pair<iterator, bool> ret = insert_unique_check(value, priv_comp(), commit_data);
if(!ret.second) if(!ret.second)
return ret; return ret;
return std::pair<iterator, bool> (insert_unique_commit(value, commit_data), true); return std::pair<iterator, bool> (insert_unique_commit(value, commit_data), true);
@@ -547,7 +556,7 @@ class rbtree_impl
iterator insert_unique(const_iterator hint, reference value) iterator insert_unique(const_iterator hint, reference value)
{ {
insert_commit_data commit_data; insert_commit_data commit_data;
std::pair<iterator, bool> ret = insert_unique_check(hint, value, commit_data); std::pair<iterator, bool> ret = insert_unique_check(hint, value, priv_comp(), commit_data);
if(!ret.second) if(!ret.second)
return ret.first; return ret.first;
return insert_unique_commit(value, commit_data); return insert_unique_commit(value, commit_data);
@@ -580,10 +589,36 @@ class rbtree_impl
} }
} }
std::pair<iterator, bool> insert_unique_check //! <b>Requires</b>: key_value_comp must be a comparison function that induces
(const_reference value, insert_commit_data &commit_data) //! the same strict weak ordering as value_compare. The difference is that
{ return insert_unique_check(value, priv_comp(), commit_data); } //! key_value_comp compares an arbitrary key with the contained values.
//!
//! <b>Effects</b>: Checks if a value can be inserted in the container, using
//! a user provided key instead of the value itself.
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing an iterator to the already present value
//! and false. If the value can be inserted returns true in the returned
//! pair boolean and fills "commit_data" that is meant to be used with
//! the "insert_commit" function.
//!
//! <b>Complexity</b>: Average complexity is at most logarithmic.
//!
//! <b>Throws</b>: If the key_value_comp ordering function throws. Strong guarantee.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a value_type is expensive: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! node that is used to impose the order is much cheaper to construct
//! than the value_type and this function offers the possibility to use that
//! part to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the value_type and use
//! "insert_commit" to insert the object in constant-time. This gives a total
//! logarithmic complexity to the insertion: check(O(log(N)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_commit" only if no more
//! objects are inserted or erased from the container.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
std::pair<iterator, bool> insert_unique_check std::pair<iterator, bool> insert_unique_check
(const KeyType &key, KeyValueCompare key_value_comp, insert_commit_data &commit_data) (const KeyType &key, KeyValueCompare key_value_comp, insert_commit_data &commit_data)
@@ -596,10 +631,38 @@ class rbtree_impl
return std::pair<iterator, bool>(iterator(ret.first, this), ret.second); return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
} }
std::pair<iterator, bool> insert_unique_check //! <b>Requires</b>: key_value_comp must be a comparison function that induces
(const_iterator hint, const_reference value, insert_commit_data &commit_data) //! the same strict weak ordering as value_compare. The difference is that
{ return insert_unique_check(hint, value, priv_comp(), commit_data); } //! key_value_comp compares an arbitrary key with the contained values.
//!
//! <b>Effects</b>: Checks if a value can be inserted in the container, using
//! a user provided key instead of the value itself, using "hint"
//! as a hint to where it will be inserted.
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing an iterator to the already present value
//! and false. If the value can be inserted returns true in the returned
//! pair boolean and fills "commit_data" that is meant to be used with
//! the "insert_commit" function.
//!
//! <b>Complexity</b>: Logarithmic in general, but it's amortized
//! constant time if t is inserted immediately before hint.
//!
//! <b>Throws</b>: If the key_value_comp ordering function throws. Strong guarantee.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a value_type is expensive: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! constructing that is used to impose the order is much cheaper to construct
//! than the value_type and this function offers the possibility to use that key
//! to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the value_type and use
//! "insert_commit" to insert the object in constant-time. This can give a total
//! constant-time complexity to the insertion: check(O(1)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_commit" only if no more
//! objects are inserted or erased from the container.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
std::pair<iterator, bool> insert_unique_check std::pair<iterator, bool> insert_unique_check
(const_iterator hint, const KeyType &key (const_iterator hint, const KeyType &key
@@ -613,6 +676,23 @@ class rbtree_impl
return std::pair<iterator, bool>(iterator(ret.first, this), ret.second); return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
} }
//! <b>Requires</b>: value must be an lvalue of type value_type. commit_data
//! must have been obtained from a previous call to "insert_check".
//! No objects should have been inserted or erased from the container between
//! the "insert_check" that filled "commit_data" and the call to "insert_commit".
//!
//! <b>Effects</b>: Inserts the value in the avl_set using the information obtained
//! from the "commit_data" that a previous "insert_check" filled.
//!
//! <b>Returns</b>: An iterator to the newly inserted object.
//!
//! <b>Complexity</b>: Constant time.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Notes</b>: This function has only sense if a "insert_check" has been
//! previously executed to fill "commit_data". No value should be inserted or
//! erased between the "insert_check" and "insert_commit" calls.
iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) iterator insert_unique_commit(reference value, const insert_commit_data &commit_data)
{ {
node_ptr to_insert(get_real_value_traits().to_node_ptr(value)); node_ptr to_insert(get_real_value_traits().to_node_ptr(value));
@@ -632,9 +712,9 @@ class rbtree_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ {
iterator ret(i); const_iterator ret(i);
++ret; ++ret;
node_ptr to_erase(i.pointed_node()); node_ptr to_erase(i.pointed_node());
if(safemode_or_autounlink) if(safemode_or_autounlink)
@@ -643,7 +723,7 @@ class rbtree_impl
this->priv_size_traits().decrement(); this->priv_size_traits().decrement();
if(safemode_or_autounlink) if(safemode_or_autounlink)
node_algorithms::init(to_erase); node_algorithms::init(to_erase);
return ret; return ret.unconst();
} }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -655,7 +735,7 @@ class rbtree_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ size_type n; return private_erase(b, e, n); } { size_type n; return private_erase(b, e, n); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -683,7 +763,11 @@ class rbtree_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ {
std::pair<iterator,iterator> p = this->equal_range(key, comp); std::pair<iterator,iterator> p = this->equal_range(key, comp);
size_type n; size_type n;
@@ -703,7 +787,7 @@ class rbtree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ {
node_ptr to_erase(i.pointed_node()); node_ptr to_erase(i.pointed_node());
iterator ret(this->erase(i)); iterator ret(this->erase(i));
@@ -711,21 +795,11 @@ class rbtree_impl
return ret; return ret;
} }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
//!
//! <b>Effects</b>: Erases the range pointed to by b end e.
//! Disposer::operator()(pointer) is called for the removed elements.
//!
//! <b>Complexity</b>: Average complexity for erase range is at most
//! O(log(size() + N)), where N is the number of elements in the range.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Note</b>: Invalidates the iterators
//! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(iterator i, Disposer disposer)
{ size_type n; return private_erase(b, e, n, disposer); } { return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
@@ -749,6 +823,22 @@ class rbtree_impl
return n; return n;
} }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//!
//! <b>Effects</b>: Erases the range pointed to by b end e.
//! Disposer::operator()(pointer) is called for the removed elements.
//!
//! <b>Complexity</b>: Average complexity for erase range is at most
//! O(log(size() + N)), where N is the number of elements in the range.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Note</b>: Invalidates the iterators
//! to the erased elements.
template<class Disposer>
iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ size_type n; return private_erase(b, e, n, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases all the elements with the given key. //! <b>Effects</b>: Erases all the elements with the given key.
@@ -764,7 +854,11 @@ class rbtree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ {
std::pair<iterator,iterator> p = this->equal_range(key, comp); std::pair<iterator,iterator> p = this->equal_range(key, comp);
size_type n; size_type n;
@@ -1207,18 +1301,18 @@ class rbtree_impl
/// @cond /// @cond
private: private:
template<class Disposer> template<class Disposer>
iterator private_erase(iterator b, iterator e, size_type &n, Disposer disposer) iterator private_erase(const_iterator b, const_iterator e, size_type &n, Disposer disposer)
{ {
for(n = 0; b != e; ++n) for(n = 0; b != e; ++n)
this->erase_and_dispose(b++, disposer); this->erase_and_dispose(b++, disposer);
return b; return b.unconst();
} }
iterator private_erase(iterator b, iterator e, size_type &n) iterator private_erase(const_iterator b, const_iterator e, size_type &n)
{ {
for(n = 0; b != e; ++n) for(n = 0; b != e; ++n)
this->erase(b++); this->erase(b++);
return b; return b.unconst();
} }
/// @endcond /// @endcond

2
include/boost/intrusive/rbtree_algorithms.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007. // (C) Copyright Ion Gaztanaga 2006-2008.
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

59
include/boost/intrusive/set.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -15,6 +15,7 @@
#include <boost/intrusive/detail/config_begin.hpp> #include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/intrusive_fwd.hpp> #include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/detail/mpl.hpp>
#include <boost/intrusive/rbtree.hpp> #include <boost/intrusive/rbtree.hpp>
#include <iterator> #include <iterator>
@@ -297,7 +298,7 @@ class set_impl
value_compare value_comp() const value_compare value_comp() const
{ return tree_.value_comp(); } { return tree_.value_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -499,7 +500,7 @@ class set_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ return tree_.erase(i); } { return tree_.erase(i); }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -513,7 +514,7 @@ class set_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ return tree_.erase(b, e); } { return tree_.erase(b, e); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -541,7 +542,11 @@ class set_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase(key, comp); } { return tree_.erase(key, comp); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -558,9 +563,15 @@ class set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return tree_.erase_and_dispose(i, disposer); } { return tree_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -576,7 +587,7 @@ class set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ return tree_.erase_and_dispose(b, e, disposer); } { return tree_.erase_and_dispose(b, e, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -611,7 +622,11 @@ class set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase_and_dispose(key, comp, disposer); } { return tree_.erase_and_dispose(key, comp, disposer); }
//! <b>Effects</b>: Erases all the elements of the container. //! <b>Effects</b>: Erases all the elements of the container.
@@ -1419,7 +1434,7 @@ class multiset_impl
value_compare value_comp() const value_compare value_comp() const
{ return tree_.value_comp(); } { return tree_.value_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -1528,7 +1543,7 @@ class multiset_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ return tree_.erase(i); } { return tree_.erase(i); }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -1542,7 +1557,7 @@ class multiset_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, iterator e)
{ return tree_.erase(b, e); } { return tree_.erase(b, e); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -1570,7 +1585,11 @@ class multiset_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase(key, comp); } { return tree_.erase(key, comp); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -1587,9 +1606,15 @@ class multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return tree_.erase_and_dispose(i, disposer); } { return tree_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Returns</b>: An iterator to the element after the erased elements. //! <b>Returns</b>: An iterator to the element after the erased elements.
@@ -1605,7 +1630,7 @@ class multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ return tree_.erase_and_dispose(b, e, disposer); } { return tree_.erase_and_dispose(b, e, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -1640,7 +1665,11 @@ class multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase_and_dispose(key, comp, disposer); } { return tree_.erase_and_dispose(key, comp, disposer); }
//! <b>Effects</b>: Erases all the elements of the container. //! <b>Effects</b>: Erases all the elements of the container.

2
include/boost/intrusive/set_hook.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

59
include/boost/intrusive/sg_set.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -15,6 +15,7 @@
#include <boost/intrusive/detail/config_begin.hpp> #include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/intrusive_fwd.hpp> #include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/sgtree.hpp> #include <boost/intrusive/sgtree.hpp>
#include <boost/intrusive/detail/mpl.hpp>
#include <iterator> #include <iterator>
namespace boost { namespace boost {
@@ -296,7 +297,7 @@ class sg_set_impl
value_compare value_comp() const value_compare value_comp() const
{ return tree_.value_comp(); } { return tree_.value_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -498,7 +499,7 @@ class sg_set_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ return tree_.erase(i); } { return tree_.erase(i); }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -512,7 +513,7 @@ class sg_set_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ return tree_.erase(b, e); } { return tree_.erase(b, e); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -540,7 +541,11 @@ class sg_set_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase(key, comp); } { return tree_.erase(key, comp); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -557,9 +562,15 @@ class sg_set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return tree_.erase_and_dispose(i, disposer); } { return tree_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -575,7 +586,7 @@ class sg_set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ return tree_.erase_and_dispose(b, e, disposer); } { return tree_.erase_and_dispose(b, e, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -610,7 +621,11 @@ class sg_set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase_and_dispose(key, comp, disposer); } { return tree_.erase_and_dispose(key, comp, disposer); }
//! <b>Effects</b>: Erases all the elements of the container. //! <b>Effects</b>: Erases all the elements of the container.
@@ -1458,7 +1473,7 @@ class sg_multiset_impl
value_compare value_comp() const value_compare value_comp() const
{ return tree_.value_comp(); } { return tree_.value_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -1567,7 +1582,7 @@ class sg_multiset_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ return tree_.erase(i); } { return tree_.erase(i); }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -1581,7 +1596,7 @@ class sg_multiset_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ return tree_.erase(b, e); } { return tree_.erase(b, e); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -1609,7 +1624,11 @@ class sg_multiset_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase(key, comp); } { return tree_.erase(key, comp); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -1626,9 +1645,15 @@ class sg_multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return tree_.erase_and_dispose(i, disposer); } { return tree_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Returns</b>: An iterator to the element after the erased elements. //! <b>Returns</b>: An iterator to the element after the erased elements.
@@ -1644,7 +1669,7 @@ class sg_multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ return tree_.erase_and_dispose(b, e, disposer); } { return tree_.erase_and_dispose(b, e, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -1679,7 +1704,11 @@ class sg_multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase_and_dispose(key, comp, disposer); } { return tree_.erase_and_dispose(key, comp, disposer); }
//! <b>Effects</b>: Erases all the elements of the container. //! <b>Effects</b>: Erases all the elements of the container.

160
include/boost/intrusive/sgtree.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -24,7 +24,7 @@
#include <functional> #include <functional>
#include <iterator> #include <iterator>
#include <utility> #include <utility>
#include <boost/config/no_tr1/cmath.hpp> #include <cmath>
#include <cstddef> #include <cstddef>
#include <boost/intrusive/detail/assert.hpp> #include <boost/intrusive/detail/assert.hpp>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
@@ -33,6 +33,8 @@
#include <boost/intrusive/detail/tree_node.hpp> #include <boost/intrusive/detail/tree_node.hpp>
#include <boost/intrusive/detail/ebo_functor_holder.hpp> #include <boost/intrusive/detail/ebo_functor_holder.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp> #include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/detail/clear_on_destructor_base.hpp>
#include <boost/intrusive/detail/mpl.hpp>
#include <boost/intrusive/options.hpp> #include <boost/intrusive/options.hpp>
#include <boost/intrusive/sgtree_algorithms.hpp> #include <boost/intrusive/sgtree_algorithms.hpp>
#include <boost/intrusive/link_mode.hpp> #include <boost/intrusive/link_mode.hpp>
@@ -204,7 +206,9 @@ template<class T, class ...Options>
template<class Config> template<class Config>
#endif #endif
class sgtree_impl class sgtree_impl
: private detail::clear_on_destructor_base<sgtree_impl<Config> >
{ {
template<class C> friend class detail::clear_on_destructor_base;
public: public:
typedef typename Config::value_traits value_traits; typedef typename Config::value_traits value_traits;
/// @cond /// @cond
@@ -354,8 +358,10 @@ class sgtree_impl
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
//! <b>Throws</b>: Nothing unless the copy constructor of the value_compare object throws. //! <b>Throws</b>: If value_traits::node_traits::node
sgtree_impl( value_compare cmp = value_compare() //! constructor throws (this does not happen with predefined Boost.Intrusive hooks)
//! or the copy constructorof the value_compare object throws. Basic guarantee.
sgtree_impl( const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits()) , const value_traits &v_traits = value_traits())
: data_(cmp, v_traits) : data_(cmp, v_traits)
{ {
@@ -372,10 +378,12 @@ class sgtree_impl
//! <b>Complexity</b>: Linear in N if [b, e) is already sorted using //! <b>Complexity</b>: Linear in N if [b, e) is already sorted using
//! comp and otherwise N * log N, where N is the distance between first and last. //! comp and otherwise N * log N, where N is the distance between first and last.
//! //!
//! <b>Throws</b>: Nothing unless the copy constructor of the value_compare object throws. //! <b>Throws</b>: If value_traits::node_traits::node
//! constructor throws (this does not happen with predefined Boost.Intrusive hooks)
//! or the copy constructor/operator() of the value_compare object throws. Basic guarantee.
template<class Iterator> template<class Iterator>
sgtree_impl( bool unique, Iterator b, Iterator e sgtree_impl( bool unique, Iterator b, Iterator e
, value_compare cmp = value_compare() , const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits()) , const value_traits &v_traits = value_traits())
: data_(cmp, v_traits) : data_(cmp, v_traits)
{ {
@@ -395,7 +403,7 @@ class sgtree_impl
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: Nothing.
~sgtree_impl() ~sgtree_impl()
{ this->clear(); } {}
//! <b>Effects</b>: Returns an iterator pointing to the beginning of the tree. //! <b>Effects</b>: Returns an iterator pointing to the beginning of the tree.
//! //!
@@ -551,7 +559,7 @@ class sgtree_impl
value_compare value_comp() const value_compare value_comp() const
{ return priv_comp(); } { return priv_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -561,7 +569,8 @@ class sgtree_impl
//! <b>Effects</b>: Returns the number of elements stored in the tree. //! <b>Effects</b>: Returns the number of elements stored in the tree.
//! //!
//! <b>Complexity</b>: Linear to elements contained in *this. //! <b>Complexity</b>: Linear to elements contained in *this
//! if constant-time size option is disabled. Constant time otherwise.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: Nothing.
size_type size() const size_type size() const
@@ -573,7 +582,7 @@ class sgtree_impl
} }
} }
//! <b>Effects</b>: Swaps the contents of two multisets. //! <b>Effects</b>: Swaps the contents of two sgtrees.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -601,7 +610,7 @@ class sgtree_impl
//! <b>Complexity</b>: Average complexity for insert element is at //! <b>Complexity</b>: Average complexity for insert element is at
//! most logarithmic. //! most logarithmic.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: If the internal value_compare ordering function throws. Strong guarantee.
//! //!
//! <b>Note</b>: Does not affect the validity of iterators and references. //! <b>Note</b>: Does not affect the validity of iterators and references.
//! No copy-constructors are called. //! No copy-constructors are called.
@@ -688,7 +697,7 @@ class sgtree_impl
std::pair<iterator, bool> insert_unique(reference value) std::pair<iterator, bool> insert_unique(reference value)
{ {
insert_commit_data commit_data; insert_commit_data commit_data;
std::pair<iterator, bool> ret = insert_unique_check(value, commit_data); std::pair<iterator, bool> ret = insert_unique_check(value, priv_comp(), commit_data);
if(!ret.second) if(!ret.second)
return ret; return ret;
return std::pair<iterator, bool> (insert_unique_commit(value, commit_data), true); return std::pair<iterator, bool> (insert_unique_commit(value, commit_data), true);
@@ -711,7 +720,7 @@ class sgtree_impl
iterator insert_unique(const_iterator hint, reference value) iterator insert_unique(const_iterator hint, reference value)
{ {
insert_commit_data commit_data; insert_commit_data commit_data;
std::pair<iterator, bool> ret = insert_unique_check(hint, value, commit_data); std::pair<iterator, bool> ret = insert_unique_check(hint, value, priv_comp(), commit_data);
if(!ret.second) if(!ret.second)
return ret.first; return ret.first;
return insert_unique_commit(value, commit_data); return insert_unique_commit(value, commit_data);
@@ -744,10 +753,36 @@ class sgtree_impl
} }
} }
std::pair<iterator, bool> insert_unique_check //! <b>Requires</b>: key_value_comp must be a comparison function that induces
(const_reference value, insert_commit_data &commit_data) //! the same strict weak ordering as value_compare. The difference is that
{ return insert_unique_check(value, priv_comp(), commit_data); } //! key_value_comp compares an arbitrary key with the contained values.
//!
//! <b>Effects</b>: Checks if a value can be inserted in the container, using
//! a user provided key instead of the value itself.
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing an iterator to the already present value
//! and false. If the value can be inserted returns true in the returned
//! pair boolean and fills "commit_data" that is meant to be used with
//! the "insert_commit" function.
//!
//! <b>Complexity</b>: Average complexity is at most logarithmic.
//!
//! <b>Throws</b>: If the key_value_comp ordering function throws. Strong guarantee.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a value_type is expensive: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! node that is used to impose the order is much cheaper to construct
//! than the value_type and this function offers the possibility to use that
//! part to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the value_type and use
//! "insert_commit" to insert the object in constant-time. This gives a total
//! logarithmic complexity to the insertion: check(O(log(N)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_commit" only if no more
//! objects are inserted or erased from the container.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
std::pair<iterator, bool> insert_unique_check std::pair<iterator, bool> insert_unique_check
(const KeyType &key, KeyValueCompare key_value_comp, insert_commit_data &commit_data) (const KeyType &key, KeyValueCompare key_value_comp, insert_commit_data &commit_data)
@@ -760,10 +795,38 @@ class sgtree_impl
return std::pair<iterator, bool>(iterator(ret.first, this), ret.second); return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
} }
std::pair<iterator, bool> insert_unique_check //! <b>Requires</b>: key_value_comp must be a comparison function that induces
(const_iterator hint, const_reference value, insert_commit_data &commit_data) //! the same strict weak ordering as value_compare. The difference is that
{ return insert_unique_check(hint, value, priv_comp(), commit_data); } //! key_value_comp compares an arbitrary key with the contained values.
//!
//! <b>Effects</b>: Checks if a value can be inserted in the container, using
//! a user provided key instead of the value itself, using "hint"
//! as a hint to where it will be inserted.
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing an iterator to the already present value
//! and false. If the value can be inserted returns true in the returned
//! pair boolean and fills "commit_data" that is meant to be used with
//! the "insert_commit" function.
//!
//! <b>Complexity</b>: Logarithmic in general, but it's amortized
//! constant time if t is inserted immediately before hint.
//!
//! <b>Throws</b>: If the key_value_comp ordering function throws. Strong guarantee.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a value_type is expensive: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! constructing that is used to impose the order is much cheaper to construct
//! than the value_type and this function offers the possibility to use that key
//! to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the value_type and use
//! "insert_commit" to insert the object in constant-time. This can give a total
//! constant-time complexity to the insertion: check(O(1)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_commit" only if no more
//! objects are inserted or erased from the container.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
std::pair<iterator, bool> insert_unique_check std::pair<iterator, bool> insert_unique_check
(const_iterator hint, const KeyType &key (const_iterator hint, const KeyType &key
@@ -777,6 +840,23 @@ class sgtree_impl
return std::pair<iterator, bool>(iterator(ret.first, this), ret.second); return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
} }
//! <b>Requires</b>: value must be an lvalue of type value_type. commit_data
//! must have been obtained from a previous call to "insert_check".
//! No objects should have been inserted or erased from the container between
//! the "insert_check" that filled "commit_data" and the call to "insert_commit".
//!
//! <b>Effects</b>: Inserts the value in the avl_set using the information obtained
//! from the "commit_data" that a previous "insert_check" filled.
//!
//! <b>Returns</b>: An iterator to the newly inserted object.
//!
//! <b>Complexity</b>: Constant time.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Notes</b>: This function has only sense if a "insert_check" has been
//! previously executed to fill "commit_data". No value should be inserted or
//! erased between the "insert_check" and "insert_commit" calls.
iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) iterator insert_unique_commit(reference value, const insert_commit_data &commit_data)
{ {
node_ptr to_insert(get_real_value_traits().to_node_ptr(value)); node_ptr to_insert(get_real_value_traits().to_node_ptr(value));
@@ -799,9 +879,9 @@ class sgtree_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ {
iterator ret(i); const_iterator ret(i);
++ret; ++ret;
node_ptr to_erase(i.pointed_node()); node_ptr to_erase(i.pointed_node());
if(safemode_or_autounlink) if(safemode_or_autounlink)
@@ -814,7 +894,7 @@ class sgtree_impl
this->priv_size_traits().decrement(); this->priv_size_traits().decrement();
if(safemode_or_autounlink) if(safemode_or_autounlink)
node_algorithms::init(to_erase); node_algorithms::init(to_erase);
return ret; return ret.unconst();
} }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -826,7 +906,7 @@ class sgtree_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ size_type n; return private_erase(b, e, n); } { size_type n; return private_erase(b, e, n); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -854,7 +934,11 @@ class sgtree_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ {
std::pair<iterator,iterator> p = this->equal_range(key, comp); std::pair<iterator,iterator> p = this->equal_range(key, comp);
size_type n; size_type n;
@@ -874,7 +958,7 @@ class sgtree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ {
node_ptr to_erase(i.pointed_node()); node_ptr to_erase(i.pointed_node());
iterator ret(this->erase(i)); iterator ret(this->erase(i));
@@ -882,6 +966,12 @@ class sgtree_impl
return ret; return ret;
} }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -895,7 +985,7 @@ class sgtree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ size_type n; return private_erase(b, e, n, disposer); } { size_type n; return private_erase(b, e, n, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -935,7 +1025,11 @@ class sgtree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ {
std::pair<iterator,iterator> p = this->equal_range(key, comp); std::pair<iterator,iterator> p = this->equal_range(key, comp);
size_type n; size_type n;
@@ -1437,18 +1531,18 @@ class sgtree_impl
/// @cond /// @cond
private: private:
template<class Disposer> template<class Disposer>
iterator private_erase(iterator b, iterator e, size_type &n, Disposer disposer) iterator private_erase(const_iterator b, const_iterator e, size_type &n, Disposer disposer)
{ {
for(n = 0; b != e; ++n) for(n = 0; b != e; ++n)
this->erase_and_dispose(b++, disposer); this->erase_and_dispose(b++, disposer);
return b; return b.unconst();
} }
iterator private_erase(iterator b, iterator e, size_type &n) iterator private_erase(const_iterator b, const_iterator e, size_type &n)
{ {
for(n = 0; b != e; ++n) for(n = 0; b != e; ++n)
this->erase(b++); this->erase(b++);
return b; return b.unconst();
} }
/// @endcond /// @endcond

13
include/boost/intrusive/slist.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -22,6 +22,7 @@
#include <boost/intrusive/circular_slist_algorithms.hpp> #include <boost/intrusive/circular_slist_algorithms.hpp>
#include <boost/intrusive/linear_slist_algorithms.hpp> #include <boost/intrusive/linear_slist_algorithms.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp> #include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/detail/clear_on_destructor_base.hpp>
#include <boost/intrusive/link_mode.hpp> #include <boost/intrusive/link_mode.hpp>
#include <boost/intrusive/options.hpp> #include <boost/intrusive/options.hpp>
#include <boost/intrusive/detail/utilities.hpp> #include <boost/intrusive/detail/utilities.hpp>
@@ -102,7 +103,9 @@ template<class T, class ...Options>
template<class Config> template<class Config>
#endif #endif
class slist_impl class slist_impl
: private detail::clear_on_destructor_base<slist_impl<Config> >
{ {
template<class C> friend class detail::clear_on_destructor_base;
//Public typedefs //Public typedefs
public: public:
typedef typename Config::value_traits value_traits; typedef typename Config::value_traits value_traits;
@@ -295,7 +298,7 @@ class slist_impl
//! <b>Complexity</b>: Linear to the number of elements in the list, if //! <b>Complexity</b>: Linear to the number of elements in the list, if
//! it's a safe-mode or auto-unlink value. Otherwise constant. //! it's a safe-mode or auto-unlink value. Otherwise constant.
~slist_impl() ~slist_impl()
{ this->clear(); } {}
//! <b>Effects</b>: Erases all the elements of the container. //! <b>Effects</b>: Erases all the elements of the container.
//! //!
@@ -978,6 +981,12 @@ class slist_impl
iterator erase_and_dispose(const_iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return this->erase_after_and_dispose(this->previous(i), disposer); } { return this->erase_after_and_dispose(this->previous(i), disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: first and last must be valid iterator to elements in *this. //! <b>Requires</b>: first and last must be valid iterator to elements in *this.
//! Disposer::operator()(pointer) shouldn't throw. //! Disposer::operator()(pointer) shouldn't throw.
//! //!

2
include/boost/intrusive/slist_hook.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

59
include/boost/intrusive/splay_set.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -15,6 +15,7 @@
#include <boost/intrusive/detail/config_begin.hpp> #include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/intrusive_fwd.hpp> #include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/splaytree.hpp> #include <boost/intrusive/splaytree.hpp>
#include <boost/intrusive/detail/mpl.hpp>
#include <iterator> #include <iterator>
namespace boost { namespace boost {
@@ -296,7 +297,7 @@ class splay_set_impl
value_compare value_comp() const value_compare value_comp() const
{ return tree_.value_comp(); } { return tree_.value_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -497,7 +498,7 @@ class splay_set_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ return tree_.erase(i); } { return tree_.erase(i); }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -511,7 +512,7 @@ class splay_set_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ return tree_.erase(b, e); } { return tree_.erase(b, e); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -539,7 +540,11 @@ class splay_set_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase(key, comp); } { return tree_.erase(key, comp); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -556,9 +561,15 @@ class splay_set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return tree_.erase_and_dispose(i, disposer); } { return tree_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -574,7 +585,7 @@ class splay_set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ return tree_.erase_and_dispose(b, e, disposer); } { return tree_.erase_and_dispose(b, e, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -609,7 +620,11 @@ class splay_set_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase_and_dispose(key, comp, disposer); } { return tree_.erase_and_dispose(key, comp, disposer); }
//! <b>Effects</b>: Erases all the elements of the container. //! <b>Effects</b>: Erases all the elements of the container.
@@ -1494,7 +1509,7 @@ class splay_multiset_impl
value_compare value_comp() const value_compare value_comp() const
{ return tree_.value_comp(); } { return tree_.value_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -1602,7 +1617,7 @@ class splay_multiset_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ return tree_.erase(i); } { return tree_.erase(i); }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -1616,7 +1631,7 @@ class splay_multiset_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ return tree_.erase(b, e); } { return tree_.erase(b, e); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -1644,7 +1659,11 @@ class splay_multiset_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase(key, comp); } { return tree_.erase(key, comp); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -1661,9 +1680,15 @@ class splay_multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return tree_.erase_and_dispose(i, disposer); } { return tree_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Returns</b>: An iterator to the element after the erased elements. //! <b>Returns</b>: An iterator to the element after the erased elements.
@@ -1679,7 +1704,7 @@ class splay_multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ return tree_.erase_and_dispose(b, e, disposer); } { return tree_.erase_and_dispose(b, e, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -1714,7 +1739,11 @@ class splay_multiset_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ return tree_.erase_and_dispose(key, comp, disposer); } { return tree_.erase_and_dispose(key, comp, disposer); }
//! <b>Effects</b>: Erases all the elements of the container. //! <b>Effects</b>: Erases all the elements of the container.

2
include/boost/intrusive/splay_set_hook.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

172
include/boost/intrusive/splaytree.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2007 // (C) Copyright Ion Gaztanaga 2007-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -25,6 +25,8 @@
#include <boost/intrusive/splay_set_hook.hpp> #include <boost/intrusive/splay_set_hook.hpp>
#include <boost/intrusive/detail/tree_node.hpp> #include <boost/intrusive/detail/tree_node.hpp>
#include <boost/intrusive/detail/ebo_functor_holder.hpp> #include <boost/intrusive/detail/ebo_functor_holder.hpp>
#include <boost/intrusive/detail/clear_on_destructor_base.hpp>
#include <boost/intrusive/detail/mpl.hpp>
#include <boost/intrusive/options.hpp> #include <boost/intrusive/options.hpp>
#include <boost/intrusive/splaytree_algorithms.hpp> #include <boost/intrusive/splaytree_algorithms.hpp>
#include <boost/intrusive/link_mode.hpp> #include <boost/intrusive/link_mode.hpp>
@@ -76,7 +78,9 @@ template<class T, class ...Options>
template<class Config> template<class Config>
#endif #endif
class splaytree_impl class splaytree_impl
: private detail::clear_on_destructor_base<splaytree_impl<Config> >
{ {
template<class C> friend class detail::clear_on_destructor_base;
public: public:
typedef typename Config::value_traits value_traits; typedef typename Config::value_traits value_traits;
/// @cond /// @cond
@@ -199,9 +203,11 @@ class splaytree_impl
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
//! <b>Throws</b>: Nothing unless the copy constructor of the value_compare object throws. //! <b>Throws</b>: If value_traits::node_traits::node
splaytree_impl( value_compare cmp = value_compare() //! constructor throws (this does not happen with predefined Boost.Intrusive hooks)
, const value_traits &v_traits = value_traits()) //! or the copy constructorof the value_compare object throws. Basic guarantee.
splaytree_impl( const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits())
: data_(cmp, v_traits) : data_(cmp, v_traits)
{ {
node_algorithms::init_header(&priv_header()); node_algorithms::init_header(&priv_header());
@@ -217,11 +223,13 @@ class splaytree_impl
//! <b>Complexity</b>: Linear in N if [b, e) is already sorted using //! <b>Complexity</b>: Linear in N if [b, e) is already sorted using
//! comp and otherwise amortized N * log N, where N is the distance between first and last. //! comp and otherwise amortized N * log N, where N is the distance between first and last.
//! //!
//! <b>Throws</b>: Nothing unless the copy constructor of the value_compare object throws. //! <b>Throws</b>: If value_traits::node_traits::node
//! constructor throws (this does not happen with predefined Boost.Intrusive hooks)
//! or the copy constructor/operator() of the value_compare object throws. Basic guarantee.
template<class Iterator> template<class Iterator>
splaytree_impl( bool unique, Iterator b, Iterator e splaytree_impl ( bool unique, Iterator b, Iterator e
, value_compare cmp = value_compare() , const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits()) , const value_traits &v_traits = value_traits())
: data_(cmp, v_traits) : data_(cmp, v_traits)
{ {
node_algorithms::init_header(&priv_header()); node_algorithms::init_header(&priv_header());
@@ -241,7 +249,7 @@ class splaytree_impl
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: Nothing.
~splaytree_impl() ~splaytree_impl()
{ this->clear(); } {}
//! <b>Effects</b>: Returns an iterator pointing to the beginning of the tree. //! <b>Effects</b>: Returns an iterator pointing to the beginning of the tree.
//! //!
@@ -397,7 +405,7 @@ class splaytree_impl
value_compare value_comp() const value_compare value_comp() const
{ return priv_comp(); } { return priv_comp(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -407,7 +415,8 @@ class splaytree_impl
//! <b>Effects</b>: Returns the number of elements stored in the tree. //! <b>Effects</b>: Returns the number of elements stored in the tree.
//! //!
//! <b>Complexity</b>: Linear to elements contained in *this. //! <b>Complexity</b>: Linear to elements contained in *this
//! if constant-time size option is disabled. Constant time otherwise.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: Nothing.
size_type size() const size_type size() const
@@ -420,7 +429,7 @@ class splaytree_impl
} }
} }
//! <b>Effects</b>: Swaps the contents of two multisets. //! <b>Effects</b>: Swaps the contents of two splaytrees.
//! //!
//! <b>Complexity</b>: Constant. //! <b>Complexity</b>: Constant.
//! //!
@@ -446,7 +455,7 @@ class splaytree_impl
//! <b>Complexity</b>: Average complexity for insert element is amortized //! <b>Complexity</b>: Average complexity for insert element is amortized
//! logarithmic. //! logarithmic.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: If the internal value_compare ordering function throws. Strong guarantee.
//! //!
//! <b>Note</b>: Does not affect the validity of iterators and references. //! <b>Note</b>: Does not affect the validity of iterators and references.
//! No copy-constructors are called. //! No copy-constructors are called.
@@ -472,7 +481,7 @@ class splaytree_impl
//! <b>Complexity</b>: Amortized logarithmic in general, but it is amortized //! <b>Complexity</b>: Amortized logarithmic in general, but it is amortized
//! constant time if t is inserted immediately before hint. //! constant time if t is inserted immediately before hint.
//! //!
//! <b>Throws</b>: Nothing. //! <b>Throws</b>: If the internal value_compare ordering function throws. Strong guarantee.
//! //!
//! <b>Note</b>: Does not affect the validity of iterators and references. //! <b>Note</b>: Does not affect the validity of iterators and references.
//! No copy-constructors are called. //! No copy-constructors are called.
@@ -526,7 +535,7 @@ class splaytree_impl
std::pair<iterator, bool> insert_unique(reference value) std::pair<iterator, bool> insert_unique(reference value)
{ {
insert_commit_data commit_data; insert_commit_data commit_data;
std::pair<iterator, bool> ret = insert_unique_check(value, commit_data); std::pair<iterator, bool> ret = insert_unique_check(value, priv_comp(), commit_data);
if(!ret.second) if(!ret.second)
return ret; return ret;
return std::pair<iterator, bool> (insert_unique_commit(value, commit_data), true); return std::pair<iterator, bool> (insert_unique_commit(value, commit_data), true);
@@ -549,7 +558,7 @@ class splaytree_impl
iterator insert_unique(const_iterator hint, reference value) iterator insert_unique(const_iterator hint, reference value)
{ {
insert_commit_data commit_data; insert_commit_data commit_data;
std::pair<iterator, bool> ret = insert_unique_check(hint, value, commit_data); std::pair<iterator, bool> ret = insert_unique_check(hint, value, priv_comp(), commit_data);
if(!ret.second) if(!ret.second)
return ret.first; return ret.first;
return insert_unique_commit(value, commit_data); return insert_unique_commit(value, commit_data);
@@ -575,10 +584,36 @@ class splaytree_impl
this->insert_unique(*b); this->insert_unique(*b);
} }
std::pair<iterator, bool> insert_unique_check //! <b>Requires</b>: key_value_comp must be a comparison function that induces
(const_reference value, insert_commit_data &commit_data) //! the same strict weak ordering as value_compare. The difference is that
{ return insert_unique_check(value, priv_comp(), commit_data); } //! key_value_comp compares an arbitrary key with the contained values.
//!
//! <b>Effects</b>: Checks if a value can be inserted in the container, using
//! a user provided key instead of the value itself.
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing an iterator to the already present value
//! and false. If the value can be inserted returns true in the returned
//! pair boolean and fills "commit_data" that is meant to be used with
//! the "insert_commit" function.
//!
//! <b>Complexity</b>: Average complexity is at most logarithmic.
//!
//! <b>Throws</b>: If the key_value_comp ordering function throws. Strong guarantee.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a value_type is expensive: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! node that is used to impose the order is much cheaper to construct
//! than the value_type and this function offers the possibility to use that
//! part to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the value_type and use
//! "insert_commit" to insert the object in constant-time. This gives a total
//! logarithmic complexity to the insertion: check(O(log(N)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_commit" only if no more
//! objects are inserted or erased from the container.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
std::pair<iterator, bool> insert_unique_check std::pair<iterator, bool> insert_unique_check
(const KeyType &key, KeyValueCompare key_value_comp, insert_commit_data &commit_data) (const KeyType &key, KeyValueCompare key_value_comp, insert_commit_data &commit_data)
@@ -591,10 +626,38 @@ class splaytree_impl
return std::pair<iterator, bool>(iterator(ret.first, this), ret.second); return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
} }
std::pair<iterator, bool> insert_unique_check //! <b>Requires</b>: key_value_comp must be a comparison function that induces
(const_iterator hint, const_reference value, insert_commit_data &commit_data) //! the same strict weak ordering as value_compare. The difference is that
{ return insert_unique_check(hint, value, priv_comp(), commit_data); } //! key_value_comp compares an arbitrary key with the contained values.
//!
//! <b>Effects</b>: Checks if a value can be inserted in the container, using
//! a user provided key instead of the value itself, using "hint"
//! as a hint to where it will be inserted.
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing an iterator to the already present value
//! and false. If the value can be inserted returns true in the returned
//! pair boolean and fills "commit_data" that is meant to be used with
//! the "insert_commit" function.
//!
//! <b>Complexity</b>: Logarithmic in general, but it's amortized
//! constant time if t is inserted immediately before hint.
//!
//! <b>Throws</b>: If the key_value_comp ordering function throws. Strong guarantee.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a value_type is expensive: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! constructing that is used to impose the order is much cheaper to construct
//! than the value_type and this function offers the possibility to use that key
//! to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the value_type and use
//! "insert_commit" to insert the object in constant-time. This can give a total
//! constant-time complexity to the insertion: check(O(1)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_commit" only if no more
//! objects are inserted or erased from the container.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
std::pair<iterator, bool> insert_unique_check std::pair<iterator, bool> insert_unique_check
(const_iterator hint, const KeyType &key (const_iterator hint, const KeyType &key
@@ -608,6 +671,23 @@ class splaytree_impl
return std::pair<iterator, bool>(iterator(ret.first, this), ret.second); return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
} }
//! <b>Requires</b>: value must be an lvalue of type value_type. commit_data
//! must have been obtained from a previous call to "insert_check".
//! No objects should have been inserted or erased from the container between
//! the "insert_check" that filled "commit_data" and the call to "insert_commit".
//!
//! <b>Effects</b>: Inserts the value in the avl_set using the information obtained
//! from the "commit_data" that a previous "insert_check" filled.
//!
//! <b>Returns</b>: An iterator to the newly inserted object.
//!
//! <b>Complexity</b>: Constant time.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Notes</b>: This function has only sense if a "insert_check" has been
//! previously executed to fill "commit_data". No value should be inserted or
//! erased between the "insert_check" and "insert_commit" calls.
iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) iterator insert_unique_commit(reference value, const insert_commit_data &commit_data)
{ {
node_ptr to_insert(get_real_value_traits().to_node_ptr(value)); node_ptr to_insert(get_real_value_traits().to_node_ptr(value));
@@ -627,9 +707,9 @@ class splaytree_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator i) iterator erase(const_iterator i)
{ {
iterator ret(i); const_iterator ret(i);
++ret; ++ret;
node_ptr to_erase(i.pointed_node()); node_ptr to_erase(i.pointed_node());
if(safemode_or_autounlink) if(safemode_or_autounlink)
@@ -638,7 +718,7 @@ class splaytree_impl
this->priv_size_traits().decrement(); this->priv_size_traits().decrement();
if(safemode_or_autounlink) if(safemode_or_autounlink)
node_algorithms::init(to_erase); node_algorithms::init(to_erase);
return ret; return ret.unconst();
} }
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -650,7 +730,7 @@ class splaytree_impl
//! //!
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
iterator erase(iterator b, iterator e) iterator erase(const_iterator b, const_iterator e)
{ size_type n; return private_erase(b, e, n); } { size_type n; return private_erase(b, e, n); }
//! <b>Effects</b>: Erases all the elements with the given value. //! <b>Effects</b>: Erases all the elements with the given value.
@@ -678,7 +758,11 @@ class splaytree_impl
//! <b>Note</b>: Invalidates the iterators (but not the references) //! <b>Note</b>: Invalidates the iterators (but not the references)
//! to the erased elements. No destructors are called. //! to the erased elements. No destructors are called.
template<class KeyType, class KeyValueCompare> template<class KeyType, class KeyValueCompare>
size_type erase(const KeyType& key, KeyValueCompare comp) size_type erase(const KeyType& key, KeyValueCompare comp
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ {
std::pair<iterator,iterator> p = this->equal_range(key, comp); std::pair<iterator,iterator> p = this->equal_range(key, comp);
size_type n; size_type n;
@@ -698,7 +782,7 @@ class splaytree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ {
node_ptr to_erase(i.pointed_node()); node_ptr to_erase(i.pointed_node());
iterator ret(this->erase(i)); iterator ret(this->erase(i));
@@ -706,6 +790,12 @@ class splaytree_impl
return ret; return ret;
} }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -719,7 +809,7 @@ class splaytree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class Disposer> template<class Disposer>
iterator erase_and_dispose(iterator b, iterator e, Disposer disposer) iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
{ size_type n; return private_erase(b, e, n, disposer); } { size_type n; return private_erase(b, e, n, disposer); }
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
@@ -759,7 +849,11 @@ class splaytree_impl
//! <b>Note</b>: Invalidates the iterators //! <b>Note</b>: Invalidates the iterators
//! to the erased elements. //! to the erased elements.
template<class KeyType, class KeyValueCompare, class Disposer> template<class KeyType, class KeyValueCompare, class Disposer>
size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer) size_type erase_and_dispose(const KeyType& key, KeyValueCompare comp, Disposer disposer
/// @cond
, typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
/// @endcond
)
{ {
std::pair<iterator,iterator> p = this->equal_range(key, comp); std::pair<iterator,iterator> p = this->equal_range(key, comp);
size_type n; size_type n;
@@ -1293,18 +1387,18 @@ class splaytree_impl
/// @cond /// @cond
private: private:
template<class Disposer> template<class Disposer>
iterator private_erase(iterator b, iterator e, size_type &n, Disposer disposer) iterator private_erase(const_iterator b, const_iterator e, size_type &n, Disposer disposer)
{ {
for(n = 0; b != e; ++n) for(n = 0; b != e; ++n)
this->erase_and_dispose(b++, disposer); this->erase_and_dispose(b++, disposer);
return b; return b.unconst();
} }
iterator private_erase(iterator b, iterator e, size_type &n) iterator private_erase(const_iterator b, const_iterator e, size_type &n)
{ {
for(n = 0; b != e; ++n) for(n = 0; b != e; ++n)
this->erase(b++); this->erase(b++);
return b; return b.unconst();
} }
/// @endcond /// @endcond
@@ -1529,14 +1623,14 @@ class splaytree
BOOST_STATIC_ASSERT((detail::is_same<typename real_value_traits::value_type, T>::value)); BOOST_STATIC_ASSERT((detail::is_same<typename real_value_traits::value_type, T>::value));
splaytree( const value_compare &cmp = value_compare() splaytree( const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits()) , const value_traits &v_traits = value_traits())
: Base(cmp, v_traits) : Base(cmp, v_traits)
{} {}
template<class Iterator> template<class Iterator>
splaytree( bool unique, Iterator b, Iterator e splaytree( bool unique, Iterator b, Iterator e
, const value_compare &cmp = value_compare() , const value_compare &cmp = value_compare()
, const value_traits &v_traits = value_traits()) , const value_traits &v_traits = value_traits())
: Base(unique, b, e, cmp, v_traits) : Base(unique, b, e, cmp, v_traits)
{} {}

1663
include/boost/intrusive/treap.hpp Normal file
View File

File diff suppressed because it is too large Load Diff

801
include/boost/intrusive/treap_algorithms.hpp Normal file
View File

@@ -0,0 +1,801 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Ion Gaztanaga 2006-2008.
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_INTRUSIVE_TRIE_ALGORITHMS_HPP
#define BOOST_INTRUSIVE_TRIE_ALGORITHMS_HPP
#include <boost/intrusive/detail/config_begin.hpp>
#include <cstddef>
#include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/detail/assert.hpp>
#include <boost/intrusive/detail/utilities.hpp>
#include <boost/intrusive/detail/tree_algorithms.hpp>
#include <algorithm>
namespace boost {
namespace intrusive {
//! treap_algorithms provides basic algorithms to manipulate
//! nodes forming a treap.
//!
//! (1) the header node is maintained with links not only to the root
//! but also to the leftmost node of the tree, to enable constant time
//! begin(), and to the rightmost node of the tree, to enable linear time
//! performance when used with the generic set algorithms (set_union,
//! etc.);
//!
//! (2) when a node being deleted has two children its successor node is
//! relinked into its place, rather than copied, so that the only
//! pointers invalidated are those referring to the deleted node.
//!
//! treap_algorithms is configured with a NodeTraits class, which encapsulates the
//! information about the node to be manipulated. NodeTraits must support the
//! following interface:
//!
//! <b>Typedefs</b>:
//!
//! <tt>node</tt>: The type of the node that forms the circular list
//!
//! <tt>node_ptr</tt>: A pointer to a node
//!
//! <tt>const_node_ptr</tt>: A pointer to a const node
//!
//! <b>Static functions</b>:
//!
//! <tt>static node_ptr get_parent(const_node_ptr n);</tt>
//!
//! <tt>static void set_parent(node_ptr n, node_ptr parent);</tt>
//!
//! <tt>static node_ptr get_left(const_node_ptr n);</tt>
//!
//! <tt>static void set_left(node_ptr n, node_ptr left);</tt>
//!
//! <tt>static node_ptr get_right(const_node_ptr n);</tt>
//!
//! <tt>static void set_right(node_ptr n, node_ptr right);</tt>
template<class NodeTraits>
class treap_algorithms
{
public:
typedef NodeTraits node_traits;
typedef typename NodeTraits::node node;
typedef typename NodeTraits::node_ptr node_ptr;
typedef typename NodeTraits::const_node_ptr const_node_ptr;
/// @cond
private:
class remove_on_destroy
{
remove_on_destroy(const remove_on_destroy&);
remove_on_destroy& operator=(const remove_on_destroy&);
public:
remove_on_destroy(node_ptr header, node_ptr z)
: header_(header), z_(z), remove_it_(true)
{}
~remove_on_destroy()
{
if(remove_it_){
tree_algorithms::erase(header_, z_);
}
}
void release()
{ remove_it_ = false; }
const node_ptr header_;
const node_ptr z_;
bool remove_it_;
};
class rerotate_on_destroy
{
rerotate_on_destroy(const remove_on_destroy&);
rerotate_on_destroy& operator=(const rerotate_on_destroy&);
public:
rerotate_on_destroy(node_ptr header, node_ptr p, std::size_t &n)
: header_(header), p_(p), n_(n), remove_it_(true)
{}
~rerotate_on_destroy()
{
if(remove_it_){
rotate_up_n(header_, p_, n_);
}
}
void release()
{ remove_it_ = false; }
const node_ptr header_;
const node_ptr p_;
std::size_t &n_;
bool remove_it_;
};
static void rotate_up_n(const node_ptr header, const node_ptr p, std::size_t n)
{
for( node_ptr p_parent = NodeTraits::get_parent(p)
; n--
; p_parent = NodeTraits::get_parent(p)){
//Check if left child
if(p == NodeTraits::get_left(p_parent)){
tree_algorithms::rotate_right(p_parent, header);
}
else{ //Right child
tree_algorithms::rotate_left(p_parent, header);
}
}
}
typedef detail::tree_algorithms<NodeTraits> tree_algorithms;
static node_ptr uncast(const_node_ptr ptr)
{
return node_ptr(const_cast<node*>(::boost::intrusive::detail::get_pointer(ptr)));
}
/// @endcond
public:
static node_ptr begin_node(const_node_ptr header)
{ return tree_algorithms::begin_node(header); }
static node_ptr end_node(const_node_ptr header)
{ return tree_algorithms::end_node(header); }
//! This type is the information that will be
//! filled by insert_unique_check
struct insert_commit_data
/// @cond
: public tree_algorithms::insert_commit_data
/// @endcond
{
/// @cond
std::size_t rotations;
/// @endcond
};
//! <b>Requires</b>: header1 and header2 must be the header nodes
//! of two trees.
//!
//! <b>Effects</b>: Swaps two trees. After the function header1 will contain
//! links to the second tree and header2 will have links to the first tree.
//!
//! <b>Complexity</b>: Constant.
//!
//! <b>Throws</b>: Nothing.
static void swap_tree(node_ptr header1, node_ptr header2)
{ return tree_algorithms::swap_tree(header1, header2); }
//! <b>Requires</b>: node1 and node2 can't be header nodes
//! of two trees.
//!
//! <b>Effects</b>: Swaps two nodes. After the function node1 will be inserted
//! in the position node2 before the function. node2 will be inserted in the
//! position node1 had before the function.
//!
//! <b>Complexity</b>: Logarithmic.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Note</b>: This function will break container ordering invariants if
//! node1 and node2 are not equivalent according to the ordering rules.
//!
//!Experimental function
static void swap_nodes(node_ptr node1, node_ptr node2)
{
if(node1 == node2)
return;
node_ptr header1(tree_algorithms::get_header(node1)), header2(tree_algorithms::get_header(node2));
swap_nodes(node1, header1, node2, header2);
}
//! <b>Requires</b>: node1 and node2 can't be header nodes
//! of two trees with header header1 and header2.
//!
//! <b>Effects</b>: Swaps two nodes. After the function node1 will be inserted
//! in the position node2 before the function. node2 will be inserted in the
//! position node1 had before the function.
//!
//! <b>Complexity</b>: Constant.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Note</b>: This function will break container ordering invariants if
//! node1 and node2 are not equivalent according to the ordering rules.
//!
//!Experimental function
static void swap_nodes(node_ptr node1, node_ptr header1, node_ptr node2, node_ptr header2)
{ tree_algorithms::swap_nodes(node1, header1, node2, header2); }
//! <b>Requires</b>: node_to_be_replaced must be inserted in a tree
//! and new_node must not be inserted in a tree.
//!
//! <b>Effects</b>: Replaces node_to_be_replaced in its position in the
//! tree with new_node. The tree does not need to be rebalanced
//!
//! <b>Complexity</b>: Logarithmic.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Note</b>: This function will break container ordering invariants if
//! new_node is not equivalent to node_to_be_replaced according to the
//! ordering rules. This function is faster than erasing and inserting
//! the node, since no rebalancing and comparison is needed.
//!
//!Experimental function
static void replace_node(node_ptr node_to_be_replaced, node_ptr new_node)
{
if(node_to_be_replaced == new_node)
return;
replace_node(node_to_be_replaced, tree_algorithms::get_header(node_to_be_replaced), new_node);
}
//! <b>Requires</b>: node_to_be_replaced must be inserted in a tree
//! with header "header" and new_node must not be inserted in a tree.
//!
//! <b>Effects</b>: Replaces node_to_be_replaced in its position in the
//! tree with new_node. The tree does not need to be rebalanced
//!
//! <b>Complexity</b>: Constant.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Note</b>: This function will break container ordering invariants if
//! new_node is not equivalent to node_to_be_replaced according to the
//! ordering rules. This function is faster than erasing and inserting
//! the node, since no rebalancing or comparison is needed.
//!
//!Experimental function
static void replace_node(node_ptr node_to_be_replaced, node_ptr header, node_ptr new_node)
{ tree_algorithms::replace_node(node_to_be_replaced, header, new_node); }
//! <b>Requires</b>: node is a tree node but not the header.
//!
//! <b>Effects</b>: Unlinks the node and rebalances the tree.
//!
//! <b>Complexity</b>: Average complexity is constant time.
//!
//! <b>Throws</b>: Nothing.
template<class NodePriorityCompare>
static void unlink(node_ptr node, NodePriorityCompare prio)
{
node_ptr x = NodeTraits::get_parent(node);
if(x){
while(!is_header(x))
x = NodeTraits::get_parent(x);
erase(x, node, prio);
}
}
//! <b>Requires</b>: header is the header of a tree.
//!
//! <b>Effects</b>: Unlinks the leftmost node from the tree, and
//! updates the header link to the new leftmost node.
//!
//! <b>Complexity</b>: Average complexity is constant time.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Notes</b>: This function breaks the tree and the tree can
//! only be used for more unlink_leftmost_without_rebalance calls.
//! This function is normally used to achieve a step by step
//! controlled destruction of the tree.
static node_ptr unlink_leftmost_without_rebalance(node_ptr header)
{ return tree_algorithms::unlink_leftmost_without_rebalance(header); }
//! <b>Requires</b>: node is a node of the tree or an node initialized
//! by init(...).
//!
//! <b>Effects</b>: Returns true if the node is initialized by init().
//!
//! <b>Complexity</b>: Constant time.
//!
//! <b>Throws</b>: Nothing.
static bool unique(const_node_ptr node)
{ return tree_algorithms::unique(node); }
//! <b>Requires</b>: node is a node of the tree but it's not the header.
//!
//! <b>Effects</b>: Returns the number of nodes of the subtree.
//!
//! <b>Complexity</b>: Linear time.
//!
//! <b>Throws</b>: Nothing.
static std::size_t count(const_node_ptr node)
{ return tree_algorithms::count(node); }
//! <b>Requires</b>: header is the header node of the tree.
//!
//! <b>Effects</b>: Returns the number of nodes above the header.
//!
//! <b>Complexity</b>: Linear time.
//!
//! <b>Throws</b>: Nothing.
static std::size_t size(const_node_ptr header)
{ return tree_algorithms::size(header); }
//! <b>Requires</b>: p is a node from the tree except the header.
//!
//! <b>Effects</b>: Returns the next node of the tree.
//!
//! <b>Complexity</b>: Average constant time.
//!
//! <b>Throws</b>: Nothing.
static node_ptr next_node(node_ptr p)
{ return tree_algorithms::next_node(p); }
//! <b>Requires</b>: p is a node from the tree except the leftmost node.
//!
//! <b>Effects</b>: Returns the previous node of the tree.
//!
//! <b>Complexity</b>: Average constant time.
//!
//! <b>Throws</b>: Nothing.
static node_ptr prev_node(node_ptr p)
{ return tree_algorithms::prev_node(p); }
//! <b>Requires</b>: node must not be part of any tree.
//!
//! <b>Effects</b>: After the function unique(node) == true.
//!
//! <b>Complexity</b>: Constant.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Nodes</b>: If node is inserted in a tree, this function corrupts the tree.
static void init(node_ptr node)
{ tree_algorithms::init(node); }
//! <b>Requires</b>: node must not be part of any tree.
//!
//! <b>Effects</b>: Initializes the header to represent an empty tree.
//! unique(header) == true.
//!
//! <b>Complexity</b>: Constant.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Nodes</b>: If node is inserted in a tree, this function corrupts the tree.
static void init_header(node_ptr header)
{
tree_algorithms::init_header(header);
}
//! <b>Requires</b>: header must be the header of a tree, z a node
//! of that tree and z != header.
//!
//! <b>Effects</b>: Erases node "z" from the tree with header "header".
//!
//! <b>Complexity</b>: Amortized constant time.
//!
//! <b>Throws</b>: Nothing.
template<class NodePriorityCompare>
static node_ptr erase(node_ptr header, node_ptr z, NodePriorityCompare pcomp)
{
rebalance_for_erasure(header, z, pcomp);
tree_algorithms::erase(header, z);
// assert(check_invariant(header, pcomp));
return z;
}
//! <b>Requires</b>: "cloner" must be a function
//! object taking a node_ptr and returning a new cloned node of it. "disposer" must
//! take a node_ptr and shouldn't throw.
//!
//! <b>Effects</b>: First empties target tree calling
//! <tt>void disposer::operator()(node_ptr)</tt> for every node of the tree
//! except the header.
//!
//! Then, duplicates the entire tree pointed by "source_header" cloning each
//! source node with <tt>node_ptr Cloner::operator()(node_ptr)</tt> to obtain
//! the nodes of the target tree. If "cloner" throws, the cloned target nodes
//! are disposed using <tt>void disposer(node_ptr)</tt>.
//!
//! <b>Complexity</b>: Linear to the number of element of the source tree plus the.
//! number of elements of tree target tree when calling this function.
//!
//! <b>Throws</b>: If cloner functor throws. If this happens target nodes are disposed.
template <class Cloner, class Disposer>
static void clone
(const_node_ptr source_header, node_ptr target_header, Cloner cloner, Disposer disposer)
{
tree_algorithms::clone(source_header, target_header, cloner, disposer);
}
//! <b>Requires</b>: "disposer" must be an object function
//! taking a node_ptr parameter and shouldn't throw.
//!
//! <b>Effects</b>: Empties the target tree calling
//! <tt>void disposer::operator()(node_ptr)</tt> for every node of the tree
//! except the header.
//!
//! <b>Complexity</b>: Linear to the number of element of the source tree plus the.
//! number of elements of tree target tree when calling this function.
//!
//! <b>Throws</b>: If cloner functor throws. If this happens target nodes are disposed.
template<class Disposer>
static void clear_and_dispose(node_ptr header, Disposer disposer)
{ tree_algorithms::clear_and_dispose(header, disposer); }
//! <b>Requires</b>: "header" must be the header node of a tree.
//! KeyNodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. KeyNodePtrCompare can compare KeyType with tree's node_ptrs.
//!
//! <b>Effects</b>: Returns an node_ptr to the first element that is
//! not less than "key" according to "comp" or "header" if that element does
//! not exist.
//!
//! <b>Complexity</b>: Logarithmic.
//!
//! <b>Throws</b>: If "comp" throws.
template<class KeyType, class KeyNodePtrCompare>
static node_ptr lower_bound
(const_node_ptr header, const KeyType &key, KeyNodePtrCompare comp)
{ return tree_algorithms::lower_bound(header, key, comp); }
//! <b>Requires</b>: "header" must be the header node of a tree.
//! KeyNodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. KeyNodePtrCompare can compare KeyType with tree's node_ptrs.
//!
//! <b>Effects</b>: Returns an node_ptr to the first element that is greater
//! than "key" according to "comp" or "header" if that element does not exist.
//!
//! <b>Complexity</b>: Logarithmic.
//!
//! <b>Throws</b>: If "comp" throws.
template<class KeyType, class KeyNodePtrCompare>
static node_ptr upper_bound
(const_node_ptr header, const KeyType &key, KeyNodePtrCompare comp)
{ return tree_algorithms::upper_bound(header, key, comp); }
//! <b>Requires</b>: "header" must be the header node of a tree.
//! KeyNodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. KeyNodePtrCompare can compare KeyType with tree's node_ptrs.
//!
//! <b>Effects</b>: Returns an node_ptr to the element that is equivalent to
//! "key" according to "comp" or "header" if that element does not exist.
//!
//! <b>Complexity</b>: Logarithmic.
//!
//! <b>Throws</b>: If "comp" throws.
template<class KeyType, class KeyNodePtrCompare>
static node_ptr find
(const_node_ptr header, const KeyType &key, KeyNodePtrCompare comp)
{ return tree_algorithms::find(header, key, comp); }
//! <b>Requires</b>: "header" must be the header node of a tree.
//! KeyNodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. KeyNodePtrCompare can compare KeyType with tree's node_ptrs.
//!
//! <b>Effects</b>: Returns an a pair of node_ptr delimiting a range containing
//! all elements that are equivalent to "key" according to "comp" or an
//! empty range that indicates the position where those elements would be
//! if they there are no equivalent elements.
//!
//! <b>Complexity</b>: Logarithmic.
//!
//! <b>Throws</b>: If "comp" throws.
template<class KeyType, class KeyNodePtrCompare>
static std::pair<node_ptr, node_ptr> equal_range
(const_node_ptr header, const KeyType &key, KeyNodePtrCompare comp)
{ return tree_algorithms::equal_range(header, key, comp); }
//! <b>Requires</b>: "h" must be the header node of a tree.
//! NodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. NodePtrCompare compares two node_ptrs.
//!
//! <b>Effects</b>: Inserts new_node into the tree before the upper bound
//! according to "comp".
//!
//! <b>Complexity</b>: Average complexity for insert element is at
//! most logarithmic.
//!
//! <b>Throws</b>: If "comp" throws.
template<class NodePtrCompare, class PriorityNodeCompare>
static node_ptr insert_equal_upper_bound
(node_ptr h, node_ptr new_node, NodePtrCompare comp, PriorityNodeCompare pcomp)
{
insert_commit_data commit_data;
tree_algorithms::insert_equal_upper_bound_check(h, new_node, comp, commit_data);
rebalance_after_insertion_check(h, commit_data.node, new_node, pcomp, commit_data.rotations);
tree_algorithms::insert_unique_commit(h, new_node, commit_data);
rebalance_after_insertion_commit(h, new_node, commit_data.rotations);
return new_node;
}
//! <b>Requires</b>: "h" must be the header node of a tree.
//! NodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. NodePtrCompare compares two node_ptrs.
//!
//! <b>Effects</b>: Inserts new_node into the tree before the lower bound
//! according to "comp".
//!
//! <b>Complexity</b>: Average complexity for insert element is at
//! most logarithmic.
//!
//! <b>Throws</b>: If "comp" throws.
template<class NodePtrCompare, class NodePriorityCompare>
static node_ptr insert_equal_lower_bound
(node_ptr h, node_ptr new_node, NodePtrCompare comp, NodePriorityCompare pcomp)
{
insert_commit_data commit_data;
tree_algorithms::insert_equal_lower_bound_check(h, new_node, comp, commit_data);
rebalance_after_insertion_check(h, commit_data.node, new_node, pcomp, commit_data.rotations);
tree_algorithms::insert_unique_commit(h, new_node, commit_data);
rebalance_after_insertion_commit(h, new_node, commit_data.rotations);
return new_node;
}
//! <b>Requires</b>: "header" must be the header node of a tree.
//! NodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. NodePtrCompare compares two node_ptrs. "hint" is node from
//! the "header"'s tree.
//!
//! <b>Effects</b>: Inserts new_node into the tree, using "hint" as a hint to
//! where it will be inserted. If "hint" is the upper_bound
//! the insertion takes constant time (two comparisons in the worst case).
//!
//! <b>Complexity</b>: Logarithmic in general, but it is amortized
//! constant time if new_node is inserted immediately before "hint".
//!
//! <b>Throws</b>: If "comp" throws.
template<class NodePtrCompare, class NodePriorityCompare>
static node_ptr insert_equal
(node_ptr h, node_ptr hint, node_ptr new_node, NodePtrCompare comp, NodePriorityCompare pcomp)
{
insert_commit_data commit_data;
tree_algorithms::insert_equal_check(h, hint, new_node, comp, commit_data);
rebalance_after_insertion_check(h, commit_data.node, new_node, pcomp, commit_data.rotations);
tree_algorithms::insert_unique_commit(h, new_node, commit_data);
rebalance_after_insertion_commit(h, new_node, commit_data.rotations);
return new_node;
}
//! <b>Requires</b>: "header" must be the header node of a tree.
//! KeyNodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. NodePtrCompare compares KeyType with a node_ptr.
//!
//! <b>Effects</b>: Checks if there is an equivalent node to "key" in the
//! tree according to "comp" and obtains the needed information to realize
//! a constant-time node insertion if there is no equivalent node.
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing a node_ptr to the already present node
//! and false. If there is not equivalent key can be inserted returns true
//! in the returned pair's boolean and fills "commit_data" that is meant to
//! be used with the "insert_commit" function to achieve a constant-time
//! insertion function.
//!
//! <b>Complexity</b>: Average complexity is at most logarithmic.
//!
//! <b>Throws</b>: If "comp" throws.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a node is expensive and the user does not want to have two equivalent nodes
//! in the tree: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! node that is used to impose the order is much cheaper to construct
//! than the node and this function offers the possibility to use that part
//! to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the node and use
//! "insert_commit" to insert the node in constant-time. This gives a total
//! logarithmic complexity to the insertion: check(O(log(N)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_unique_commit" only
//! if no more objects are inserted or erased from the set.
template<class KeyType, class KeyNodePtrCompare, class KeyNodePtrPrioCompare>
static std::pair<node_ptr, bool> insert_unique_check
(const_node_ptr header, const KeyType &key
,KeyNodePtrCompare comp, KeyNodePtrPrioCompare pcomp
,insert_commit_data &commit_data)
{
std::pair<node_ptr, bool> ret =
tree_algorithms::insert_unique_check(header, key, comp, commit_data);
if(ret.second)
rebalance_after_insertion_check(header, commit_data.node, key, pcomp, commit_data.rotations);
return ret;
}
//! <b>Requires</b>: "header" must be the header node of a tree.
//! KeyNodePtrCompare is a function object that induces a strict weak
//! ordering compatible with the strict weak ordering used to create the
//! the tree. NodePtrCompare compares KeyType with a node_ptr.
//! "hint" is node from the "header"'s tree.
//!
//! <b>Effects</b>: Checks if there is an equivalent node to "key" in the
//! tree according to "comp" using "hint" as a hint to where it should be
//! inserted and obtains the needed information to realize
//! a constant-time node insertion if there is no equivalent node.
//! If "hint" is the upper_bound the function has constant time
//! complexity (two comparisons in the worst case).
//!
//! <b>Returns</b>: If there is an equivalent value
//! returns a pair containing a node_ptr to the already present node
//! and false. If there is not equivalent key can be inserted returns true
//! in the returned pair's boolean and fills "commit_data" that is meant to
//! be used with the "insert_commit" function to achieve a constant-time
//! insertion function.
//!
//! <b>Complexity</b>: Average complexity is at most logarithmic, but it is
//! amortized constant time if new_node should be inserted immediately before "hint".
//!
//! <b>Throws</b>: If "comp" throws.
//!
//! <b>Notes</b>: This function is used to improve performance when constructing
//! a node is expensive and the user does not want to have two equivalent nodes
//! in the tree: if there is an equivalent value
//! the constructed object must be discarded. Many times, the part of the
//! node that is used to impose the order is much cheaper to construct
//! than the node and this function offers the possibility to use that part
//! to check if the insertion will be successful.
//!
//! If the check is successful, the user can construct the node and use
//! "insert_commit" to insert the node in constant-time. This gives a total
//! logarithmic complexity to the insertion: check(O(log(N)) + commit(O(1)).
//!
//! "commit_data" remains valid for a subsequent "insert_unique_commit" only
//! if no more objects are inserted or erased from the set.
template<class KeyType, class KeyNodePtrCompare, class KeyNodePtrPrioCompare>
static std::pair<node_ptr, bool> insert_unique_check
(const_node_ptr header, node_ptr hint, const KeyType &key
,KeyNodePtrCompare comp, KeyNodePtrPrioCompare pcomp, insert_commit_data &commit_data)
{
std::pair<node_ptr, bool> ret =
tree_algorithms::insert_unique_check(header, hint, key, comp, commit_data);
if(ret.second)
rebalance_after_insertion_check(header, commit_data.node, key, pcomp, commit_data.rotations);
return ret;
}
//! <b>Requires</b>: "header" must be the header node of a tree.
//! "commit_data" must have been obtained from a previous call to
//! "insert_unique_check". No objects should have been inserted or erased
//! from the set between the "insert_unique_check" that filled "commit_data"
//! and the call to "insert_commit".
//!
//!
//! <b>Effects</b>: Inserts new_node in the set using the information obtained
//! from the "commit_data" that a previous "insert_check" filled.
//!
//! <b>Complexity</b>: Constant time.
//!
//! <b>Throws</b>: Nothing.
//!
//! <b>Notes</b>: This function has only sense if a "insert_unique_check" has been
//! previously executed to fill "commit_data". No value should be inserted or
//! erased between the "insert_check" and "insert_commit" calls.
static void insert_unique_commit
(node_ptr header, node_ptr new_node, const insert_commit_data &commit_data)
{
tree_algorithms::insert_unique_commit(header, new_node, commit_data);
rebalance_after_insertion_commit(header, new_node, commit_data.rotations);
}
//! <b>Requires</b>: "n" must be a node inserted in a tree.
//!
//! <b>Effects</b>: Returns a pointer to the header node of the tree.
//!
//! <b>Complexity</b>: Logarithmic.
//!
//! <b>Throws</b>: Nothing.
static node_ptr get_header(node_ptr n)
{ return tree_algorithms::get_header(n); }
/// @cond
private:
//! <b>Requires</b>: p is a node of a tree.
//!
//! <b>Effects</b>: Returns true if p is the header of the tree.
//!
//! <b>Complexity</b>: Constant.
//!
//! <b>Throws</b>: Nothing.
static bool is_header(const_node_ptr p)
{
return tree_algorithms::is_header(p);
}
template<class NodePriorityCompare>
static void rebalance_for_erasure(node_ptr header, node_ptr z, NodePriorityCompare pcomp)
{
std::size_t n = 0;
rerotate_on_destroy rb(header, z, n);
node_ptr z_left = NodeTraits::get_left(z);
node_ptr z_right = NodeTraits::get_right(z);
while(z_left || z_right){
if(!z_right || (z_left && pcomp(z_left, z_right))){
tree_algorithms::rotate_right(z, header);
}
else{
tree_algorithms::rotate_left(z, header);
}
++n;
z_left = NodeTraits::get_left(z);
z_right = NodeTraits::get_right(z);
}
rb.release();
}
template<class Key, class KeyNodePriorityCompare>
static void rebalance_after_insertion_check
( const_node_ptr header, const_node_ptr upnode, const Key &k
, KeyNodePriorityCompare pcomp, std::size_t &num_rotations)
{
//First check rotations since pcomp can throw
num_rotations = 0;
std::size_t n = 0;
while(upnode != header && pcomp(k, upnode)){
++n;
upnode = NodeTraits::get_parent(upnode);
}
num_rotations = n;
}
static void rebalance_after_insertion_commit(node_ptr header, node_ptr p, std::size_t n)
{
// Now to n rotations
for( node_ptr p_parent = NodeTraits::get_parent(p)
; n--
; p_parent = NodeTraits::get_parent(p)){
//Check if left child
if(p == NodeTraits::get_left(p_parent)){
tree_algorithms::rotate_right(p_parent, header);
}
else{ //Right child
tree_algorithms::rotate_left(p_parent, header);
}
}
}
template<class NodePriorityCompare>
static bool check_invariant(const_node_ptr header, NodePriorityCompare pcomp)
{
node_ptr beg = begin_node(header);
node_ptr end = end_node(header);
while(beg != end){
node_ptr p = NodeTraits::get_parent(beg);
if(p != header){
if(pcomp(beg, p))
return false;
}
beg = next_node(beg);
}
return true;
}
/// @endcond
};
} //namespace intrusive
} //namespace boost
#include <boost/intrusive/detail/config_end.hpp>
#endif //BOOST_INTRUSIVE_TRIE_ALGORITHMS_HPP

2406
include/boost/intrusive/treap_set.hpp Normal file
View File

File diff suppressed because it is too large Load Diff

2
include/boost/intrusive/trivial_value_traits.hpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at

18
include/boost/intrusive/unordered_set.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@@ -235,7 +235,7 @@ class unordered_set_impl
key_equal key_eq() const key_equal key_eq() const
{ return table_.key_eq(); } { return table_.key_eq(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: if constant-time size and cache_last options are disabled, //! <b>Complexity</b>: if constant-time size and cache_last options are disabled,
//! average constant time (worst case, with empty() == true: O(this->bucket_count()). //! average constant time (worst case, with empty() == true: O(this->bucket_count()).
@@ -463,6 +463,12 @@ class unordered_set_impl
iterator erase_and_dispose(const_iterator i, Disposer disposer) iterator erase_and_dispose(const_iterator i, Disposer disposer)
{ return table_.erase_and_dispose(i, disposer); } { return table_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.
@@ -1288,7 +1294,7 @@ class unordered_multiset_impl
key_equal key_eq() const key_equal key_eq() const
{ return table_.key_eq(); } { return table_.key_eq(); }
//! <b>Effects</b>: Returns true is the container is empty. //! <b>Effects</b>: Returns true if the container is empty.
//! //!
//! <b>Complexity</b>: if constant-time size and cache_last options are disabled, //! <b>Complexity</b>: if constant-time size and cache_last options are disabled,
//! average constant time (worst case, with empty() == true: O(this->bucket_count()). //! average constant time (worst case, with empty() == true: O(this->bucket_count()).
@@ -1453,6 +1459,12 @@ class unordered_multiset_impl
void erase_and_dispose(const_iterator i, Disposer disposer) void erase_and_dispose(const_iterator i, Disposer disposer)
{ table_.erase_and_dispose(i, disposer); } { table_.erase_and_dispose(i, disposer); }
#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//! //!
//! <b>Effects</b>: Erases the range pointed to by b end e. //! <b>Effects</b>: Erases the range pointed to by b end e.

2
include/boost/intrusive/unordered_set_hook.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// (C) Copyright Olaf Krzikalla 2004-2006. // (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gaztanaga 2006-2007 // (C) Copyright Ion Gaztanaga 2006-2008
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at