passenger 5.0.24 → 5.0.25

data/src/cxx_supportlib/vendor-modified/boost/intrusive/treap.hpp

@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// (C) Copyright Ion Gaztanaga 2008-2012
+// (C) Copyright Ion Gaztanaga 2008-2013
 //
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -13,61 +13,50 @@
 #define BOOST_INTRUSIVE_TREAP_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/bs_set_hook.hpp>
+#include <boost/intrusive/bstree.hpp>
 #include <boost/intrusive/detail/tree_node.hpp>
 #include <boost/intrusive/detail/ebo_functor_holder.hpp>
 #include <boost/intrusive/pointer_traits.hpp>
-#include <boost/intrusive/detail/clear_on_destructor_base.hpp>
-#include <boost/intrusive/detail/utilities.hpp>
-#include <boost/intrusive/pointer_traits.hpp>
-#include <boost/intrusive/options.hpp>
+#include <boost/intrusive/detail/get_value_traits.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/intrusive/treap_algorithms.hpp>
 #include <boost/intrusive/link_mode.hpp>
-#include <boost/move/move.hpp>
 #include <boost/intrusive/priority_compare.hpp>
+#include <boost/intrusive/detail/node_cloner_disposer.hpp>
+#include <boost/intrusive/detail/key_nodeptr_comp.hpp>
+
+#include <boost/static_assert.hpp>
+#include <boost/move/utility_core.hpp>
+#include <boost/move/adl_move_swap.hpp>
+
+#include <cstddef>
+#include <boost/intrusive/detail/minimal_less_equal_header.hpp>
+#include <boost/intrusive/detail/minimal_pair_header.hpp>   //std::pair
+
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#  pragma once
+#endif
 
 namespace boost {
 namespace intrusive {
 
 /// @cond
 
-template <class ValueTraits, class Compare, class PrioCompare, class SizeType, bool ConstantTimeSize>
-struct treap_setopt
+struct treap_defaults
+   : bstree_defaults
 {
-   typedef ValueTraits  value_traits;
-   typedef Compare      compare;
-   typedef PrioCompare  priority_compare;
-   typedef SizeType     size_type;
-   static const bool constant_time_size = ConstantTimeSize;
+   typedef void priority;
 };
 
-template <class T>
-struct treap_set_defaults
-   :  pack_options
-      < none
-      , base_hook<detail::default_bs_set_hook>
-      , constant_time_size<true>
-      , size_type<std::size_t>
-      , compare<std::less<T> >
-      , priority<boost::intrusive::priority_compare<T> >
-      >::type
-{};
-
 /// @endcond
 
 //! The class template treap is an intrusive treap container that
 //! is used to construct intrusive set and multiset containers. The no-throw
-//! guarantee holds only, if the value_compare object and priority_compare object
+//! guarantee holds only, if the key_compare object and priority_compare object
 //! don't throw.
 //!
 //! The template parameter \c T is the type to be managed by the container.
@@ -81,170 +70,105 @@ struct treap_set_defaults
 #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
 template<class T, class ...Options>
 #else
-template<class Config>
+template<class ValueTraits, class VoidOrKeyOfValue, class VoidOrKeyComp, class VoidOrPrioComp, class SizeType, bool ConstantTimeSize, typename HeaderHolder>
 #endif
 class treap_impl
-   :  private detail::clear_on_destructor_base<treap_impl<Config> >
+   /// @cond
+   : public bstree_impl<ValueTraits, VoidOrKeyOfValue, VoidOrKeyComp, SizeType, ConstantTimeSize, BsTreeAlgorithms, HeaderHolder>
+   //Use public inheritance to avoid MSVC bugs with closures
+   , public detail::ebo_functor_holder
+         < typename get_prio
+            < VoidOrPrioComp
+            , typename bstree_impl
+               <ValueTraits, VoidOrKeyOfValue, VoidOrKeyComp, SizeType, ConstantTimeSize, BsTreeAlgorithms, HeaderHolder>::value_type>::type
+         >
+   /// @endcond
 {
-   template<class C> friend class detail::clear_on_destructor_base;
    public:
-   typedef typename Config::value_traits                             value_traits;
+   typedef ValueTraits                                               value_traits;
    /// @cond
-   static const bool external_value_traits =
-      detail::external_value_traits_bool_is_true<value_traits>::value;
-   typedef typename detail::eval_if_c
-      < external_value_traits
-      , detail::eval_value_traits<value_traits>
-      , detail::identity<value_traits>
-      >::type                                                        real_value_traits;
+   typedef bstree_impl< ValueTraits, VoidOrKeyOfValue, VoidOrKeyComp, SizeType
+                      , ConstantTimeSize, BsTreeAlgorithms
+                      , HeaderHolder>                                tree_type;
+   typedef tree_type                                                 implementation_defined;
+   typedef get_prio
+               < VoidOrPrioComp
+               , typename tree_type::value_type>                     get_prio_type;
+
+   typedef detail::ebo_functor_holder
+      <typename get_prio_type::type>                                 prio_base;
+
    /// @endcond
-   typedef typename real_value_traits::pointer                       pointer;
-   typedef typename real_value_traits::const_pointer                 const_pointer;
-   typedef typename pointer_traits<pointer>::element_type            value_type;
-   typedef typename pointer_traits<pointer>::reference               reference;
-   typedef typename pointer_traits<const_pointer>::reference         const_reference;
-   typedef typename pointer_traits<pointer>::difference_type         difference_type;
-   typedef value_type                                                key_type;
-   typedef typename Config::size_type                                size_type;
-   typedef typename Config::compare                                  value_compare;
-   typedef typename Config::priority_compare                         priority_compare;
-   typedef value_compare                                             key_compare;
-   typedef tree_iterator<treap_impl, false>                          iterator;
-   typedef tree_iterator<treap_impl, true>                           const_iterator;
-   typedef boost::intrusive::detail::reverse_iterator<iterator>      reverse_iterator;
-   typedef boost::intrusive::detail::reverse_iterator<const_iterator>const_reverse_iterator;
-   typedef typename real_value_traits::node_traits                   node_traits;
-   typedef typename node_traits::node                                node;
-   typedef typename pointer_traits
-      <pointer>::template rebind_pointer
-         <node>::type                                                node_ptr;
-   typedef typename pointer_traits
-      <pointer>::template rebind_pointer
-         <const node>::type                                          const_node_ptr;
-   typedef treap_algorithms<node_traits>                             node_algorithms;
-
-   static const bool constant_time_size = Config::constant_time_size;
-   static const bool stateful_value_traits = detail::is_stateful_value_traits<real_value_traits>::value;
+
+   typedef typename implementation_defined::pointer                  pointer;
+   typedef typename implementation_defined::const_pointer            const_pointer;
+   typedef typename implementation_defined::value_type               value_type;
+   typedef typename implementation_defined::key_type                 key_type;
+   typedef typename implementation_defined::key_of_value             key_of_value;
+   typedef typename implementation_defined::reference                reference;
+   typedef typename implementation_defined::const_reference          const_reference;
+   typedef typename implementation_defined::difference_type          difference_type;
+   typedef typename implementation_defined::size_type                size_type;
+   typedef typename implementation_defined::value_compare            value_compare;
+   typedef typename implementation_defined::key_compare              key_compare;
+   typedef typename implementation_defined::iterator                 iterator;
+   typedef typename implementation_defined::const_iterator           const_iterator;
+   typedef typename implementation_defined::reverse_iterator         reverse_iterator;
+   typedef typename implementation_defined::const_reverse_iterator   const_reverse_iterator;
+   typedef typename implementation_defined::node_traits              node_traits;
+   typedef typename implementation_defined::node                     node;
+   typedef typename implementation_defined::node_ptr                 node_ptr;
+   typedef typename implementation_defined::const_node_ptr           const_node_ptr;
+   typedef BOOST_INTRUSIVE_IMPDEF(treap_algorithms<node_traits>)     node_algorithms;
+   typedef BOOST_INTRUSIVE_IMPDEF(typename get_prio_type::type)      priority_compare;
+
+   static const bool constant_time_size      = implementation_defined::constant_time_size;
+   static const bool stateful_value_traits   = implementation_defined::stateful_value_traits;
+   static const bool safemode_or_autounlink = is_safe_autounlink<value_traits::link_mode>::value;
+
+   typedef detail::key_nodeptr_comp<priority_compare, value_traits> value_node_prio_comp_t;
+
+   template<class KeyPrioComp>
+   detail::key_nodeptr_comp<KeyPrioComp, value_traits> key_node_prio_comp(KeyPrioComp keypriocomp) const
+   {  return detail::key_nodeptr_comp<KeyPrioComp, value_traits>(keypriocomp, &this->get_value_traits());  }
+
+   value_node_prio_comp_t value_node_prio_comp() const
+   {  return this->key_node_prio_comp(this->priv_pcomp()); }
 
    /// @cond
    private:
-   typedef detail::size_holder<constant_time_size, size_type>        size_traits;
 
    //noncopyable
    BOOST_MOVABLE_BUT_NOT_COPYABLE(treap_impl)
 
-   enum { safemode_or_autounlink  =
-            (int)real_value_traits::link_mode == (int)auto_unlink   ||
-            (int)real_value_traits::link_mode == (int)safe_link     };
-
-   //Constant-time size is incompatible with auto-unlink hooks!
-   BOOST_STATIC_ASSERT(!(constant_time_size && ((int)real_value_traits::link_mode == (int)auto_unlink)));
-
-   struct header_plus_size : public size_traits
-   {  node header_;  };
-
-   struct node_plus_pred_t : public detail::ebo_functor_holder<value_compare>
-   {
-      node_plus_pred_t(const value_compare &comp, const priority_compare &p_comp)
-         :  detail::ebo_functor_holder<value_compare>(comp)
-         ,  header_plus_priority_size_(p_comp)
-      {}
-      struct header_plus_priority_size
-         : public detail::ebo_functor_holder<priority_compare>
-      {
-         header_plus_priority_size(const priority_compare &p_comp)
-            :  detail::ebo_functor_holder<priority_compare>(p_comp)
-         {}
-         header_plus_size header_plus_size_;
-      }  header_plus_priority_size_;
-   };
-
-   struct data_t : public treap_impl::value_traits
-   {
-      typedef typename treap_impl::value_traits value_traits;
-      data_t(const value_compare & comp, const priority_compare &pcomp, const value_traits &val_traits)
-         :  value_traits(val_traits), node_plus_pred_(comp, pcomp)
-      {}
-      node_plus_pred_t node_plus_pred_;
-   } data_;
-
-   const value_compare &priv_comp() const
-   {  return data_.node_plus_pred_.get();  }
-
-   value_compare &priv_comp()
-   {  return data_.node_plus_pred_.get();  }
-
    const priority_compare &priv_pcomp() const
-   {  return data_.node_plus_pred_.header_plus_priority_size_.get();  }
+   {  return static_cast<const prio_base&>(*this).get();  }
 
    priority_compare &priv_pcomp()
-   {  return data_.node_plus_pred_.header_plus_priority_size_.get();  }
-
-   const value_traits &priv_value_traits() const
-   {  return data_;  }
-
-   value_traits &priv_value_traits()
-   {  return data_;  }
-
-   node_ptr priv_header_ptr()
-   {  return pointer_traits<node_ptr>::pointer_to(data_.node_plus_pred_.header_plus_priority_size_.header_plus_size_.header_);  }
-
-   const_node_ptr priv_header_ptr() const
-   {  return pointer_traits<const_node_ptr>::pointer_to(data_.node_plus_pred_.header_plus_priority_size_.header_plus_size_.header_);  }
-
-   static node_ptr uncast(const const_node_ptr & ptr)
-   {  return pointer_traits<node_ptr>::const_cast_from(ptr);  }
-
-   size_traits &priv_size_traits()
-   {  return data_.node_plus_pred_.header_plus_priority_size_.header_plus_size_;  }
-
-   const size_traits &priv_size_traits() const
-   {  return data_.node_plus_pred_.header_plus_priority_size_.header_plus_size_;  }
-
-   const real_value_traits &get_real_value_traits(detail::bool_<false>) const
-   {  return data_;  }
-
-   const real_value_traits &get_real_value_traits(detail::bool_<true>) const
-   {  return data_.get_value_traits(*this);  }
-
-   real_value_traits &get_real_value_traits(detail::bool_<false>)
-   {  return data_;  }
-
-   real_value_traits &get_real_value_traits(detail::bool_<true>)
-   {  return data_.get_value_traits(*this);  }
+   {  return static_cast<prio_base&>(*this).get();  }
 
    /// @endcond
 
    public:
-
-   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 node_algorithms::insert_commit_data insert_commit_data;
 
-   //! <b>Effects</b>: Constructs an empty treap.
+   //! <b>Effects</b>: Constructs an empty container.
    //!
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Throws</b>: If value_traits::node_traits::node
    //!   constructor throws (this does not happen with predefined Boost.Intrusive hooks)
    //!   or the copy constructor of the value_compare/priority_compare objects throw. Basic guarantee.
-   explicit treap_impl( const value_compare &cmp    = value_compare()
+   explicit treap_impl( const key_compare &cmp    = key_compare()
                       , const priority_compare &pcmp = priority_compare()
                       , const value_traits &v_traits = value_traits())
-      :  data_(cmp, pcmp, v_traits)
-   {
-      node_algorithms::init_header(this->priv_header_ptr());
-      this->priv_size_traits().set_size(size_type(0));
-   }
+      : tree_type(cmp, v_traits), prio_base(pcmp)
+   {}
 
    //! <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.
    //!
-   //! <b>Effects</b>: Constructs an empty treap and inserts elements from
+   //! <b>Effects</b>: Constructs an empty container and inserts elements from
    //!   [b, e).
    //!
    //! <b>Complexity</b>: Linear in N if [b, e) is already sorted using
@@ -252,99 +176,53 @@ class treap_impl
    //!
    //! <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/priority_compare objects
+   //!   or the copy constructor/operator() of the key_compare/priority_compare objects
    //!   throw. Basic guarantee.
    template<class Iterator>
    treap_impl( bool unique, Iterator b, Iterator e
-            , const value_compare &cmp     = value_compare()
+            , const key_compare &cmp     = key_compare()
             , const priority_compare &pcmp = priority_compare()
             , const value_traits &v_traits = value_traits())
-      : data_(cmp, pcmp, v_traits)
+      : tree_type(cmp, v_traits), prio_base(pcmp)
    {
-      node_algorithms::init_header(this->priv_header_ptr());
-      this->priv_size_traits().set_size(size_type(0));
       if(unique)
          this->insert_unique(b, e);
       else
          this->insert_equal(b, e);
    }
 
-   //! <b>Effects</b>: to-do
-   //!
+   //! @copydoc ::boost::intrusive::bstree::bstree(bstree &&)
    treap_impl(BOOST_RV_REF(treap_impl) x)
-      : data_( ::boost::move(x.priv_comp())
-             , ::boost::move(x.priv_pcomp())
-             , ::boost::move(x.priv_value_traits()))
-   {
-      node_algorithms::init_header(this->priv_header_ptr());
-      this->priv_size_traits().set_size(size_type(0));
-      this->swap(x);
-   }
+      : tree_type(BOOST_MOVE_BASE(tree_type, x))
+      , prio_base(::boost::move(x.priv_pcomp()))
+   {}
 
-   //! <b>Effects</b>: to-do
-   //!
+   //! @copydoc ::boost::intrusive::bstree::operator=(bstree &&)
    treap_impl& operator=(BOOST_RV_REF(treap_impl) x)
    {  this->swap(x); return *this;  }
 
-   //! <b>Effects</b>: Detaches all elements from this. The objects in the set
-   //!   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.
-   //!
-   //! <b>Complexity</b>: Linear to elements contained in *this
-   //!   if constant-time size option is disabled. Constant time otherwise.
-   //!
-   //! <b>Throws</b>: Nothing.
-   ~treap_impl()
-   {}
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   //! @copydoc ::boost::intrusive::bstree::~bstree()
+   ~treap_impl();
 
-   //! <b>Effects</b>: Returns an iterator pointing to the beginning of the treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator begin()
-   {  return iterator (node_traits::get_left(this->priv_header_ptr()), this);   }
+   //! @copydoc ::boost::intrusive::bstree::begin()
+   iterator begin();
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the beginning of the treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator begin() const
-   {  return this->cbegin();   }
+   //! @copydoc ::boost::intrusive::bstree::begin()const
+   const_iterator begin() const;
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the beginning of the treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator cbegin() const
-   {  return const_iterator (node_traits::get_left(this->priv_header_ptr()), this);   }
+   //! @copydoc ::boost::intrusive::bstree::cbegin()const
+   const_iterator cbegin() const;
 
-   //! <b>Effects</b>: Returns an iterator pointing to the end of the treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator end()
-   {  return iterator (this->priv_header_ptr(), this);  }
+   //! @copydoc ::boost::intrusive::bstree::end()
+   iterator end();
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the end of the treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator end() const
-   {  return this->cend();  }
-
-   //! <b>Effects</b>: Returns a const_iterator pointing to the end of the treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator cend() const
-   {  return const_iterator (uncast(this->priv_header_ptr()), this);  }
+   //! @copydoc ::boost::intrusive::bstree::end()const
+   const_iterator end() const;
 
+   //! @copydoc ::boost::intrusive::bstree::cend()const
+   const_iterator cend() const;
+   #endif
 
    //! <b>Effects</b>: Returns an iterator pointing to the highest priority object of the treap.
    //!
@@ -352,7 +230,7 @@ class treap_impl
    //!
    //! <b>Throws</b>: Nothing.
    iterator top()
-   {  return this->empty() ? this->end() : iterator (node_traits::get_parent(this->priv_header_ptr()), this);   }
+   {  return this->tree_type::root();   }
 
    //! <b>Effects</b>: Returns a const_iterator pointing to the highest priority object of the treap..
    //!
@@ -368,61 +246,27 @@ class treap_impl
    //!
    //! <b>Throws</b>: Nothing.
    const_iterator ctop() const
-   {  return this->empty() ? this->cend() : const_iterator (node_traits::get_parent(this->priv_header_ptr()), this);   }
+   {  return this->tree_type::root();   }
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning of the
-   //!    reversed treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   reverse_iterator rbegin()
-   {  return reverse_iterator(this->end());  }
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   //! @copydoc ::boost::intrusive::bstree::rbegin()
+   reverse_iterator rbegin();
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
-   //!    of the reversed treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator rbegin() const
-   {  return const_reverse_iterator(this->end());  }
+   //! @copydoc ::boost::intrusive::bstree::rbegin()const
+   const_reverse_iterator rbegin() const;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
-   //!    of the reversed treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator crbegin() const
-   {  return const_reverse_iterator(this->end());  }
+   //! @copydoc ::boost::intrusive::bstree::crbegin()const
+   const_reverse_iterator crbegin() const;
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
-   //!    of the reversed treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   reverse_iterator rend()
-   {  return reverse_iterator(this->begin());   }
+   //! @copydoc ::boost::intrusive::bstree::rend()
+   reverse_iterator rend();
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
-   //!    of the reversed treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator rend() const
-   {  return const_reverse_iterator(this->begin());   }
+   //! @copydoc ::boost::intrusive::bstree::rend()const
+   const_reverse_iterator rend() const;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
-   //!    of the reversed treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator crend() const
-   {  return const_reverse_iterator(this->begin());   }
+   //! @copydoc ::boost::intrusive::bstree::crend()const
+   const_reverse_iterator crend() const;
+   #endif
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the highest priority object of the
    //!    reversed treap.
@@ -451,59 +295,33 @@ class treap_impl
    const_reverse_iterator crtop() const
    {  return const_reverse_iterator(this->top());  }
 
-   //! <b>Precondition</b>: end_iterator must be a valid end iterator
-   //!   of treap.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the treap associated to the end iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   static treap_impl &container_from_end_iterator(iterator end_iterator)
-   {  return priv_container_from_end_iterator(end_iterator);   }
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   //! @copydoc ::boost::intrusive::bstree::container_from_end_iterator(iterator)
+   static treap_impl &container_from_end_iterator(iterator end_iterator);
 
-   //! <b>Precondition</b>: end_iterator must be a valid end const_iterator
-   //!   of treap.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the treap associated to the iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   static const treap_impl &container_from_end_iterator(const_iterator end_iterator)
-   {  return priv_container_from_end_iterator(end_iterator);   }
+   //! @copydoc ::boost::intrusive::bstree::container_from_end_iterator(const_iterator)
+   static const treap_impl &container_from_end_iterator(const_iterator end_iterator);
 
-   //! <b>Precondition</b>: it must be a valid iterator
-   //!   of treap.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the treap associated to the iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   static treap_impl &container_from_iterator(iterator it)
-   {  return priv_container_from_iterator(it);   }
+   //! @copydoc ::boost::intrusive::bstree::container_from_iterator(iterator)
+   static treap_impl &container_from_iterator(iterator it);
 
-   //! <b>Precondition</b>: it must be a valid end const_iterator
-   //!   of treap.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the treap associated to the end iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   static const treap_impl &container_from_iterator(const_iterator it)
-   {  return priv_container_from_iterator(it);   }
+   //! @copydoc ::boost::intrusive::bstree::container_from_iterator(const_iterator)
+   static const treap_impl &container_from_iterator(const_iterator it);
 
-   //! <b>Effects</b>: Returns the value_compare object used by the treap.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: If value_compare copy-constructor throws.
-   value_compare value_comp() const
-   {  return this->priv_comp();   }
+   //! @copydoc ::boost::intrusive::bstree::key_comp()const
+   key_compare key_comp() const;
 
-   //! <b>Effects</b>: Returns the priority_compare object used by the treap.
+   //! @copydoc ::boost::intrusive::bstree::value_comp()const
+   value_compare value_comp() const;
+
+   //! @copydoc ::boost::intrusive::bstree::empty()const
+   bool empty() const;
+
+   //! @copydoc ::boost::intrusive::bstree::size()const
+   size_type size() const;
+   #endif   //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+
+   //! <b>Effects</b>: Returns the priority_compare object used by the container.
    //!
    //! <b>Complexity</b>: Constant.
    //!
@@ -511,115 +329,127 @@ class treap_impl
    priority_compare priority_comp() const
    {  return this->priv_pcomp();   }
 
-   //! <b>Effects</b>: Returns true if the container is empty.
+   //! <b>Effects</b>: Swaps the contents of two treaps.
    //!
    //! <b>Complexity</b>: Constant.
    //!
-   //! <b>Throws</b>: Nothing.
-   bool empty() const
-   {  return node_algorithms::unique(this->priv_header_ptr());   }
+   //! <b>Throws</b>: If the comparison functor's swap call throws.
+   void swap(treap_impl& other)
+   {
+      tree_type::swap(other);
+      //This can throw
+      ::boost::adl_move_swap(this->priv_pcomp(), other.priv_pcomp());
+   }
 
-   //! <b>Effects</b>: Returns the number of elements stored in the treap.
+   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
+   //!   Cloner should yield to nodes equivalent to the original nodes.
    //!
-   //! <b>Complexity</b>: Linear to elements contained in *this
-   //!   if constant-time size option is disabled. Constant time otherwise.
+   //! <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.
    //!
-   //! <b>Throws</b>: Nothing.
-   size_type size() const
+   //!   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.
+   template <class Cloner, class Disposer>
+   void clone_from(const treap_impl &src, Cloner cloner, Disposer disposer)
    {
-      if(constant_time_size)
-         return this->priv_size_traits().get_size();
-      else{
-         return (size_type)node_algorithms::size(this->priv_header_ptr());
-      }
+      tree_type::clone_from(src, cloner, disposer);
+      this->priv_pcomp() = src.priv_pcomp();
    }
 
-   //! <b>Effects</b>: Swaps the contents of two treaps.
+   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
+   //!   Cloner should yield to nodes equivalent to the original nodes.
    //!
-   //! <b>Complexity</b>: Constant.
+   //! <b>Effects</b>: Erases all the elements from *this
+   //!   calling Disposer::operator()(pointer), clones all the
+   //!   elements from src calling Cloner::operator()(reference)
+   //!   and inserts them on *this. Copies the predicate from the source container.
    //!
-   //! <b>Throws</b>: If the comparison functor's swap call throws.
-   void swap(treap_impl& other)
+   //!   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.
+   template <class Cloner, class Disposer>
+   void clone_from(BOOST_RV_REF(treap_impl) src, Cloner cloner, Disposer disposer)
    {
-      //This can throw
-      using std::swap;
-      swap(priv_comp(), priv_comp());
-      swap(priv_pcomp(), priv_pcomp());
-      //These can't throw
-      node_algorithms::swap_tree(this->priv_header_ptr(), other.priv_header_ptr());
-      if(constant_time_size){
-         size_type backup = this->priv_size_traits().get_size();
-         this->priv_size_traits().set_size(other.priv_size_traits().get_size());
-         other.priv_size_traits().set_size(backup);
-      }
+      tree_type::clone_from(BOOST_MOVE_BASE(tree_type, src), cloner, disposer);
+      this->priv_pcomp() = ::boost::move(src.priv_pcomp());
    }
 
    //! <b>Requires</b>: value must be an lvalue
    //!
-   //! <b>Effects</b>: Inserts value into the treap before the upper bound.
+   //! <b>Effects</b>: Inserts value into the container before the upper bound.
    //!
    //! <b>Complexity</b>: Average complexity for insert element is at
    //!   most logarithmic.
    //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare functions throw. Strong guarantee.
+   //! <b>Throws</b>: If the internal key_compare or priority_compare functions throw. Strong guarantee.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
    //!   No copy-constructors are called.
    iterator insert_equal(reference value)
    {
-      detail::key_nodeptr_comp<value_compare, treap_impl>
-         key_node_comp(priv_comp(), this);
-      detail::key_nodeptr_comp<priority_compare, treap_impl>
-         key_node_pcomp(priv_pcomp(), this);
-      node_ptr to_insert(get_real_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->priv_header_ptr(), to_insert, key_node_comp, key_node_pcomp), this);
-      this->priv_size_traits().increment();
+      node_ptr to_insert(this->get_value_traits().to_node_ptr(value));
+      BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || node_algorithms::unique(to_insert));
+      iterator ret
+         ( node_algorithms::insert_equal_upper_bound
+            ( this->tree_type::header_ptr()
+            , to_insert
+            , this->key_node_comp(this->key_comp())
+            , this->value_node_prio_comp())
+         , this->priv_value_traits_ptr());
+      this->tree_type::sz_traits().increment();
       return ret;
    }
 
    //! <b>Requires</b>: value must be an lvalue, and "hint" must be
    //!   a valid iterator.
    //!
-   //! <b>Effects</b>: Inserts x into the treap, using "hint" as a hint to
+   //! <b>Effects</b>: Inserts x into the container, 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 t is inserted immediately before hint.
    //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare functions throw. Strong guarantee.
+   //! <b>Throws</b>: If the internal key_compare or priority_compare functions throw. Strong guarantee.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
    //!   No copy-constructors are called.
    iterator insert_equal(const_iterator hint, reference value)
    {
-      detail::key_nodeptr_comp<value_compare, treap_impl>
-         key_node_comp(priv_comp(), this);
-      detail::key_nodeptr_comp<priority_compare, treap_impl>
-         key_node_pcomp(priv_pcomp(), this);
-      node_ptr to_insert(get_real_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->priv_header_ptr(), hint.pointed_node(), to_insert, key_node_comp, key_node_pcomp), this);
-      this->priv_size_traits().increment();
+      node_ptr to_insert(this->get_value_traits().to_node_ptr(value));
+      BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || node_algorithms::unique(to_insert));
+      iterator ret
+         (node_algorithms::insert_equal
+            ( this->tree_type::header_ptr()
+            , hint.pointed_node()
+            , to_insert
+            , this->key_node_comp(this->key_comp())
+            , this->value_node_prio_comp())
+         , this->priv_value_traits_ptr());
+      this->tree_type::sz_traits().increment();
       return ret;
    }
 
    //! <b>Requires</b>: Dereferencing iterator must yield an lvalue
    //!   of type value_type.
    //!
-   //! <b>Effects</b>: Inserts a each element of a range into the treap
+   //! <b>Effects</b>: Inserts a each element of a range into the container
    //!   before the upper bound of the key of each element.
    //!
    //! <b>Complexity</b>: Insert range is in general O(N * log(N)), where N is the
    //!   size of the range. However, it is linear in N if the range is already sorted
-   //!   by value_comp().
+   //!   by key_comp().
    //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare functions throw.
+   //! <b>Throws</b>: If the internal key_compare or priority_compare functions throw.
    //!   Strong guarantee.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
@@ -634,13 +464,13 @@ class treap_impl
 
    //! <b>Requires</b>: value must be an lvalue
    //!
-   //! <b>Effects</b>: Inserts value into the treap if the value
+   //! <b>Effects</b>: Inserts value into the container if the value
    //!   is not already present.
    //!
    //! <b>Complexity</b>: Average complexity for insert element is at
    //!   most logarithmic.
    //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare functions throw.
+   //! <b>Throws</b>: If the internal key_compare or priority_compare functions throw.
    //!   Strong guarantee.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
@@ -648,23 +478,24 @@ class treap_impl
    std::pair<iterator, bool> insert_unique(reference value)
    {
       insert_commit_data commit_data;
-      std::pair<iterator, bool> ret = insert_unique_check(value, priv_comp(), priv_pcomp(), commit_data);
+      std::pair<iterator, bool> ret = this->insert_unique_check
+         (value, this->comp(), this->priv_pcomp(), commit_data);
       if(!ret.second)
          return ret;
-      return std::pair<iterator, bool> (insert_unique_commit(value, commit_data), true);
+      return std::pair<iterator, bool> (this->insert_unique_commit(value, commit_data), true);
    }
 
    //! <b>Requires</b>: value must be an lvalue, and "hint" must be
    //!   a valid iterator
    //!
-   //! <b>Effects</b>: Tries to insert x into the treap, using "hint" as a hint
+   //! <b>Effects</b>: Tries to insert x into the container, using "hint" as a hint
    //!   to where it will be inserted.
    //!
    //! <b>Complexity</b>: Logarithmic in general, but it is amortized
    //!   constant time (two comparisons in the worst case)
    //!   if t is inserted immediately before hint.
    //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare functions throw.
+   //! <b>Throws</b>: If the internal key_compare or priority_compare functions throw.
    //!   Strong guarantee.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
@@ -672,22 +503,23 @@ class treap_impl
    iterator insert_unique(const_iterator hint, reference value)
    {
       insert_commit_data commit_data;
-      std::pair<iterator, bool> ret = insert_unique_check(hint, value, priv_comp(), priv_pcomp(), commit_data);
+      std::pair<iterator, bool> ret = this->insert_unique_check
+         (hint, value, this->comp(), this->priv_pcomp(), commit_data);
       if(!ret.second)
          return ret.first;
-      return insert_unique_commit(value, commit_data);
+      return this->insert_unique_commit(value, commit_data);
    }
 
    //! <b>Requires</b>: Dereferencing iterator must yield an lvalue
    //!   of type value_type.
    //!
-   //! <b>Effects</b>: Tries to insert each element of a range into the treap.
+   //! <b>Effects</b>: Tries to insert each element of a range into the container.
    //!
    //! <b>Complexity</b>: Insert range is in general O(N * log(N)), where N is the
    //!   size of the range. However, it is linear in N if the range is already sorted
-   //!   by value_comp().
+   //!   by key_comp().
    //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare functions throw.
+   //! <b>Throws</b>: If the internal key_compare or priority_compare functions throw.
    //!   Strong guarantee.
    //!
    //! <b>Note</b>: Does not affect the validity of iterators and references.
@@ -706,11 +538,11 @@ class treap_impl
       }
    }
 
-   //! <b>Requires</b>: key_value_comp must be a comparison function that induces
-   //!   the same strict weak ordering as value_compare.
+   //! <b>Requires</b>: comp must be a comparison function that induces
+   //!   the same strict weak ordering as key_compare.
    //!   key_value_pcomp must be a comparison function that induces
    //!   the same strict weak ordering as priority_compare. The difference is that
-   //!   key_value_pcomp and key_value_comp compare an arbitrary key with the contained values.
+   //!   key_value_pcomp and comp compare 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.
@@ -723,7 +555,7 @@ class treap_impl
    //!
    //! <b>Complexity</b>: Average complexity is at most logarithmic.
    //!
-   //! <b>Throws</b>: If the key_value_comp or key_value_pcomp
+   //! <b>Throws</b>: If the comp or key_value_pcomp
    //!   ordering functions throw. Strong guarantee.
    //!
    //! <b>Notes</b>: This function is used to improve performance when constructing
@@ -739,26 +571,23 @@ class treap_impl
    //!
    //!   "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, class KeyValuePrioCompare>
+   template<class KeyType, class KeyTypeKeyCompare, class KeyValuePrioCompare>
    std::pair<iterator, bool> insert_unique_check
-      ( const KeyType &key, KeyValueCompare key_value_comp
+      ( const KeyType &key, KeyTypeKeyCompare comp
       , KeyValuePrioCompare key_value_pcomp, insert_commit_data &commit_data)
    {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         comp(key_value_comp, this);
-      detail::key_nodeptr_comp<KeyValuePrioCompare, treap_impl>
-         pcomp(key_value_pcomp, this);
-      std::pair<node_ptr, bool> ret =
+      std::pair<node_ptr, bool> const ret =
          (node_algorithms::insert_unique_check
-            (this->priv_header_ptr(), key, comp, pcomp, commit_data));
-      return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
+            ( this->tree_type::header_ptr(), key
+            , this->key_node_comp(comp), this->key_node_prio_comp(key_value_pcomp), commit_data));
+      return std::pair<iterator, bool>(iterator(ret.first, this->priv_value_traits_ptr()), ret.second);
    }
 
-   //! <b>Requires</b>: key_value_comp must be a comparison function that induces
-   //!   the same strict weak ordering as value_compare.
+   //! <b>Requires</b>: comp must be a comparison function that induces
+   //!   the same strict weak ordering as key_compare.
    //!   key_value_pcomp must be a comparison function that induces
    //!   the same strict weak ordering as priority_compare. The difference is that
-   //!   key_value_pcomp and key_value_comp compare an arbitrary key with the contained values.
+   //!   key_value_pcomp and comp compare 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"
@@ -773,7 +602,7 @@ class treap_impl
    //! <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 or key_value_pcomp
+   //! <b>Throws</b>: If the comp or key_value_pcomp
    //!   ordering functions throw. Strong guarantee.
    //!
    //! <b>Notes</b>: This function is used to improve performance when constructing
@@ -789,21 +618,18 @@ class treap_impl
    //!
    //!   "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, class KeyValuePrioCompare>
+   template<class KeyType, class KeyTypeKeyCompare, class KeyValuePrioCompare>
    std::pair<iterator, bool> insert_unique_check
       ( const_iterator hint, const KeyType &key
-      , KeyValueCompare key_value_comp
+      , KeyTypeKeyCompare comp
       , KeyValuePrioCompare key_value_pcomp
       , insert_commit_data &commit_data)
    {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         comp(key_value_comp, this);
-      detail::key_nodeptr_comp<KeyValuePrioCompare, treap_impl>
-         pcomp(key_value_pcomp, this);
-      std::pair<node_ptr, bool> ret =
+      std::pair<node_ptr, bool> const ret =
          (node_algorithms::insert_unique_check
-            (this->priv_header_ptr(), hint.pointed_node(), key, comp, pcomp, commit_data));
-      return std::pair<iterator, bool>(iterator(ret.first, this), ret.second);
+            ( this->tree_type::header_ptr(), hint.pointed_node(), key
+            , this->key_node_comp(comp), this->key_node_prio_comp(key_value_pcomp), commit_data));
+      return std::pair<iterator, bool>(iterator(ret.first, this->priv_value_traits_ptr()), ret.second);
    }
 
    //! <b>Requires</b>: value must be an lvalue of type value_type. commit_data
@@ -825,92 +651,84 @@ class treap_impl
    //!   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(get_real_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->priv_header_ptr(), to_insert, commit_data);
-      this->priv_size_traits().increment();
-      return iterator(to_insert, this);
+      node_ptr to_insert(this->get_value_traits().to_node_ptr(value));
+      BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || node_algorithms::unique(to_insert));
+      node_algorithms::insert_unique_commit(this->tree_type::header_ptr(), to_insert, commit_data);
+      this->tree_type::sz_traits().increment();
+      return iterator(to_insert, this->priv_value_traits_ptr());
    }
 
    //! <b>Requires</b>: value must be an lvalue, "pos" must be
    //!   a valid iterator (or end) and must be the succesor of value
    //!   once inserted according to the predicate
    //!
-   //! <b>Effects</b>: Inserts x into the treap before "pos".
+   //! <b>Effects</b>: Inserts x into the container before "pos".
    //!
    //! <b>Complexity</b>: Constant time.
    //!
    //! <b>Throws</b>: If the internal priority_compare function throws. Strong guarantee.
    //!
    //! <b>Note</b>: This function does not check preconditions so if "pos" is not
-   //! the successor of "value" treap ordering invariant will be broken.
+   //! the successor of "value" container ordering invariant will be broken.
    //! This is a low-level function to be used only for performance reasons
    //! by advanced users.
    iterator insert_before(const_iterator pos, reference value)
    {
-      node_ptr to_insert(get_real_value_traits().to_node_ptr(value));
-      if(safemode_or_autounlink)
-         BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(node_algorithms::unique(to_insert));
-      detail::key_nodeptr_comp<priority_compare, treap_impl>
-         pcomp(priv_pcomp(), this);
-      iterator ret (node_algorithms::insert_before
-         (this->priv_header_ptr(), pos.pointed_node(), to_insert, pcomp), this);
-      this->priv_size_traits().increment();
+      node_ptr to_insert(this->get_value_traits().to_node_ptr(value));
+      BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || node_algorithms::unique(to_insert));
+      iterator ret
+         ( node_algorithms::insert_before
+            ( this->tree_type::header_ptr(), pos.pointed_node(), to_insert, this->value_node_prio_comp())
+         , this->priv_value_traits_ptr());
+      this->tree_type::sz_traits().increment();
       return ret;
    }
 
    //! <b>Requires</b>: value must be an lvalue, and it must be no less
    //!   than the greatest inserted key
    //!
-   //! <b>Effects</b>: Inserts x into the treap in the last position.
+   //! <b>Effects</b>: Inserts x into the container in the last position.
    //!
    //! <b>Complexity</b>: Constant time.
    //!
    //! <b>Throws</b>: If the internal priority_compare function throws. Strong guarantee.
    //!
    //! <b>Note</b>: This function does not check preconditions so if value is
-   //!   less than the greatest inserted key treap ordering invariant will be broken.
+   //!   less than the greatest inserted key container ordering invariant will be broken.
    //!   This function is slightly more efficient than using "insert_before".
    //!   This is a low-level function to be used only for performance reasons
    //!   by advanced users.
    void push_back(reference value)
    {
-      node_ptr to_insert(get_real_value_traits().to_node_ptr(value));
-      if(safemode_or_autounlink)
-         BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(node_algorithms::unique(to_insert));
-      detail::key_nodeptr_comp<priority_compare, treap_impl>
-         pcomp(priv_pcomp(), this);
-      node_algorithms::push_back(this->priv_header_ptr(), to_insert, pcomp);
-      this->priv_size_traits().increment();
+      node_ptr to_insert(this->get_value_traits().to_node_ptr(value));
+      BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || node_algorithms::unique(to_insert));
+      node_algorithms::push_back(this->tree_type::header_ptr(), to_insert, this->value_node_prio_comp());
+      this->tree_type::sz_traits().increment();
    }
 
    //! <b>Requires</b>: value must be an lvalue, and it must be no greater
    //!   than the minimum inserted key
    //!
-   //! <b>Effects</b>: Inserts x into the treap in the first position.
+   //! <b>Effects</b>: Inserts x into the container in the first position.
    //!
    //! <b>Complexity</b>: Constant time.
    //!
    //! <b>Throws</b>: If the internal priority_compare function throws. Strong guarantee.
    //!
    //! <b>Note</b>: This function does not check preconditions so if value is
-   //!   greater than the minimum inserted key treap ordering invariant will be broken.
+   //!   greater than the minimum inserted key container ordering invariant will be broken.
    //!   This function is slightly more efficient than using "insert_before".
    //!   This is a low-level function to be used only for performance reasons
    //!   by advanced users.
    void push_front(reference value)
    {
-      node_ptr to_insert(get_real_value_traits().to_node_ptr(value));
-      if(safemode_or_autounlink)
-         BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(node_algorithms::unique(to_insert));
-      detail::key_nodeptr_comp<priority_compare, treap_impl>
-         pcomp(priv_pcomp(), this);
-      node_algorithms::push_front(this->priv_header_ptr(), to_insert, pcomp);
-      this->priv_size_traits().increment();
+      node_ptr to_insert(this->get_value_traits().to_node_ptr(value));
+      BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || node_algorithms::unique(to_insert));
+      node_algorithms::push_front(this->tree_type::header_ptr(), to_insert, this->value_node_prio_comp());
+      this->tree_type::sz_traits().increment();
    }
 
-   //! <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.
    //!
@@ -923,12 +741,9 @@ class treap_impl
       const_iterator ret(i);
       ++ret;
       node_ptr to_erase(i.pointed_node());
-      if(safemode_or_autounlink)
-         BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!node_algorithms::unique(to_erase));
-      detail::key_nodeptr_comp<priority_compare, treap_impl>
-         key_node_pcomp(priv_pcomp(), this);
-      node_algorithms::erase(this->priv_header_ptr(), to_erase, key_node_pcomp);
-      this->priv_size_traits().decrement();
+      BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || !node_algorithms::unique(to_erase));
+      node_algorithms::erase(this->tree_type::header_ptr(), to_erase, this->value_node_prio_comp());
+      this->tree_type::sz_traits().decrement();
       if(safemode_or_autounlink)
          node_algorithms::init(to_erase);
       return ret.unconst();
@@ -956,8 +771,8 @@ class treap_impl
    //!
    //! <b>Note</b>: Invalidates the iterators (but not the references)
    //!    to the erased elements. No destructors are called.
-   size_type erase(const_reference value)
-   {  return this->erase(value, priv_comp());   }
+   size_type erase(const key_type &key)
+   {  return this->erase(key, this->key_comp());   }
 
    //! <b>Effects</b>: Erases all the elements with the given key.
    //!   according to the comparison functor "comp".
@@ -971,12 +786,10 @@ class treap_impl
    //!
    //! <b>Note</b>: Invalidates the iterators (but not the references)
    //!    to the erased elements. No destructors are called.
-   template<class KeyType, class KeyValueCompare>
-   size_type erase(const KeyType& key, KeyValueCompare comp
-                  /// @cond
-                  , typename detail::enable_if_c<!detail::is_convertible<KeyValueCompare, const_iterator>::value >::type * = 0
-                  /// @endcond
-                  )
+   template<class KeyType, class KeyTypeKeyCompare>
+   BOOST_INTRUSIVE_DOC1ST(size_type
+      , typename detail::disable_if_convertible<KeyTypeKeyCompare BOOST_INTRUSIVE_I const_iterator BOOST_INTRUSIVE_I size_type>::type)
+      erase(const KeyType& key, KeyTypeKeyCompare comp)
    {
       std::pair<iterator,iterator> p = this->equal_range(key, comp);
       size_type n;
@@ -986,7 +799,7 @@ class treap_impl
 
    //! <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.
@@ -1000,7 +813,7 @@ class treap_impl
    {
       node_ptr to_erase(i.pointed_node());
       iterator ret(this->erase(i));
-      disposer(get_real_value_traits().to_value_ptr(to_erase));
+      disposer(this->get_value_traits().to_value_ptr(to_erase));
       return ret;
    }
 
@@ -1041,9 +854,9 @@ class treap_impl
    //! <b>Note</b>: Invalidates the iterators (but not the references)
    //!    to the erased elements. No destructors are called.
    template<class Disposer>
-   size_type erase_and_dispose(const_reference value, Disposer disposer)
+   size_type erase_and_dispose(const key_type &key, Disposer disposer)
    {
-      std::pair<iterator,iterator> p = this->equal_range(value);
+      std::pair<iterator,iterator> p = this->equal_range(key);
       size_type n;
       private_erase(p.first, p.second, n, disposer);
       return n;
@@ -1064,12 +877,10 @@ class treap_impl
    //!
    //! <b>Note</b>: Invalidates the iterators
    //!    to the erased elements.
-   template<class KeyType, class KeyValueCompare, class 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
-                  )
+   template<class KeyType, class KeyTypeKeyCompare, class Disposer>
+   BOOST_INTRUSIVE_DOC1ST(size_type
+      , typename detail::disable_if_convertible<KeyTypeKeyCompare BOOST_INTRUSIVE_I const_iterator BOOST_INTRUSIVE_I size_type>::type)
+      erase_and_dispose(const KeyType& key, KeyTypeKeyCompare comp, Disposer disposer)
    {
       std::pair<iterator,iterator> p = this->equal_range(key, comp);
       size_type n;
@@ -1087,15 +898,7 @@ class treap_impl
    //! <b>Note</b>: Invalidates the iterators (but not the references)
    //!    to the erased elements. No destructors are called.
    void clear()
-   {
-      if(safemode_or_autounlink){
-         this->clear_and_dispose(detail::null_disposer());
-      }
-      else{
-         node_algorithms::init_header(priv_header_ptr());
-         this->priv_size_traits().set_size(0);
-      }
-   }
+   {  tree_type::clear(); }
 
    //! <b>Effects</b>: Erases all of the elements calling disposer(p) for
    //!   each node to be erased.
@@ -1109,484 +912,147 @@ class treap_impl
    template<class Disposer>
    void clear_and_dispose(Disposer disposer)
    {
-      node_algorithms::clear_and_dispose(this->priv_header_ptr()
-         , detail::node_disposer<Disposer, treap_impl>(disposer, this));
-      node_algorithms::init_header(this->priv_header_ptr());
-      this->priv_size_traits().set_size(0);
+      node_algorithms::clear_and_dispose(this->tree_type::header_ptr()
+         , detail::node_disposer<Disposer, value_traits, TreapAlgorithms>(disposer, &this->get_value_traits()));
+      node_algorithms::init_header(this->tree_type::header_ptr());
+      this->tree_type::sz_traits().set_size(0);
    }
 
-   //! <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
-   {  return this->count(value, priv_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.
-   template<class KeyType, class KeyValueCompare>
-   size_type count(const KeyType &key, KeyValueCompare comp) const
+   //! @copydoc ::boost::intrusive::bstree::check(ExtraChecker)const
+   template <class ExtraChecker>
+   void check(ExtraChecker extra_checker) const
    {
-      std::pair<const_iterator, const_iterator> ret = this->equal_range(key, comp);
-      return std::distance(ret.first, ret.second);
+      tree_type::check(detail::treap_node_extra_checker
+         <ValueTraits, value_node_prio_comp_t, ExtraChecker>(this->value_node_prio_comp(), extra_checker));
    }
 
-   //! <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.
-   iterator lower_bound(const_reference value)
-   {  return this->lower_bound(value, priv_comp());   }
+   //! @copydoc ::boost::intrusive::bstree::check()const
+   void check() const
+   {  check(detail::empty_node_checker<ValueTraits>());  }
 
-   //! <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.
-   const_iterator lower_bound(const_reference value) const
-   {  return this->lower_bound(value, priv_comp());   }
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   //! @copydoc ::boost::intrusive::bstree::count(const key_type &)const
+   size_type count(const key_type &key) const;
 
-   //! <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.
-   template<class KeyType, class KeyValueCompare>
-   iterator lower_bound(const KeyType &key, KeyValueCompare comp)
-   {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         key_node_comp(comp, this);
-      return iterator(node_algorithms::lower_bound
-         (this->priv_header_ptr(), key, key_node_comp), this);
-   }
+   //! @copydoc ::boost::intrusive::bstree::count(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   size_type count(const KeyType& key, KeyTypeKeyCompare comp) const;
 
-   //! <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.
-   template<class KeyType, class KeyValueCompare>
-   const_iterator lower_bound(const KeyType &key, KeyValueCompare comp) const
-   {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         key_node_comp(comp, this);
-      return const_iterator(node_algorithms::lower_bound
-         (this->priv_header_ptr(), key, key_node_comp), this);
-   }
+   //! @copydoc ::boost::intrusive::bstree::lower_bound(const key_type &)
+   iterator lower_bound(const key_type &key);
 
-   //! <b>Effects</b>: Returns an iterator to the first element whose
-   //!   key is greater than k or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator upper_bound(const_reference value)
-   {  return this->upper_bound(value, priv_comp());   }
+   //! @copydoc ::boost::intrusive::bstree::lower_bound(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   iterator lower_bound(const KeyType& key, KeyTypeKeyCompare comp);
 
-   //! <b>Effects</b>: Returns an iterator to the first element whose
-   //!   key is greater than k according to comp or end() if that element
-   //!   does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   template<class KeyType, class KeyValueCompare>
-   iterator upper_bound(const KeyType &key, KeyValueCompare comp)
-   {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         key_node_comp(comp, this);
-      return iterator(node_algorithms::upper_bound
-         (this->priv_header_ptr(), key, key_node_comp), this);
-   }
+   //! @copydoc ::boost::intrusive::bstree::lower_bound(const key_type &)const
+   const_iterator lower_bound(const key_type &key) const;
 
-   //! <b>Effects</b>: Returns an iterator to the first element whose
-   //!   key is greater than k or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator upper_bound(const_reference value) const
-   {  return this->upper_bound(value, priv_comp());   }
+   //! @copydoc ::boost::intrusive::bstree::lower_bound(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   const_iterator lower_bound(const KeyType& key, KeyTypeKeyCompare comp) const;
 
-   //! <b>Effects</b>: Returns an iterator to the first element whose
-   //!   key is greater than k according to comp or end() if that element
-   //!   does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   template<class KeyType, class KeyValueCompare>
-   const_iterator upper_bound(const KeyType &key, KeyValueCompare comp) const
-   {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         key_node_comp(comp, this);
-      return const_iterator(node_algorithms::upper_bound
-         (this->priv_header_ptr(), key, key_node_comp), this);
-   }
+   //! @copydoc ::boost::intrusive::bstree::upper_bound(const key_type &)
+   iterator upper_bound(const key_type &key);
 
-   //! <b>Effects</b>: Finds an iterator to the first element whose key is
-   //!   k or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator find(const_reference value)
-   {  return this->find(value, priv_comp()); }
+   //! @copydoc ::boost::intrusive::bstree::upper_bound(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   iterator upper_bound(const KeyType& key, KeyTypeKeyCompare comp);
 
-   //! <b>Effects</b>: Finds an iterator to the first element whose key is
-   //!   k or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   template<class KeyType, class KeyValueCompare>
-   iterator find(const KeyType &key, KeyValueCompare comp)
-   {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         key_node_comp(comp, this);
-      return iterator
-         (node_algorithms::find(this->priv_header_ptr(), key, key_node_comp), this);
-   }
+   //! @copydoc ::boost::intrusive::bstree::upper_bound(const key_type &)const
+   const_iterator upper_bound(const key_type &key) const;
 
-   //! <b>Effects</b>: Finds a const_iterator to the first element whose key is
-   //!   k or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator find(const_reference value) const
-   {  return this->find(value, priv_comp()); }
+   //! @copydoc ::boost::intrusive::bstree::upper_bound(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   const_iterator upper_bound(const KeyType& key, KeyTypeKeyCompare comp) const;
 
-   //! <b>Effects</b>: Finds a const_iterator to the first element whose key is
-   //!   k or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   template<class KeyType, class KeyValueCompare>
-   const_iterator find(const KeyType &key, KeyValueCompare comp) const
-   {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         key_node_comp(comp, this);
-      return const_iterator
-         (node_algorithms::find(this->priv_header_ptr(), key, key_node_comp), this);
-   }
+   //! @copydoc ::boost::intrusive::bstree::find(const key_type &)
+   iterator find(const key_type &key);
 
-   //! <b>Effects</b>: Finds a range containing all elements whose key is k or
-   //!   an empty range that indicates the position where those elements would be
-   //!   if they there is no elements with key k.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   std::pair<iterator,iterator> equal_range(const_reference value)
-   {  return this->equal_range(value, priv_comp());   }
+   //! @copydoc ::boost::intrusive::bstree::find(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   iterator find(const KeyType& key, KeyTypeKeyCompare comp);
 
-   //! <b>Effects</b>: Finds a range containing all elements whose key is k or
-   //!   an empty range that indicates the position where those elements would be
-   //!   if they there is no elements with key k.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   template<class KeyType, class KeyValueCompare>
-   std::pair<iterator,iterator> equal_range(const KeyType &key, KeyValueCompare comp)
-   {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         key_node_comp(comp, this);
-      std::pair<node_ptr, node_ptr> ret
-         (node_algorithms::equal_range(this->priv_header_ptr(), key, key_node_comp));
-      return std::pair<iterator, iterator>(iterator(ret.first, this), iterator(ret.second, this));
-   }
+   //! @copydoc ::boost::intrusive::bstree::find(const key_type &)const
+   const_iterator find(const key_type &key) const;
 
-   //! <b>Effects</b>: Finds a range containing all elements whose key is k or
-   //!   an empty range that indicates the position where those elements would be
-   //!   if they there is no elements with key k.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
+   //! @copydoc ::boost::intrusive::bstree::find(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   const_iterator find(const KeyType& key, KeyTypeKeyCompare comp) const;
+
+   //! @copydoc ::boost::intrusive::bstree::equal_range(const key_type &)
+   std::pair<iterator,iterator> equal_range(const key_type &key);
+
+   //! @copydoc ::boost::intrusive::bstree::equal_range(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   std::pair<iterator,iterator> equal_range(const KeyType& key, KeyTypeKeyCompare comp);
+
+   //! @copydoc ::boost::intrusive::bstree::equal_range(const key_type &)const
    std::pair<const_iterator, const_iterator>
-      equal_range(const_reference value) const
-   {  return this->equal_range(value, priv_comp());   }
+      equal_range(const key_type &key) const;
 
-   //! <b>Effects</b>: Finds a range containing all elements whose key is k or
-   //!   an empty range that indicates the position where those elements would be
-   //!   if they there is no elements with key k.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: Nothing.
-   template<class KeyType, class KeyValueCompare>
+   //! @copydoc ::boost::intrusive::bstree::equal_range(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
    std::pair<const_iterator, const_iterator>
-      equal_range(const KeyType &key, KeyValueCompare comp) const
-   {
-      detail::key_nodeptr_comp<KeyValueCompare, treap_impl>
-         key_node_comp(comp, this);
-      std::pair<node_ptr, node_ptr> ret
-         (node_algorithms::equal_range(this->priv_header_ptr(), key, key_node_comp));
-      return std::pair<const_iterator, const_iterator>(const_iterator(ret.first, this), const_iterator(ret.second, this));
-   }
+      equal_range(const KeyType& key, KeyTypeKeyCompare comp) const;
 
-   //! <b>Requires</b>: 'lower_value' must not be greater than 'upper_value'. If
-   //!   'lower_value' == 'upper_value', ('left_closed' || 'right_closed') must be false.
-   //!
-   //! <b>Effects</b>: Returns an a pair with the following criteria:
-   //!
-   //!   first = lower_bound(lower_key) if left_closed, upper_bound(lower_key) otherwise
-   //!
-   //!   second = upper_bound(upper_key) if right_closed, lower_bound(upper_key) otherwise
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If the predicate throws.
-   //!
-   //! <b>Note</b>: This function can be more efficient than calling upper_bound
-   //!   and lower_bound for lower_value and upper_value.
+   //! @copydoc ::boost::intrusive::bstree::bounded_range(const key_type &,const key_type &,bool,bool)
    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, priv_comp(), left_closed, right_closed);   }
+      (const key_type &lower_key, const key_type &upper_key, bool left_closed, bool right_closed);
 
-   //! <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 tree. 
-   //!   'lower_key' must not be greater than 'upper_key' according to 'comp'. If
-   //!   'lower_key' == 'upper_key', ('left_closed' || 'right_closed') must be false.
-   //!
-   //! <b>Effects</b>: Returns an a pair with the following criteria:
-   //!
-   //!   first = lower_bound(lower_key, comp) if left_closed, upper_bound(lower_key, comp) otherwise
-   //!
-   //!   second = upper_bound(upper_key, comp) if right_closed, lower_bound(upper_key, comp) otherwise
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <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.
-   template<class KeyType, class KeyValueCompare>
+   //! @copydoc ::boost::intrusive::bstree::bounded_range(const KeyType&,const KeyType&,KeyTypeKeyCompare,bool,bool)
+   template<class KeyType, class KeyTypeKeyCompare>
    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, treap_impl>
-         key_node_comp(comp, this);
-      std::pair<node_ptr, node_ptr> ret
-         (node_algorithms::bounded_range
-            (this->priv_header_ptr(), lower_key, upper_key, key_node_comp, left_closed, right_closed));
-      return std::pair<iterator, iterator>(iterator(ret.first, this), iterator(ret.second, this));
-   }
+      (const KeyType& lower_key, const KeyType& upper_key, KeyTypeKeyCompare comp, bool left_closed, bool right_closed);
 
-   //! <b>Requires</b>: 'lower_value' must not be greater than 'upper_value'. If
-   //!   'lower_value' == 'upper_value', ('left_closed' || 'right_closed') must be false.
-   //!
-   //! <b>Effects</b>: Returns an a pair with the following criteria:
-   //!
-   //!   first = lower_bound(lower_key) if left_closed, upper_bound(lower_key) otherwise
-   //!
-   //!   second = upper_bound(upper_key) if right_closed, lower_bound(upper_key) otherwise
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If the predicate throws.
-   //!
-   //! <b>Note</b>: This function can be more efficient than calling upper_bound
-   //!   and lower_bound for lower_value and upper_value.
-   std::pair<const_iterator,const_iterator> bounded_range
-      (const_reference lower_value, const_reference upper_value, bool left_closed, bool right_closed) const
-   {  return this->bounded_range(lower_value, upper_value, priv_comp(), left_closed, right_closed);   }
+   //! @copydoc ::boost::intrusive::bstree::bounded_range(const key_type &,const key_type &,bool,bool)const
+   std::pair<const_iterator, const_iterator>
+      bounded_range(const key_type &lower_key, const key_type &upper_key, bool left_closed, bool right_closed) const;
 
-   //! <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 tree. 
-   //!   'lower_key' must not be greater than 'upper_key' according to 'comp'. If
-   //!   'lower_key' == 'upper_key', ('left_closed' || 'right_closed') must be false.
-   //!
-   //! <b>Effects</b>: Returns an a pair with the following criteria:
-   //!
-   //!   first = lower_bound(lower_key, comp) if left_closed, upper_bound(lower_key, comp) otherwise
-   //!
-   //!   second = upper_bound(upper_key, comp) if right_closed, lower_bound(upper_key, comp) otherwise
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <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.
-   template<class KeyType, class KeyValueCompare>
-   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, treap_impl>
-         key_node_comp(comp, this);
-      std::pair<node_ptr, node_ptr> ret
-         (node_algorithms::bounded_range
-            (this->priv_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), const_iterator(ret.second, this));
-   }
+   //! @copydoc ::boost::intrusive::bstree::bounded_range(const KeyType&,const KeyType&,KeyTypeKeyCompare,bool,bool)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   std::pair<const_iterator, const_iterator> bounded_range
+         (const KeyType& lower_key, const KeyType& upper_key, KeyTypeKeyCompare comp, bool left_closed, bool right_closed) const;
 
-   //! <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.
-   template <class Cloner, class Disposer>
-   void clone_from(const treap_impl &src, Cloner cloner, Disposer disposer)
-   {
-      this->clear_and_dispose(disposer);
-      if(!src.empty()){
-         detail::exception_disposer<treap_impl, Disposer>
-            rollback(*this, disposer);
-         node_algorithms::clone
-            (src.priv_header_ptr()
-            ,this->priv_header_ptr()
-            ,detail::node_cloner<Cloner, treap_impl>(cloner, this)
-            ,detail::node_disposer<Disposer, treap_impl>(disposer, this));
-         this->priv_size_traits().set_size(src.priv_size_traits().get_size());
-         this->priv_comp() = src.priv_comp();
-         rollback.release();
-      }
-   }
+   //! @copydoc ::boost::intrusive::bstree::s_iterator_to(reference)
+   static iterator s_iterator_to(reference value);
 
-   //! <b>Effects</b>: Unlinks the leftmost node from the treap.
-   //!
-   //! <b>Complexity</b>: Average complexity is constant time.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Notes</b>: This function breaks the treap and the treap 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 treap.
-   pointer unlink_leftmost_without_rebalance()
-   {
-      node_ptr to_be_disposed(node_algorithms::unlink_leftmost_without_rebalance
-                           (this->priv_header_ptr()));
-      if(!to_be_disposed)
-         return 0;
-      this->priv_size_traits().decrement();
-      if(safemode_or_autounlink)//If this is commented does not work with normal_link
-         node_algorithms::init(to_be_disposed);
-      return get_real_value_traits().to_value_ptr(to_be_disposed);
-   }
+   //! @copydoc ::boost::intrusive::bstree::s_iterator_to(const_reference)
+   static const_iterator s_iterator_to(const_reference value);
 
-   //! <b>Requires</b>: replace_this must be a valid iterator of *this
-   //!   and with_this must not be inserted in any treap.
-   //!
-   //! <b>Effects</b>: Replaces replace_this in its position in the
-   //!   treap with with_this. The treap 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
-   //!   with_this is not equivalent to *replace_this according to the
-   //!   ordering and priority rules. This function is faster than erasing and inserting
-   //!   the node, since no rebalancing or comparison is needed.
-   void replace_node(iterator replace_this, reference with_this)
-   {
-      node_algorithms::replace_node( get_real_value_traits().to_node_ptr(*replace_this)
-                                   , this->priv_header_ptr()
-                                   , get_real_value_traits().to_node_ptr(with_this));
-      if(safemode_or_autounlink)
-         node_algorithms::init(replace_this.pointed_node());
-   }
+   //! @copydoc ::boost::intrusive::bstree::iterator_to(reference)
+   iterator iterator_to(reference value);
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a set of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid iterator i belonging to the set
-   //!   that points to the value
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Note</b>: This static function is available only if the <i>value traits</i>
-   //!   is stateless.
-   static iterator s_iterator_to(reference value)
-   {
-      BOOST_STATIC_ASSERT((!stateful_value_traits));
-      return iterator (value_traits::to_node_ptr(value), 0);
-   }
+   //! @copydoc ::boost::intrusive::bstree::iterator_to(const_reference)const
+   const_iterator iterator_to(const_reference value) const;
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a set of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid const_iterator i belonging to the
-   //!   set that points to the value
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Note</b>: This static function is available only if the <i>value traits</i>
-   //!   is stateless.
-   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)), 0);
-   }
+   //! @copydoc ::boost::intrusive::bstree::init_node(reference)
+   static void init_node(reference value);
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a set of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid iterator i belonging to the set
-   //!   that points to the value
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator iterator_to(reference value)
-   {  return iterator (value_traits::to_node_ptr(value), this); }
+   //! @copydoc ::boost::intrusive::bstree::unlink_leftmost_without_rebalance
+   pointer unlink_leftmost_without_rebalance();
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a set of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid const_iterator i belonging to the
-   //!   set that points to the value
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator iterator_to(const_reference value) const
-   {  return const_iterator (value_traits::to_node_ptr(const_cast<reference> (value)), this); }
+   //! @copydoc ::boost::intrusive::bstree::replace_node
+   void replace_node(iterator replace_this, reference with_this);
 
-   //! <b>Requires</b>: value shall not be in a treap.
-   //!
-   //! <b>Effects</b>: init_node puts the hook of a value in a well-known default
-   //!   state.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant time.
-   //!
-   //! <b>Note</b>: This function puts the hook in the well-known default state
-   //!   used by auto_unlink and safe hooks.
-   static void init_node(reference value)
-   { node_algorithms::init(value_traits::to_node_ptr(value)); }
+   //! @copydoc ::boost::intrusive::bstree::remove_node
+   void remove_node(reference value);
+
+   friend bool operator< (const treap_impl &x, const treap_impl &y);
+
+   friend bool operator==(const treap_impl &x, const treap_impl &y);
+
+   friend bool operator!= (const treap_impl &x, const treap_impl &y);
+
+   friend bool operator>(const treap_impl &x, const treap_impl &y);
+
+   friend bool operator<=(const treap_impl &x, const treap_impl &y);
+
+   friend bool operator>=(const treap_impl &x, const treap_impl &y);
+
+   friend void swap(treap_impl &x, treap_impl &y);
+
+   #endif   //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
 
    /// @cond
    private:
@@ -1605,197 +1071,41 @@ class treap_impl
       return b.unconst();
    }
    /// @endcond
-
-   private:
-   static treap_impl &priv_container_from_end_iterator(const const_iterator &end_iterator)
-   {
-      header_plus_size *r = detail::parent_from_member<header_plus_size, node>
-         ( boost::intrusive::detail::to_raw_pointer(end_iterator.pointed_node()), &header_plus_size::header_);
-      typename node_plus_pred_t::header_plus_priority_size *n =
-         detail::parent_from_member
-         < typename node_plus_pred_t::header_plus_priority_size
-         , header_plus_size>
-         (r, &node_plus_pred_t::header_plus_priority_size::header_plus_size_);
-      node_plus_pred_t *pn = detail::parent_from_member
-         < node_plus_pred_t
-         , typename node_plus_pred_t::header_plus_priority_size>
-         (n, &node_plus_pred_t::header_plus_priority_size_);
-      data_t *d = detail::parent_from_member<data_t, node_plus_pred_t>(pn, &data_t::node_plus_pred_);
-      treap_impl *tr  = detail::parent_from_member<treap_impl, data_t>(d, &treap_impl::data_);
-      return *tr;
-   }
-
-   static treap_impl &priv_container_from_iterator(const const_iterator &it)
-   {  return priv_container_from_end_iterator(it.end_iterator_from_it());   }
 };
 
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-template<class T, class ...Options>
-#else
-template<class Config>
-#endif
-inline bool operator<
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-(const treap_impl<T, Options...> &x, const treap_impl<T, Options...> &y)
-#else
-(const treap_impl<Config> &x, const treap_impl<Config> &y)
-#endif
-{  return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
-
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-template<class T, class ...Options>
-#else
-template<class Config>
-#endif
-bool operator==
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-(const treap_impl<T, Options...> &x, const treap_impl<T, Options...> &y)
-#else
-(const treap_impl<Config> &x, const treap_impl<Config> &y)
-#endif
-{
-   typedef treap_impl<Config> tree_type;
-   typedef typename tree_type::const_iterator const_iterator;
-
-   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;
-   }
-}
-
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-template<class T, class ...Options>
-#else
-template<class Config>
-#endif
-inline bool operator!=
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-(const treap_impl<T, Options...> &x, const treap_impl<T, Options...> &y)
-#else
-(const treap_impl<Config> &x, const treap_impl<Config> &y)
-#endif
-{  return !(x == y); }
-
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-template<class T, class ...Options>
-#else
-template<class Config>
-#endif
-inline bool operator>
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-(const treap_impl<T, Options...> &x, const treap_impl<T, Options...> &y)
-#else
-(const treap_impl<Config> &x, const treap_impl<Config> &y)
-#endif
-{  return y < x;  }
-
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-template<class T, class ...Options>
-#else
-template<class Config>
-#endif
-inline bool operator<=
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-(const treap_impl<T, Options...> &x, const treap_impl<T, Options...> &y)
-#else
-(const treap_impl<Config> &x, const treap_impl<Config> &y)
-#endif
-{  return !(y < x);  }
 
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-template<class T, class ...Options>
-#else
-template<class Config>
-#endif
-inline bool operator>=
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-(const treap_impl<T, Options...> &x, const treap_impl<T, Options...> &y)
-#else
-(const treap_impl<Config> &x, const treap_impl<Config> &y)
-#endif
-{  return !(x < y);  }
-
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
+//! Helper metafunction to define a \c treap that yields to the same type when the
+//! same options (either explicitly or implicitly) are used.
+#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
 template<class T, class ...Options>
 #else
-template<class Config>
+template<class T, class O1 = void, class O2 = void
+                , class O3 = void, class O4 = void
+                , class O5 = void, class O6 = void>
 #endif
-inline void swap
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-(treap_impl<T, Options...> &x, treap_impl<T, Options...> &y)
-#else
-(treap_impl<Config> &x, treap_impl<Config> &y)
-#endif
-{  x.swap(y);  }
-
-/// @cond
-#if !defined(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
-struct make_treap_opt
+struct make_treap
 {
    typedef typename pack_options
-      < treap_set_defaults<T>,
+      < treap_defaults,
       #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-      O1, O2, O3, O4
+      O1, O2, O3, O4, O5, O6
       #else
       Options...
       #endif
       >::type packed_options;
+
    typedef typename detail::get_value_traits
-      <T, typename packed_options::value_traits>::type value_traits;
+      <T, typename packed_options::proto_value_traits>::type value_traits;
 
-   typedef treap_setopt
+   typedef treap_impl
          < value_traits
+         , typename packed_options::key_of_value
          , typename packed_options::compare
          , typename packed_options::priority
          , typename packed_options::size_type
          , packed_options::constant_time_size
-         > type;
-};
-/// @endcond
-
-//! Helper metafunction to define a \c treap that yields to the same type when the
-//! same options (either explicitly or implicitly) are used.
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) || defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-template<class T, class ...Options>
-#else
-template<class T, class O1 = none, class O2 = none
-                , class O3 = none, class O4 = none>
-#endif
-struct make_trie
-{
-   /// @cond
-   typedef treap_impl
-      < typename make_treap_opt<T,
-         #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-         O1, O2, O3, O4
-         #else
-         Options...
-         #endif
-         >::type
-      > implementation_defined;
+         , typename packed_options::header_holder_type
+         > implementation_defined;
    /// @endcond
    typedef implementation_defined type;
 };
@@ -1803,23 +1113,23 @@ struct make_trie
 #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, class O6>
 #else
 template<class T, class ...Options>
 #endif
 class treap
-   :  public make_trie<T,
+   :  public make_treap<T,
       #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-      O1, O2, O3, O4
+      O1, O2, O3, O4, O5, O6
       #else
       Options...
       #endif
       >::type
 {
-   typedef typename make_trie
+   typedef typename make_treap
       <T,
       #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-      O1, O2, O3, O4
+      O1, O2, O3, O4, O5, O6
       #else
       Options...
       #endif
@@ -1827,36 +1137,45 @@ class treap
    BOOST_MOVABLE_BUT_NOT_COPYABLE(treap)
 
    public:
-   typedef typename Base::value_compare      value_compare;
+   typedef typename Base::key_compare        key_compare;
    typedef typename Base::priority_compare   priority_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;
+   typedef typename Base::reverse_iterator           reverse_iterator;
+   typedef typename Base::const_reverse_iterator     const_reverse_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));
 
-   treap( const value_compare &cmp = value_compare()
-       , const priority_compare &pcmp = priority_compare()
-       , const value_traits &v_traits = value_traits())
+   explicit treap( const key_compare &cmp = key_compare()
+                 , const priority_compare &pcmp = priority_compare()
+                 , const value_traits &v_traits = value_traits())
       :  Base(cmp, pcmp, v_traits)
    {}
 
    template<class Iterator>
    treap( bool unique, Iterator b, Iterator e
-       , const value_compare &cmp = value_compare()
+       , const key_compare &cmp = key_compare()
        , const priority_compare &pcmp = priority_compare()
        , const value_traits &v_traits = value_traits())
       :  Base(unique, b, e, cmp, pcmp, v_traits)
    {}
 
    treap(BOOST_RV_REF(treap) x)
-      :  Base(::boost::move(static_cast<Base&>(x)))
+      :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
    treap& operator=(BOOST_RV_REF(treap) x)
-   {  this->Base::operator=(::boost::move(static_cast<Base&>(x))); return *this;  }
+   {  return static_cast<treap&>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
+
+   template <class Cloner, class Disposer>
+   void clone_from(const treap &src, Cloner cloner, Disposer disposer)
+   {  Base::clone_from(src, cloner, disposer);  }
+
+   template <class Cloner, class Disposer>
+   void clone_from(BOOST_RV_REF(treap) src, Cloner cloner, Disposer disposer)
+   {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
    static treap &container_from_end_iterator(iterator end_iterator)
    {  return static_cast<treap &>(Base::container_from_end_iterator(end_iterator));   }
@@ -1864,16 +1183,15 @@ class treap
    static const treap &container_from_end_iterator(const_iterator end_iterator)
    {  return static_cast<const treap &>(Base::container_from_end_iterator(end_iterator));   }
 
-   static treap &container_from_it(iterator it)
+   static treap &container_from_iterator(iterator it)
    {  return static_cast<treap &>(Base::container_from_iterator(it));   }
 
-   static const treap &container_from_it(const_iterator it)
+   static const treap &container_from_iterator(const_iterator it)
    {  return static_cast<const treap &>(Base::container_from_iterator(it));   }
 };
 
 #endif
 
-
 } //namespace intrusive
 } //namespace boost