passenger 5.0.24 → 5.0.25

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

@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// (C) Copyright Ion Gaztanaga 2007-2012
+// (C) Copyright Ion Gaztanaga 2007-2014
 //
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,15 +9,19 @@
 // See http://www.boost.org/libs/intrusive for documentation.
 //
 /////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_INTRUSIVE_TRIE_SET_HPP
-#define BOOST_INTRUSIVE_TRIE_SET_HPP
+#ifndef BOOST_INTRUSIVE_TREAP_SET_HPP
+#define BOOST_INTRUSIVE_TREAP_SET_HPP
 
 #include <boost/intrusive/detail/config_begin.hpp>
 #include <boost/intrusive/intrusive_fwd.hpp>
 #include <boost/intrusive/treap.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
-#include <boost/move/move.hpp>
-#include <iterator>
+#include <boost/move/utility_core.hpp>
+#include <boost/static_assert.hpp>
+
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#  pragma once
+#endif
 
 namespace boost {
 namespace intrusive {
@@ -36,14 +40,16 @@ namespace intrusive {
 #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_set_impl
+#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   : public treap_impl<ValueTraits, VoidOrKeyOfValue, VoidOrKeyComp, VoidOrPrioComp, SizeType, ConstantTimeSize, HeaderHolder>
+#endif
 {
    /// @cond
-   typedef treap_impl<Config> tree_type;
-   //! This class is
-   //! movable
+   public:
+   typedef treap_impl<ValueTraits, VoidOrKeyOfValue, VoidOrKeyComp, VoidOrPrioComp, SizeType, ConstantTimeSize, HeaderHolder> tree_type;
    BOOST_MOVABLE_BUT_NOT_COPYABLE(treap_set_impl)
 
    typedef tree_type implementation_defined;
@@ -52,6 +58,8 @@ class treap_set_impl
    public:
    typedef typename implementation_defined::value_type               value_type;
    typedef typename implementation_defined::value_traits             value_traits;
+   typedef typename implementation_defined::key_type                 key_type;
+   typedef typename implementation_defined::key_of_value             key_of_value;
    typedef typename implementation_defined::pointer                  pointer;
    typedef typename implementation_defined::const_pointer            const_pointer;
    typedef typename implementation_defined::reference                reference;
@@ -59,8 +67,8 @@ class treap_set_impl
    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::priority_compare         priority_compare;
    typedef typename implementation_defined::key_compare              key_compare;
+   typedef typename implementation_defined::priority_compare         priority_compare;
    typedef typename implementation_defined::iterator                 iterator;
    typedef typename implementation_defined::const_iterator           const_iterator;
    typedef typename implementation_defined::reverse_iterator         reverse_iterator;
@@ -72,12 +80,7 @@ class treap_set_impl
    typedef typename implementation_defined::const_node_ptr           const_node_ptr;
    typedef typename implementation_defined::node_algorithms          node_algorithms;
 
-   static const bool constant_time_size = Config::constant_time_size;
-
-   /// @cond
-   private:
-   tree_type tree_;
-   /// @endcond
+   static const bool constant_time_size = implementation_defined::constant_time_size;
 
    public:
    //! <b>Effects</b>: Constructs an empty treap_set.
@@ -86,11 +89,11 @@ class treap_set_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 of the value_compare object throws.
-   explicit treap_set_impl( const value_compare &cmp      = value_compare()
+   //!   or the copy constructor of the key_compare object throws.
+   explicit treap_set_impl( const key_compare &cmp      = key_compare()
                           , const priority_compare &pcmp  = priority_compare()
                           , const value_traits &v_traits  = value_traits())
-      :  tree_(cmp, pcmp, v_traits)
+      :  tree_type(cmp, pcmp, v_traits)
    {}
 
    //! <b>Requires</b>: Dereferencing iterator must yield an lvalue of type value_type.
@@ -100,1265 +103,371 @@ class treap_set_impl
    //!   [b, e).
    //!
    //! <b>Complexity</b>: Linear in N if [b, e) is already sorted using
-   //!   comp and otherwise N * log N, where N is std::distance(last, first).
+   //!   comp and otherwise N * log N, where N is distance(last, first).
    //!
    //! <b>Throws</b>: If value_traits::node_traits::node
    //!   constructor throws (this does not happen with predefined Boost.Intrusive hooks)
-   //!   or the copy constructor/operator() of the value_compare object throws.
+   //!   or the copy constructor/operator() of the key_compare object throws.
    template<class Iterator>
    treap_set_impl( 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())
-      : tree_(true, b, e, cmp, pcmp, v_traits)
+      : tree_type(true, b, e, cmp, pcmp, v_traits)
    {}
 
    //! <b>Effects</b>: to-do
    //!
    treap_set_impl(BOOST_RV_REF(treap_set_impl) x)
-      :  tree_(::boost::move(x.tree_))
+      :  tree_type(BOOST_MOVE_BASE(tree_type, x))
    {}
 
    //! <b>Effects</b>: to-do
    //!
    treap_set_impl& operator=(BOOST_RV_REF(treap_set_impl) x)
-   {  tree_ = ::boost::move(x.tree_);  return *this;  }
+   {  return static_cast<treap_set_impl&>(tree_type::operator=(BOOST_MOVE_BASE(tree_type, x)));  }
 
-   //! <b>Effects</b>: Detaches all elements from this. The objects in the treap_set
-   //!   are not deleted (i.e. no destructors are called).
-   //!
-   //! <b>Complexity</b>: Linear to the number of elements on the container.
-   //!   if it's a safe-mode or auto-unlink value_type. Constant time otherwise.
-   //!
-   //! <b>Throws</b>: Nothing.
-   ~treap_set_impl()
-   {}
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   //! @copydoc ::boost::intrusive::treap::~treap()
+   ~treap_set_impl();
 
-   //! <b>Effects</b>: Returns an iterator pointing to the beginning of the treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator begin()
-   { return tree_.begin();  }
+   //! @copydoc ::boost::intrusive::treap::begin()
+   iterator begin();
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the beginning of the treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator begin() const
-   { return tree_.begin();  }
+   //! @copydoc ::boost::intrusive::treap::begin()const
+   const_iterator begin() const;
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the beginning of the treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator cbegin() const
-   { return tree_.cbegin();  }
+   //! @copydoc ::boost::intrusive::treap::cbegin()const
+   const_iterator cbegin() const;
 
-   //! <b>Effects</b>: Returns an iterator pointing to the end of the treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator end()
-   { return tree_.end();  }
+   //! @copydoc ::boost::intrusive::treap::end()
+   iterator end();
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the end of the treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator end() const
-   { return tree_.end();  }
+   //! @copydoc ::boost::intrusive::treap::end()const
+   const_iterator end() const;
 
-   //! <b>Effects</b>: Returns an iterator pointing to the highest priority object of the tree.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator top()
-   { return tree_.top();  }
+   //! @copydoc ::boost::intrusive::treap::cend()const
+   const_iterator cend() const;
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the highest priority object of the tree..
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator top() const
-   {  return this->ctop();   }
+   //! @copydoc ::boost::intrusive::treap::rbegin()
+   reverse_iterator rbegin();
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the highest priority object of the tree..
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator ctop() const
-   { return tree_.ctop();  }
+   //! @copydoc ::boost::intrusive::treap::rbegin()const
+   const_reverse_iterator rbegin() const;
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the end of the treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator cend() const
-   { return tree_.cend();  }
+   //! @copydoc ::boost::intrusive::treap::crbegin()const
+   const_reverse_iterator crbegin() const;
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning of the
-   //!    reversed treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   reverse_iterator rbegin()
-   { return tree_.rbegin();  }
+   //! @copydoc ::boost::intrusive::treap::rend()
+   reverse_iterator rend();
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
-   //!    of the reversed treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator rbegin() const
-   { return tree_.rbegin();  }
+   //! @copydoc ::boost::intrusive::treap::rend()const
+   const_reverse_iterator rend() const;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
-   //!    of the reversed treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator crbegin() const
-   { return tree_.crbegin();  }
+   //! @copydoc ::boost::intrusive::treap::crend()const
+   const_reverse_iterator crend() const;
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
-   //!    of the reversed treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   reverse_iterator rend()
-   { return tree_.rend();  }
+   //! @copydoc ::boost::intrusive::treap::container_from_end_iterator(iterator)
+   static treap_set_impl &container_from_end_iterator(iterator end_iterator);
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
-   //!    of the reversed treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator rend() const
-   { return tree_.rend();  }
+   //! @copydoc ::boost::intrusive::treap::container_from_end_iterator(const_iterator)
+   static const treap_set_impl &container_from_end_iterator(const_iterator end_iterator);
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
-   //!    of the reversed treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator crend() const
-   { return tree_.crend();  }
+   //! @copydoc ::boost::intrusive::treap::container_from_iterator(iterator)
+   static treap_set_impl &container_from_iterator(iterator it);
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the highest priority object of the
-   //!    reversed tree.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   reverse_iterator rtop()
-   {  return tree_.rtop();  }
+   //! @copydoc ::boost::intrusive::treap::container_from_iterator(const_iterator)
+   static const treap_set_impl &container_from_iterator(const_iterator it);
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the highest priority objec
-   //!    of the reversed tree.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator rtop() const
-   {  return tree_.crtop();  }
+   //! @copydoc ::boost::intrusive::treap::key_comp()const
+   key_compare key_comp() const;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the highest priority object
-   //!    of the reversed tree.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator crtop() const
-   {  return tree_.crtop();  }
+   //! @copydoc ::boost::intrusive::treap::value_comp()const
+   value_compare value_comp() const;
 
-   //! <b>Precondition</b>: end_iterator must be a valid end iterator
-   //!   of treap_set.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the treap_set associated to the end iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   static treap_set_impl &container_from_end_iterator(iterator end_iterator)
-   {
-      return *detail::parent_from_member<treap_set_impl, tree_type>
-         ( &tree_type::container_from_end_iterator(end_iterator)
-         , &treap_set_impl::tree_);
-   }
-
-   //! <b>Precondition</b>: end_iterator must be a valid end const_iterator
-   //!   of treap_set.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the treap_set associated to the end iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   static const treap_set_impl &container_from_end_iterator(const_iterator end_iterator)
-   {
-      return *detail::parent_from_member<treap_set_impl, tree_type>
-         ( &tree_type::container_from_end_iterator(end_iterator)
-         , &treap_set_impl::tree_);
-   }
-
-   //! <b>Precondition</b>: it must be a valid iterator of set.
-   //!
-   //! <b>Effects</b>: Returns a reference to the set associated to the iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   static treap_set_impl &container_from_iterator(iterator it)
-   {
-      return *detail::parent_from_member<treap_set_impl, tree_type>
-         ( &tree_type::container_from_iterator(it)
-         , &treap_set_impl::tree_);
-   }
-
-   //! <b>Precondition</b>: it must be a valid const_iterator of set.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the set associated to the iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   static const treap_set_impl &container_from_iterator(const_iterator it)
-   {
-      return *detail::parent_from_member<treap_set_impl, tree_type>
-         ( &tree_type::container_from_iterator(it)
-         , &treap_set_impl::tree_);
-   }
-
-   //! <b>Effects</b>: Returns the key_compare object used by the treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: If key_compare copy-constructor throws.
-   key_compare key_comp() const
-   { return tree_.value_comp(); }
+   //! @copydoc ::boost::intrusive::treap::empty()const
+   bool empty() const;
 
-   //! <b>Effects</b>: Returns the value_compare object used by the treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: If value_compare copy-constructor throws.
-   value_compare value_comp() const
-   { return tree_.value_comp(); }
+   //! @copydoc ::boost::intrusive::treap::size()const
+   size_type size() const;
 
-   //! <b>Effects</b>: Returns the priority_compare object used by the treap_set.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: If priority_compare copy-constructor throws.
-   priority_compare priority_comp() const
-   {  return tree_.priority_comp();   }
+   //! @copydoc ::boost::intrusive::treap::swap
+   void swap(treap_set_impl& other);
 
-   //! <b>Effects</b>: Returns true if the container is empty.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   bool empty() const
-   { return tree_.empty(); }
+   //! @copydoc ::boost::intrusive::treap::clone_from(const treap&,Cloner,Disposer)
+   template <class Cloner, class Disposer>
+   void clone_from(const treap_set_impl &src, Cloner cloner, Disposer disposer);
 
-   //! <b>Effects</b>: Returns the number of elements stored in the treap_set.
-   //!
-   //! <b>Complexity</b>: Linear to elements contained in *this if,
-   //!   constant-time size option is enabled. Constant-time otherwise.
-   //!
-   //! <b>Throws</b>: Nothing.
-   size_type size() const
-   { return tree_.size(); }
+   #else
 
-   //! <b>Effects</b>: Swaps the contents of two sets.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: If the swap() call for the comparison functor
-   //!   found using ADL throws. Strong guarantee.
-   void swap(treap_set_impl& other)
-   { tree_.swap(other.tree_); }
+   using tree_type::clone_from;
 
-   //! <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.
+   #endif
+
+   //! @copydoc ::boost::intrusive::treap::clone_from(treap&&,Cloner,Disposer)
    template <class Cloner, class Disposer>
-   void clone_from(const treap_set_impl &src, Cloner cloner, Disposer disposer)
-   {  tree_.clone_from(src.tree_, cloner, disposer);  }
+   void clone_from(BOOST_RV_REF(treap_set_impl) src, Cloner cloner, Disposer disposer)
+   {  tree_type::clone_from(BOOST_MOVE_BASE(tree_type, src), cloner, disposer);  }
 
-   //! <b>Requires</b>: value must be an lvalue
-   //!
-   //! <b>Effects</b>: Tries to inserts value into the treap_set.
-   //!
-   //! <b>Returns</b>: If the value
-   //!   is not already present inserts it and returns a pair containing the
-   //!   iterator to the new value and true. If there is an equivalent value
-   //!   returns a pair containing an iterator to the already present value
-   //!   and false.
-   //!
-   //! <b>Complexity</b>: Average complexity for insert element is at
-   //!   most logarithmic.
-   //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare ordering function throw.
-   //!   Strong guarantee.
-   //!
-   //! <b>Note</b>: Does not affect the validity of iterators and references.
-   //!   No copy-constructors are called.
+   #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
+
+   //! @copydoc ::boost::intrusive::treap::top()
+   iterator top();
+
+   //! @copydoc ::boost::intrusive::treap::top()const
+   const_iterator top() const;
+
+   //! @copydoc ::boost::intrusive::treap::ctop()const
+   const_iterator ctop() const;
+
+   //! @copydoc ::boost::intrusive::treap::rtop()
+   reverse_iterator rtop();
+
+   //! @copydoc ::boost::intrusive::treap::rtop()const
+   const_reverse_iterator rtop() const;
+
+   //! @copydoc ::boost::intrusive::treap::crtop()const
+   const_reverse_iterator crtop() const;
+
+   //! @copydoc ::boost::intrusive::treap::crtop() const
+   priority_compare priority_comp() const;
+   #endif   //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+
+   //! @copydoc ::boost::intrusive::treap::insert_unique(reference)
    std::pair<iterator, bool> insert(reference value)
-   {  return tree_.insert_unique(value);  }
+   {  return tree_type::insert_unique(value);  }
 
-   //! <b>Requires</b>: value must be an lvalue
-   //!
-   //! <b>Effects</b>: Tries to to insert x into the treap_set, using "hint"
-   //!   as a hint to where it will be inserted.
-   //!
-   //! <b>Returns</b>: An iterator that points to the position where the
-   //!   new element was inserted into the treap_set.
-   //!
-   //! <b>Complexity</b>: Logarithmic in general, but it's amortized
-   //!   constant time if t is inserted immediately before hint.
-   //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare ordering
-   //!   functions throw. Strong guarantee.
-   //!
-   //! <b>Note</b>: Does not affect the validity of iterators and references.
-   //!   No copy-constructors are called.
+   //! @copydoc ::boost::intrusive::treap::insert_unique(const_iterator,reference)
    iterator insert(const_iterator hint, reference value)
-   {  return tree_.insert_unique(hint, value);  }
+   {  return tree_type::insert_unique(hint, value);  }
 
-   //! <b>Requires</b>: key_value_comp must be a comparison function that induces
-   //!   the same strict weak ordering as value_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.
-   //!
-   //! <b>Effects</b>: Checks if a value can be inserted in the treap_set, using
-   //!   a user provided key instead of the value itself.
-   //!
-   //! <b>Returns</b>: If there is an equivalent value
-   //!   returns a pair containing an iterator to the already present value
-   //!   and false. If the value can be inserted returns true in the returned
-   //!   pair boolean and fills "commit_data" that is meant to be used with
-   //!   the "insert_commit" function.
-   //!
-   //! <b>Complexity</b>: Average complexity is at most logarithmic.
-   //!
-   //! <b>Throws</b>: If key_value_comp or key_value_pcomp ordering function throw.
-   //!    Strong guarantee.
-   //!
-   //! <b>Notes</b>: This function is used to improve performance when constructing
-   //!   a value_type is expensive: if there is an equivalent value
-   //!   the constructed object must be discarded. Many times, the part of the
-   //!   node that is used to impose the order is much cheaper to construct
-   //!   than the value_type and this function offers the possibility to use that
-   //!   part to check if the insertion will be successful.
-   //!
-   //!   If the check is successful, the user can construct the value_type and use
-   //!   "insert_commit" to insert the object in constant-time. This gives a total
-   //!   logarithmic complexity to the insertion: check(O(log(N)) + commit(O(1)).
-   //!
-   //!   "commit_data" remains valid for a subsequent "insert_commit" only if no more
-   //!   objects are inserted or erased from the treap_set.
-   template<class KeyType, class KeyValueCompare, class KeyValuePriorityCompare>
+   //! @copydoc ::boost::intrusive::treap::insert_unique_check(const KeyType&,KeyTypeKeyCompare,KeyValuePrioCompare,insert_commit_data&)
+   template<class KeyType, class KeyTypeKeyCompare, class KeyValuePrioCompare>
    std::pair<iterator, bool> insert_check
-      ( const KeyType &key, KeyValueCompare key_value_comp, KeyValuePriorityCompare key_value_pcomp
+      ( const KeyType &key, KeyTypeKeyCompare comp, KeyValuePrioCompare key_value_pcomp
       , insert_commit_data &commit_data)
-   {  return tree_.insert_unique_check(key, key_value_comp, key_value_pcomp, commit_data); }
+   {  return tree_type::insert_unique_check(key, comp, key_value_pcomp, commit_data); }
 
-   //! <b>Requires</b>: key_value_comp must be a comparison function that induces
-   //!   the same strict weak ordering as value_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.
-   //!
-   //! <b>Effects</b>: Checks if a value can be inserted in the treap_set, using
-   //!   a user provided key instead of the value itself, using "hint"
-   //!   as a hint to where it will be inserted.
-   //!
-   //! <b>Returns</b>: If there is an equivalent value
-   //!   returns a pair containing an iterator to the already present value
-   //!   and false. If the value can be inserted returns true in the returned
-   //!   pair boolean and fills "commit_data" that is meant to be used with
-   //!   the "insert_commit" function.
-   //!
-   //! <b>Complexity</b>: Logarithmic in general, but it's amortized
-   //!   constant time if t is inserted immediately before hint.
-   //!
-   //! <b>Throws</b>: If key_value_comp or key_value_pcomp ordering function throw.
-   //!    Strong guarantee.
-   //!
-   //! <b>Notes</b>: This function is used to improve performance when constructing
-   //!   a value_type is expensive: if there is an equivalent value
-   //!   the constructed object must be discarded. Many times, the part of the
-   //!   constructing that is used to impose the order is much cheaper to construct
-   //!   than the value_type and this function offers the possibility to use that key
-   //!   to check if the insertion will be successful.
-   //!
-   //!   If the check is successful, the user can construct the value_type and use
-   //!   "insert_commit" to insert the object in constant-time. This can give a total
-   //!   constant-time complexity to the insertion: check(O(1)) + commit(O(1)).
-   //!
-   //!   "commit_data" remains valid for a subsequent "insert_commit" only if no more
-   //!   objects are inserted or erased from the treap_set.
-   template<class KeyType, class KeyValueCompare, class KeyValuePriorityCompare>
+   //! @copydoc ::boost::intrusive::treap::insert_unique_check(const_iterator,const KeyType&,KeyTypeKeyCompare,KeyValuePrioCompare,insert_commit_data&)
+   template<class KeyType, class KeyTypeKeyCompare, class KeyValuePrioCompare>
    std::pair<iterator, bool> insert_check
       ( const_iterator hint, const KeyType &key
-      , KeyValueCompare key_value_comp, KeyValuePriorityCompare key_value_pcomp
+      , KeyTypeKeyCompare comp, KeyValuePrioCompare key_value_pcomp
       , insert_commit_data &commit_data)
-   {  return tree_.insert_unique_check(hint, key, key_value_comp, key_value_pcomp, commit_data); }
-
-   //! <b>Requires</b>: value must be an lvalue of type value_type. commit_data
-   //!   must have been obtained from a previous call to "insert_check".
-   //!   No objects should have been inserted or erased from the treap_set between
-   //!   the "insert_check" that filled "commit_data" and the call to "insert_commit".
-   //!
-   //! <b>Effects</b>: Inserts the value in the treap_set using the information obtained
-   //!   from the "commit_data" that a previous "insert_check" filled.
-   //!
-   //! <b>Returns</b>: An iterator to the newly inserted object.
-   //!
-   //! <b>Complexity</b>: Constant time.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Notes</b>: This function has only sense if a "insert_check" has been
-   //!   previously executed to fill "commit_data". No value should be inserted or
-   //!   erased between the "insert_check" and "insert_commit" calls.
-   iterator insert_commit(reference value, const insert_commit_data &commit_data)
-   {  return tree_.insert_unique_commit(value, commit_data); }
+   {  return tree_type::insert_unique_check(hint, key, comp, key_value_pcomp, commit_data); }
 
-   //! <b>Requires</b>: Dereferencing iterator must yield an lvalue
-   //!   of type value_type.
-   //!
-   //! <b>Effects</b>: Inserts a range into the treap_set.
-   //!
-   //! <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().
-   //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare ordering function
-   //!   throw. Basic guarantee.
-   //!
-   //! <b>Note</b>: Does not affect the validity of iterators and references.
-   //!   No copy-constructors are called.
+   //! @copydoc ::boost::intrusive::treap::insert_unique(Iterator,Iterator)
    template<class Iterator>
    void insert(Iterator b, Iterator e)
-   {  tree_.insert_unique(b, e);  }
+   {  tree_type::insert_unique(b, e);  }
 
-   //! <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. "value" must not be equal to any
-   //!   inserted key according to the predicate.
-   //!
-   //! <b>Effects</b>: Inserts x into the treap 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.
-   //! This is a low-level function to be used only for performance reasons
-   //! by advanced users.
-   iterator insert_before(const_iterator pos, reference value)
-   {  return tree_.insert_before(pos, value);  }
-
-   //! <b>Requires</b>: value must be an lvalue, and it must be greater than
-   //!   any inserted key according to the predicate.
-   //!
-   //! <b>Effects</b>: Inserts x into the treap 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.
-   //!   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)
-   {  tree_.push_back(value);  }
-
-   //! <b>Requires</b>: value must be an lvalue, and it must be less
-   //!   than any inserted key according to the predicate.
-   //!
-   //! <b>Effects</b>: Inserts x into the treap 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.
-   //!   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)
-   {  tree_.push_front(value);  }
-
-   //! <b>Effects</b>: Erases the element pointed to by pos.
-   //!
-   //! <b>Complexity</b>: Average complexity is constant time.
-   //!
-   //! <b>Returns</b>: An iterator to the element after the erased element.
-   //!
-   //! <b>Throws</b>: If the internal priority_compare function throws. Strong guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
-   iterator erase(const_iterator i)
-   {  return tree_.erase(i);  }
+   //! @copydoc ::boost::intrusive::treap::insert_unique_commit
+   iterator insert_commit(reference value, const insert_commit_data &commit_data)
+   {  return tree_type::insert_unique_commit(value, commit_data);  }
 
-   //! <b>Effects</b>: Erases the range pointed to by b end e.
-   //!
-   //! <b>Complexity</b>: Average complexity for erase range is at most
-   //!   O(log(size() + N)), where N is the number of elements in the range.
-   //!
-   //! <b>Returns</b>: An iterator to the element after the erased elements.
-   //!
-   //! <b>Throws</b>: If the internal priority_compare function throws. Basic guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
-   iterator erase(const_iterator b, const_iterator e)
-   {  return tree_.erase(b, e);  }
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   //! @copydoc ::boost::intrusive::treap::insert_before
+   iterator insert_before(const_iterator pos, reference value);
 
-   //! <b>Effects</b>: Erases all the elements with the given value.
-   //!
-   //! <b>Returns</b>: The number of erased elements.
-   //!
-   //! <b>Complexity</b>: O(log(size()) + this->count(value)).
-   //!
-   //! <b>Throws</b>: If internal value_compare or priority_compare
-   //!   ordering functions throw. Basic guarantee.
-   //!
-   //! <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 tree_.erase(value);  }
+   //! @copydoc ::boost::intrusive::treap::push_back
+   void push_back(reference value);
 
-   //! <b>Effects</b>: Erases all the elements that compare equal with
-   //!   the given key and the given comparison functor.
-   //!
-   //! <b>Returns</b>: The number of erased elements.
-   //!
-   //! <b>Complexity</b>: O(log(size() + this->count(key, comp)).
-   //!
-   //! <b>Throws</b>: If comp or internal priority_compare
-   //!   ordering functions throw. Basic guarantee.
-   //!
-   //! <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
-                  )
-   {  return tree_.erase(key, comp);  }
-
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Effects</b>: Erases the element pointed to by pos.
-   //!   Disposer::operator()(pointer) is called for the removed element.
-   //!
-   //! <b>Complexity</b>: Average complexity for erase element is constant time.
-   //!
-   //! <b>Returns</b>: An iterator to the element after the erased element.
-   //!
-   //! <b>Throws</b>: If the internal priority_compare function throws. Strong guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators
-   //!    to the erased elements.
-   template<class Disposer>
-   iterator erase_and_dispose(const_iterator i, Disposer disposer)
-   {  return tree_.erase_and_dispose(i, disposer);  }
+   //! @copydoc ::boost::intrusive::treap::push_front
+   void push_front(reference value);
+
+   //! @copydoc ::boost::intrusive::treap::erase(const_iterator)
+   iterator erase(const_iterator i);
 
-   #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
+   //! @copydoc ::boost::intrusive::treap::erase(const_iterator,const_iterator)
+   iterator erase(const_iterator b, const_iterator e);
+
+   //! @copydoc ::boost::intrusive::treap::erase(const key_type &)
+   size_type erase(const key_type &key);
+
+   //! @copydoc ::boost::intrusive::treap::erase(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   size_type erase(const KeyType& key, KeyTypeKeyCompare comp);
+
+   //! @copydoc ::boost::intrusive::treap::erase_and_dispose(const_iterator,Disposer)
    template<class Disposer>
-   iterator erase_and_dispose(iterator i, Disposer disposer)
-   {  return this->erase_and_dispose(const_iterator(i), disposer);   }
-   #endif
+   iterator erase_and_dispose(const_iterator i, Disposer disposer);
 
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Effects</b>: Erases the range pointed to by b end e.
-   //!   Disposer::operator()(pointer) is called for the removed elements.
-   //!
-   //! <b>Complexity</b>: Average complexity for erase range is at most
-   //!   O(log(size() + N)), where N is the number of elements in the range.
-   //!
-   //! <b>Returns</b>: An iterator to the element after the erased elements.
-   //!
-   //! <b>Throws</b>: If the internal priority_compare function throws. Basic guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators
-   //!    to the erased elements.
+   //! @copydoc ::boost::intrusive::treap::erase_and_dispose(const_iterator,const_iterator,Disposer)
    template<class Disposer>
-   iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
-   {  return tree_.erase_and_dispose(b, e, disposer);  }
+   iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer);
 
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Effects</b>: Erases all the elements with the given value.
-   //!   Disposer::operator()(pointer) is called for the removed elements.
-   //!
-   //! <b>Throws</b>: If the internal value_compare ordering function throws.
-   //!
-   //! <b>Complexity</b>: O(log(size() + this->count(value)). Basic guarantee.
-   //!
-   //! <b>Throws</b>: If the internal priority_compare function throws. Strong guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
+   //! @copydoc ::boost::intrusive::treap::erase_and_dispose(const key_type &, Disposer)
    template<class Disposer>
-   size_type erase_and_dispose(const_reference value, Disposer disposer)
-   {  return tree_.erase_and_dispose(value, disposer);  }
+   size_type erase_and_dispose(const key_type &key, Disposer disposer);
 
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Effects</b>: Erases all the elements with the given key.
-   //!   according to the comparison functor "comp".
-   //!   Disposer::operator()(pointer) is called for the removed elements.
-   //!
-   //! <b>Returns</b>: The number of erased elements.
-   //!
-   //! <b>Complexity</b>: O(log(size() + this->count(key, comp)).
-   //!
-   //! <b>Throws</b>: If comp or internal priority_compare ordering functions throw.
-   //!   Basic guarantee.
-   //!
-   //! <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
-                  )
-   {  return tree_.erase_and_dispose(key, comp, disposer);  }
-
-   //! <b>Effects</b>: Erases all the elements of the container.
-   //!
-   //! <b>Complexity</b>: Linear to the number of elements on the container.
-   //!   if it's a safe-mode or auto-unlink value_type. Constant time otherwise.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
-   void clear()
-   {  return tree_.clear();  }
+   //! @copydoc ::boost::intrusive::treap::erase_and_dispose(const KeyType&,KeyTypeKeyCompare,Disposer)
+   template<class KeyType, class KeyTypeKeyCompare, class Disposer>
+   size_type erase_and_dispose(const KeyType& key, KeyTypeKeyCompare comp, Disposer disposer);
 
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Effects</b>: Erases all the elements of the container.
-   //!
-   //! <b>Complexity</b>: Linear to the number of elements on the container.
-   //!   Disposer::operator()(pointer) is called for the removed elements.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
+   //! @copydoc ::boost::intrusive::treap::clear
+   void clear();
+
+   //! @copydoc ::boost::intrusive::treap::clear_and_dispose
    template<class Disposer>
-   void clear_and_dispose(Disposer disposer)
-   {  return tree_.clear_and_dispose(disposer);  }
+   void clear_and_dispose(Disposer disposer);
 
-   //! <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>: If the internal value_compare ordering function throws.
-   size_type count(const_reference value) const
-   {  return tree_.find(value) != end();  }
+   #endif   //   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
 
-   //! <b>Effects</b>: Returns the number of contained elements with the same key
-   //!   compared with the given comparison functor.
-   //!
-   //! <b>Complexity</b>: Logarithmic to the number of elements contained plus lineal
-   //!   to number of objects with the given key.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   template<class KeyType, class KeyValueCompare>
-   size_type count(const KeyType& key, KeyValueCompare comp) const
-   {  return tree_.find(key, comp) != end();  }
+   //! @copydoc ::boost::intrusive::treap::count(const key_type &)const
+   size_type count(const key_type &key) const
+   {  return static_cast<size_type>(this->tree_type::find(key) != this->tree_type::cend()); }
 
-   //! <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>: If the internal value_compare ordering function throws.
-   iterator lower_bound(const_reference value)
-   {  return tree_.lower_bound(value);  }
+   //! @copydoc ::boost::intrusive::treap::count(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   size_type count(const KeyType& key, KeyTypeKeyCompare comp) const
+   {  return static_cast<size_type>(this->tree_type::find(key, comp) != this->tree_type::cend()); }
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Returns an iterator to the first element whose
-   //!   key according to the comparison functor is not less than k or
-   //!   end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   iterator lower_bound(const KeyType& key, KeyValueCompare comp)
-   {  return tree_.lower_bound(key, comp);  }
-
-   //! <b>Effects</b>: Returns a const iterator to the first element whose
-   //!   key is not less than k or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If the internal value_compare ordering function throws.
-   const_iterator lower_bound(const_reference value) const
-   {  return tree_.lower_bound(value);  }
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Returns a const_iterator to the first element whose
-   //!   key according to the comparison functor is not less than k or
-   //!   end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   const_iterator lower_bound(const KeyType& key, KeyValueCompare comp) const
-   {  return tree_.lower_bound(key, comp);  }
-
-   //! <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>: If the internal value_compare ordering function throws.
-   iterator upper_bound(const_reference value)
-   {  return tree_.upper_bound(value);  }
+   //! @copydoc ::boost::intrusive::treap::lower_bound(const key_type &)
+   iterator lower_bound(const key_type &key);
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Returns an iterator to the first element whose
-   //!   key according to the comparison functor is greater than key or
-   //!   end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   iterator upper_bound(const KeyType& key, KeyValueCompare comp)
-   {  return tree_.upper_bound(key, comp);  }
-
-   //! <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>: If the internal value_compare ordering function throws.
-   const_iterator upper_bound(const_reference value) const
-   {  return tree_.upper_bound(value);  }
+   //! @copydoc ::boost::intrusive::treap::lower_bound(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   iterator lower_bound(const KeyType& key, KeyTypeKeyCompare comp);
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Returns a const_iterator to the first element whose
-   //!   key according to the comparison functor is greater than key or
-   //!   end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   const_iterator upper_bound(const KeyType& key, KeyValueCompare comp) const
-   {  return tree_.upper_bound(key, comp);  }
-
-   //! <b>Effects</b>: Finds an iterator to the first element whose value is
-   //!   "value" or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If the internal value_compare ordering function throws.
-   iterator find(const_reference value)
-   {  return tree_.find(value);  }
+   //! @copydoc ::boost::intrusive::treap::lower_bound(const key_type &)const
+   const_iterator lower_bound(const key_type &key) const;
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Finds an iterator to the first element whose key is
-   //!   "key" according to the comparison functor or end() if that element
-   //!   does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   iterator find(const KeyType& key, KeyValueCompare comp)
-   {  return tree_.find(key, comp);  }
-
-   //! <b>Effects</b>: Finds a const_iterator to the first element whose value is
-   //!   "value" or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If the internal value_compare ordering function throws.
-   const_iterator find(const_reference value) const
-   {  return tree_.find(value);  }
+   //! @copydoc ::boost::intrusive::treap::lower_bound(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   const_iterator lower_bound(const KeyType& key, KeyTypeKeyCompare comp) const;
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Finds a const_iterator to the first element whose key is
-   //!   "key" according to the comparison functor or end() if that element
-   //!   does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   const_iterator find(const KeyType& key, KeyValueCompare comp) const
-   {  return tree_.find(key, 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>: If the internal value_compare ordering function throws.
-   std::pair<iterator,iterator> equal_range(const_reference value)
-   {  return tree_.equal_range(value);  }
+   //! @copydoc ::boost::intrusive::treap::upper_bound(const key_type &)
+   iterator upper_bound(const key_type &key);
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Finds a range containing all elements whose key is k
-   //!   according to the comparison functor 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>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   std::pair<iterator,iterator> equal_range(const KeyType& key, KeyValueCompare comp)
-   {  return tree_.equal_range(key, 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>: If the internal value_compare ordering function throws.
-   std::pair<const_iterator, const_iterator>
-      equal_range(const_reference value) const
-   {  return tree_.equal_range(value);  }
+   //! @copydoc ::boost::intrusive::treap::upper_bound(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   iterator upper_bound(const KeyType& key, KeyTypeKeyCompare comp);
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Finds a range containing all elements whose key is k
-   //!   according to the comparison functor 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>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   std::pair<const_iterator, const_iterator>
-      equal_range(const KeyType& key, KeyValueCompare comp) const
-   {  return tree_.equal_range(key, comp);  }
+   //! @copydoc ::boost::intrusive::treap::upper_bound(const key_type &)const
+   const_iterator upper_bound(const key_type &key) 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.
-   std::pair<iterator,iterator> bounded_range
-      (const_reference lower_value, const_reference upper_value, bool left_closed, bool right_closed)
-   {  return tree_.bounded_range(lower_value, upper_value, left_closed, 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>
-   std::pair<iterator,iterator> bounded_range
-      (const KeyType& lower_key, const KeyType& upper_key, KeyValueCompare comp, bool left_closed, bool right_closed)
-   {  return tree_.bounded_range(lower_key, upper_key, comp, left_closed, right_closed);  }
+   //! @copydoc ::boost::intrusive::treap::upper_bound(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   const_iterator upper_bound(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.
-   std::pair<const_iterator, const_iterator>
-      bounded_range(const_reference lower_value, const_reference upper_value, bool left_closed, bool right_closed) const
-   {  return tree_.bounded_range(lower_value, upper_value, left_closed, 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::treap::find(const key_type &)
+   iterator find(const key_type &key);
+
+   //! @copydoc ::boost::intrusive::treap::find(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   iterator find(const KeyType& key, KeyTypeKeyCompare comp);
+
+   //! @copydoc ::boost::intrusive::treap::find(const key_type &)const
+   const_iterator find(const key_type &key) const;
+
+   //! @copydoc ::boost::intrusive::treap::find(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   const_iterator find(const KeyType& key, KeyTypeKeyCompare comp) const;
+
+   #endif   //   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+
+   //! @copydoc ::boost::intrusive::rbtree::equal_range(const key_type &)
+   std::pair<iterator,iterator> equal_range(const key_type &key)
+   {  return this->tree_type::lower_bound_range(key); }
+
+   //! @copydoc ::boost::intrusive::rbtree::equal_range(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   std::pair<iterator,iterator> equal_range(const KeyType& key, KeyTypeKeyCompare comp)
+   {  return this->tree_type::equal_range(key, comp); }
+
+   //! @copydoc ::boost::intrusive::rbtree::equal_range(const key_type &)const
    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
-   {  return tree_.bounded_range(lower_key, upper_key, comp, left_closed, right_closed);  }
+      equal_range(const key_type &key) const
+   {  return this->tree_type::lower_bound_range(key); }
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a treap_set of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid iterator i belonging to the treap_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)
-   {  return tree_type::s_iterator_to(value);  }
+   //! @copydoc ::boost::intrusive::rbtree::equal_range(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   std::pair<const_iterator, const_iterator>
+      equal_range(const KeyType& key, KeyTypeKeyCompare comp) const
+   {  return this->tree_type::equal_range(key, comp); }
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a treap_set of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid const_iterator i belonging to the
-   //!   treap_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)
-   {  return tree_type::s_iterator_to(value);  }
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a treap_set of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid iterator i belonging to the treap_set
-   //!   that points to the value
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator iterator_to(reference value)
-   {  return tree_.iterator_to(value);  }
+   //! @copydoc ::boost::intrusive::treap::bounded_range(const key_type &,const key_type &,bool,bool)
+   std::pair<iterator,iterator> bounded_range
+      (const key_type &lower_key, const key_type &upper_key, bool left_closed, bool right_closed);
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a treap_set of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid const_iterator i belonging to the
-   //!   treap_set that points to the value
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator iterator_to(const_reference value) const
-   {  return tree_.iterator_to(value);  }
+   //! @copydoc ::boost::intrusive::treap::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, KeyTypeKeyCompare comp, bool left_closed, bool right_closed);
 
-   //! <b>Requires</b>: value shall not be in a treap_set/treap_multiset.
-   //!
-   //! <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)
-   { tree_type::init_node(value);   }
+   //! @copydoc ::boost::intrusive::treap::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>Effects</b>: Unlinks the leftmost node from the tree.
-   //!
-   //! <b>Complexity</b>: Average complexity is constant time.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Notes</b>: This function breaks the tree and the tree can
-   //!   only be used for more unlink_leftmost_without_rebalance calls.
-   //!   This function is normally used to achieve a step by step
-   //!   controlled destruction of the tree.
-   pointer unlink_leftmost_without_rebalance()
-   {  return tree_.unlink_leftmost_without_rebalance();  }
-
-   //! <b>Requires</b>: replace_this must be a valid iterator of *this
-   //!   and with_this must not be inserted in any tree.
-   //!
-   //! <b>Effects</b>: Replaces replace_this in its position in the
-   //!   tree with with_this. The tree does not need to be rebalanced.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Note</b>: This function will break container ordering invariants if
-   //!   with_this is not equivalent to *replace_this according to the
-   //!   ordering 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)
-   {  tree_.replace_node(replace_this, with_this);   }
-
-   //! <b>Effects</b>: Rebalances the tree.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Linear.
-   void rebalance()
-   {  tree_.rebalance(); }
+   //! @copydoc ::boost::intrusive::treap::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>: old_root is a node of a tree.
-   //!
-   //! <b>Effects</b>: Rebalances the subtree rooted at old_root.
-   //!
-   //! <b>Returns</b>: The new root of the subtree.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Linear to the elements in the subtree.
-   iterator rebalance_subtree(iterator root)
-   {  return tree_.rebalance_subtree(root); }
+   //! @copydoc ::boost::intrusive::treap::s_iterator_to(reference)
+   static iterator s_iterator_to(reference value);
 
-   //! <b>Returns</b>: The balance factor (alpha) used in this tree
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   float balance_factor() const
-   {  return tree_.balance_factor(); }
+   //! @copydoc ::boost::intrusive::treap::s_iterator_to(const_reference)
+   static const_iterator s_iterator_to(const_reference value);
 
-   //! <b>Requires</b>: new_alpha must be a value between 0.5 and 1.0
-   //!
-   //! <b>Effects</b>: Establishes a new balance factor (alpha) and rebalances
-   //!   the tree if the new balance factor is stricter (less) than the old factor.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Linear to the elements in the subtree.
-   void balance_factor(float new_alpha)
-   {  tree_.balance_factor(new_alpha); }
+   //! @copydoc ::boost::intrusive::treap::iterator_to(reference)
+   iterator iterator_to(reference value);
 
-   /// @cond
-   friend bool operator==(const treap_set_impl &x, const treap_set_impl &y)
-   {  return x.tree_ == y.tree_;  }
+   //! @copydoc ::boost::intrusive::treap::iterator_to(const_reference)const
+   const_iterator iterator_to(const_reference value) const;
 
-   friend bool operator<(const treap_set_impl &x, const treap_set_impl &y)
-   {  return x.tree_ < y.tree_;  }
-   /// @endcond
-};
+   //! @copydoc ::boost::intrusive::treap::init_node(reference)
+   static void init_node(reference value);
 
-#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_set_impl<T, Options...> &x, const treap_set_impl<T, Options...> &y)
-#else
-(const treap_set_impl<Config> &x, const treap_set_impl<Config> &y)
-#endif
-{  return !(x == y); }
+   //! @copydoc ::boost::intrusive::treap::unlink_leftmost_without_rebalance
+   pointer unlink_leftmost_without_rebalance();
 
-#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_set_impl<T, Options...> &x, const treap_set_impl<T, Options...> &y)
-#else
-(const treap_set_impl<Config> &x, const treap_set_impl<Config> &y)
-#endif
-{  return y < x;  }
+   //! @copydoc ::boost::intrusive::treap::replace_node
+   void replace_node(iterator replace_this, reference with_this);
 
-#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_set_impl<T, Options...> &x, const treap_set_impl<T, Options...> &y)
-#else
-(const treap_set_impl<Config> &x, const treap_set_impl<Config> &y)
-#endif
-{  return !(y < x);  }
+   //! @copydoc ::boost::intrusive::treap::remove_node
+   void remove_node(reference value);
 
-#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_set_impl<T, Options...> &x, const treap_set_impl<T, Options...> &y)
-#else
-(const treap_set_impl<Config> &x, const treap_set_impl<Config> &y)
-#endif
-{  return !(x < y);  }
+   #endif   //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+};
 
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-template<class T, class ...Options>
-#else
-template<class Config>
-#endif
-inline void swap
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-(treap_set_impl<T, Options...> &x, treap_set_impl<T, Options...> &y)
-#else
-(treap_set_impl<Config> &x, treap_set_impl<Config> &y)
-#endif
-{  x.swap(y);  }
 
 //! Helper metafunction to define a \c treap_set 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>
+template<class T, class O1 = void, class O2 = void
+                , class O3 = void, class O4 = void
+                , class O5 = void, class O6 = void>
 #endif
 struct make_treap_set
 {
-   /// @cond
-   typedef treap_set_impl
-      < typename make_treap_opt<T,
+   typedef typename pack_options
+      < treap_defaults,
       #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-      O1, O2, O3, O4
+      O1, O2, O3, O4, O5, O6
       #else
       Options...
       #endif
-      >::type
-      > implementation_defined;
+      >::type packed_options;
+
+   typedef typename detail::get_value_traits
+      <T, typename packed_options::proto_value_traits>::type value_traits;
+
+   typedef treap_set_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
+         , typename packed_options::header_holder_type
+         > implementation_defined;
    /// @endcond
    typedef implementation_defined type;
 };
@@ -1366,14 +475,14 @@ struct make_treap_set
 #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_set
    :  public make_treap_set<T,
       #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-      O1, O2, O3, O4
+      O1, O2, O3, O4, O5, O6
       #else
       Options...
       #endif
@@ -1382,7 +491,7 @@ class treap_set
    typedef typename make_treap_set
       <T,
       #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-      O1, O2, O3, O4
+      O1, O2, O3, O4, O5, O6
       #else
       Options...
       #endif
@@ -1390,7 +499,7 @@ class treap_set
    BOOST_MOVABLE_BUT_NOT_COPYABLE(treap_set)
 
    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::iterator           iterator;
@@ -1399,26 +508,34 @@ class treap_set
    //Assert if passed value traits are compatible with the type
    BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   treap_set( const value_compare &cmp    = value_compare()
-           , const priority_compare &pcmp = priority_compare()
-           , const value_traits &v_traits = value_traits())
+   explicit treap_set( 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_set( 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(b, e, cmp, pcmp, v_traits)
    {}
 
    treap_set(BOOST_RV_REF(treap_set) x)
-      :  Base(::boost::move(static_cast<Base&>(x)))
+      :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
    treap_set& operator=(BOOST_RV_REF(treap_set) x)
-   {  this->Base::operator=(::boost::move(static_cast<Base&>(x))); return *this;  }
+   {  return static_cast<treap_set &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
+
+   template <class Cloner, class Disposer>
+   void clone_from(const treap_set &src, Cloner cloner, Disposer disposer)
+   {  Base::clone_from(src, cloner, disposer);  }
+
+   template <class Cloner, class Disposer>
+   void clone_from(BOOST_RV_REF(treap_set) src, Cloner cloner, Disposer disposer)
+   {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
    static treap_set &container_from_end_iterator(iterator end_iterator)
    {  return static_cast<treap_set &>(Base::container_from_end_iterator(end_iterator));   }
@@ -1449,20 +566,25 @@ class treap_set
 #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_multiset_impl
+#ifndef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   : public treap_impl<ValueTraits, VoidOrKeyOfValue, VoidOrKeyComp, VoidOrPrioComp, SizeType, ConstantTimeSize, HeaderHolder>
+#endif
 {
    /// @cond
-   typedef treap_impl<Config> tree_type;
-
+   typedef treap_impl<ValueTraits, VoidOrKeyOfValue, VoidOrKeyComp, VoidOrPrioComp, SizeType, ConstantTimeSize, HeaderHolder> tree_type;
    BOOST_MOVABLE_BUT_NOT_COPYABLE(treap_multiset_impl)
+
    typedef tree_type implementation_defined;
    /// @endcond
 
    public:
    typedef typename implementation_defined::value_type               value_type;
    typedef typename implementation_defined::value_traits             value_traits;
+   typedef typename implementation_defined::key_type                 key_type;
+   typedef typename implementation_defined::key_of_value             key_of_value;
    typedef typename implementation_defined::pointer                  pointer;
    typedef typename implementation_defined::const_pointer            const_pointer;
    typedef typename implementation_defined::reference                reference;
@@ -1470,8 +592,8 @@ class treap_multiset_impl
    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::priority_compare         priority_compare;
    typedef typename implementation_defined::key_compare              key_compare;
+   typedef typename implementation_defined::priority_compare         priority_compare;
    typedef typename implementation_defined::iterator                 iterator;
    typedef typename implementation_defined::const_iterator           const_iterator;
    typedef typename implementation_defined::reverse_iterator         reverse_iterator;
@@ -1483,12 +605,7 @@ class treap_multiset_impl
    typedef typename implementation_defined::const_node_ptr           const_node_ptr;
    typedef typename implementation_defined::node_algorithms          node_algorithms;
 
-   static const bool constant_time_size = Config::constant_time_size;
-
-   /// @cond
-   private:
-   tree_type tree_;
-   /// @endcond
+   static const bool constant_time_size = implementation_defined::constant_time_size;
 
    public:
    //! <b>Effects</b>: Constructs an empty treap_multiset.
@@ -1497,11 +614,11 @@ class treap_multiset_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 of the value_compare/priority_compare objects throw.
-   explicit treap_multiset_impl( const value_compare &cmp     = value_compare()
-                               , const priority_compare &pcmp = priority_compare()
-                               , const value_traits &v_traits = value_traits())
-      :  tree_(cmp, pcmp, v_traits)
+   //!   or the copy constructor of the key_compare object throws.
+   explicit treap_multiset_impl( const key_compare &cmp      = key_compare()
+                          , const priority_compare &pcmp  = priority_compare()
+                          , const value_traits &v_traits  = value_traits())
+      :  tree_type(cmp, pcmp, v_traits)
    {}
 
    //! <b>Requires</b>: Dereferencing iterator must yield an lvalue of type value_type.
@@ -1511,1161 +628,338 @@ class treap_multiset_impl
    //!   [b, e).
    //!
    //! <b>Complexity</b>: Linear in N if [b, e) is already sorted using
-   //!   comp and otherwise N * log N, where N is the distance between first and last
+   //!   comp and otherwise N * log N, where N is distance(last, first).
    //!
    //! <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 throw.
+   //!   or the copy constructor/operator() of the key_compare object throws.
    template<class Iterator>
    treap_multiset_impl( Iterator b, Iterator e
-                , const value_compare &cmp     = value_compare()
-                , const priority_compare &pcmp = priority_compare()
-                , const value_traits &v_traits = value_traits())
-      : tree_(false, b, e, cmp, pcmp, v_traits)
+           , const key_compare &cmp = key_compare()
+           , const priority_compare &pcmp  = priority_compare()
+           , const value_traits &v_traits = value_traits())
+      : tree_type(false, b, e, cmp, pcmp, v_traits)
    {}
 
    //! <b>Effects</b>: to-do
    //!
    treap_multiset_impl(BOOST_RV_REF(treap_multiset_impl) x)
-      :  tree_(::boost::move(x.tree_))
+      :  tree_type(BOOST_MOVE_BASE(tree_type, x))
    {}
 
    //! <b>Effects</b>: to-do
    //!
    treap_multiset_impl& operator=(BOOST_RV_REF(treap_multiset_impl) x)
-   {  tree_ = ::boost::move(x.tree_);  return *this;  }
+   {  return static_cast<treap_multiset_impl&>(tree_type::operator=(BOOST_MOVE_BASE(tree_type, x)));  }
 
-   //! <b>Effects</b>: Detaches all elements from this. The objects in the treap_multiset
-   //!   are not deleted (i.e. no destructors are called).
-   //!
-   //! <b>Complexity</b>: Linear to the number of elements on the container.
-   //!   if it's a safe-mode or auto-unlink value_type. Constant time otherwise.
-   //!
-   //! <b>Throws</b>: Nothing.
-   ~treap_multiset_impl()
-   {}
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   //! @copydoc ::boost::intrusive::treap::~treap()
+   ~treap_multiset_impl();
 
-   //! <b>Effects</b>: Returns an iterator pointing to the beginning of the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator begin()
-   { return tree_.begin();  }
+   //! @copydoc ::boost::intrusive::treap::begin()
+   iterator begin();
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the beginning of the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator begin() const
-   { return tree_.begin();  }
+   //! @copydoc ::boost::intrusive::treap::begin()const
+   const_iterator begin() const;
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the beginning of the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator cbegin() const
-   { return tree_.cbegin();  }
+   //! @copydoc ::boost::intrusive::treap::cbegin()const
+   const_iterator cbegin() const;
 
-   //! <b>Effects</b>: Returns an iterator pointing to the end of the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator end()
-   { return tree_.end();  }
+   //! @copydoc ::boost::intrusive::treap::end()
+   iterator end();
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the end of the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator end() const
-   { return tree_.end();  }
+   //! @copydoc ::boost::intrusive::treap::end()const
+   const_iterator end() const;
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the end of the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator cend() const
-   { return tree_.cend();  }
+   //! @copydoc ::boost::intrusive::treap::cend()const
+   const_iterator cend() const;
 
-   //! <b>Effects</b>: Returns an iterator pointing to the highest priority object of the tree.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator top()
-   { return tree_.top();  }
+   //! @copydoc ::boost::intrusive::treap::rbegin()
+   reverse_iterator rbegin();
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the highest priority object of the tree..
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator top() const
-   {  return this->ctop();   }
+   //! @copydoc ::boost::intrusive::treap::rbegin()const
+   const_reverse_iterator rbegin() const;
 
-   //! <b>Effects</b>: Returns a const_iterator pointing to the highest priority object of the tree..
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator ctop() const
-   { return tree_.ctop();  }
+   //! @copydoc ::boost::intrusive::treap::crbegin()const
+   const_reverse_iterator crbegin() const;
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning of the
-   //!    reversed treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   reverse_iterator rbegin()
-   { return tree_.rbegin();  }
+   //! @copydoc ::boost::intrusive::treap::rend()
+   reverse_iterator rend();
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
-   //!    of the reversed treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator rbegin() const
-   { return tree_.rbegin();  }
+   //! @copydoc ::boost::intrusive::treap::rend()const
+   const_reverse_iterator rend() const;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
-   //!    of the reversed treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator crbegin() const
-   { return tree_.crbegin();  }
+   //! @copydoc ::boost::intrusive::treap::crend()const
+   const_reverse_iterator crend() const;
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
-   //!    of the reversed treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   reverse_iterator rend()
-   { return tree_.rend();  }
+   //! @copydoc ::boost::intrusive::treap::container_from_end_iterator(iterator)
+   static treap_multiset_impl &container_from_end_iterator(iterator end_iterator);
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
-   //!    of the reversed treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator rend() const
-   { return tree_.rend();  }
+   //! @copydoc ::boost::intrusive::treap::container_from_end_iterator(const_iterator)
+   static const treap_multiset_impl &container_from_end_iterator(const_iterator end_iterator);
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
-   //!    of the reversed treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator crend() const
-   { return tree_.crend();  }
+   //! @copydoc ::boost::intrusive::treap::container_from_iterator(iterator)
+   static treap_multiset_impl &container_from_iterator(iterator it);
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the highest priority object of the
-   //!    reversed tree.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   reverse_iterator rtop()
-   {  return tree_.rtop();  }
+   //! @copydoc ::boost::intrusive::treap::container_from_iterator(const_iterator)
+   static const treap_multiset_impl &container_from_iterator(const_iterator it);
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the highest priority objec
-   //!    of the reversed tree.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator rtop() const
-   {  return tree_.crtop();  }
+   //! @copydoc ::boost::intrusive::treap::key_comp()const
+   key_compare key_comp() const;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the highest priority object
-   //!    of the reversed tree.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_reverse_iterator crtop() const
-   {  return tree_.crtop();  }
+   //! @copydoc ::boost::intrusive::treap::value_comp()const
+   value_compare value_comp() const;
 
-   //! <b>Precondition</b>: end_iterator must be a valid end iterator
-   //!   of treap_multiset.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the treap_multiset associated to the end iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   static treap_multiset_impl &container_from_end_iterator(iterator end_iterator)
-   {
-      return *detail::parent_from_member<treap_multiset_impl, tree_type>
-         ( &tree_type::container_from_end_iterator(end_iterator)
-         , &treap_multiset_impl::tree_);
-   }
-
-   //! <b>Precondition</b>: end_iterator must be a valid end const_iterator
-   //!   of treap_multiset.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the treap_multiset associated to the end iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   static const treap_multiset_impl &container_from_end_iterator(const_iterator end_iterator)
-   {
-      return *detail::parent_from_member<treap_multiset_impl, tree_type>
-         ( &tree_type::container_from_end_iterator(end_iterator)
-         , &treap_multiset_impl::tree_);
-   }
-
-   //! <b>Precondition</b>: it must be a valid iterator of multiset.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the multiset associated to the iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   static treap_multiset_impl &container_from_iterator(iterator it)
-   {
-      return *detail::parent_from_member<treap_multiset_impl, tree_type>
-         ( &tree_type::container_from_iterator(it)
-         , &treap_multiset_impl::tree_);
-   }
-
-   //! <b>Precondition</b>: it must be a valid const_iterator of multiset.
-   //!
-   //! <b>Effects</b>: Returns a const reference to the multiset associated to the iterator
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   static const treap_multiset_impl &container_from_iterator(const_iterator it)
-   {
-      return *detail::parent_from_member<treap_multiset_impl, tree_type>
-         ( &tree_type::container_from_iterator(it)
-         , &treap_multiset_impl::tree_);
-   }
-
-   //! <b>Effects</b>: Returns the key_compare object used by the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: If key_compare copy-constructor throws.
-   key_compare key_comp() const
-   { return tree_.value_comp(); }
+   //! @copydoc ::boost::intrusive::treap::empty()const
+   bool empty() const;
 
-   //! <b>Effects</b>: Returns the value_compare object used by the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: If value_compare copy-constructor throws.
-   value_compare value_comp() const
-   { return tree_.value_comp(); }
+   //! @copydoc ::boost::intrusive::treap::size()const
+   size_type size() const;
 
-   //! <b>Effects</b>: Returns the priority_compare object used by the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: If priority_compare copy-constructor throws.
-   priority_compare priority_comp() const
-   {  return tree_.priority_comp();   }
+   //! @copydoc ::boost::intrusive::treap::swap
+   void swap(treap_multiset_impl& other);
 
-   //! <b>Effects</b>: Returns true if the container is empty.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   bool empty() const
-   { return tree_.empty(); }
+   //! @copydoc ::boost::intrusive::treap::clone_from(const treap&,Cloner,Disposer)
+   template <class Cloner, class Disposer>
+   void clone_from(const treap_multiset_impl &src, Cloner cloner, Disposer disposer);
 
-   //! <b>Effects</b>: Returns the number of elements stored in the treap_multiset.
-   //!
-   //! <b>Complexity</b>: Linear to elements contained in *this if,
-   //!   constant-time size option is enabled. Constant-time otherwise.
-   //!
-   //! <b>Throws</b>: Nothing.
-   size_type size() const
-   { return tree_.size(); }
+   #else
 
-   //! <b>Effects</b>: Swaps the contents of two treap_multisets.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: If the swap() call for the comparison functor
-   //!   found using ADL throws. Strong guarantee.
-   void swap(treap_multiset_impl& other)
-   { tree_.swap(other.tree_); }
+   using tree_type::clone_from;
 
-   //! <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.
+   #endif
+
+   //! @copydoc ::boost::intrusive::treap::clone_from(treap&&,Cloner,Disposer)
    template <class Cloner, class Disposer>
-   void clone_from(const treap_multiset_impl &src, Cloner cloner, Disposer disposer)
-   {  tree_.clone_from(src.tree_, cloner, disposer);  }
+   void clone_from(BOOST_RV_REF(treap_multiset_impl) src, Cloner cloner, Disposer disposer)
+   {  tree_type::clone_from(BOOST_MOVE_BASE(tree_type, src), cloner, disposer);  }
 
-   //! <b>Requires</b>: value must be an lvalue
-   //!
-   //! <b>Effects</b>: Inserts value into the treap_multiset.
-   //!
-   //! <b>Returns</b>: An iterator that points to the position where the new
-   //!   element was inserted.
-   //!
-   //! <b>Complexity</b>: Average complexity for insert element is at
-   //!   most logarithmic.
-   //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare ordering
-   //!  function throws. Strong guarantee.
-   //!
-   //! <b>Note</b>: Does not affect the validity of iterators and references.
-   //!   No copy-constructors are called.
-   iterator insert(reference value)
-   {  return tree_.insert_equal(value);  }
+   #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
 
-   //! <b>Requires</b>: value must be an lvalue
-   //!
-   //! <b>Effects</b>: Inserts x into the treap_multiset, using pos as a hint to
-   //!   where it will be inserted.
-   //!
-   //! <b>Returns</b>: An iterator that points to the position where the new
-   //!   element was inserted.
-   //!
-   //! <b>Complexity</b>: Logarithmic in general, but it is amortized
-   //!   constant time if t is inserted immediately before hint.
-   //!
-   //! <b>Throws</b>: If internal value_compare or priority_compare ordering functions throw.
-   //!   Strong guarantee.
-   //!
-   //! <b>Note</b>: Does not affect the validity of iterators and references.
-   //!   No copy-constructors are called.
+   //! @copydoc ::boost::intrusive::treap::top()
+   iterator top();
+
+   //! @copydoc ::boost::intrusive::treap::top()const
+   const_iterator top() const;
+
+   //! @copydoc ::boost::intrusive::treap::ctop()const
+   const_iterator ctop() const;
+
+   //! @copydoc ::boost::intrusive::treap::rtop()
+   reverse_iterator rtop();
+
+   //! @copydoc ::boost::intrusive::treap::rtop()const
+   const_reverse_iterator rtop() const;
+
+   //! @copydoc ::boost::intrusive::treap::crtop()const
+   const_reverse_iterator crtop() const;
+
+   //! @copydoc ::boost::intrusive::treap::crtop() const
+   priority_compare priority_comp() const;
+   #endif   //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+
+   //! @copydoc ::boost::intrusive::treap::insert_equal(reference)
+   iterator insert(reference value)
+   {  return tree_type::insert_equal(value);  }
+
+   //! @copydoc ::boost::intrusive::treap::insert_equal(const_iterator,reference)
    iterator insert(const_iterator hint, reference value)
-   {  return tree_.insert_equal(hint, value);  }
+   {  return tree_type::insert_equal(hint, value);  }
 
-   //! <b>Requires</b>: Dereferencing iterator must yield an lvalue
-   //!   of type value_type.
-   //!
-   //! <b>Effects</b>: Inserts a range into the treap_multiset.
-   //!
-   //! <b>Returns</b>: An iterator that points to the position where the new
-   //!   element was inserted.
-   //!
-   //! <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().
-   //!
-   //! <b>Throws</b>: If internal value_compare or priority_compare ordering functions throw.
-   //!   Basic guarantee.
-   //!
-   //! <b>Note</b>: Does not affect the validity of iterators and references.
-   //!   No copy-constructors are called.
+   //! @copydoc ::boost::intrusive::treap::insert_equal(Iterator,Iterator)
    template<class Iterator>
    void insert(Iterator b, Iterator e)
-   {  tree_.insert_equal(b, e);  }
+   {  tree_type::insert_equal(b, e);  }
 
-   //! <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>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.
-   //! This is a low-level function to be used only for performance reasons
-   //! by advanced users.
-   iterator insert_before(const_iterator pos, reference value)
-   {  return tree_.insert_before(pos, value);  }
-
-   //! <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>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.
-   //!   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)
-   {  tree_.push_back(value);  }
-
-   //! <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>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.
-   //!   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)
-   {  tree_.push_front(value);  }
-
-   //! <b>Effects</b>: Erases the element pointed to by pos.
-   //!
-   //! <b>Complexity</b>: Average complexity is constant time.
-   //!
-   //! <b>Returns</b>: An iterator to the element after the erased element.
-   //!
-   //! <b>Throws</b>: If the internal priority_compare function throws. Strong guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
-   iterator erase(const_iterator i)
-   {  return tree_.erase(i);  }
+   #ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
+   //! @copydoc ::boost::intrusive::treap::insert_before
+   iterator insert_before(const_iterator pos, reference value);
 
-   //! <b>Effects</b>: Erases the range pointed to by b end e.
-   //!
-   //! <b>Returns</b>: An iterator to the element after the erased elements.
-   //!
-   //! <b>Complexity</b>: Average complexity for erase range is at most
-   //!   O(log(size() + N)), where N is the number of elements in the range.
-   //!
-   //! <b>Throws</b>: If the internal priority_compare function throws. Basic guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
-   iterator erase(const_iterator b, const_iterator e)
-   {  return tree_.erase(b, e);  }
+   //! @copydoc ::boost::intrusive::treap::push_back
+   void push_back(reference value);
 
-   //! <b>Effects</b>: Erases all the elements with the given value.
-   //!
-   //! <b>Returns</b>: The number of erased elements.
-   //!
-   //! <b>Complexity</b>: O(log(size() + this->count(value)).
-   //!
-   //! <b>Throws</b>: If the internal value_compare or priority_compare ordering
-   //!   functiona throw. Basic guarantee.
-   //!
-   //! <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 tree_.erase(value);  }
+   //! @copydoc ::boost::intrusive::treap::push_front
+   void push_front(reference value);
 
-   //! <b>Effects</b>: Erases all the elements that compare equal with
-   //!   the given key and the given comparison functor.
-   //!
-   //! <b>Returns</b>: The number of erased elements.
-   //!
-   //! <b>Complexity</b>: O(log(size() + this->count(key, comp)).
-   //!
-   //! <b>Throws</b>: If comp or internal priority_compare ordering functions throw. Basic guarantee.
-   //!
-   //! <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
-                  )
-   {  return tree_.erase(key, comp);  }
-
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Returns</b>: An iterator to the element after the erased element.
-   //!
-   //! <b>Effects</b>: Erases the element pointed to by pos.
-   //!   Disposer::operator()(pointer) is called for the removed element.
-   //!
-   //! <b>Complexity</b>: Average complexity for erase element is constant time.
-   //!
-   //! <b>Throws</b>: If the internal priority_compare function throws. Strong guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators
-   //!    to the erased elements.
-   template<class Disposer>
-   iterator erase_and_dispose(const_iterator i, Disposer disposer)
-   {  return tree_.erase_and_dispose(i, disposer);  }
+   //! @copydoc ::boost::intrusive::treap::erase(const_iterator)
+   iterator erase(const_iterator i);
+
+   //! @copydoc ::boost::intrusive::treap::erase(const_iterator,const_iterator)
+   iterator erase(const_iterator b, const_iterator e);
+
+   //! @copydoc ::boost::intrusive::treap::erase(const key_type &)
+   size_type erase(const key_type &key);
 
-   #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
+   //! @copydoc ::boost::intrusive::treap::erase(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   size_type erase(const KeyType& key, KeyTypeKeyCompare comp);
+
+   //! @copydoc ::boost::intrusive::treap::erase_and_dispose(const_iterator,Disposer)
    template<class Disposer>
-   iterator erase_and_dispose(iterator i, Disposer disposer)
-   {  return this->erase_and_dispose(const_iterator(i), disposer);   }
-   #endif
+   iterator erase_and_dispose(const_iterator i, Disposer disposer);
 
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Returns</b>: An iterator to the element after the erased elements.
-   //!
-   //! <b>Effects</b>: Erases the range pointed to by b end e.
-   //!   Disposer::operator()(pointer) is called for the removed elements.
-   //!
-   //! <b>Complexity</b>: Average complexity for erase range is at most
-   //!   O(log(size() + N)), where N is the number of elements in the range.
-   //!
-   //! <b>Throws</b>: If the internal priority_compare function throws. Basic guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators
-   //!    to the erased elements.
+   //! @copydoc ::boost::intrusive::treap::erase_and_dispose(const_iterator,const_iterator,Disposer)
    template<class Disposer>
-   iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer)
-   {  return tree_.erase_and_dispose(b, e, disposer);  }
+   iterator erase_and_dispose(const_iterator b, const_iterator e, Disposer disposer);
 
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Effects</b>: Erases all the elements with the given value.
-   //!   Disposer::operator()(pointer) is called for the removed elements.
-   //!
-   //! <b>Returns</b>: The number of erased elements.
-   //!
-   //! <b>Complexity</b>: O(log(size() + this->count(value)).
-   //!
-   //! <b>Throws</b>: If the internal value_compare ordering function throws. Basic guarantee.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
+   //! @copydoc ::boost::intrusive::treap::erase_and_dispose(const key_type &, Disposer)
    template<class Disposer>
-   size_type erase_and_dispose(const_reference value, Disposer disposer)
-   {  return tree_.erase_and_dispose(value, disposer);  }
+   size_type erase_and_dispose(const key_type &key, Disposer disposer);
 
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Effects</b>: Erases all the elements with the given key.
-   //!   according to the comparison functor "comp".
-   //!   Disposer::operator()(pointer) is called for the removed elements.
-   //!
-   //! <b>Returns</b>: The number of erased elements.
-   //!
-   //! <b>Complexity</b>: O(log(size() + this->count(key, comp)).
-   //!
-   //! <b>Throws</b>: If comp or internal priority_compare ordering functions throw. Basic guarantee.
-   //!
-   //! <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
-                  )
-   {  return tree_.erase_and_dispose(key, comp, disposer);  }
-
-   //! <b>Effects</b>: Erases all the elements of the container.
-   //!
-   //! <b>Complexity</b>: Linear to the number of elements on the container.
-   //!   if it's a safe-mode or auto-unlink value_type. Constant time otherwise.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
-   void clear()
-   {  return tree_.clear();  }
+   //! @copydoc ::boost::intrusive::treap::erase_and_dispose(const KeyType&,KeyTypeKeyCompare,Disposer)
+   template<class KeyType, class KeyTypeKeyCompare, class Disposer>
+   size_type erase_and_dispose(const KeyType& key, KeyTypeKeyCompare comp, Disposer disposer);
 
-   //! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
-   //!
-   //! <b>Effects</b>: Erases all the elements of the container.
-   //!
-   //! <b>Complexity</b>: Linear to the number of elements on the container.
-   //!   Disposer::operator()(pointer) is called for the removed elements.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Note</b>: Invalidates the iterators (but not the references)
-   //!    to the erased elements. No destructors are called.
+   //! @copydoc ::boost::intrusive::treap::clear
+   void clear();
+
+   //! @copydoc ::boost::intrusive::treap::clear_and_dispose
    template<class Disposer>
-   void clear_and_dispose(Disposer disposer)
-   {  return tree_.clear_and_dispose(disposer);  }
+   void clear_and_dispose(Disposer disposer);
 
-   //! <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>: If the internal value_compare ordering function throws.
-   size_type count(const_reference value) const
-   {  return tree_.count(value);  }
+   //! @copydoc ::boost::intrusive::treap::count(const key_type &)const
+   size_type count(const key_type &key) const;
 
-   //! <b>Effects</b>: Returns the number of contained elements with the same key
-   //!   compared with the given comparison functor.
-   //!
-   //! <b>Complexity</b>: Logarithmic to the number of elements contained plus lineal
-   //!   to number of objects with the given key.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   template<class KeyType, class KeyValueCompare>
-   size_type count(const KeyType& key, KeyValueCompare comp) const
-   {  return tree_.count(key, comp);  }
+   //! @copydoc ::boost::intrusive::treap::count(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   size_type count(const KeyType& key, KeyTypeKeyCompare comp) 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>: If the internal value_compare ordering function throws.
-   iterator lower_bound(const_reference value)
-   {  return tree_.lower_bound(value);  }
+   //! @copydoc ::boost::intrusive::treap::lower_bound(const key_type &)
+   iterator lower_bound(const key_type &key);
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Returns an iterator to the first element whose
-   //!   key according to the comparison functor is not less than k or
-   //!   end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   iterator lower_bound(const KeyType& key, KeyValueCompare comp)
-   {  return tree_.lower_bound(key, comp);  }
-
-   //! <b>Effects</b>: Returns a const iterator to the first element whose
-   //!   key is not less than k or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If the internal value_compare ordering function throws.
-   const_iterator lower_bound(const_reference value) const
-   {  return tree_.lower_bound(value);  }
+   //! @copydoc ::boost::intrusive::treap::lower_bound(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   iterator lower_bound(const KeyType& key, KeyTypeKeyCompare comp);
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Returns a const_iterator to the first element whose
-   //!   key according to the comparison functor is not less than k or
-   //!   end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   const_iterator lower_bound(const KeyType& key, KeyValueCompare comp) const
-   {  return tree_.lower_bound(key, comp);  }
-
-   //! <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>: If the internal value_compare ordering function throws.
-   iterator upper_bound(const_reference value)
-   {  return tree_.upper_bound(value);  }
+   //! @copydoc ::boost::intrusive::treap::lower_bound(const key_type &)const
+   const_iterator lower_bound(const key_type &key) const;
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Returns an iterator to the first element whose
-   //!   key according to the comparison functor is greater than key or
-   //!   end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   iterator upper_bound(const KeyType& key, KeyValueCompare comp)
-   {  return tree_.upper_bound(key, comp);  }
-
-   //! <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>: If the internal value_compare ordering function throws.
-   const_iterator upper_bound(const_reference value) const
-   {  return tree_.upper_bound(value);  }
+   //! @copydoc ::boost::intrusive::treap::lower_bound(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   const_iterator lower_bound(const KeyType& key, KeyTypeKeyCompare comp) const;
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Returns a const_iterator to the first element whose
-   //!   key according to the comparison functor is greater than key or
-   //!   end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   const_iterator upper_bound(const KeyType& key, KeyValueCompare comp) const
-   {  return tree_.upper_bound(key, comp);  }
-
-   //! <b>Effects</b>: Finds an iterator to the first element whose value is
-   //!   "value" or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If the internal value_compare ordering function throws.
-   iterator find(const_reference value)
-   {  return tree_.find(value);  }
+   //! @copydoc ::boost::intrusive::treap::upper_bound(const key_type &)
+   iterator upper_bound(const key_type &key);
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Finds an iterator to the first element whose key is
-   //!   "key" according to the comparison functor or end() if that element
-   //!   does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   iterator find(const KeyType& key, KeyValueCompare comp)
-   {  return tree_.find(key, comp);  }
-
-   //! <b>Effects</b>: Finds a const_iterator to the first element whose value is
-   //!   "value" or end() if that element does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If the internal value_compare ordering function throws.
-   const_iterator find(const_reference value) const
-   {  return tree_.find(value);  }
+   //! @copydoc ::boost::intrusive::treap::upper_bound(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   iterator upper_bound(const KeyType& key, KeyTypeKeyCompare comp);
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Finds a const_iterator to the first element whose key is
-   //!   "key" according to the comparison functor or end() if that element
-   //!   does not exist.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   //!
-   //! <b>Throws</b>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   const_iterator find(const KeyType& key, KeyValueCompare comp) const
-   {  return tree_.find(key, 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>: If the internal value_compare ordering function throws.
-   std::pair<iterator,iterator> equal_range(const_reference value)
-   {  return tree_.equal_range(value);  }
+   //! @copydoc ::boost::intrusive::treap::upper_bound(const key_type &)const
+   const_iterator upper_bound(const key_type &key) const;
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Finds a range containing all elements whose key is k
-   //!   according to the comparison functor 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>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
-   std::pair<iterator,iterator> equal_range(const KeyType& key, KeyValueCompare comp)
-   {  return tree_.equal_range(key, 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>: If the internal value_compare ordering function throws.
+   //! @copydoc ::boost::intrusive::treap::upper_bound(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   const_iterator upper_bound(const KeyType& key, KeyTypeKeyCompare comp) const;
+
+   //! @copydoc ::boost::intrusive::treap::find(const key_type &)
+   iterator find(const key_type &key);
+
+   //! @copydoc ::boost::intrusive::treap::find(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   iterator find(const KeyType& key, KeyTypeKeyCompare comp);
+
+   //! @copydoc ::boost::intrusive::treap::find(const key_type &)const
+   const_iterator find(const key_type &key) const;
+
+   //! @copydoc ::boost::intrusive::treap::find(const KeyType&,KeyTypeKeyCompare)const
+   template<class KeyType, class KeyTypeKeyCompare>
+   const_iterator find(const KeyType& key, KeyTypeKeyCompare comp) const;
+
+   //! @copydoc ::boost::intrusive::treap::equal_range(const key_type &)
+   std::pair<iterator,iterator> equal_range(const key_type &key);
+
+   //! @copydoc ::boost::intrusive::treap::equal_range(const KeyType&,KeyTypeKeyCompare)
+   template<class KeyType, class KeyTypeKeyCompare>
+   std::pair<iterator,iterator> equal_range(const KeyType& key, KeyTypeKeyCompare comp);
+
+   //! @copydoc ::boost::intrusive::treap::equal_range(const key_type &)const
    std::pair<const_iterator, const_iterator>
-      equal_range(const_reference value) const
-   {  return tree_.equal_range(value);  }
+      equal_range(const key_type &key) const;
 
-   //! <b>Requires</b>: comp must imply the same element order as
-   //!   value_compare. Usually key is the part of the value_type
-   //!   that is used in the ordering functor.
-   //!
-   //! <b>Effects</b>: Finds a range containing all elements whose key is k
-   //!   according to the comparison functor 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>: If comp ordering function throws.
-   //!
-   //! <b>Note</b>: This function is used when constructing a value_type
-   //!   is expensive and the value_type can be compared with a cheaper
-   //!   key type. Usually this key is part of the value_type.
-   template<class KeyType, class KeyValueCompare>
+   //! @copydoc ::boost::intrusive::treap::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
-   {  return tree_.equal_range(key, comp);  }
+      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::treap::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 tree_.bounded_range(lower_value, upper_value, left_closed, 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>
+      (const key_type &lower_key, const key_type &upper_key, bool left_closed, bool right_closed);
+
+   //! @copydoc ::boost::intrusive::treap::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)
-   {  return tree_.bounded_range(lower_key, upper_key, comp, left_closed, right_closed);  }
+      (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 tree_.bounded_range(lower_value, upper_value, left_closed, 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::treap::bounded_range(const key_type &,const key_type &,bool,bool)const
    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
-   {  return tree_.bounded_range(lower_key, upper_key, comp, left_closed, right_closed);  }
+      bounded_range(const key_type &lower_key, const key_type &upper_key, bool left_closed, bool right_closed) const;
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a treap_multiset of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid iterator i belonging to the treap_multiset
-   //!   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)
-   {  return tree_type::s_iterator_to(value);  }
+   //! @copydoc ::boost::intrusive::treap::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>: value must be an lvalue and shall be in a treap_multiset of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid const_iterator i belonging to the
-   //!   treap_multiset 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)
-   {  return tree_type::s_iterator_to(value);  }
+   //! @copydoc ::boost::intrusive::treap::s_iterator_to(reference)
+   static iterator s_iterator_to(reference value);
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a treap_multiset of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid iterator i belonging to the treap_multiset
-   //!   that points to the value
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   iterator iterator_to(reference value)
-   {  return tree_.iterator_to(value);  }
+   //! @copydoc ::boost::intrusive::treap::s_iterator_to(const_reference)
+   static const_iterator s_iterator_to(const_reference value);
 
-   //! <b>Requires</b>: value must be an lvalue and shall be in a treap_multiset of
-   //!   appropriate type. Otherwise the behavior is undefined.
-   //!
-   //! <b>Effects</b>: Returns: a valid const_iterator i belonging to the
-   //!   treap_multiset that points to the value
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   const_iterator iterator_to(const_reference value) const
-   {  return tree_.iterator_to(value);  }
+   //! @copydoc ::boost::intrusive::treap::iterator_to(reference)
+   iterator iterator_to(reference value);
 
-   //! <b>Requires</b>: value shall not be in a treap_multiset/treap_multiset.
-   //!
-   //! <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)
-   { tree_type::init_node(value);   }
+   //! @copydoc ::boost::intrusive::treap::iterator_to(const_reference)const
+   const_iterator iterator_to(const_reference value) const;
 
-   //! <b>Effects</b>: Unlinks the leftmost node from the tree.
-   //!
-   //! <b>Complexity</b>: Average complexity is constant time.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Notes</b>: This function breaks the tree and the tree can
-   //!   only be used for more unlink_leftmost_without_rebalance calls.
-   //!   This function is normally used to achieve a step by step
-   //!   controlled destruction of the tree.
-   pointer unlink_leftmost_without_rebalance()
-   {  return tree_.unlink_leftmost_without_rebalance();  }
-
-   //! <b>Requires</b>: replace_this must be a valid iterator of *this
-   //!   and with_this must not be inserted in any tree.
-   //!
-   //! <b>Effects</b>: Replaces replace_this in its position in the
-   //!   tree with with_this. The tree does not need to be rebalanced.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Note</b>: This function will break container ordering invariants if
-   //!   with_this is not equivalent to *replace_this according to the
-   //!   ordering 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)
-   {  tree_.replace_node(replace_this, with_this);   }
-
-   //! <b>Effects</b>: Rebalances the tree.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Linear.
-   void rebalance()
-   {  tree_.rebalance(); }
+   //! @copydoc ::boost::intrusive::treap::init_node(reference)
+   static void init_node(reference value);
 
-   //! <b>Requires</b>: old_root is a node of a tree.
-   //!
-   //! <b>Effects</b>: Rebalances the subtree rooted at old_root.
-   //!
-   //! <b>Returns</b>: The new root of the subtree.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Linear to the elements in the subtree.
-   iterator rebalance_subtree(iterator root)
-   {  return tree_.rebalance_subtree(root); }
+   //! @copydoc ::boost::intrusive::treap::unlink_leftmost_without_rebalance
+   pointer unlink_leftmost_without_rebalance();
 
-   //! <b>Returns</b>: The balance factor (alpha) used in this tree
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   float balance_factor() const
-   {  return tree_.balance_factor(); }
+   //! @copydoc ::boost::intrusive::treap::replace_node
+   void replace_node(iterator replace_this, reference with_this);
 
-   //! <b>Requires</b>: new_alpha must be a value between 0.5 and 1.0
-   //!
-   //! <b>Effects</b>: Establishes a new balance factor (alpha) and rebalances
-   //!   the tree if the new balance factor is stricter (less) than the old factor.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Linear to the elements in the subtree.
-   void balance_factor(float new_alpha)
-   {  tree_.balance_factor(new_alpha); }
+   //! @copydoc ::boost::intrusive::treap::remove_node
+   void remove_node(reference value);
 
-   /// @cond
-   friend bool operator==(const treap_multiset_impl &x, const treap_multiset_impl &y)
-   {  return x.tree_ == y.tree_;  }
-
-   friend bool operator<(const treap_multiset_impl &x, const treap_multiset_impl &y)
-   {  return x.tree_ < y.tree_;  }
-   /// @endcond
+   #endif   //#ifdef BOOST_INTRUSIVE_DOXYGEN_INVOKED
 };
 
-#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_multiset_impl<T, Options...> &x, const treap_multiset_impl<T, Options...> &y)
-#else
-(const treap_multiset_impl<Config> &x, const treap_multiset_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_multiset_impl<T, Options...> &x, const treap_multiset_impl<T, Options...> &y)
-#else
-(const treap_multiset_impl<Config> &x, const treap_multiset_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_multiset_impl<T, Options...> &x, const treap_multiset_impl<T, Options...> &y)
-#else
-(const treap_multiset_impl<Config> &x, const treap_multiset_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_multiset_impl<T, Options...> &x, const treap_multiset_impl<T, Options...> &y)
-#else
-(const treap_multiset_impl<Config> &x, const treap_multiset_impl<Config> &y)
-#endif
-{  return !(x < y);  }
-
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-template<class T, class ...Options>
-#else
-template<class Config>
-#endif
-inline void swap
-#if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
-(treap_multiset_impl<T, Options...> &x, treap_multiset_impl<T, Options...> &y)
-#else
-(treap_multiset_impl<Config> &x, treap_multiset_impl<Config> &y)
-#endif
-{  x.swap(y);  }
 
 //! Helper metafunction to define a \c treap_multiset 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>
+template<class T, class O1 = void, class O2 = void
+                , class O3 = void, class O4 = void
+                , class O5 = void, class O6 = void>
 #endif
 struct make_treap_multiset
 {
-   /// @cond
+   typedef typename pack_options
+      < treap_defaults,
+      #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+      O1, O2, O3, O4, O5, O6
+      #else
+      Options...
+      #endif
+      >::type packed_options;
+
+   typedef typename detail::get_value_traits
+      <T, typename packed_options::proto_value_traits>::type value_traits;
+
    typedef treap_multiset_impl
-      < typename make_treap_opt<T,
-         #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-         O1, O2, O3, O4
-         #else
-         Options...
-         #endif
-         >::type
-      > implementation_defined;
+         < 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
+         , typename packed_options::header_holder_type
+         > implementation_defined;
    /// @endcond
    typedef implementation_defined type;
 };
@@ -2673,14 +967,14 @@ struct make_treap_multiset
 #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_multiset
    :  public make_treap_multiset<T,
       #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-      O1, O2, O3, O4
+      O1, O2, O3, O4, O5, O6
       #else
       Options...
       #endif
@@ -2689,16 +983,15 @@ class treap_multiset
    typedef typename make_treap_multiset
       <T,
       #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
-      O1, O2, O3, O4
+      O1, O2, O3, O4, O5, O6
       #else
       Options...
       #endif
       >::type   Base;
-   //Movable
    BOOST_MOVABLE_BUT_NOT_COPYABLE(treap_multiset)
 
    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::iterator           iterator;
@@ -2707,26 +1000,34 @@ class treap_multiset
    //Assert if passed value traits are compatible with the type
    BOOST_STATIC_ASSERT((detail::is_same<typename value_traits::value_type, T>::value));
 
-   treap_multiset( const value_compare &cmp = value_compare()
-                , const priority_compare &pcmp = priority_compare()
-                , const value_traits &v_traits = value_traits())
+   explicit treap_multiset( 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_multiset( Iterator b, Iterator e
-           , const value_compare &cmp = value_compare()
-           , const priority_compare &pcmp = priority_compare()
-           , const value_traits &v_traits = value_traits())
+      , const key_compare &cmp = key_compare()
+      , const priority_compare &pcmp = priority_compare()
+      , const value_traits &v_traits = value_traits())
       :  Base(b, e, cmp, pcmp, v_traits)
    {}
 
    treap_multiset(BOOST_RV_REF(treap_multiset) x)
-      :  Base(::boost::move(static_cast<Base&>(x)))
+      :  Base(BOOST_MOVE_BASE(Base, x))
    {}
 
    treap_multiset& operator=(BOOST_RV_REF(treap_multiset) x)
-   {  this->Base::operator=(::boost::move(static_cast<Base&>(x))); return *this;  }
+   {  return static_cast<treap_multiset &>(this->Base::operator=(BOOST_MOVE_BASE(Base, x)));  }
+
+   template <class Cloner, class Disposer>
+   void clone_from(const treap_multiset &src, Cloner cloner, Disposer disposer)
+   {  Base::clone_from(src, cloner, disposer);  }
+
+   template <class Cloner, class Disposer>
+   void clone_from(BOOST_RV_REF(treap_multiset) src, Cloner cloner, Disposer disposer)
+   {  Base::clone_from(BOOST_MOVE_BASE(Base, src), cloner, disposer);  }
 
    static treap_multiset &container_from_end_iterator(iterator end_iterator)
    {  return static_cast<treap_multiset &>(Base::container_from_end_iterator(end_iterator));   }
@@ -2748,4 +1049,4 @@ class treap_multiset
 
 #include <boost/intrusive/detail/config_end.hpp>
 
-#endif //BOOST_INTRUSIVE_TRIE_SET_HPP
+#endif //BOOST_INTRUSIVE_TREAP_SET_HPP