Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/intrusive/bstree.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/intrusive/bstree.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/intrusive/bstree.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// (C) Copyright Ion Gaztanaga 2013-2013 +// (C) Copyright Ion Gaztanaga 2013-2014 // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -13,130 +13,163 @@ #define BOOST_INTRUSIVE_BSTREE_HPP #include <boost/intrusive/detail/config_begin.hpp> -#include <algorithm> -#include <cstddef> -#include <functional> -#include <iterator> -#include <utility> +#include <boost/intrusive/intrusive_fwd.hpp> #include <boost/intrusive/detail/assert.hpp> #include <boost/static_assert.hpp> #include <boost/intrusive/intrusive_fwd.hpp> -#include <boost/intrusive/set_hook.hpp> +#include <boost/intrusive/bs_set_hook.hpp> #include <boost/intrusive/detail/tree_node.hpp> +#include <boost/intrusive/detail/tree_iterator.hpp> #include <boost/intrusive/detail/ebo_functor_holder.hpp> #include <boost/intrusive/detail/mpl.hpp> #include <boost/intrusive/pointer_traits.hpp> -#include <boost/intrusive/detail/clear_on_destructor_base.hpp> -#include <boost/intrusive/detail/function_detector.hpp> -#include <boost/intrusive/detail/utilities.hpp> -#include <boost/intrusive/options.hpp> +#include <boost/intrusive/detail/is_stateful_value_traits.hpp> +#include <boost/intrusive/detail/empty_node_checker.hpp> +#include <boost/intrusive/detail/default_header_holder.hpp> +#include <boost/intrusive/detail/reverse_iterator.hpp> +#include <boost/intrusive/detail/exception_disposer.hpp> +#include <boost/intrusive/detail/node_cloner_disposer.hpp> +#include <boost/intrusive/detail/key_nodeptr_comp.hpp> +#include <boost/intrusive/detail/simple_disposers.hpp> +#include <boost/intrusive/detail/size_holder.hpp> +#include <boost/intrusive/detail/algo_type.hpp> +#include <boost/intrusive/detail/algorithm.hpp> + +#include <boost/intrusive/detail/get_value_traits.hpp> #include <boost/intrusive/bstree_algorithms.hpp> #include <boost/intrusive/link_mode.hpp> -#include <boost/move/move.hpp> +#include <boost/intrusive/parent_from_member.hpp> +#include <boost/move/utility_core.hpp> +#include <boost/move/adl_move_swap.hpp> + +#include <boost/intrusive/detail/minimal_pair_header.hpp> +#include <cstddef> //size_t... +#include <boost/intrusive/detail/minimal_less_equal_header.hpp>//less, equal_to + +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif namespace boost { namespace intrusive { /// @cond +struct default_bstree_hook_applier +{ template <class T> struct apply{ typedef typename T::default_bstree_hook type; }; }; + +template<> +struct is_default_hook_tag<default_bstree_hook_applier> +{ static const bool value = true; }; + struct bstree_defaults { - typedef detail::default_bstree_hook proto_value_traits; + typedef default_bstree_hook_applier proto_value_traits; static const bool constant_time_size = true; typedef std::size_t size_type; typedef void compare; static const bool floating_point = true; //For sgtree typedef void priority; //For treap + typedef void header_holder_type; }; -template<class ValueTraits, algo_types AlgoType> +template<class ValueTraits, algo_types AlgoType, typename HeaderHolder> struct bstbase3 - : public detail::get_real_value_traits<ValueTraits>::type::node_traits::node - , public ValueTraits { typedef ValueTraits value_traits; - typedef typename detail::get_real_value_traits<ValueTraits>::type real_value_traits; - typedef typename real_value_traits::node_traits node_traits; + typedef typename value_traits::node_traits node_traits; typedef typename node_traits::node node_type; typedef typename get_algo<AlgoType, node_traits>::type node_algorithms; typedef typename node_traits::node_ptr node_ptr; typedef typename node_traits::const_node_ptr const_node_ptr; - - bstbase3(const ValueTraits &vtraits) - : ValueTraits(vtraits) - {} - - static const bool external_value_traits = - detail::external_value_traits_bool_is_true<ValueTraits>::value; - - node_ptr header_ptr() - { return pointer_traits<node_ptr>::pointer_to(static_cast<node_type&>(*this)); } - - const_node_ptr header_ptr() const - { return pointer_traits<const_node_ptr>::pointer_to(static_cast<const node_type&>(*this)); } - - const value_traits &val_traits() const - { return *this; } - - value_traits &val_traits() - { return *this; } - - const real_value_traits &get_real_value_traits(detail::bool_<false>) const - { return *this; } - - const real_value_traits &get_real_value_traits(detail::bool_<true>) const - { return this->val_traits().get_value_traits(*this); } - - real_value_traits &get_real_value_traits(detail::bool_<false>) - { return *this; } - - real_value_traits &get_real_value_traits(detail::bool_<true>) - { return this->val_traits().get_value_traits(*this); } - - const real_value_traits &get_real_value_traits() const - { return this->get_real_value_traits(detail::bool_<external_value_traits>()); } - - real_value_traits &get_real_value_traits() - { return this->get_real_value_traits(detail::bool_<external_value_traits>()); } - - typedef typename pointer_traits<node_ptr>::template rebind_pointer<const real_value_traits>::type const_real_value_traits_ptr; - - const_real_value_traits_ptr real_value_traits_ptr() const - { return pointer_traits<const_real_value_traits_ptr>::pointer_to(this->get_real_value_traits()); } - - - typedef tree_iterator<real_value_traits, false> iterator; - typedef tree_iterator<real_value_traits, true> const_iterator; - typedef boost::intrusive::detail::reverse_iterator<iterator> reverse_iterator; - typedef boost::intrusive::detail::reverse_iterator<const_iterator> const_reverse_iterator; - typedef BOOST_INTRUSIVE_IMPDEF(typename real_value_traits::pointer) pointer; - typedef BOOST_INTRUSIVE_IMPDEF(typename real_value_traits::const_pointer) const_pointer; + typedef tree_iterator<value_traits, false> iterator; + typedef tree_iterator<value_traits, true> const_iterator; + typedef boost::intrusive::reverse_iterator<iterator> reverse_iterator; + typedef boost::intrusive::reverse_iterator<const_iterator> const_reverse_iterator; + typedef BOOST_INTRUSIVE_IMPDEF(typename value_traits::pointer) pointer; + typedef BOOST_INTRUSIVE_IMPDEF(typename value_traits::const_pointer) const_pointer; typedef BOOST_INTRUSIVE_IMPDEF(typename pointer_traits<pointer>::element_type) value_type; typedef BOOST_INTRUSIVE_IMPDEF(value_type) key_type; typedef BOOST_INTRUSIVE_IMPDEF(typename pointer_traits<pointer>::reference) reference; typedef BOOST_INTRUSIVE_IMPDEF(typename pointer_traits<const_pointer>::reference) const_reference; typedef BOOST_INTRUSIVE_IMPDEF(typename pointer_traits<const_pointer>::difference_type) difference_type; - static const bool safemode_or_autounlink = is_safe_autounlink<real_value_traits::link_mode>::value; - static const bool stateful_value_traits = detail::is_stateful_value_traits<real_value_traits>::value; + typedef typename detail::get_header_holder_type + < value_traits,HeaderHolder >::type header_holder_type; + + static const bool safemode_or_autounlink = is_safe_autounlink<value_traits::link_mode>::value; + static const bool stateful_value_traits = detail::is_stateful_value_traits<value_traits>::value; + static const bool has_container_from_iterator = + detail::is_same< header_holder_type, detail::default_header_holder< node_traits > >::value; + + struct holder_t : public ValueTraits + { + explicit holder_t(const ValueTraits &vtraits) + : ValueTraits(vtraits) + {} + header_holder_type root; + } holder; + + static bstbase3 &get_tree_base_from_end_iterator(const const_iterator &end_iterator) + { + BOOST_STATIC_ASSERT(has_container_from_iterator); + node_ptr p = end_iterator.pointed_node(); + header_holder_type* h = header_holder_type::get_holder(p); + holder_t *holder = get_parent_from_member<holder_t, header_holder_type>(h, &holder_t::root); + bstbase3 *base = get_parent_from_member<bstbase3, holder_t> (holder, &bstbase3::holder); + return *base; + } + + bstbase3(const ValueTraits &vtraits) + : holder(vtraits) + { + node_algorithms::init_header(this->header_ptr()); + } + + node_ptr header_ptr() + { return holder.root.get_node(); } + + const_node_ptr header_ptr() const + { return holder.root.get_node(); } + + const value_traits &get_value_traits() const + { return this->holder; } + + value_traits &get_value_traits() + { return this->holder; } + + typedef typename boost::intrusive::value_traits_pointers + <ValueTraits>::const_value_traits_ptr const_value_traits_ptr; + + const_value_traits_ptr priv_value_traits_ptr() const + { return pointer_traits<const_value_traits_ptr>::pointer_to(this->get_value_traits()); } iterator begin() - { return iterator (node_traits::get_left(this->header_ptr()), this->real_value_traits_ptr()); } + { return iterator(node_algorithms::begin_node(this->header_ptr()), this->priv_value_traits_ptr()); } const_iterator begin() const { return cbegin(); } const_iterator cbegin() const - { return const_iterator (node_traits::get_left(this->header_ptr()), this->real_value_traits_ptr()); } + { return const_iterator(node_algorithms::begin_node(this->header_ptr()), this->priv_value_traits_ptr()); } iterator end() - { return iterator (this->header_ptr(), this->real_value_traits_ptr()); } + { return iterator(node_algorithms::end_node(this->header_ptr()), this->priv_value_traits_ptr()); } const_iterator end() const { return cend(); } const_iterator cend() const - { return const_iterator (detail::uncast(this->header_ptr()), this->real_value_traits_ptr()); } + { return const_iterator(node_algorithms::end_node(this->header_ptr()), this->priv_value_traits_ptr()); } + + iterator root() + { return iterator(node_algorithms::root_node(this->header_ptr()), this->priv_value_traits_ptr()); } + + const_iterator root() const + { return croot(); } + + const_iterator croot() const + { return const_iterator(node_algorithms::root_node(this->header_ptr()), this->priv_value_traits_ptr()); } reverse_iterator rbegin() { return reverse_iterator(end()); } @@ -158,9 +191,9 @@ void replace_node(iterator replace_this, reference with_this) { - node_algorithms::replace_node( get_real_value_traits().to_node_ptr(*replace_this) + node_algorithms::replace_node( get_value_traits().to_node_ptr(*replace_this) , this->header_ptr() - , get_real_value_traits().to_node_ptr(with_this)); + , get_value_traits().to_node_ptr(with_this)); if(safemode_or_autounlink) node_algorithms::init(replace_this.pointed_node()); } @@ -169,43 +202,57 @@ { node_algorithms::rebalance(this->header_ptr()); } iterator rebalance_subtree(iterator root) - { return iterator(node_algorithms::rebalance_subtree(root.pointed_node()), this->real_value_traits_ptr()); } + { return iterator(node_algorithms::rebalance_subtree(root.pointed_node()), this->priv_value_traits_ptr()); } static iterator s_iterator_to(reference value) { BOOST_STATIC_ASSERT((!stateful_value_traits)); - return iterator (value_traits::to_node_ptr(value), const_real_value_traits_ptr()); + return iterator (value_traits::to_node_ptr(value), const_value_traits_ptr()); } static const_iterator s_iterator_to(const_reference value) { BOOST_STATIC_ASSERT((!stateful_value_traits)); - return const_iterator (value_traits::to_node_ptr(const_cast<reference> (value)), const_real_value_traits_ptr()); + return const_iterator (value_traits::to_node_ptr(*pointer_traits<pointer>::const_cast_from(pointer_traits<const_pointer>::pointer_to(value))), const_value_traits_ptr()); } iterator iterator_to(reference value) - { return iterator (value_traits::to_node_ptr(value), this->real_value_traits_ptr()); } + { return iterator (this->get_value_traits().to_node_ptr(value), this->priv_value_traits_ptr()); } const_iterator iterator_to(const_reference value) const - { return const_iterator (value_traits::to_node_ptr(const_cast<reference> (value)), this->real_value_traits_ptr()); } + { return const_iterator (this->get_value_traits().to_node_ptr(*pointer_traits<pointer>::const_cast_from(pointer_traits<const_pointer>::pointer_to(value))), this->priv_value_traits_ptr()); } static void init_node(reference value) { node_algorithms::init(value_traits::to_node_ptr(value)); } }; -template<class ValueTraits, class VoidOrKeyComp, algo_types AlgoType> +template<class Less, class T> +struct get_compare +{ + typedef Less type; +}; + +template<class T> +struct get_compare<void, T> +{ + typedef ::std::less<T> type; +}; + +template<class ValueTraits, class VoidOrKeyComp, algo_types AlgoType, typename HeaderHolder> struct bstbase2 - : public bstbase3<ValueTraits, AlgoType> - , public detail::ebo_functor_holder<typename get_less< VoidOrKeyComp - , typename detail::get_real_value_traits<ValueTraits>::type::value_type + //Put the (possibly empty) functor in the first position to get EBO in MSVC + //Use public inheritance to avoid MSVC bugs with closures + : public detail::ebo_functor_holder<typename get_compare< VoidOrKeyComp + , typename ValueTraits::value_type >::type> + , public bstbase3<ValueTraits, AlgoType, HeaderHolder> { - typedef bstbase3<ValueTraits, AlgoType> treeheader_t; - typedef typename treeheader_t::real_value_traits real_value_traits; + typedef bstbase3<ValueTraits, AlgoType, HeaderHolder> treeheader_t; + typedef typename treeheader_t::value_traits value_traits; typedef typename treeheader_t::node_algorithms node_algorithms; - typedef typename get_less - < VoidOrKeyComp, typename real_value_traits::value_type>::type value_compare; + typedef typename get_compare + < VoidOrKeyComp, typename value_traits::value_type>::type value_compare; typedef BOOST_INTRUSIVE_IMPDEF(value_compare) key_compare; typedef typename treeheader_t::iterator iterator; typedef typename treeheader_t::const_iterator const_iterator; @@ -213,17 +260,17 @@ typedef typename treeheader_t::const_node_ptr const_node_ptr; bstbase2(const value_compare &comp, const ValueTraits &vtraits) - : treeheader_t(vtraits), detail::ebo_functor_holder<value_compare>(comp) + : detail::ebo_functor_holder<value_compare>(comp), treeheader_t(vtraits) {} const value_compare &comp() const { return this->get(); } - + value_compare &comp() { return this->get(); } - typedef BOOST_INTRUSIVE_IMPDEF(typename real_value_traits::pointer) pointer; - typedef BOOST_INTRUSIVE_IMPDEF(typename real_value_traits::const_pointer) const_pointer; + typedef BOOST_INTRUSIVE_IMPDEF(typename value_traits::pointer) pointer; + typedef BOOST_INTRUSIVE_IMPDEF(typename value_traits::const_pointer) const_pointer; typedef BOOST_INTRUSIVE_IMPDEF(typename pointer_traits<pointer>::element_type) value_type; typedef BOOST_INTRUSIVE_IMPDEF(value_type) key_type; typedef BOOST_INTRUSIVE_IMPDEF(typename pointer_traits<pointer>::reference) reference; @@ -237,6 +284,7 @@ key_compare key_comp() const { return this->comp(); } + //lower_bound iterator lower_bound(const_reference value) { return this->lower_bound(value, this->comp()); } @@ -246,31 +294,32 @@ template<class KeyType, class KeyValueCompare> iterator lower_bound(const KeyType &key, KeyValueCompare comp) { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); return iterator(node_algorithms::lower_bound - (this->header_ptr(), key, key_node_comp), this->real_value_traits_ptr()); + (this->header_ptr(), key, key_node_comp), this->priv_value_traits_ptr()); } template<class KeyType, class KeyValueCompare> const_iterator lower_bound(const KeyType &key, KeyValueCompare comp) const { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); return const_iterator(node_algorithms::lower_bound - (this->header_ptr(), key, key_node_comp), this->real_value_traits_ptr()); + (this->header_ptr(), key, key_node_comp), this->priv_value_traits_ptr()); } + //upper_bound iterator upper_bound(const_reference value) { return this->upper_bound(value, this->comp()); } template<class KeyType, class KeyValueCompare> iterator upper_bound(const KeyType &key, KeyValueCompare comp) { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); return iterator(node_algorithms::upper_bound - (this->header_ptr(), key, key_node_comp), this->real_value_traits_ptr()); + (this->header_ptr(), key, key_node_comp), this->priv_value_traits_ptr()); } const_iterator upper_bound(const_reference value) const @@ -279,22 +328,23 @@ template<class KeyType, class KeyValueCompare> const_iterator upper_bound(const KeyType &key, KeyValueCompare comp) const { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); return const_iterator(node_algorithms::upper_bound - (this->header_ptr(), key, key_node_comp), this->real_value_traits_ptr()); + (this->header_ptr(), key, key_node_comp), this->priv_value_traits_ptr()); } + //find iterator find(const_reference value) { return this->find(value, this->comp()); } template<class KeyType, class KeyValueCompare> iterator find(const KeyType &key, KeyValueCompare comp) { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); return iterator - (node_algorithms::find(this->header_ptr(), key, key_node_comp), this->real_value_traits_ptr()); + (node_algorithms::find(this->header_ptr(), key, key_node_comp), this->priv_value_traits_ptr()); } const_iterator find(const_reference value) const @@ -303,24 +353,25 @@ template<class KeyType, class KeyValueCompare> const_iterator find(const KeyType &key, KeyValueCompare comp) const { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); return const_iterator - (node_algorithms::find(this->header_ptr(), key, key_node_comp), this->real_value_traits_ptr()); + (node_algorithms::find(this->header_ptr(), key, key_node_comp), this->priv_value_traits_ptr()); } + //equal_range std::pair<iterator,iterator> equal_range(const_reference value) { return this->equal_range(value, this->comp()); } template<class KeyType, class KeyValueCompare> std::pair<iterator,iterator> equal_range(const KeyType &key, KeyValueCompare comp) { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); std::pair<node_ptr, node_ptr> ret (node_algorithms::equal_range(this->header_ptr(), key, key_node_comp)); - return std::pair<iterator, iterator>( iterator(ret.first, this->real_value_traits_ptr()) - , iterator(ret.second, this->real_value_traits_ptr())); + return std::pair<iterator, iterator>( iterator(ret.first, this->priv_value_traits_ptr()) + , iterator(ret.second, this->priv_value_traits_ptr())); } std::pair<const_iterator, const_iterator> @@ -331,14 +382,46 @@ std::pair<const_iterator, const_iterator> equal_range(const KeyType &key, KeyValueCompare comp) const { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); std::pair<node_ptr, node_ptr> ret (node_algorithms::equal_range(this->header_ptr(), key, key_node_comp)); - return std::pair<const_iterator, const_iterator>( const_iterator(ret.first, this->real_value_traits_ptr()) - , const_iterator(ret.second, this->real_value_traits_ptr())); + return std::pair<const_iterator, const_iterator>( const_iterator(ret.first, this->priv_value_traits_ptr()) + , const_iterator(ret.second, this->priv_value_traits_ptr())); } + //lower_bound_range + std::pair<iterator,iterator> lower_bound_range(const_reference value) + { return this->lower_bound_range(value, this->comp()); } + + template<class KeyType, class KeyValueCompare> + std::pair<iterator,iterator> lower_bound_range(const KeyType &key, KeyValueCompare comp) + { + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); + std::pair<node_ptr, node_ptr> ret + (node_algorithms::lower_bound_range(this->header_ptr(), key, key_node_comp)); + return std::pair<iterator, iterator>( iterator(ret.first, this->priv_value_traits_ptr()) + , iterator(ret.second, this->priv_value_traits_ptr())); + } + + std::pair<const_iterator, const_iterator> + lower_bound_range(const_reference value) const + { return this->lower_bound_range(value, this->comp()); } + + template<class KeyType, class KeyValueCompare> + std::pair<const_iterator, const_iterator> + lower_bound_range(const KeyType &key, KeyValueCompare comp) const + { + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); + std::pair<node_ptr, node_ptr> ret + (node_algorithms::lower_bound_range(this->header_ptr(), key, key_node_comp)); + return std::pair<const_iterator, const_iterator>( const_iterator(ret.first, this->priv_value_traits_ptr()) + , const_iterator(ret.second, this->priv_value_traits_ptr())); + } + + //bounded_range std::pair<iterator,iterator> bounded_range (const_reference lower_value, const_reference upper_value, bool left_closed, bool right_closed) { return this->bounded_range(lower_value, upper_value, this->comp(), left_closed, right_closed); } @@ -347,13 +430,13 @@ std::pair<iterator,iterator> bounded_range (const KeyType &lower_key, const KeyType &upper_key, KeyValueCompare comp, bool left_closed, bool right_closed) { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); std::pair<node_ptr, node_ptr> ret (node_algorithms::bounded_range (this->header_ptr(), lower_key, upper_key, key_node_comp, left_closed, right_closed)); - return std::pair<iterator, iterator>( iterator(ret.first, this->real_value_traits_ptr()) - , iterator(ret.second, this->real_value_traits_ptr())); + return std::pair<iterator, iterator>( iterator(ret.first, this->priv_value_traits_ptr()) + , iterator(ret.second, this->priv_value_traits_ptr())); } std::pair<const_iterator,const_iterator> bounded_range @@ -364,25 +447,26 @@ std::pair<const_iterator,const_iterator> bounded_range (const KeyType &lower_key, const KeyType &upper_key, KeyValueCompare comp, bool left_closed, bool right_closed) const { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - key_node_comp(comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + key_node_comp(comp, &this->get_value_traits()); std::pair<node_ptr, node_ptr> ret (node_algorithms::bounded_range (this->header_ptr(), lower_key, upper_key, key_node_comp, left_closed, right_closed)); - return std::pair<const_iterator, const_iterator>( const_iterator(ret.first, this->real_value_traits_ptr()) - , const_iterator(ret.second, this->real_value_traits_ptr())); + return std::pair<const_iterator, const_iterator>( const_iterator(ret.first, this->priv_value_traits_ptr()) + , const_iterator(ret.second, this->priv_value_traits_ptr())); } + //insert_unique_check template<class KeyType, class KeyValueCompare> std::pair<iterator, bool> insert_unique_check (const KeyType &key, KeyValueCompare key_value_comp, insert_commit_data &commit_data) { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - ocomp(key_value_comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + ocomp(key_value_comp, &this->get_value_traits()); std::pair<node_ptr, bool> ret = (node_algorithms::insert_unique_check (this->header_ptr(), key, ocomp, commit_data)); - return std::pair<iterator, bool>(iterator(ret.first, this->real_value_traits_ptr()), ret.second); + return std::pair<iterator, bool>(iterator(ret.first, this->priv_value_traits_ptr()), ret.second); } template<class KeyType, class KeyValueCompare> @@ -390,63 +474,102 @@ (const_iterator hint, const KeyType &key ,KeyValueCompare key_value_comp, insert_commit_data &commit_data) { - detail::key_nodeptr_comp<KeyValueCompare, real_value_traits> - ocomp(key_value_comp, &this->get_real_value_traits()); + detail::key_nodeptr_comp<KeyValueCompare, value_traits> + ocomp(key_value_comp, &this->get_value_traits()); std::pair<node_ptr, bool> ret = (node_algorithms::insert_unique_check (this->header_ptr(), hint.pointed_node(), key, ocomp, commit_data)); - return std::pair<iterator, bool>(iterator(ret.first, this->real_value_traits_ptr()), ret.second); + return std::pair<iterator, bool>(iterator(ret.first, this->priv_value_traits_ptr()), ret.second); } }; -template<class ValueTraits, class VoidOrKeyComp, bool ConstantTimeSize, class SizeType, algo_types AlgoType> +//Due to MSVC's EBO implementation, to save space and maintain the ABI, we must put the non-empty size member +//in the first position, but if size is not going to be stored then we'll use an specialization +//that doesn't inherit from size_holder +template<class ValueTraits, class VoidOrKeyComp, bool ConstantTimeSize, class SizeType, algo_types AlgoType, typename HeaderHolder> +struct bstbase_hack + : public detail::size_holder<ConstantTimeSize, SizeType> + , public bstbase2 < ValueTraits, VoidOrKeyComp, AlgoType, HeaderHolder> +{ + typedef bstbase2< ValueTraits, VoidOrKeyComp, AlgoType, HeaderHolder> base_type; + typedef typename base_type::value_compare value_compare; + typedef SizeType size_type; + typedef typename base_type::node_traits node_traits; + typedef typename get_algo + <AlgoType, node_traits>::type algo_type; + + bstbase_hack(const value_compare & comp, const ValueTraits &vtraits) + : base_type(comp, vtraits) + { + this->sz_traits().set_size(size_type(0)); + } + + typedef detail::size_holder<ConstantTimeSize, SizeType> size_traits; + + size_traits &sz_traits() + { return static_cast<size_traits &>(*this); } + + const size_traits &sz_traits() const + { return static_cast<const size_traits &>(*this); } +}; + +//Specialization for ConstantTimeSize == false +template<class ValueTraits, class VoidOrKeyComp, class SizeType, algo_types AlgoType, typename HeaderHolder> +struct bstbase_hack<ValueTraits, VoidOrKeyComp, false, SizeType, AlgoType, HeaderHolder> + : public bstbase2 < ValueTraits, VoidOrKeyComp, AlgoType, HeaderHolder> +{ + typedef bstbase2< ValueTraits, VoidOrKeyComp, AlgoType, HeaderHolder> base_type; + typedef typename base_type::value_compare value_compare; + bstbase_hack(const value_compare & comp, const ValueTraits &vtraits) + : base_type(comp, vtraits) + {} + + typedef detail::size_holder<true, SizeType> size_traits; + + size_traits &sz_traits() + { return s_size_traits; } + + const size_traits &sz_traits() const + { return s_size_traits; } + + static size_traits s_size_traits; +}; + +template<class ValueTraits, class VoidOrKeyComp, class SizeType, algo_types AlgoType, typename HeaderHolder> +detail::size_holder<true, SizeType> bstbase_hack<ValueTraits, VoidOrKeyComp, false, SizeType, AlgoType, HeaderHolder>::s_size_traits; + +//This class will +template<class ValueTraits, class VoidOrKeyComp, bool ConstantTimeSize, class SizeType, algo_types AlgoType, typename HeaderHolder> struct bstbase - : public detail::size_holder<ConstantTimeSize, SizeType> - , public bstbase2 < ValueTraits, VoidOrKeyComp, AlgoType> + : public bstbase_hack< ValueTraits, VoidOrKeyComp, ConstantTimeSize, SizeType, AlgoType, HeaderHolder> { - typedef typename detail::get_real_value_traits<ValueTraits>::type real_value_traits; - typedef bstbase2< ValueTraits, VoidOrKeyComp, AlgoType> base_type; + typedef bstbase_hack< ValueTraits, VoidOrKeyComp, ConstantTimeSize, SizeType, AlgoType, HeaderHolder> base_type; + typedef ValueTraits value_traits; typedef typename base_type::value_compare value_compare; - typedef BOOST_INTRUSIVE_IMPDEF(value_compare) key_compare; + typedef value_compare key_compare; typedef typename base_type::const_reference const_reference; typedef typename base_type::reference reference; typedef typename base_type::iterator iterator; typedef typename base_type::const_iterator const_iterator; typedef typename base_type::node_traits node_traits; typedef typename get_algo - <AlgoType, node_traits>::type algo_type; + <AlgoType, node_traits>::type node_algorithms; typedef SizeType size_type; bstbase(const value_compare & comp, const ValueTraits &vtraits) : base_type(comp, vtraits) {} - public: - typedef detail::size_holder<ConstantTimeSize, SizeType> size_traits; - - size_traits &sz_traits() - { return *this; } - - const size_traits &sz_traits() const - { return *this; } - - size_type count(const_reference value) const - { return size_type(this->count(value, this->comp())); } - - template<class KeyType, class KeyValueCompare> - size_type count(const KeyType &key, KeyValueCompare comp) const + //Detach all inserted nodes. This will add exception safety to bstree_impl + //constructors inserting elements. + ~bstbase() { - std::pair<const_iterator, const_iterator> ret = this->equal_range(key, comp); - return size_type(std::distance(ret.first, ret.second)); - } - - bool empty() const - { - if(ConstantTimeSize){ - return !this->sz_traits().get_size(); - } - else{ - return algo_type::unique(this->header_ptr()); + if(is_safe_autounlink<value_traits::link_mode>::value){ + node_algorithms::clear_and_dispose + ( this->header_ptr() + , detail::node_disposer<detail::null_disposer, value_traits, AlgoType> + (detail::null_disposer(), &this->get_value_traits())); + node_algorithms::init(this->header_ptr()); } } }; @@ -472,29 +595,21 @@ #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) template<class T, class ...Options> #else -template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType> +template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType, typename HeaderHolder> #endif class bstree_impl - : public bstbase<ValueTraits, VoidKeyComp, ConstantTimeSize, SizeType, AlgoType> - , private detail::clear_on_destructor_base - < bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> - , is_safe_autounlink<detail::get_real_value_traits<ValueTraits>::type::link_mode>::value - > + : public bstbase<ValueTraits, VoidKeyComp, ConstantTimeSize, SizeType, AlgoType, HeaderHolder> { - template<class C, bool> friend class detail::clear_on_destructor_base; public: - typedef ValueTraits value_traits; /// @cond - static const bool external_value_traits = - detail::external_value_traits_bool_is_true<value_traits>::value; - typedef typename detail::get_real_value_traits<ValueTraits>::type real_value_traits; - typedef bstbase<value_traits, VoidKeyComp, ConstantTimeSize, SizeType, AlgoType> data_type; - typedef tree_iterator<real_value_traits, false> iterator_type; - typedef tree_iterator<real_value_traits, true> const_iterator_type; + typedef bstbase<ValueTraits, VoidKeyComp, ConstantTimeSize, SizeType, AlgoType, HeaderHolder> data_type; + typedef tree_iterator<ValueTraits, false> iterator_type; + typedef tree_iterator<ValueTraits, true> const_iterator_type; /// @endcond - typedef BOOST_INTRUSIVE_IMPDEF(typename real_value_traits::pointer) pointer; - typedef BOOST_INTRUSIVE_IMPDEF(typename real_value_traits::const_pointer) const_pointer; + typedef BOOST_INTRUSIVE_IMPDEF(ValueTraits) value_traits; + typedef BOOST_INTRUSIVE_IMPDEF(typename value_traits::pointer) pointer; + typedef BOOST_INTRUSIVE_IMPDEF(typename value_traits::const_pointer) const_pointer; typedef BOOST_INTRUSIVE_IMPDEF(typename pointer_traits<pointer>::element_type) value_type; typedef BOOST_INTRUSIVE_IMPDEF(value_type) key_type; typedef BOOST_INTRUSIVE_IMPDEF(typename pointer_traits<pointer>::reference) reference; @@ -505,9 +620,9 @@ typedef BOOST_INTRUSIVE_IMPDEF(value_compare) key_compare; typedef BOOST_INTRUSIVE_IMPDEF(iterator_type) iterator; typedef BOOST_INTRUSIVE_IMPDEF(const_iterator_type) const_iterator; - typedef BOOST_INTRUSIVE_IMPDEF(boost::intrusive::detail::reverse_iterator<iterator>) reverse_iterator; - typedef BOOST_INTRUSIVE_IMPDEF(boost::intrusive::detail::reverse_iterator<const_iterator>) const_reverse_iterator; - typedef BOOST_INTRUSIVE_IMPDEF(typename real_value_traits::node_traits) node_traits; + typedef BOOST_INTRUSIVE_IMPDEF(boost::intrusive::reverse_iterator<iterator>) reverse_iterator; + typedef BOOST_INTRUSIVE_IMPDEF(boost::intrusive::reverse_iterator<const_iterator>) const_reverse_iterator; + typedef BOOST_INTRUSIVE_IMPDEF(typename value_traits::node_traits) node_traits; typedef BOOST_INTRUSIVE_IMPDEF(typename node_traits::node) node; typedef BOOST_INTRUSIVE_IMPDEF(typename node_traits::node_ptr) node_ptr; typedef BOOST_INTRUSIVE_IMPDEF(typename node_traits::const_node_ptr) const_node_ptr; @@ -517,17 +632,17 @@ typedef BOOST_INTRUSIVE_IMPDEF(algo_type) node_algorithms; static const bool constant_time_size = ConstantTimeSize; - static const bool stateful_value_traits = detail::is_stateful_value_traits<real_value_traits>::value; + static const bool stateful_value_traits = detail::is_stateful_value_traits<value_traits>::value; /// @cond private: //noncopyable BOOST_MOVABLE_BUT_NOT_COPYABLE(bstree_impl) - static const bool safemode_or_autounlink = is_safe_autounlink<real_value_traits::link_mode>::value; + static const bool safemode_or_autounlink = is_safe_autounlink<value_traits::link_mode>::value; //Constant-time size is incompatible with auto-unlink hooks! - BOOST_STATIC_ASSERT(!(constant_time_size && ((int)real_value_traits::link_mode == (int)auto_unlink))); + BOOST_STATIC_ASSERT(!(constant_time_size && ((int)value_traits::link_mode == (int)auto_unlink))); protected: @@ -545,14 +660,11 @@ //! //! <b>Throws</b>: If value_traits::node_traits::node //! constructor throws (this does not happen with predefined Boost.Intrusive hooks) - //! or the copy constructorof the value_compare object throws. Basic guarantee. + //! or the copy constructor of the value_compare object throws. Basic guarantee. explicit bstree_impl( const value_compare &cmp = value_compare() , const value_traits &v_traits = value_traits()) : data_type(cmp, v_traits) - { - node_algorithms::init_header(this->header_ptr()); - this->sz_traits().set_size(size_type(0)); - } + {} //! <b>Requires</b>: Dereferencing iterator must yield an lvalue of type value_type. //! cmp must be a comparison function that induces a strict weak ordering. @@ -572,8 +684,7 @@ , const value_traits &v_traits = value_traits()) : data_type(cmp, v_traits) { - node_algorithms::init_header(this->header_ptr()); - this->sz_traits().set_size(size_type(0)); + //bstbase releases elements in case of exceptions if(unique) this->insert_unique(b, e); else @@ -583,10 +694,8 @@ //! <b>Effects</b>: to-do //! bstree_impl(BOOST_RV_REF(bstree_impl) x) - : data_type(::boost::move(x.comp()), ::boost::move(x.val_traits())) + : data_type(::boost::move(x.comp()), ::boost::move(x.get_value_traits())) { - node_algorithms::init_header(this->header_ptr()); - this->sz_traits().set_size(size_type(0)); this->swap(x); } @@ -708,8 +817,8 @@ //! <b>Complexity</b>: Constant. static bstree_impl &container_from_end_iterator(iterator end_iterator) { - return *static_cast<bstree_impl*> - (boost::intrusive::detail::to_raw_pointer(end_iterator.pointed_node())); + return static_cast<bstree_impl&> + (data_type::get_tree_base_from_end_iterator(end_iterator)); } //! <b>Precondition</b>: end_iterator must be a valid end const_iterator @@ -722,8 +831,8 @@ //! <b>Complexity</b>: Constant. static const bstree_impl &container_from_end_iterator(const_iterator end_iterator) { - return *static_cast<const bstree_impl*> - (boost::intrusive::detail::to_raw_pointer(end_iterator.pointed_node())); + return static_cast<bstree_impl&> + (data_type::get_tree_base_from_end_iterator(end_iterator)); } //! <b>Precondition</b>: it must be a valid iterator @@ -756,7 +865,7 @@ //! //! <b>Throws</b>: If value_compare copy-constructor throws. key_compare key_comp() const; - + //! <b>Effects</b>: Returns the value_compare object used by the container. //! //! <b>Complexity</b>: Constant. @@ -764,14 +873,22 @@ //! <b>Throws</b>: If value_compare copy-constructor throws. value_compare value_comp() const; + #endif //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED + //! <b>Effects</b>: Returns true if the container is empty. //! //! <b>Complexity</b>: Constant. //! //! <b>Throws</b>: Nothing. - bool empty() const; - - #endif //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED + bool empty() const + { + if(ConstantTimeSize){ + return !this->data_type::sz_traits().get_size(); + } + else{ + return algo_type::unique(this->header_ptr()); + } + } //! <b>Effects</b>: Returns the number of elements stored in the container. //! @@ -796,8 +913,7 @@ void swap(bstree_impl& other) { //This can throw - using std::swap; - swap(this->comp(), this->comp()); + ::boost::adl_move_swap(this->comp(), this->comp()); //These can't throw node_algorithms::swap_tree(this->header_ptr(), node_ptr(other.header_ptr())); if(constant_time_size){ @@ -829,10 +945,45 @@ detail::exception_disposer<bstree_impl, Disposer> rollback(*this, disposer); node_algorithms::clone - (const_node_ptr(src.header_ptr()) - ,node_ptr(this->header_ptr()) - ,detail::node_cloner <Cloner, real_value_traits, AlgoType>(cloner, &this->get_real_value_traits()) - ,detail::node_disposer<Disposer, real_value_traits, AlgoType>(disposer, &this->get_real_value_traits())); + (src.header_ptr() + ,this->header_ptr() + ,detail::node_cloner <Cloner, value_traits, AlgoType>(cloner, &this->get_value_traits()) + ,detail::node_disposer<Disposer, value_traits, AlgoType>(disposer, &this->get_value_traits())); + this->sz_traits().set_size(src.sz_traits().get_size()); + this->comp() = src.comp(); + rollback.release(); + } + } + + //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. + //! Cloner should yield to nodes equivalent to the original nodes. + //! + //! <b>Effects</b>: Erases all the elements from *this + //! calling Disposer::operator()(pointer), clones all the + //! elements from src calling Cloner::operator()(const_reference ) + //! and inserts them on *this. Copies the predicate from the source container. + //! + //! If cloner throws, all cloned elements are unlinked and disposed + //! calling Disposer::operator()(pointer). + //! + //! <b>Complexity</b>: Linear to erased plus inserted elements. + //! + //! <b>Throws</b>: If cloner throws or predicate copy assignment throws. Basic guarantee. + //! + //! <b>Note</b>: This version can modify the source container, useful to implement + //! move semantics. + template <class Cloner, class Disposer> + void clone_from(bstree_impl &src, Cloner cloner, Disposer disposer) + { + this->clear_and_dispose(disposer); + if(!src.empty()){ + detail::exception_disposer<bstree_impl, Disposer> + rollback(*this, disposer); + node_algorithms::clone + (src.header_ptr() + ,this->header_ptr() + ,detail::node_cloner <Cloner, value_traits, AlgoType, false>(cloner, &this->get_value_traits()) + ,detail::node_disposer<Disposer, value_traits, AlgoType>(disposer, &this->get_value_traits())); this->sz_traits().set_size(src.sz_traits().get_size()); this->comp() = src.comp(); rollback.release(); @@ -852,13 +1003,13 @@ //! No copy-constructors are called. iterator insert_equal(reference value) { - detail::key_nodeptr_comp<value_compare, real_value_traits> - key_node_comp(this->comp(), &this->get_real_value_traits()); - node_ptr to_insert(this->get_real_value_traits().to_node_ptr(value)); + detail::key_nodeptr_comp<value_compare, value_traits> + key_node_comp(this->comp(), &this->get_value_traits()); + node_ptr to_insert(this->get_value_traits().to_node_ptr(value)); if(safemode_or_autounlink) BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(node_algorithms::unique(to_insert)); iterator ret(node_algorithms::insert_equal_upper_bound - (this->header_ptr(), to_insert, key_node_comp), this->real_value_traits_ptr()); + (this->header_ptr(), to_insert, key_node_comp), this->priv_value_traits_ptr()); this->sz_traits().increment(); return ret; } @@ -879,13 +1030,13 @@ //! No copy-constructors are called. iterator insert_equal(const_iterator hint, reference value) { - detail::key_nodeptr_comp<value_compare, real_value_traits> - key_node_comp(this->comp(), &this->get_real_value_traits()); - node_ptr to_insert(this->get_real_value_traits().to_node_ptr(value)); + detail::key_nodeptr_comp<value_compare, value_traits> + key_node_comp(this->comp(), &this->get_value_traits()); + node_ptr to_insert(this->get_value_traits().to_node_ptr(value)); if(safemode_or_autounlink) BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(node_algorithms::unique(to_insert)); iterator ret(node_algorithms::insert_equal - (this->header_ptr(), hint.pointed_node(), to_insert, key_node_comp), this->real_value_traits_ptr()); + (this->header_ptr(), hint.pointed_node(), to_insert, key_node_comp), this->priv_value_traits_ptr()); this->sz_traits().increment(); return ret; } @@ -1077,13 +1228,13 @@ //! erased between the "insert_check" and "insert_commit" calls. iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) { - node_ptr to_insert(this->get_real_value_traits().to_node_ptr(value)); + node_ptr to_insert(this->get_value_traits().to_node_ptr(value)); if(safemode_or_autounlink) BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(node_algorithms::unique(to_insert)); node_algorithms::insert_unique_commit (this->header_ptr(), to_insert, commit_data); this->sz_traits().increment(); - return iterator(to_insert, this->real_value_traits_ptr()); + return iterator(to_insert, this->priv_value_traits_ptr()); } //! <b>Requires</b>: value must be an lvalue, "pos" must be @@ -1102,12 +1253,12 @@ //! by advanced users. iterator insert_before(const_iterator pos, reference value) { - node_ptr to_insert(this->get_real_value_traits().to_node_ptr(value)); + node_ptr to_insert(this->get_value_traits().to_node_ptr(value)); if(safemode_or_autounlink) BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(node_algorithms::unique(to_insert)); this->sz_traits().increment(); return iterator(node_algorithms::insert_before - (this->header_ptr(), pos.pointed_node(), to_insert), this->real_value_traits_ptr()); + (this->header_ptr(), pos.pointed_node(), to_insert), this->priv_value_traits_ptr()); } //! <b>Requires</b>: value must be an lvalue, and it must be no less @@ -1126,7 +1277,7 @@ //! by advanced users. void push_back(reference value) { - node_ptr to_insert(this->get_real_value_traits().to_node_ptr(value)); + node_ptr to_insert(this->get_value_traits().to_node_ptr(value)); if(safemode_or_autounlink) BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(node_algorithms::unique(to_insert)); this->sz_traits().increment(); @@ -1149,14 +1300,14 @@ //! by advanced users. void push_front(reference value) { - node_ptr to_insert(this->get_real_value_traits().to_node_ptr(value)); + node_ptr to_insert(this->get_value_traits().to_node_ptr(value)); if(safemode_or_autounlink) BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(node_algorithms::unique(to_insert)); this->sz_traits().increment(); node_algorithms::push_front(this->header_ptr(), to_insert); } - //! <b>Effects</b>: Erases the element pointed to by pos. + //! <b>Effects</b>: Erases the element pointed to by i. //! //! <b>Complexity</b>: Average complexity for erase element is constant time. //! @@ -1229,7 +1380,7 @@ //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw. //! - //! <b>Effects</b>: Erases the element pointed to by pos. + //! <b>Effects</b>: Erases the element pointed to by i. //! Disposer::operator()(pointer) is called for the removed element. //! //! <b>Complexity</b>: Average complexity for erase element is constant time. @@ -1243,7 +1394,7 @@ { node_ptr to_erase(i.pointed_node()); iterator ret(this->erase(i)); - disposer(this->get_real_value_traits().to_value_ptr(to_erase)); + disposer(this->get_value_traits().to_value_ptr(to_erase)); return ret; } @@ -1351,36 +1502,59 @@ void clear_and_dispose(Disposer disposer) { node_algorithms::clear_and_dispose(this->header_ptr() - , detail::node_disposer<Disposer, real_value_traits, AlgoType>(disposer, &this->get_real_value_traits())); + , detail::node_disposer<Disposer, value_traits, AlgoType>(disposer, &this->get_value_traits())); node_algorithms::init_header(this->header_ptr()); this->sz_traits().set_size(0); } - #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) - //! <b>Effects</b>: Returns the number of contained elements with the given value //! //! <b>Complexity</b>: Logarithmic to the number of elements contained plus lineal //! to number of objects with the given value. //! - //! <b>Throws</b>: Nothing. - size_type count(const_reference value) const; + //! <b>Throws</b>: If `value_compare` throws. + size_type count(const_reference value) const + { return size_type(this->count(value, this->comp())); } //! <b>Effects</b>: Returns the number of contained elements with the given key //! //! <b>Complexity</b>: Logarithmic to the number of elements contained plus lineal //! to number of objects with the given key. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `comp` throws. template<class KeyType, class KeyValueCompare> - size_type count(const KeyType &key, KeyValueCompare comp) const; + size_type count(const KeyType &key, KeyValueCompare comp) const + { + std::pair<const_iterator, const_iterator> ret = this->equal_range(key, comp); + size_type n = 0; + for(; ret.first != ret.second; ++ret.first){ ++n; } + return n; + } + + #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) + + //Add non-const overloads to theoretically const members + //as some algorithms have different behavior when non-const versions are used (like splay trees). + size_type count(const_reference value) + { return size_type(this->count(value, this->comp())); } + + template<class KeyType, class KeyValueCompare> + size_type count(const KeyType &key, KeyValueCompare comp) + { + std::pair<const_iterator, const_iterator> ret = this->equal_range(key, comp); + size_type n = 0; + for(; ret.first != ret.second; ++ret.first){ ++n; } + return n; + } + + #else //defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) //! <b>Effects</b>: Returns an iterator to the first element whose //! key is not less than k or end() if that element does not exist. //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `value_compare` throws. iterator lower_bound(const_reference value); //! <b>Effects</b>: Returns an iterator to the first element whose @@ -1388,7 +1562,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `value_compare` throws. const_iterator lower_bound(const_reference value) const; //! <b>Effects</b>: Returns an iterator to the first element whose @@ -1396,16 +1570,16 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `comp` throws. template<class KeyType, class KeyValueCompare> iterator lower_bound(const KeyType &key, KeyValueCompare comp); - + //! <b>Effects</b>: Returns a const iterator to the first element whose //! key is not less than k or end() if that element does not exist. //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `comp` throws. template<class KeyType, class KeyValueCompare> const_iterator lower_bound(const KeyType &key, KeyValueCompare comp) const; @@ -1414,7 +1588,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `value_compare` throws. iterator upper_bound(const_reference value); //! <b>Effects</b>: Returns an iterator to the first element whose @@ -1423,7 +1597,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `comp` throws. template<class KeyType, class KeyValueCompare> iterator upper_bound(const KeyType &key, KeyValueCompare comp); @@ -1432,7 +1606,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `value_compare` throws. const_iterator upper_bound(const_reference value) const; //! <b>Effects</b>: Returns an iterator to the first element whose @@ -1441,7 +1615,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `comp` throws. template<class KeyType, class KeyValueCompare> const_iterator upper_bound(const KeyType &key, KeyValueCompare comp) const; @@ -1450,7 +1624,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `value_compare` throws. iterator find(const_reference value); //! <b>Effects</b>: Finds an iterator to the first element whose key is @@ -1458,7 +1632,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `comp` throws. template<class KeyType, class KeyValueCompare> iterator find(const KeyType &key, KeyValueCompare comp); @@ -1467,7 +1641,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `value_compare` throws. const_iterator find(const_reference value) const; //! <b>Effects</b>: Finds a const_iterator to the first element whose key is @@ -1475,7 +1649,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `comp` throws. template<class KeyType, class KeyValueCompare> const_iterator find(const KeyType &key, KeyValueCompare comp) const; @@ -1485,7 +1659,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `value_compare` throws. std::pair<iterator,iterator> equal_range(const_reference value); //! <b>Effects</b>: Finds a range containing all elements whose key is k or @@ -1494,7 +1668,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `comp` throws. template<class KeyType, class KeyValueCompare> std::pair<iterator,iterator> equal_range(const KeyType &key, KeyValueCompare comp); @@ -1504,7 +1678,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `value_compare` throws. std::pair<const_iterator, const_iterator> equal_range(const_reference value) const; @@ -1514,7 +1688,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: Nothing. + //! <b>Throws</b>: If `comp` throws. template<class KeyType, class KeyValueCompare> std::pair<const_iterator, const_iterator> equal_range(const KeyType &key, KeyValueCompare comp) const; @@ -1530,7 +1704,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: If the predicate throws. + //! <b>Throws</b>: If `value_compare` throws. //! //! <b>Note</b>: This function can be more efficient than calling upper_bound //! and lower_bound for lower_value and upper_value. @@ -1541,7 +1715,7 @@ //! <b>Requires</b>: KeyValueCompare is a function object that induces a strict weak //! ordering compatible with the strict weak ordering used to create the - //! the container. + //! the container. //! 'lower_key' must not be greater than 'upper_key' according to 'comp'. If //! 'lower_key' == 'upper_key', ('left_closed' || 'right_closed') must be false. //! @@ -1553,7 +1727,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: If "comp" throws. + //! <b>Throws</b>: If `comp` throws. //! //! <b>Note</b>: This function can be more efficient than calling upper_bound //! and lower_bound for lower_key and upper_key. @@ -1574,7 +1748,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: If the predicate throws. + //! <b>Throws</b>: If `value_compare` throws. //! //! <b>Note</b>: This function can be more efficient than calling upper_bound //! and lower_bound for lower_value and upper_value. @@ -1585,7 +1759,7 @@ //! <b>Requires</b>: KeyValueCompare is a function object that induces a strict weak //! ordering compatible with the strict weak ordering used to create the - //! the container. + //! the container. //! 'lower_key' must not be greater than 'upper_key' according to 'comp'. If //! 'lower_key' == 'upper_key', ('left_closed' || 'right_closed') must be false. //! @@ -1597,7 +1771,7 @@ //! //! <b>Complexity</b>: Logarithmic. //! - //! <b>Throws</b>: If "comp" throws. + //! <b>Throws</b>: If `comp` throws. //! //! <b>Note</b>: This function can be more efficient than calling upper_bound //! and lower_bound for lower_key and upper_key. @@ -1691,7 +1865,7 @@ this->sz_traits().decrement(); if(safemode_or_autounlink)//If this is commented does not work with normal_link node_algorithms::init(to_be_disposed); - return this->get_real_value_traits().to_value_ptr(to_be_disposed); + return this->get_value_traits().to_value_ptr(to_be_disposed); } #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) @@ -1753,6 +1927,35 @@ node_algorithms::init(to_remove); } + //! <b>Effects</b>: Asserts the integrity of the container with additional checks provided by the user. + //! + //! <b>Complexity</b>: Linear time. + //! + //! <b>Note</b>: The method might not have effect when asserts are turned off (e.g., with NDEBUG). + //! Experimental function, interface might change in future versions. + template <class ExtraChecker> + void check(ExtraChecker extra_checker) const + { + typedef detail::key_nodeptr_comp<value_compare, value_traits> nodeptr_comp_t; + nodeptr_comp_t nodeptr_comp(this->comp(), &this->get_value_traits()); + typedef typename get_node_checker<AlgoType, ValueTraits, nodeptr_comp_t, ExtraChecker>::type node_checker_t; + typename node_checker_t::return_type checker_return; + node_algorithms::check(this->header_ptr(), node_checker_t(nodeptr_comp, extra_checker), checker_return); + if (constant_time_size) + BOOST_INTRUSIVE_INVARIANT_ASSERT(this->sz_traits().get_size() == checker_return.node_count); + } + + //! <b>Effects</b>: Asserts the integrity of the container. + //! + //! <b>Complexity</b>: Linear time. + //! + //! <b>Note</b>: The method has no effect when asserts are turned off (e.g., with NDEBUG). + //! Experimental function, interface might change in future versions. + void check() const + { + check(detail::empty_node_checker<ValueTraits>()); + } + /// @cond private: template<class Disposer> @@ -1770,135 +1973,110 @@ return b.unconst(); } /// @endcond - - private: - static bstree_impl &priv_container_from_end_iterator(const const_iterator &end_iterator) - { - return *static_cast<bstree_impl*> - (boost::intrusive::detail::to_raw_pointer(end_iterator.pointed_node())); - } }; #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) template<class T, class ...Options> #else -template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType> +template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType, typename HeaderHolder> #endif inline bool operator< #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) (const bstree_impl<T, Options...> &x, const bstree_impl<T, Options...> &y) #else -( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &x -, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &y) +( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &x +, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &y) #endif -{ return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end()); } +{ return ::boost::intrusive::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end()); } #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) template<class T, class ...Options> #else -template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType> +template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType, typename HeaderHolder> #endif bool operator== #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) (const bstree_impl<T, Options...> &x, const bstree_impl<T, Options...> &y) #else -( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &x -, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &y) +( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &x +, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &y) #endif { - typedef bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> tree_type; - typedef typename tree_type::const_iterator const_iterator; + typedef bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> tree_type; if(tree_type::constant_time_size && x.size() != y.size()){ return false; } - const_iterator end1 = x.end(); - const_iterator i1 = x.begin(); - const_iterator i2 = y.begin(); - if(tree_type::constant_time_size){ - while (i1 != end1 && *i1 == *i2) { - ++i1; - ++i2; - } - return i1 == end1; - } - else{ - const_iterator end2 = y.end(); - while (i1 != end1 && i2 != end2 && *i1 == *i2) { - ++i1; - ++i2; - } - return i1 == end1 && i2 == end2; - } + return boost::intrusive::algo_equal(x.cbegin(), x.cend(), y.cbegin(), y.cend()); } #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) template<class T, class ...Options> #else -template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType> +template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType, typename HeaderHolder> #endif inline bool operator!= #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) (const bstree_impl<T, Options...> &x, const bstree_impl<T, Options...> &y) #else -( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &x -, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &y) +( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &x +, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &y) #endif { return !(x == y); } #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) template<class T, class ...Options> #else -template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType> +template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType, typename HeaderHolder> #endif inline bool operator> #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) (const bstree_impl<T, Options...> &x, const bstree_impl<T, Options...> &y) #else -( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &x -, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &y) +( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &x +, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &y) #endif { return y < x; } #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) template<class T, class ...Options> #else -template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType> +template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType, typename HeaderHolder> #endif inline bool operator<= #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) (const bstree_impl<T, Options...> &x, const bstree_impl<T, Options...> &y) #else -( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &x -, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &y) +( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &x +, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &y) #endif { return !(y < x); } #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) template<class T, class ...Options> #else -template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType> +template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType, typename HeaderHolder> #endif inline bool operator>= #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) (const bstree_impl<T, Options...> &x, const bstree_impl<T, Options...> &y) #else -( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &x -, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &y) +( const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &x +, const bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &y) #endif { return !(x < y); } #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) template<class T, class ...Options> #else -template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType> +template<class ValueTraits, class VoidKeyComp, class SizeType, bool ConstantTimeSize, algo_types AlgoType, typename HeaderHolder> #endif inline void swap #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) (bstree_impl<T, Options...> &x, bstree_impl<T, Options...> &y) #else -( bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &x -, bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType> &y) +( bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &x +, bstree_impl<ValueTraits, VoidKeyComp, SizeType, ConstantTimeSize, AlgoType, HeaderHolder> &y) #endif { x.swap(y); } @@ -1908,7 +2086,8 @@ template<class T, class ...Options> #else template<class T, class O1 = void, class O2 = void - , class O3 = void, class O4 = void> + , class O3 = void, class O4 = void + , class O5 = void> #endif struct make_bstree { @@ -1916,7 +2095,7 @@ typedef typename pack_options < bstree_defaults, #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) - O1, O2, O3, O4 + O1, O2, O3, O4, O5 #else Options... #endif @@ -1931,6 +2110,7 @@ , typename packed_options::size_type , packed_options::constant_time_size , BsTreeAlgorithms + , typename packed_options::header_holder_type > implementation_defined; /// @endcond typedef implementation_defined type; @@ -1940,14 +2120,14 @@ #ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) -template<class T, class O1, class O2, class O3, class O4> +template<class T, class O1, class O2, class O3, class O4, class O5> #else template<class T, class ...Options> #endif class bstree : public make_bstree<T, #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) - O1, O2, O3, O4 + O1, O2, O3, O4, O5 #else Options... #endif @@ -1956,7 +2136,7 @@ typedef typename make_bstree <T, #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) - O1, O2, O3, O4 + O1, O2, O3, O4, O5 #else Options... #endif @@ -1966,12 +2146,11 @@ public: typedef typename Base::value_compare value_compare; typedef typename Base::value_traits value_traits; - typedef typename Base::real_value_traits real_value_traits; typedef typename Base::iterator iterator; typedef typename Base::const_iterator const_iterator; //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 value_traits::value_type, T>::value)); bstree( const value_compare &cmp = value_compare() , const value_traits &v_traits = value_traits()) @@ -1986,11 +2165,11 @@ {} bstree(BOOST_RV_REF(bstree) x) - : Base(::boost::move(static_cast<Base&>(x))) + : Base(BOOST_MOVE_BASE(Base, x)) {} bstree& operator=(BOOST_RV_REF(bstree) x) - { return static_cast<bstree &>(this->Base::operator=(::boost::move(static_cast<Base&>(x)))); } + { return static_cast<bstree &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x))); } static bstree &container_from_end_iterator(iterator end_iterator) { return static_cast<bstree &>(Base::container_from_end_iterator(end_iterator)); }