passenger 5.0.24 → 5.0.25

data/src/cxx_supportlib/vendor-modified/boost/container/scoped_allocator_fwd.hpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////
 //
-// (C) Copyright Ion Gaztanaga 2011-2012. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2015-2015. Distributed under the Boost
 // Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
@@ -11,70 +11,58 @@
 #ifndef BOOST_CONTAINER_ALLOCATOR_SCOPED_ALLOCATOR_FWD_HPP
 #define BOOST_CONTAINER_ALLOCATOR_SCOPED_ALLOCATOR_FWD_HPP
 
-#if (defined MSC_VER) && (_MSC_VER >= 1200)
+//! \file
+//! This header file forward declares boost::container::scoped_allocator_adaptor
+
+#ifndef BOOST_CONFIG_HPP
+#  include <boost/config.hpp>
+#endif
+
+#if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
 #endif
 
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
+#include <boost/container/detail/std_fwd.hpp>
+#include <boost/container/uses_allocator_fwd.hpp>
 
 #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-#include <boost/container/detail/preprocessor.hpp>
-#include <boost/container/detail/type_traits.hpp>
+#include <boost/move/detail/fwd_macros.hpp>
 #endif
 
 namespace boost { namespace container {
 
-///@cond
+#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #if !defined(BOOST_CONTAINER_UNIMPLEMENTED_PACK_EXPANSION_TO_FIXED_LIST)
 
-   template <typename OuterAlloc, typename ...InnerAllocs>
-   class scoped_allocator_adaptor;
+      template <typename OuterAlloc, typename ...InnerAllocs>
+      class scoped_allocator_adaptor;
 
    #else // #if !defined(BOOST_CONTAINER_UNIMPLEMENTED_PACK_EXPANSION_TO_FIXED_LIST)
 
-   template <typename ...InnerAllocs>
-   class scoped_allocator_adaptor;
+      template <typename ...InnerAllocs>
+      class scoped_allocator_adaptor;
 
-   template <typename OuterAlloc, typename ...InnerAllocs>
-   class scoped_allocator_adaptor<OuterAlloc, InnerAllocs...>;
+      template <typename OuterAlloc, typename ...InnerAllocs>
+      class scoped_allocator_adaptor<OuterAlloc, InnerAllocs...>;
 
    #endif   // #if !defined(BOOST_CONTAINER_UNIMPLEMENTED_PACK_EXPANSION_TO_FIXED_LIST)
 
-
 #else    // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
-template <typename OuterAlloc
-BOOST_PP_ENUM_TRAILING( BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS
-                      , BOOST_CONTAINER_PP_TEMPLATE_PARAM_WITH_DEFAULT, container_detail::nat)
->
-class scoped_allocator_adaptor;
+   template <typename OuterAlloc, BOOST_MOVE_CLASSDFLT9>
+   class scoped_allocator_adaptor;
 
 #endif
 
-///@endcond
-
-//! The allocator_arg_t struct is an empty structure type used as a unique type to
-//! disambiguate constructor and function overloading. Specifically, several types
-//! have constructors with allocator_arg_t as the first argument, immediately followed
-//! by an argument of a type that satisfies the Allocator requirements
-struct allocator_arg_t{};
-
-//! A instance of type allocator_arg_t
-//!
-static const allocator_arg_t allocator_arg = allocator_arg_t();
-
-template <class T>
-struct constructible_with_allocator_suffix;
 
-template <class T>
-struct constructible_with_allocator_prefix;
+#else    //BOOST_CONTAINER_DOXYGEN_INVOKED
 
-template <typename T, typename Alloc>
-struct uses_allocator;
+#endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 }} // namespace boost { namespace container {
 

data/src/cxx_supportlib/vendor-modified/boost/container/set.hpp

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////
 //
-// (C) Copyright Ion Gaztanaga 2005-2012. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2005-2013. Distributed under the Boost
 // Software License, Version 1.0. (See accompanying file
 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
@@ -11,40 +11,42 @@
 #ifndef BOOST_CONTAINER_SET_HPP
 #define BOOST_CONTAINER_SET_HPP
 
-#if (defined _MSC_VER) && (_MSC_VER >= 1200)
+#ifndef BOOST_CONFIG_HPP
+#  include <boost/config.hpp>
+#endif
+
+#if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
 #endif
 
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
+// container
 #include <boost/container/container_fwd.hpp>
-
-#include <utility>
-#include <functional>
-#include <memory>
-
-#include <boost/move/utility.hpp>
-#include <boost/move/detail/move_helpers.hpp>
+// container/detail
 #include <boost/container/detail/mpl.hpp>
 #include <boost/container/detail/tree.hpp>
-#include <boost/move/utility.hpp>
-#ifndef BOOST_CONTAINER_PERFECT_FORWARDING
-#include <boost/container/detail/preprocessor.hpp>
+#include <boost/container/new_allocator.hpp> //new_allocator
+// intrusive/detail
+#include <boost/intrusive/detail/minimal_pair_header.hpp>      //pair
+#include <boost/intrusive/detail/minimal_less_equal_header.hpp>//less, equal
+// move
+#include <boost/move/traits.hpp>
+#include <boost/move/utility_core.hpp>
+// move/detail
+#include <boost/move/detail/move_helpers.hpp>
+#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#include <boost/move/detail/fwd_macros.hpp>
+#endif
+// std
+#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
+#include <initializer_list>
 #endif
 
 namespace boost {
 namespace container {
 
-/// @cond
-// Forward declarations of operators < and ==, needed for friend declaration.
-template <class Key, class Compare, class Allocator>
-inline bool operator==(const set<Key,Compare,Allocator>& x,
-                       const set<Key,Compare,Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-inline bool operator<(const set<Key,Compare,Allocator>& x,
-                      const set<Key,Compare,Allocator>& y);
-/// @endcond
+#ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 //! A set is a kind of associative container that supports unique keys (contains at
 //! most one of each key value) and provides for fast retrieval of the keys themselves.
@@ -53,20 +55,27 @@ inline bool operator<(const set<Key,Compare,Allocator>& x,
 //! A set satisfies all of the requirements of a container and of a reversible container
 //! , and of an associative container. A set also provides most operations described in
 //! for unique keys.
-#ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-template <class Key, class Compare = std::less<Key>, class Allocator = std::allocator<Key> >
+//!
+//! \tparam Key is the type to be inserted in the set, which is also the key_type
+//! \tparam Compare is the comparison functor used to order keys
+//! \tparam Allocator is the allocator to be used to allocate memory for this container
+//! \tparam SetOptions is an packed option type generated using using boost::container::tree_assoc_options.
+template <class Key, class Compare = std::less<Key>, class Allocator = new_allocator<Key>, class SetOptions = tree_assoc_defaults >
 #else
-template <class Key, class Compare, class Allocator>
+template <class Key, class Compare, class Allocator, class SetOptions>
 #endif
 class set
+   ///@cond
+   : public container_detail::tree
+      < Key, Key, container_detail::identity<Key>, Compare, Allocator, SetOptions>
+   ///@endcond
 {
-   /// @cond
+   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
    BOOST_COPYABLE_AND_MOVABLE(set)
-   typedef container_detail::rbtree<Key, Key,
-                     container_detail::identity<Key>, Compare, Allocator> tree_t;
-   tree_t m_tree;  // red-black tree representing set
-   /// @endcond
+   typedef container_detail::tree
+      < Key, Key, container_detail::identity<Key>, Compare, Allocator, SetOptions> base_t;
+   #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
    public:
    //////////////////////////////////////////////
@@ -78,6 +87,7 @@ class set
    typedef Key                                                                         value_type;
    typedef Compare                                                                     key_compare;
    typedef Compare                                                                     value_compare;
+   typedef ::boost::container::allocator_traits<Allocator>                             allocator_traits_type;
    typedef typename ::boost::container::allocator_traits<Allocator>::pointer           pointer;
    typedef typename ::boost::container::allocator_traits<Allocator>::const_pointer     const_pointer;
    typedef typename ::boost::container::allocator_traits<Allocator>::reference         reference;
@@ -85,11 +95,11 @@ class set
    typedef typename ::boost::container::allocator_traits<Allocator>::size_type         size_type;
    typedef typename ::boost::container::allocator_traits<Allocator>::difference_type   difference_type;
    typedef Allocator                                                                   allocator_type;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::stored_allocator_type)              stored_allocator_type;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::iterator)                           iterator;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::const_iterator)                     const_iterator;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::reverse_iterator)                   reverse_iterator;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::const_reverse_iterator)             const_reverse_iterator;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::stored_allocator_type)              stored_allocator_type;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::iterator)                           iterator;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_iterator)                     const_iterator;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::reverse_iterator)                   reverse_iterator;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_reverse_iterator)             const_reverse_iterator;
 
    //////////////////////////////////////////////
    //
@@ -101,7 +111,7 @@ class set
    //!
    //! <b>Complexity</b>: Constant.
    set()
-      : m_tree()
+      : base_t()
    {}
 
    //! <b>Effects</b>: Constructs an empty set using the specified comparison object
@@ -110,7 +120,14 @@ class set
    //! <b>Complexity</b>: Constant.
    explicit set(const Compare& comp,
                 const allocator_type& a = allocator_type())
-      : m_tree(comp, a)
+      : base_t(comp, a)
+   {}
+
+   //! <b>Effects</b>: Constructs an empty set using the specified allocator object.
+   //!
+   //! <b>Complexity</b>: Constant.
+   explicit set(const allocator_type& a)
+      : base_t(a)
    {}
 
    //! <b>Effects</b>: Constructs an empty set using the specified comparison object and
@@ -121,7 +138,17 @@ class set
    template <class InputIterator>
    set(InputIterator first, InputIterator last, const Compare& comp = Compare(),
          const allocator_type& a = allocator_type())
-      : m_tree(true, first, last, comp, a)
+      : base_t(true, first, last, comp, a)
+   {}
+
+   //! <b>Effects</b>: Constructs an empty set using the specified
+   //! allocator, and inserts elements from the range [first ,last ).
+   //!
+   //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
+   //! comp and otherwise N logN, where N is last - first.
+   template <class InputIterator>
+   set(InputIterator first, InputIterator last, const allocator_type& a)
+      : base_t(true, first, last, key_compare(), a)
    {}
 
    //! <b>Effects</b>: Constructs an empty set using the specified comparison object and
@@ -132,17 +159,54 @@ class set
    //! unique values.
    //!
    //! <b>Complexity</b>: Linear in N.
+   //!
+   //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
    set( ordered_unique_range_t, InputIterator first, InputIterator last
       , const Compare& comp = Compare(), const allocator_type& a = allocator_type())
-      : m_tree(ordered_range, first, last, comp, a)
+      : base_t(ordered_range, first, last, comp, a)
    {}
 
+#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
+   //! <b>Effects</b>: Constructs an empty set using the specified comparison object and
+   //! allocator, and inserts elements from the range [il.begin(), il.end()).
+   //!
+   //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
+   //! comp and otherwise N logN, where N is il.begin() - il.end().
+   set(std::initializer_list<value_type> il, const Compare& comp = Compare(), const allocator_type& a = allocator_type())
+      : base_t(true, il.begin(), il.end(), comp, a)
+   {}
+
+   //! <b>Effects</b>: Constructs an empty set using the specified
+   //! allocator, and inserts elements from the range [il.begin(), il.end()).
+   //!
+   //! <b>Complexity</b>: Linear in N if the range [il.begin(), il.end()) is already sorted using
+   //! comp and otherwise N logN, where N is il.begin() - il.end().
+   set(std::initializer_list<value_type> il, const allocator_type& a)
+      : base_t(true, il.begin(), il.end(), Compare(), a)
+   {}
+
+   //! <b>Effects</b>: Constructs an empty set using the specified comparison object and
+   //! allocator, and inserts elements from the ordered unique range [il.begin(), il.end()). This function
+   //! is more efficient than the normal range creation for ordered ranges.
+   //!
+   //! <b>Requires</b>: [il.begin(), il.end()) must be ordered according to the predicate and must be
+   //! unique values.
+   //!
+   //! <b>Complexity</b>: Linear in N.
+   //!
+   //! <b>Note</b>: Non-standard extension.
+   set( ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp = Compare()
+      , const allocator_type& a = allocator_type())
+      : base_t(ordered_range, il.begin(), il.end(), comp, a)
+   {}
+#endif
+
    //! <b>Effects</b>: Copy constructs a set.
    //!
    //! <b>Complexity</b>: Linear in x.size().
    set(const set& x)
-      : m_tree(x.m_tree)
+      : base_t(static_cast<const base_t&>(x))
    {}
 
    //! <b>Effects</b>: Move constructs a set. Constructs *this using x's resources.
@@ -151,14 +215,14 @@ class set
    //!
    //! <b>Postcondition</b>: x is emptied.
    set(BOOST_RV_REF(set) x)
-      : m_tree(boost::move(x.m_tree))
+      : base_t(BOOST_MOVE_BASE(base_t, x))
    {}
 
    //! <b>Effects</b>: Copy constructs a set using the specified allocator.
    //!
    //! <b>Complexity</b>: Linear in x.size().
    set(const set& x, const allocator_type &a)
-      : m_tree(x.m_tree, a)
+      : base_t(static_cast<const base_t&>(x), a)
    {}
 
    //! <b>Effects</b>: Move constructs a set using the specified allocator.
@@ -166,27 +230,47 @@ class set
    //!
    //! <b>Complexity</b>: Constant if a == x.get_allocator(), linear otherwise.
    set(BOOST_RV_REF(set) x, const allocator_type &a)
-      : m_tree(boost::move(x.m_tree), a)
+      : base_t(BOOST_MOVE_BASE(base_t, x), a)
    {}
 
    //! <b>Effects</b>: Makes *this a copy of x.
    //!
    //! <b>Complexity</b>: Linear in x.size().
    set& operator=(BOOST_COPY_ASSIGN_REF(set) x)
-   {  m_tree = x.m_tree;   return *this;  }
+   {  return static_cast<set&>(this->base_t::operator=(static_cast<const base_t&>(x)));  }
 
    //! <b>Effects</b>: this->swap(x.get()).
    //!
-   //! <b>Complexity</b>: Constant.
+   //! <b>Throws</b>: If allocator_traits_type::propagate_on_container_move_assignment
+   //!   is false and (allocation throws or value_type's move constructor throws)
+   //!
+   //! <b>Complexity</b>: Constant if allocator_traits_type::
+   //!   propagate_on_container_move_assignment is true or
+   //!   this->get>allocator() == x.get_allocator(). Linear otherwise.
    set& operator=(BOOST_RV_REF(set) x)
-   {  m_tree = boost::move(x.m_tree);   return *this;  }
+      BOOST_NOEXCEPT_IF(  allocator_traits_type::is_always_equal::value
+                                 && boost::container::container_detail::is_nothrow_move_assignable<Compare>::value )
+   {  return static_cast<set&>(this->base_t::operator=(BOOST_MOVE_BASE(base_t, x)));  }
+
+#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
+   //! <b>Effects</b>: Copy all elements from il to *this.
+   //!
+   //! <b>Complexity</b>: Linear in il.size().
+   set& operator=(std::initializer_list<value_type> il)
+   {
+      this->clear();
+      insert(il.begin(), il.end());
+      return *this;
+   }
+#endif
+
+   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
-   //! <b>Effects</b>: Returns a copy of the Allocator that
+   //! <b>Effects</b>: Returns a copy of the allocator that
    //!   was passed to the object's constructor.
    //!
    //! <b>Complexity</b>: Constant.
-   allocator_type get_allocator() const
-   { return m_tree.get_allocator(); }
+   allocator_type get_allocator() const;
 
    //! <b>Effects</b>: Returns a reference to the internal allocator.
    //!
@@ -195,8 +279,7 @@ class set
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   const stored_allocator_type &get_stored_allocator() const
-   { return m_tree.get_stored_allocator(); }
+   stored_allocator_type &get_stored_allocator();
 
    //! <b>Effects</b>: Returns a reference to the internal allocator.
    //!
@@ -205,107 +288,89 @@ class set
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   stored_allocator_type &get_stored_allocator()
-   { return m_tree.get_stored_allocator(); }
-
-   //////////////////////////////////////////////
-   //
-   //                capacity
-   //
-   //////////////////////////////////////////////
+   const stored_allocator_type &get_stored_allocator() const;
 
    //! <b>Effects</b>: Returns an iterator to the first element contained in the container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant
-   iterator begin()
-   { return m_tree.begin(); }
+   iterator begin();
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_iterator begin() const
-   { return m_tree.begin(); }
+   const_iterator begin() const;
 
-   //! <b>Effects</b>: Returns an iterator to the end of the container.
+   //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   iterator end()
-   { return m_tree.end(); }
+   const_iterator cbegin() const;
 
-   //! <b>Effects</b>: Returns a const_iterator to the end of the container.
+   //! <b>Effects</b>: Returns an iterator to the end of the container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_iterator end() const
-   { return m_tree.end(); }
+   iterator end();
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
-   //! of the reversed container.
+   //! <b>Effects</b>: Returns a const_iterator to the end of the container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reverse_iterator rbegin()
-   { return m_tree.rbegin(); }
+   const_iterator end() const;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
-   //! of the reversed container.
+   //! <b>Effects</b>: Returns a const_iterator to the end of the container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reverse_iterator rbegin() const
-   { return m_tree.rbegin(); }
+   const_iterator cend() const;
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
+   //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
    //! of the reversed container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reverse_iterator rend()
-   { return m_tree.rend(); }
+   reverse_iterator rbegin();
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
+   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
    //! of the reversed container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reverse_iterator rend() const
-   { return m_tree.rend(); }
+   const_reverse_iterator rbegin() const;
 
-   //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
+   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
+   //! of the reversed container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_iterator cbegin() const
-   { return m_tree.cbegin(); }
+   const_reverse_iterator crbegin() const;
 
-   //! <b>Effects</b>: Returns a const_iterator to the end of the container.
+   //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
+   //! of the reversed container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_iterator cend() const
-   { return m_tree.cend(); }
+   reverse_iterator rend();
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
+   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
    //! of the reversed container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reverse_iterator crbegin() const
-   { return m_tree.crbegin(); }
+   const_reverse_iterator rend() const;
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
    //! of the reversed container.
@@ -313,46 +378,31 @@ class set
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reverse_iterator crend() const
-   { return m_tree.crend(); }
-
-   //////////////////////////////////////////////
-   //
-   //                capacity
-   //
-   //////////////////////////////////////////////
+   const_reverse_iterator crend() const;
 
    //! <b>Effects</b>: Returns true if the container contains no elements.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   bool empty() const
-   { return m_tree.empty(); }
+   bool empty() const;
 
    //! <b>Effects</b>: Returns the number of the elements contained in the container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   size_type size() const
-   { return m_tree.size(); }
+   size_type size() const;
 
    //! <b>Effects</b>: Returns the largest possible size of the container.
    //!
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   size_type max_size() const
-   { return m_tree.max_size(); }
+   size_type max_size() const;
+   #endif   //   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
-   //////////////////////////////////////////////
-   //
-   //                modifiers
-   //
-   //////////////////////////////////////////////
-
-   #if defined(BOOST_CONTAINER_PERFECT_FORWARDING) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    //! <b>Effects</b>:  Inserts an object x of type Key constructed with
    //!   std::forward<Args>(args)... if and only if there is
@@ -369,8 +419,8 @@ class set
    //!
    //! <b>Complexity</b>: Logarithmic.
    template <class... Args>
-   std::pair<iterator,bool> emplace(Args&&... args)
-   {  return m_tree.emplace_unique(boost::forward<Args>(args)...); }
+   std::pair<iterator,bool> emplace(BOOST_FWD_REF(Args)... args)
+   {  return this->base_t::emplace_unique(boost::forward<Args>(args)...); }
 
    //! <b>Effects</b>:  Inserts an object of type Key constructed with
    //!   std::forward<Args>(args)... if and only if there is
@@ -382,26 +432,24 @@ class set
    //!
    //! <b>Complexity</b>: Logarithmic.
    template <class... Args>
-   iterator emplace_hint(const_iterator hint, Args&&... args)
-   {  return m_tree.emplace_hint_unique(hint, boost::forward<Args>(args)...); }
-
-   #else //#ifdef BOOST_CONTAINER_PERFECT_FORWARDING
-
-   #define BOOST_PP_LOCAL_MACRO(n)                                                                 \
-   BOOST_PP_EXPR_IF(n, template<) BOOST_PP_ENUM_PARAMS(n, class P) BOOST_PP_EXPR_IF(n, >)          \
-   std::pair<iterator,bool> emplace(BOOST_PP_ENUM(n, BOOST_CONTAINER_PP_PARAM_LIST, _))            \
-   {  return m_tree.emplace_unique(BOOST_PP_ENUM(n, BOOST_CONTAINER_PP_PARAM_FORWARD, _)); }       \
-                                                                                                   \
-   BOOST_PP_EXPR_IF(n, template<) BOOST_PP_ENUM_PARAMS(n, class P) BOOST_PP_EXPR_IF(n, >)          \
-   iterator emplace_hint(const_iterator hint                                                       \
-                         BOOST_PP_ENUM_TRAILING(n, BOOST_CONTAINER_PP_PARAM_LIST, _))              \
-   {  return m_tree.emplace_hint_unique(hint                                                       \
-                               BOOST_PP_ENUM_TRAILING(n, BOOST_CONTAINER_PP_PARAM_FORWARD, _));}   \
-   //!
-   #define BOOST_PP_LOCAL_LIMITS (0, BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS)
-   #include BOOST_PP_LOCAL_ITERATE()
+   iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
+   {  return this->base_t::emplace_hint_unique(p, boost::forward<Args>(args)...); }
+
+   #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+
+   #define BOOST_CONTAINER_SET_EMPLACE_CODE(N) \
+   BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
+   std::pair<iterator,bool> emplace(BOOST_MOVE_UREF##N)\
+   {  return this->base_t::emplace_unique(BOOST_MOVE_FWD##N);  }\
+   \
+   BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
+   iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   {  return this->base_t::emplace_hint_unique(hint BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
+   //
+   BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_SET_EMPLACE_CODE)
+   #undef BOOST_CONTAINER_SET_EMPLACE_CODE
 
-   #endif   //#ifdef BOOST_CONTAINER_PERFECT_FORWARDING
+   #endif   // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    //! <b>Effects</b>: Inserts x if and only if there is no element in the container
@@ -448,9 +496,9 @@ class set
    //! <b>Returns</b>: An iterator pointing to the element with key equivalent to the key of x.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   iterator insert(const_iterator position, value_type &&x);
+   iterator insert(const_iterator p, value_type &&x);
    #else
-   BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator)
+   BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator, const_iterator)
    #endif
 
    //! <b>Requires</b>: first, last are not iterators into *this.
@@ -461,7 +509,18 @@ class set
    //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from first to last)
    template <class InputIterator>
    void insert(InputIterator first, InputIterator last)
-   {  m_tree.insert_unique(first, last);  }
+   {  this->base_t::insert_unique(first, last);  }
+
+#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
+   //! <b>Effects</b>: inserts each element from the range [il.begin(),il.end()) if and only
+   //!   if there is no element with key equivalent to the key of that element.
+   //!
+   //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from il.begin() to il.end())
+   void insert(std::initializer_list<value_type> il)
+   {  this->base_t::insert_unique(il.begin(), il.end()); }
+#endif
+
+   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    //! <b>Effects</b>: Erases the element pointed to by p.
    //!
@@ -470,24 +529,21 @@ class set
    //!   returns end().
    //!
    //! <b>Complexity</b>: Amortized constant time
-   iterator erase(const_iterator p)
-   {  return m_tree.erase(p); }
+   iterator erase(const_iterator p);
 
    //! <b>Effects</b>: Erases all elements in the container with key equivalent to x.
    //!
    //! <b>Returns</b>: Returns the number of erased elements.
    //!
    //! <b>Complexity</b>: log(size()) + count(k)
-   size_type erase(const key_type& x)
-   {  return m_tree.erase(x); }
+   size_type erase(const key_type& x);
 
    //! <b>Effects</b>: Erases all the elements in the range [first, last).
    //!
    //! <b>Returns</b>: Returns last.
    //!
    //! <b>Complexity</b>: log(size())+N where N is the distance from first to last.
-   iterator erase(const_iterator first, const_iterator last)
-   {  return m_tree.erase(first, last);  }
+   iterator erase(const_iterator first, const_iterator last);
 
    //! <b>Effects</b>: Swaps the contents of *this and x.
    //!
@@ -495,178 +551,180 @@ class set
    //!
    //! <b>Complexity</b>: Constant.
    void swap(set& x)
-   { m_tree.swap(x.m_tree); }
+      BOOST_NOEXCEPT_IF(  allocator_traits_type::is_always_equal::value
+                                 && boost::container::container_detail::is_nothrow_swappable<Compare>::value );
 
    //! <b>Effects</b>: erase(a.begin(),a.end()).
    //!
    //! <b>Postcondition</b>: size() == 0.
    //!
    //! <b>Complexity</b>: linear in size().
-   void clear()
-   { m_tree.clear(); }
-
-   //////////////////////////////////////////////
-   //
-   //                observers
-   //
-   //////////////////////////////////////////////
+   void clear();
 
    //! <b>Effects</b>: Returns the comparison object out
    //!   of which a was constructed.
    //!
    //! <b>Complexity</b>: Constant.
-   key_compare key_comp() const
-   { return m_tree.key_comp(); }
+   key_compare key_comp() const;
 
    //! <b>Effects</b>: Returns an object of value_compare constructed out
    //!   of the comparison object.
    //!
    //! <b>Complexity</b>: Constant.
-   value_compare value_comp() const
-   { return m_tree.key_comp(); }
-
-   //////////////////////////////////////////////
-   //
-   //              set operations
-   //
-   //////////////////////////////////////////////
+   value_compare value_comp() const;
 
    //! <b>Returns</b>: An iterator pointing to an element with the key
    //!   equivalent to x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   iterator find(const key_type& x)
-   { return m_tree.find(x); }
+   iterator find(const key_type& x);
 
-   //! <b>Returns</b>: Allocator const_iterator pointing to an element with the key
+   //! <b>Returns</b>: A const_iterator pointing to an element with the key
    //!   equivalent to x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic.
-   const_iterator find(const key_type& x) const
-   { return m_tree.find(x); }
+   const_iterator find(const key_type& x) const;
+
+   #endif   //#if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    //! <b>Returns</b>: The number of elements with key equivalent to x.
    //!
    //! <b>Complexity</b>: log(size())+count(k)
    size_type count(const key_type& x) const
-   {  return m_tree.find(x) == m_tree.end() ? 0 : 1;  }
+   {  return static_cast<size_type>(this->base_t::find(x) != this->base_t::cend());  }
+
+   //! <b>Returns</b>: The number of elements with key equivalent to x.
+   //!
+   //! <b>Complexity</b>: log(size())+count(k)
+   size_type count(const key_type& x)
+   {  return static_cast<size_type>(this->base_t::find(x) != this->base_t::end());  }
+
+   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    //! <b>Returns</b>: An iterator pointing to the first element with key not less
    //!   than k, or a.end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic
-   iterator lower_bound(const key_type& x)
-   {  return m_tree.lower_bound(x); }
+   iterator lower_bound(const key_type& x);
 
-   //! <b>Returns</b>: Allocator const iterator pointing to the first element with key not
+   //! <b>Returns</b>: A const iterator pointing to the first element with key not
    //!   less than k, or a.end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic
-   const_iterator lower_bound(const key_type& x) const
-   {  return m_tree.lower_bound(x); }
+   const_iterator lower_bound(const key_type& x) const;
 
    //! <b>Returns</b>: An iterator pointing to the first element with key not less
    //!   than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic
-   iterator upper_bound(const key_type& x)
-   {  return m_tree.upper_bound(x);    }
+   iterator upper_bound(const key_type& x);
 
-   //! <b>Returns</b>: Allocator const iterator pointing to the first element with key not
+   //! <b>Returns</b>: A const iterator pointing to the first element with key not
    //!   less than x, or end() if such an element is not found.
    //!
    //! <b>Complexity</b>: Logarithmic
-   const_iterator upper_bound(const key_type& x) const
-   {  return m_tree.upper_bound(x);    }
+   const_iterator upper_bound(const key_type& x) const;
+
+   #endif   //#if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic
    std::pair<iterator,iterator> equal_range(const key_type& x)
-   {  return m_tree.equal_range(x); }
+   {  return this->base_t::lower_bound_range(x);  }
 
    //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
    //!
    //! <b>Complexity</b>: Logarithmic
    std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const
-   {  return m_tree.equal_range(x); }
+   {  return this->base_t::lower_bound_range(x);  }
 
-   /// @cond
-   template <class K1, class C1, class A1>
-   friend bool operator== (const set<K1,C1,A1>&, const set<K1,C1,A1>&);
+   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
-   template <class K1, class C1, class A1>
-   friend bool operator< (const set<K1,C1,A1>&, const set<K1,C1,A1>&);
+   //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
+   //!
+   //! <b>Complexity</b>: Logarithmic
+   std::pair<iterator,iterator> equal_range(const key_type& x);
 
-   private:
-   template <class KeyType>
-   std::pair<iterator, bool> priv_insert(BOOST_FWD_REF(KeyType) x)
-   {  return m_tree.insert_unique(::boost::forward<KeyType>(x));  }
+   //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
+   //!
+   //! <b>Complexity</b>: Logarithmic
+   std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const;
 
-   template <class KeyType>
-   iterator priv_insert(const_iterator p, BOOST_FWD_REF(KeyType) x)
-   {  return m_tree.insert_unique(p, ::boost::forward<KeyType>(x)); }
-   /// @endcond
-};
+   //! <b>Effects</b>: Rebalances the tree. It's a no-op for Red-Black and AVL trees.
+   //!
+   //! <b>Complexity</b>: Linear
+   void rebalance();
 
-template <class Key, class Compare, class Allocator>
-inline bool operator==(const set<Key,Compare,Allocator>& x,
-                       const set<Key,Compare,Allocator>& y)
-{  return x.m_tree == y.m_tree;  }
+   //! <b>Effects</b>: Returns true if x and y are equal
+   //!
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator==(const set& x, const set& y);
 
-template <class Key, class Compare, class Allocator>
-inline bool operator<(const set<Key,Compare,Allocator>& x,
-                      const set<Key,Compare,Allocator>& y)
-{  return x.m_tree < y.m_tree;   }
+   //! <b>Effects</b>: Returns true if x and y are unequal
+   //!
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator!=(const set& x, const set& y);
 
-template <class Key, class Compare, class Allocator>
-inline bool operator!=(const set<Key,Compare,Allocator>& x,
-                       const set<Key,Compare,Allocator>& y)
-{  return !(x == y);   }
+   //! <b>Effects</b>: Returns true if x is less than y
+   //!
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator<(const set& x, const set& y);
 
-template <class Key, class Compare, class Allocator>
-inline bool operator>(const set<Key,Compare,Allocator>& x,
-                      const set<Key,Compare,Allocator>& y)
-{  return y < x; }
+   //! <b>Effects</b>: Returns true if x is greater than y
+   //!
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator>(const set& x, const set& y);
 
-template <class Key, class Compare, class Allocator>
-inline bool operator<=(const set<Key,Compare,Allocator>& x,
-                       const set<Key,Compare,Allocator>& y)
-{  return !(y < x); }
+   //! <b>Effects</b>: Returns true if x is equal or less than y
+   //!
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator<=(const set& x, const set& y);
 
-template <class Key, class Compare, class Allocator>
-inline bool operator>=(const set<Key,Compare,Allocator>& x,
-                       const set<Key,Compare,Allocator>& y)
-{  return !(x < y);  }
+   //! <b>Effects</b>: Returns true if x is equal or greater than y
+   //!
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator>=(const set& x, const set& y);
 
-template <class Key, class Compare, class Allocator>
-inline void swap(set<Key,Compare,Allocator>& x, set<Key,Compare,Allocator>& y)
-{  x.swap(y);  }
+   //! <b>Effects</b>: x.swap(y)
+   //!
+   //! <b>Complexity</b>: Constant.
+   friend void swap(set& x, set& y);
 
-/// @cond
+   #endif   //#if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+
+   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
+   private:
+   template <class KeyType>
+   std::pair<iterator, bool> priv_insert(BOOST_FWD_REF(KeyType) x)
+   {  return this->base_t::insert_unique(::boost::forward<KeyType>(x));  }
+
+   template <class KeyType>
+   iterator priv_insert(const_iterator p, BOOST_FWD_REF(KeyType) x)
+   {  return this->base_t::insert_unique(p, ::boost::forward<KeyType>(x)); }
+   #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
+};
+
+#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 }  //namespace container {
 
 //!has_trivial_destructor_after_move<> == true_type
 //!specialization for optimizations
-template <class Key, class C, class Allocator>
-struct has_trivial_destructor_after_move<boost::container::set<Key, C, Allocator> >
+template <class Key, class Compare, class SetOptions, class Allocator>
+struct has_trivial_destructor_after_move<boost::container::set<Key, Compare, Allocator, SetOptions> >
 {
-   static const bool value = has_trivial_destructor_after_move<Allocator>::value && has_trivial_destructor_after_move<C>::value;
+   typedef typename ::boost::container::allocator_traits<Allocator>::pointer pointer;
+   static const bool value = ::boost::has_trivial_destructor_after_move<Allocator>::value &&
+                             ::boost::has_trivial_destructor_after_move<pointer>::value &&
+                             ::boost::has_trivial_destructor_after_move<Compare>::value;
 };
 
 namespace container {
 
-// Forward declaration of operators < and ==, needed for friend declaration.
+#endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
-template <class Key, class Compare, class Allocator>
-inline bool operator==(const multiset<Key,Compare,Allocator>& x,
-                       const multiset<Key,Compare,Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-inline bool operator<(const multiset<Key,Compare,Allocator>& x,
-                      const multiset<Key,Compare,Allocator>& y);
-/// @endcond
+#ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 //! A multiset is a kind of associative container that supports equivalent keys
 //! (possibly contains multiple copies of the same key value) and provides for
@@ -675,20 +733,27 @@ inline bool operator<(const multiset<Key,Compare,Allocator>& x,
 //! A multiset satisfies all of the requirements of a container and of a reversible
 //! container, and of an associative container). multiset also provides most operations
 //! described for duplicate keys.
-#ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-template <class Key, class Compare = std::less<Key>, class Allocator = std::allocator<Key> >
+//!
+//! \tparam Key is the type to be inserted in the set, which is also the key_type
+//! \tparam Compare is the comparison functor used to order keys
+//! \tparam Allocator is the allocator to be used to allocate memory for this container
+//! \tparam MultiSetOptions is an packed option type generated using using boost::container::tree_assoc_options.
+template <class Key, class Compare = std::less<Key>, class Allocator = new_allocator<Key>, class MultiSetOptions = tree_assoc_defaults >
 #else
-template <class Key, class Compare, class Allocator>
+template <class Key, class Compare, class Allocator, class MultiSetOptions>
 #endif
 class multiset
-{
    /// @cond
+   : public container_detail::tree
+      <Key, Key,container_detail::identity<Key>, Compare, Allocator, MultiSetOptions>
+   /// @endcond
+{
+   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
    BOOST_COPYABLE_AND_MOVABLE(multiset)
-   typedef container_detail::rbtree<Key, Key,
-                     container_detail::identity<Key>, Compare, Allocator> tree_t;
-   tree_t m_tree;  // red-black tree representing multiset
-   /// @endcond
+   typedef container_detail::tree
+      <Key, Key,container_detail::identity<Key>, Compare, Allocator, MultiSetOptions> base_t;
+   #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
    public:
 
@@ -701,6 +766,7 @@ class multiset
    typedef Key                                                                         value_type;
    typedef Compare                                                                     key_compare;
    typedef Compare                                                                     value_compare;
+   typedef ::boost::container::allocator_traits<Allocator>                             allocator_traits_type;
    typedef typename ::boost::container::allocator_traits<Allocator>::pointer           pointer;
    typedef typename ::boost::container::allocator_traits<Allocator>::const_pointer     const_pointer;
    typedef typename ::boost::container::allocator_traits<Allocator>::reference         reference;
@@ -708,11 +774,11 @@ class multiset
    typedef typename ::boost::container::allocator_traits<Allocator>::size_type         size_type;
    typedef typename ::boost::container::allocator_traits<Allocator>::difference_type   difference_type;
    typedef Allocator                                                                   allocator_type;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::stored_allocator_type)              stored_allocator_type;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::iterator)                           iterator;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::const_iterator)                     const_iterator;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::reverse_iterator)                   reverse_iterator;
-   typedef typename BOOST_CONTAINER_IMPDEF(tree_t::const_reverse_iterator)             const_reverse_iterator;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::stored_allocator_type)              stored_allocator_type;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::iterator)                           iterator;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_iterator)                     const_iterator;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::reverse_iterator)                   reverse_iterator;
+   typedef typename BOOST_CONTAINER_IMPDEF(base_t::const_reverse_iterator)             const_reverse_iterator;
 
    //////////////////////////////////////////////
    //
@@ -720,33 +786,34 @@ class multiset
    //
    //////////////////////////////////////////////
 
-   //! <b>Effects</b>: Constructs an empty multiset using the specified comparison
-   //!   object and allocator.
-   //!
-   //! <b>Complexity</b>: Constant.
+   //! @copydoc ::boost::container::set::set()
    multiset()
-      : m_tree()
+      : base_t()
    {}
 
-   //! <b>Effects</b>: Constructs an empty multiset using the specified comparison
-   //!   object and allocator.
-   //!
-   //! <b>Complexity</b>: Constant.
+   //! @copydoc ::boost::container::set::set(const Compare&, const allocator_type&)
    explicit multiset(const Compare& comp,
                      const allocator_type& a = allocator_type())
-      : m_tree(comp, a)
+      : base_t(comp, a)
    {}
 
-   //! <b>Effects</b>: Constructs an empty multiset using the specified comparison object
-   //!   and allocator, and inserts elements from the range [first ,last ).
-   //!
-   //! <b>Complexity</b>: Linear in N if the range [first ,last ) is already sorted using
-   //! comp and otherwise N logN, where N is last - first.
+   //! @copydoc ::boost::container::set::set(const allocator_type&)
+   explicit multiset(const allocator_type& a)
+      : base_t(a)
+   {}
+
+   //! @copydoc ::boost::container::set::set(InputIterator, InputIterator, const Compare& comp, const allocator_type&)
    template <class InputIterator>
    multiset(InputIterator first, InputIterator last,
             const Compare& comp = Compare(),
             const allocator_type& a = allocator_type())
-      : m_tree(false, first, last, comp, a)
+      : base_t(false, first, last, comp, a)
+   {}
+
+   //! @copydoc ::boost::container::set::set(InputIterator, InputIterator, const allocator_type&)
+   template <class InputIterator>
+   multiset(InputIterator first, InputIterator last, const allocator_type& a)
+      : base_t(false, first, last, key_compare(), a)
    {}
 
    //! <b>Effects</b>: Constructs an empty multiset using the specified comparison object and
@@ -756,230 +823,130 @@ class multiset
    //! <b>Requires</b>: [first ,last) must be ordered according to the predicate.
    //!
    //! <b>Complexity</b>: Linear in N.
+   //!
+   //! <b>Note</b>: Non-standard extension.
    template <class InputIterator>
    multiset( ordered_range_t, InputIterator first, InputIterator last
            , const Compare& comp = Compare()
            , const allocator_type& a = allocator_type())
-      : m_tree(ordered_range, first, last, comp, a)
+      : base_t(ordered_range, first, last, comp, a)
    {}
 
-   //! <b>Effects</b>: Copy constructs a multiset.
-   //!
-   //! <b>Complexity</b>: Linear in x.size().
+#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
+   //! @copydoc ::boost::container::set::set(std::initializer_list<value_type>, const Compare& comp, const allocator_type&)
+   multiset(std::initializer_list<value_type> il, const Compare& comp = Compare(), const allocator_type& a = allocator_type())
+      : base_t(false, il.begin(), il.end(), comp, a)
+   {}
+
+   //! @copydoc ::boost::container::set::set(std::initializer_list<value_type>, const allocator_type&)
+   multiset(std::initializer_list<value_type> il, const allocator_type& a)
+      : base_t(false, il.begin(), il.end(), Compare(), a)
+   {}
+
+   //! @copydoc ::boost::container::set::set(ordered_unique_range_t, std::initializer_list<value_type>, const Compare& comp, const allocator_type&)
+   multiset(ordered_unique_range_t, std::initializer_list<value_type> il, const Compare& comp = Compare(), const allocator_type& a = allocator_type())
+      : base_t(ordered_range, il.begin(), il.end(), comp, a)
+   {}
+#endif
+
+   //! @copydoc ::boost::container::set::set(const set &)
    multiset(const multiset& x)
-      : m_tree(x.m_tree)
+      : base_t(static_cast<const base_t&>(x))
    {}
 
-   //! <b>Effects</b>: Move constructs a multiset. Constructs *this using x's resources.
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Postcondition</b>: x is emptied.
+   //! @copydoc ::boost::container::set::set(set &&)
    multiset(BOOST_RV_REF(multiset) x)
-      : m_tree(boost::move(x.m_tree))
+      : base_t(BOOST_MOVE_BASE(base_t, x))
    {}
 
-   //! <b>Effects</b>: Copy constructs a multiset using the specified allocator.
-   //!
-   //! <b>Complexity</b>: Linear in x.size().
+   //! @copydoc ::boost::container::set::set(const set &, const allocator_type &)
    multiset(const multiset& x, const allocator_type &a)
-      : m_tree(x.m_tree, a)
+      : base_t(static_cast<const base_t&>(x), a)
    {}
 
-   //! <b>Effects</b>: Move constructs a multiset using the specified allocator.
-   //!                 Constructs *this using x's resources.
-   //!
-   //! <b>Complexity</b>: Constant if a == x.get_allocator(), linear otherwise.
-   //!
-   //! <b>Postcondition</b>: x is emptied.
+   //! @copydoc ::boost::container::set::set(set &&, const allocator_type &)
    multiset(BOOST_RV_REF(multiset) x, const allocator_type &a)
-      : m_tree(boost::move(x.m_tree), a)
+      : base_t(BOOST_MOVE_BASE(base_t, x), a)
    {}
 
-   //! <b>Effects</b>: Makes *this a copy of x.
-   //!
-   //! <b>Complexity</b>: Linear in x.size().
+   //! @copydoc ::boost::container::set::operator=(const set &)
    multiset& operator=(BOOST_COPY_ASSIGN_REF(multiset) x)
-   {  m_tree = x.m_tree;   return *this;  }
+   {  return static_cast<multiset&>(this->base_t::operator=(static_cast<const base_t&>(x)));  }
 
-   //! <b>Effects</b>: this->swap(x.get()).
-   //!
-   //! <b>Complexity</b>: Constant.
+   //! @copydoc ::boost::container::set::operator=(set &&)
    multiset& operator=(BOOST_RV_REF(multiset) x)
-   {  m_tree = boost::move(x.m_tree);   return *this;  }
-
-   //! <b>Effects</b>: Returns a copy of the Allocator that
-   //!   was passed to the object's constructor.
-   //!
-   //! <b>Complexity</b>: Constant.
-   allocator_type get_allocator() const
-   { return m_tree.get_allocator(); }
-
-   //! <b>Effects</b>: Returns a reference to the internal allocator.
-   //!
-   //! <b>Throws</b>: Nothing
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Note</b>: Non-standard extension.
-   stored_allocator_type &get_stored_allocator()
-   { return m_tree.get_stored_allocator(); }
+      BOOST_NOEXCEPT_IF(  allocator_traits_type::is_always_equal::value
+                                 && boost::container::container_detail::is_nothrow_move_assignable<Compare>::value )
+   {  return static_cast<multiset&>(this->base_t::operator=(BOOST_MOVE_BASE(base_t, x)));  }
+
+#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
+   //! @copydoc ::boost::container::set::operator=(std::initializer_list<value_type>)
+   multiset& operator=(std::initializer_list<value_type> il)
+   {
+       this->clear();
+       insert(il.begin(), il.end());
+       return *this;
+   }
+#endif
+   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
-   //! <b>Effects</b>: Returns a reference to the internal allocator.
-   //!
-   //! <b>Throws</b>: Nothing
-   //!
-   //! <b>Complexity</b>: Constant.
-   //!
-   //! <b>Note</b>: Non-standard extension.
-   const stored_allocator_type &get_stored_allocator() const
-   { return m_tree.get_stored_allocator(); }
+   //! @copydoc ::boost::container::set::get_allocator()
+   allocator_type get_allocator() const;
 
-   //////////////////////////////////////////////
-   //
-   //                iterators
-   //
-   //////////////////////////////////////////////
+   //! @copydoc ::boost::container::set::get_stored_allocator()
+   stored_allocator_type &get_stored_allocator();
 
-   //! <b>Effects</b>: Returns an iterator to the first element contained in the container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   iterator begin()
-   { return m_tree.begin(); }
+   //! @copydoc ::boost::container::set::get_stored_allocator() const
+   const stored_allocator_type &get_stored_allocator() const;
 
-   //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   const_iterator begin() const
-   { return m_tree.begin(); }
+   //! @copydoc ::boost::container::set::begin()
+   iterator begin();
 
-   //! <b>Effects</b>: Returns an iterator to the end of the container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   iterator end()
-   { return m_tree.end(); }
+   //! @copydoc ::boost::container::set::begin() const
+   const_iterator begin() const;
 
-   //! <b>Effects</b>: Returns a const_iterator to the end of the container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   const_iterator end() const
-   { return m_tree.end(); }
+   //! @copydoc ::boost::container::set::cbegin() const
+   const_iterator cbegin() const;
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
-   //! of the reversed container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   reverse_iterator rbegin()
-   { return m_tree.rbegin(); }
+   //! @copydoc ::boost::container::set::end()
+   iterator end() BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
-   //! of the reversed container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   const_reverse_iterator rbegin() const
-   { return m_tree.rbegin(); }
+   //! @copydoc ::boost::container::set::end() const
+   const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
-   //! of the reversed container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   reverse_iterator rend()
-   { return m_tree.rend(); }
+   //! @copydoc ::boost::container::set::cend() const
+   const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
-   //! of the reversed container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   const_reverse_iterator rend() const
-   { return m_tree.rend(); }
+   //! @copydoc ::boost::container::set::rbegin()
+   reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //! <b>Effects</b>: Returns a const_iterator to the first element contained in the container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   const_iterator cbegin() const
-   { return m_tree.cbegin(); }
+   //! @copydoc ::boost::container::set::rbegin() const
+   const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //! <b>Effects</b>: Returns a const_iterator to the end of the container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   const_iterator cend() const
-   { return m_tree.cend(); }
+   //! @copydoc ::boost::container::set::crbegin() const
+   const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
-   //! of the reversed container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   const_reverse_iterator crbegin() const
-   { return m_tree.crbegin(); }
+   //! @copydoc ::boost::container::set::rend()
+   reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
-   //! of the reversed container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   const_reverse_iterator crend() const
-   { return m_tree.crend(); }
+   //! @copydoc ::boost::container::set::rend() const
+   const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //////////////////////////////////////////////
-   //
-   //                capacity
-   //
-   //////////////////////////////////////////////
+   //! @copydoc ::boost::container::set::crend() const
+   const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //! <b>Effects</b>: Returns true if the container contains no elements.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   bool empty() const
-   { return m_tree.empty(); }
+   //! @copydoc ::boost::container::set::empty() const
+   bool empty() const;
 
-   //! <b>Effects</b>: Returns the number of the elements contained in the container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   size_type size() const
-   { return m_tree.size(); }
+   //! @copydoc ::boost::container::set::size() const
+   size_type size() const;
 
-   //! <b>Effects</b>: Returns the largest possible size of the container.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
-   size_type max_size() const
-   { return m_tree.max_size(); }
+   //! @copydoc ::boost::container::set::max_size() const
+   size_type max_size() const;
 
-   //////////////////////////////////////////////
-   //
-   //                modifiers
-   //
-   //////////////////////////////////////////////
+   #endif   //#if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
-   #if defined(BOOST_CONTAINER_PERFECT_FORWARDING) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    //! <b>Effects</b>: Inserts an object of type Key constructed with
    //!   std::forward<Args>(args)... and returns the iterator pointing to the
@@ -987,8 +954,8 @@ class multiset
    //!
    //! <b>Complexity</b>: Logarithmic.
    template <class... Args>
-   iterator emplace(Args&&... args)
-   {  return m_tree.emplace_equal(boost::forward<Args>(args)...); }
+   iterator emplace(BOOST_FWD_REF(Args)... args)
+   {  return this->base_t::emplace_equal(boost::forward<Args>(args)...); }
 
    //! <b>Effects</b>: Inserts an object of type Key constructed with
    //!   std::forward<Args>(args)...
@@ -999,29 +966,24 @@ class multiset
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
    template <class... Args>
-   iterator emplace_hint(const_iterator hint, Args&&... args)
-   {  return m_tree.emplace_hint_equal(hint, boost::forward<Args>(args)...); }
-
-   #else //#ifdef BOOST_CONTAINER_PERFECT_FORWARDING
-
-   #define BOOST_PP_LOCAL_MACRO(n)                                                                 \
-   BOOST_PP_EXPR_IF(n, template<) BOOST_PP_ENUM_PARAMS(n, class P) BOOST_PP_EXPR_IF(n, >)          \
-   iterator emplace(BOOST_PP_ENUM(n, BOOST_CONTAINER_PP_PARAM_LIST, _))                            \
-   {  return m_tree.emplace_equal(BOOST_PP_ENUM(n, BOOST_CONTAINER_PP_PARAM_FORWARD, _)); }        \
-                                                                                                   \
-   BOOST_PP_EXPR_IF(n, template<) BOOST_PP_ENUM_PARAMS(n, class P) BOOST_PP_EXPR_IF(n, >)          \
-   iterator emplace_hint(const_iterator hint                                                       \
-                         BOOST_PP_ENUM_TRAILING(n, BOOST_CONTAINER_PP_PARAM_LIST, _))              \
-   {  return m_tree.emplace_hint_equal(hint                                                        \
-                               BOOST_PP_ENUM_TRAILING(n, BOOST_CONTAINER_PP_PARAM_FORWARD, _));}   \
-   //!
-   #define BOOST_PP_LOCAL_LIMITS (0, BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS)
-   #include BOOST_PP_LOCAL_ITERATE()
-
-   #endif   //#ifdef BOOST_CONTAINER_PERFECT_FORWARDING
-
-
+   iterator emplace_hint(const_iterator p, BOOST_FWD_REF(Args)... args)
+   {  return this->base_t::emplace_hint_equal(p, boost::forward<Args>(args)...); }
+
+   #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+
+   #define BOOST_CONTAINER_MULTISET_EMPLACE_CODE(N) \
+   BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
+   iterator emplace(BOOST_MOVE_UREF##N)\
+   {  return this->base_t::emplace_equal(BOOST_MOVE_FWD##N);  }\
+   \
+   BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
+   iterator emplace_hint(const_iterator hint BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   {  return this->base_t::emplace_hint_equal(hint BOOST_MOVE_I##N BOOST_MOVE_FWD##N); }\
+   //
+   BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_MULTISET_EMPLACE_CODE)
+   #undef BOOST_CONTAINER_MULTISET_EMPLACE_CODE
 
+   #endif   // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    //! <b>Effects</b>: Inserts x and returns the iterator pointing to the
@@ -1061,9 +1023,9 @@ class multiset
    //!
    //! <b>Complexity</b>: Logarithmic in general, but amortized constant if t
    //!   is inserted right before p.
-   iterator insert(const_iterator position, value_type &&x);
+   iterator insert(const_iterator p, value_type &&x);
    #else
-   BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator)
+   BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator, const_iterator)
    #endif
 
    //! <b>Requires</b>: first, last are not iterators into *this.
@@ -1073,208 +1035,140 @@ class multiset
    //! <b>Complexity</b>: At most N log(size()+N) (N is the distance from first to last)
    template <class InputIterator>
    void insert(InputIterator first, InputIterator last)
-   {  m_tree.insert_equal(first, last);  }
+   {  this->base_t::insert_equal(first, last);  }
 
-   //! <b>Effects</b>: Erases the element pointed to by p.
-   //!
-   //! <b>Returns</b>: Returns an iterator pointing to the element immediately
-   //!   following q prior to the element being erased. If no such element exists,
-   //!   returns end().
-   //!
-   //! <b>Complexity</b>: Amortized constant time
-   iterator erase(const_iterator p)
-   {  return m_tree.erase(p); }
+#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
+   //! @copydoc ::boost::container::set::insert(std::initializer_list<value_type>)
+   void insert(std::initializer_list<value_type> il)
+   {  this->base_t::insert_equal(il.begin(), il.end());  }
+#endif
 
-   //! <b>Effects</b>: Erases all elements in the container with key equivalent to x.
-   //!
-   //! <b>Returns</b>: Returns the number of erased elements.
-   //!
-   //! <b>Complexity</b>: log(size()) + count(k)
-   size_type erase(const key_type& x)
-   {  return m_tree.erase(x); }
+   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
-   //! <b>Effects</b>: Erases all the elements in the range [first, last).
-   //!
-   //! <b>Returns</b>: Returns last.
-   //!
-   //! <b>Complexity</b>: log(size())+N where N is the distance from first to last.
-   iterator erase(const_iterator first, const_iterator last)
-   {  return m_tree.erase(first, last); }
+   //! @copydoc ::boost::container::set::erase(const_iterator)
+   iterator erase(const_iterator p);
 
-   //! <b>Effects</b>: Swaps the contents of *this and x.
-   //!
-   //! <b>Throws</b>: Nothing.
-   //!
-   //! <b>Complexity</b>: Constant.
+   //! @copydoc ::boost::container::set::erase(const key_type&)
+   size_type erase(const key_type& x);
+
+   //! @copydoc ::boost::container::set::erase(const_iterator,const_iterator)
+   iterator erase(const_iterator first, const_iterator last);
+
+   //! @copydoc ::boost::container::set::swap
    void swap(multiset& x)
-   { m_tree.swap(x.m_tree); }
+      BOOST_NOEXCEPT_IF(  allocator_traits_type::is_always_equal::value
+                                 && boost::container::container_detail::is_nothrow_swappable<Compare>::value );
 
-   //! <b>Effects</b>: erase(a.begin(),a.end()).
-   //!
-   //! <b>Postcondition</b>: size() == 0.
-   //!
-   //! <b>Complexity</b>: linear in size().
-   void clear()
-   { m_tree.clear(); }
+   //! @copydoc ::boost::container::set::clear
+   void clear() BOOST_NOEXCEPT_OR_NOTHROW;
 
-   //////////////////////////////////////////////
-   //
-   //                observers
-   //
-   //////////////////////////////////////////////
+   //! @copydoc ::boost::container::set::key_comp
+   key_compare key_comp() const;
 
-   //! <b>Effects</b>: Returns the comparison object out
-   //!   of which a was constructed.
-   //!
-   //! <b>Complexity</b>: Constant.
-   key_compare key_comp() const
-   { return m_tree.key_comp(); }
+   //! @copydoc ::boost::container::set::value_comp
+   value_compare value_comp() const;
 
-   //! <b>Effects</b>: Returns an object of value_compare constructed out
-   //!   of the comparison object.
-   //!
-   //! <b>Complexity</b>: Constant.
-   value_compare value_comp() const
-   { return m_tree.key_comp(); }
+   //! @copydoc ::boost::container::set::find(const key_type& )
+   iterator find(const key_type& x);
 
-   //////////////////////////////////////////////
-   //
-   //              set operations
-   //
-   //////////////////////////////////////////////
+   //! @copydoc ::boost::container::set::find(const key_type& ) const
+   const_iterator find(const key_type& x) const;
 
-   //! <b>Returns</b>: An iterator pointing to an element with the key
-   //!   equivalent to x, or end() if such an element is not found.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   iterator find(const key_type& x)
-   { return m_tree.find(x); }
+   //! @copydoc ::boost::container::set::count(const key_type& ) const
+   size_type count(const key_type& x) const;
 
-   //! <b>Returns</b>: Allocator const iterator pointing to an element with the key
-   //!   equivalent to x, or end() if such an element is not found.
-   //!
-   //! <b>Complexity</b>: Logarithmic.
-   const_iterator find(const key_type& x) const
-   { return m_tree.find(x); }
+   //! @copydoc ::boost::container::set::lower_bound(const key_type& )
+   iterator lower_bound(const key_type& x);
 
-   //! <b>Returns</b>: The number of elements with key equivalent to x.
+   //! @copydoc ::boost::container::set::lower_bound(const key_type& ) const
+   const_iterator lower_bound(const key_type& x) const;
+
+   //! @copydoc ::boost::container::set::upper_bound(const key_type& )
+   iterator upper_bound(const key_type& x);
+
+   //! @copydoc ::boost::container::set::upper_bound(const key_type& ) const
+   const_iterator upper_bound(const key_type& x) const;
+
+   //! @copydoc ::boost::container::set::equal_range(const key_type& ) const
+   std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const;
+
+   //! @copydoc ::boost::container::set::equal_range(const key_type& )
+   std::pair<iterator,iterator> equal_range(const key_type& x);
+
+   //! @copydoc ::boost::container::set::rebalance()
+   void rebalance();
+
+   //! <b>Effects</b>: Returns true if x and y are equal
    //!
-   //! <b>Complexity</b>: log(size())+count(k)
-   size_type count(const key_type& x) const
-   {  return m_tree.count(x);  }
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator==(const multiset& x, const multiset& y);
 
-   //! <b>Returns</b>: An iterator pointing to the first element with key not less
-   //!   than k, or a.end() if such an element is not found.
+   //! <b>Effects</b>: Returns true if x and y are unequal
    //!
-   //! <b>Complexity</b>: Logarithmic
-   iterator lower_bound(const key_type& x)
-   {  return m_tree.lower_bound(x); }
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator!=(const multiset& x, const multiset& y);
 
-   //! <b>Returns</b>: Allocator const iterator pointing to the first element with key not
-   //!   less than k, or a.end() if such an element is not found.
+   //! <b>Effects</b>: Returns true if x is less than y
    //!
-   //! <b>Complexity</b>: Logarithmic
-   const_iterator lower_bound(const key_type& x) const
-   {  return m_tree.lower_bound(x); }
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator<(const multiset& x, const multiset& y);
 
-   //! <b>Returns</b>: An iterator pointing to the first element with key not less
-   //!   than x, or end() if such an element is not found.
+   //! <b>Effects</b>: Returns true if x is greater than y
    //!
-   //! <b>Complexity</b>: Logarithmic
-   iterator upper_bound(const key_type& x)
-   {  return m_tree.upper_bound(x);    }
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator>(const multiset& x, const multiset& y);
 
-   //! <b>Returns</b>: Allocator const iterator pointing to the first element with key not
-   //!   less than x, or end() if such an element is not found.
+   //! <b>Effects</b>: Returns true if x is equal or less than y
    //!
-   //! <b>Complexity</b>: Logarithmic
-   const_iterator upper_bound(const key_type& x) const
-   {  return m_tree.upper_bound(x);    }
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator<=(const multiset& x, const multiset& y);
 
-   //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
+   //! <b>Effects</b>: Returns true if x is equal or greater than y
    //!
-   //! <b>Complexity</b>: Logarithmic
-   std::pair<iterator,iterator> equal_range(const key_type& x)
-   {  return m_tree.equal_range(x); }
+   //! <b>Complexity</b>: Linear to the number of elements in the container.
+   friend bool operator>=(const multiset& x, const multiset& y);
 
-   //! <b>Effects</b>: Equivalent to std::make_pair(this->lower_bound(k), this->upper_bound(k)).
+   //! <b>Effects</b>: x.swap(y)
    //!
-   //! <b>Complexity</b>: Logarithmic
-   std::pair<const_iterator, const_iterator> equal_range(const key_type& x) const
-   {  return m_tree.equal_range(x); }
+   //! <b>Complexity</b>: Constant.
+   friend void swap(multiset& x, multiset& y);
 
-   /// @cond
-   template <class K1, class C1, class A1>
-   friend bool operator== (const multiset<K1,C1,A1>&,
-                           const multiset<K1,C1,A1>&);
-   template <class K1, class C1, class A1>
-   friend bool operator< (const multiset<K1,C1,A1>&,
-                          const multiset<K1,C1,A1>&);
+   #endif   //#if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+
+   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
    template <class KeyType>
    iterator priv_insert(BOOST_FWD_REF(KeyType) x)
-   {  return m_tree.insert_equal(::boost::forward<KeyType>(x));  }
+   {  return this->base_t::insert_equal(::boost::forward<KeyType>(x));  }
 
    template <class KeyType>
    iterator priv_insert(const_iterator p, BOOST_FWD_REF(KeyType) x)
-   {  return m_tree.insert_equal(p, ::boost::forward<KeyType>(x)); }
+   {  return this->base_t::insert_equal(p, ::boost::forward<KeyType>(x)); }
 
-   /// @endcond
+   #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 };
 
-template <class Key, class Compare, class Allocator>
-inline bool operator==(const multiset<Key,Compare,Allocator>& x,
-                       const multiset<Key,Compare,Allocator>& y)
-{  return x.m_tree == y.m_tree;  }
-
-template <class Key, class Compare, class Allocator>
-inline bool operator<(const multiset<Key,Compare,Allocator>& x,
-                      const multiset<Key,Compare,Allocator>& y)
-{  return x.m_tree < y.m_tree;   }
-
-template <class Key, class Compare, class Allocator>
-inline bool operator!=(const multiset<Key,Compare,Allocator>& x,
-                       const multiset<Key,Compare,Allocator>& y)
-{  return !(x == y);  }
-
-template <class Key, class Compare, class Allocator>
-inline bool operator>(const multiset<Key,Compare,Allocator>& x,
-                      const multiset<Key,Compare,Allocator>& y)
-{  return y < x;  }
-
-template <class Key, class Compare, class Allocator>
-inline bool operator<=(const multiset<Key,Compare,Allocator>& x,
-                       const multiset<Key,Compare,Allocator>& y)
-{  return !(y < x);  }
-
-template <class Key, class Compare, class Allocator>
-inline bool operator>=(const multiset<Key,Compare,Allocator>& x,
-                       const multiset<Key,Compare,Allocator>& y)
-{  return !(x < y);  }
-
-template <class Key, class Compare, class Allocator>
-inline void swap(multiset<Key,Compare,Allocator>& x, multiset<Key,Compare,Allocator>& y)
-{  x.swap(y);  }
-
-/// @cond
+#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 }  //namespace container {
 
 //!has_trivial_destructor_after_move<> == true_type
 //!specialization for optimizations
-template <class Key, class C, class Allocator>
-struct has_trivial_destructor_after_move<boost::container::multiset<Key, C, Allocator> >
+template <class Key, class Compare, class Allocator, class MultiSetOptions>
+struct has_trivial_destructor_after_move<boost::container::multiset<Key, Compare, Allocator, MultiSetOptions> >
 {
-   static const bool value = has_trivial_destructor_after_move<Allocator>::value && has_trivial_destructor_after_move<C>::value;
+   typedef typename ::boost::container::allocator_traits<Allocator>::pointer pointer;
+   static const bool value = ::boost::has_trivial_destructor_after_move<Allocator>::value &&
+                             ::boost::has_trivial_destructor_after_move<pointer>::value &&
+                             ::boost::has_trivial_destructor_after_move<Compare>::value;
 };
 
 namespace container {
 
-/// @endcond
+#endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 }}
 
 #include <boost/container/detail/config_end.hpp>
 
-#endif /* BOOST_CONTAINER_SET_HPP */
-
+#endif   // BOOST_CONTAINER_SET_HPP