passenger 6.0.4 → 6.0.9

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

@@ -21,11 +21,105 @@
 
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
+#include <boost/core/ignore_unused.hpp>
 
 #ifndef BOOST_NO_EXCEPTIONS
+#include <exception> //for std exception base
+
+#  if defined(BOOST_CONTAINER_USE_STD_EXCEPTIONS)
    #include <stdexcept> //for std exception types
    #include <string>    //for implicit std::string conversion
    #include <new>       //for std::bad_alloc
+
+typedef std::bad_alloc bad_alloc_t;
+typedef std::out_of_range out_of_range_t;
+typedef std::out_of_range length_error_t;
+typedef std::logic_error logic_error_t;
+typedef std::runtime_error runtime_error_t;
+
+#  else	//!BOOST_CONTAINER_USE_STD_EXCEPTIONS
+
+namespace boost {
+namespace container {
+
+class exception
+   : public ::std::exception
+{
+   typedef ::std::exception std_exception_t;
+
+   public:
+
+   //msg must be a static string (guaranteed by callers)
+   explicit exception(const char *msg)
+      : std_exception_t(), m_msg(msg)
+   {}
+
+   virtual const char *what() const BOOST_NOEXCEPT_OR_NOTHROW
+   {  return m_msg ? m_msg : "unknown boost::container exception"; }
+
+   private:
+   const char *m_msg;
+};
+
+class bad_alloc
+   : public exception
+{
+   public:
+   bad_alloc()
+      : exception("boost::container::bad_alloc thrown")
+   {}
+};
+
+typedef bad_alloc bad_alloc_t;
+
+class out_of_range
+   : public exception
+{
+   public:
+   explicit out_of_range(const char *msg)
+      : exception(msg)
+   {}
+};
+
+typedef out_of_range out_of_range_t;
+
+class length_error
+   : public exception
+{
+   public:
+   explicit length_error(const char *msg)
+      : exception(msg)
+   {}
+};
+
+typedef out_of_range length_error_t;
+
+class logic_error
+   : public exception
+{
+   public:
+   explicit logic_error(const char *msg)
+      : exception(msg)
+   {}
+};
+
+typedef logic_error logic_error_t;
+
+class runtime_error
+   : public exception
+{
+   public:
+   explicit runtime_error(const char *msg)
+      : exception(msg)
+   {}
+};
+
+typedef runtime_error runtime_error_t;
+
+}  // namespace boost {
+}  // namespace container {
+
+#  endif
 #else
    #include <boost/assert.hpp>
    #include <cstdlib>   //for std::abort
@@ -37,55 +131,49 @@ namespace container {
 #if defined(BOOST_CONTAINER_USER_DEFINED_THROW_CALLBACKS)
    //The user must provide definitions for the following functions
 
-   void throw_bad_alloc();
+   BOOST_NORETURN void throw_bad_alloc();
 
-   void throw_out_of_range(const char* str);
+   BOOST_NORETURN void throw_out_of_range(const char* str);
 
-   void throw_length_error(const char* str);
+   BOOST_NORETURN void throw_length_error(const char* str);
 
-   void throw_logic_error(const char* str);
+   BOOST_NORETURN void throw_logic_error(const char* str);
 
-   void throw_runtime_error(const char* str);
+   BOOST_NORETURN void throw_runtime_error(const char* str);
 
 #elif defined(BOOST_NO_EXCEPTIONS)
 
-   inline void throw_bad_alloc()
+   BOOST_NORETURN inline void throw_bad_alloc()
    {
-      const char msg[] = "boost::container bad_alloc thrown";
-      (void)msg;
-      BOOST_ASSERT(!msg);
+      BOOST_ASSERT(!"boost::container bad_alloc thrown");
       std::abort();
    }
 
-   inline void throw_out_of_range(const char* str)
+   BOOST_NORETURN inline void throw_out_of_range(const char* str)
    {
-      const char msg[] = "boost::container out_of_range thrown";
-      (void)msg; (void)str;
-      BOOST_ASSERT_MSG(!msg, str);
+      boost::ignore_unused(str);
+      BOOST_ASSERT_MSG(!"boost::container out_of_range thrown", str);
       std::abort();
    }
 
-   inline void throw_length_error(const char* str)
+   BOOST_NORETURN inline void throw_length_error(const char* str)
    {
-      const char msg[] = "boost::container length_error thrown";
-      (void)msg; (void)str;
-      BOOST_ASSERT_MSG(!msg, str);
+      boost::ignore_unused(str);
+      BOOST_ASSERT_MSG(!"boost::container length_error thrown", str);
       std::abort();
    }
 
-   inline void throw_logic_error(const char* str)
+   BOOST_NORETURN inline void throw_logic_error(const char* str)
    {
-      const char msg[] = "boost::container logic_error thrown";
-      (void)msg; (void)str;
-      BOOST_ASSERT_MSG(!msg, str);
+      boost::ignore_unused(str);
+      BOOST_ASSERT_MSG(!"boost::container logic_error thrown", str);
       std::abort();
    }
 
-   inline void throw_runtime_error(const char* str)
+   BOOST_NORETURN inline void throw_runtime_error(const char* str)
    {
-      const char msg[] = "boost::container runtime_error thrown";
-      (void)msg; (void)str;
-      BOOST_ASSERT_MSG(!msg, str);
+      boost::ignore_unused(str);
+      BOOST_ASSERT_MSG(!"boost::container runtime_error thrown", str);
       std::abort();
    }
 
@@ -102,9 +190,13 @@ namespace container {
    //! <li>If BOOST_NO_EXCEPTIONS and BOOST_CONTAINER_USER_DEFINED_THROW_CALLBACKS are defined
    //!   the user must provide an implementation and the function should not return.</li>
    //! </ul>
-   inline void throw_bad_alloc()
+   BOOST_NORETURN inline void throw_bad_alloc()
    {
+      #ifdef BOOST_CONTAINER_USE_STD_EXCEPTIONS
       throw std::bad_alloc();
+      #else
+      throw bad_alloc();
+      #endif
    }
 
    //! Exception callback called by Boost.Container to signal arguments out of range.
@@ -118,9 +210,13 @@ namespace container {
    //! <li>If BOOST_NO_EXCEPTIONS and BOOST_CONTAINER_USER_DEFINED_THROW_CALLBACKS are defined
    //!   the user must provide an implementation and the function should not return.</li>
    //! </ul>
-   inline void throw_out_of_range(const char* str)
+   BOOST_NORETURN inline void throw_out_of_range(const char* str)
    {
+      #ifdef BOOST_CONTAINER_USE_STD_EXCEPTIONS
       throw std::out_of_range(str);
+      #else
+      throw out_of_range(str);
+      #endif
    }
 
    //! Exception callback called by Boost.Container to signal errors resizing.
@@ -134,9 +230,13 @@ namespace container {
    //! <li>If BOOST_NO_EXCEPTIONS and BOOST_CONTAINER_USER_DEFINED_THROW_CALLBACKS are defined
    //!   the user must provide an implementation and the function should not return.</li>
    //! </ul>
-   inline void throw_length_error(const char* str)
+   BOOST_NORETURN inline void throw_length_error(const char* str)
    {
+      #ifdef BOOST_CONTAINER_USE_STD_EXCEPTIONS
       throw std::length_error(str);
+      #else
+      throw length_error(str);
+      #endif
    }
 
    //! Exception callback called by Boost.Container  to report errors in the internal logical
@@ -151,9 +251,13 @@ namespace container {
    //! <li>If BOOST_NO_EXCEPTIONS and BOOST_CONTAINER_USER_DEFINED_THROW_CALLBACKS are defined
    //!   the user must provide an implementation and the function should not return.</li>
    //! </ul>
-   inline void throw_logic_error(const char* str)
+   BOOST_NORETURN inline void throw_logic_error(const char* str)
    {
+      #ifdef BOOST_CONTAINER_USE_STD_EXCEPTIONS
       throw std::logic_error(str);
+      #else
+      throw logic_error(str);
+      #endif
    }
 
    //! Exception callback called by Boost.Container  to report errors that can only be detected during runtime.
@@ -167,9 +271,13 @@ namespace container {
    //! <li>If BOOST_NO_EXCEPTIONS and BOOST_CONTAINER_USER_DEFINED_THROW_CALLBACKS are defined
    //!   the user must provide an implementation and the function should not return.</li>
    //! </ul>
-   inline void throw_runtime_error(const char* str)
+   BOOST_NORETURN inline void throw_runtime_error(const char* str)
    {
+      #ifdef BOOST_CONTAINER_USE_STD_EXCEPTIONS
       throw std::runtime_error(str);
+      #else
+      throw runtime_error(str);
+      #endif
    }
 
 #endif

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

@@ -97,11 +97,23 @@ class vec_iterator
    private:
    Pointer m_ptr;
 
+   class nat
+   {
+      public:
+      Pointer get_ptr() const
+      { return Pointer();  }
+   };
+   typedef typename dtl::if_c< IsConst
+                             , vec_iterator<Pointer, false>
+                             , nat>::type                                           nonconst_iterator;
+
    public:
-   BOOST_CONTAINER_FORCEINLINE const Pointer &get_ptr() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_FORCEINLINE
+      const Pointer &get_ptr() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return   m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE Pointer &get_ptr() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_FORCEINLINE
+      Pointer &get_ptr() BOOST_NOEXCEPT_OR_NOTHROW
    {  return   m_ptr;  }
 
    BOOST_CONTAINER_FORCEINLINE explicit vec_iterator(Pointer ptr) BOOST_NOEXCEPT_OR_NOTHROW
@@ -116,18 +128,28 @@ class vec_iterator
       : m_ptr()   //Value initialization to achieve "null iterators" (N3644)
    {}
 
-   BOOST_CONTAINER_FORCEINLINE vec_iterator(vec_iterator<Pointer, false> const& other) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_FORCEINLINE vec_iterator(const vec_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
       :  m_ptr(other.get_ptr())
    {}
 
+   BOOST_CONTAINER_FORCEINLINE vec_iterator(const nonconst_iterator &other) BOOST_NOEXCEPT_OR_NOTHROW
+      :  m_ptr(other.get_ptr())
+   {}
+
+   BOOST_CONTAINER_FORCEINLINE vec_iterator & operator=(const vec_iterator& other) BOOST_NOEXCEPT_OR_NOTHROW
+   {  m_ptr = other.get_ptr();   return *this;  }
+
    //Pointer like operators
-   BOOST_CONTAINER_FORCEINLINE reference operator*()   const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      reference operator*()   const BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(!!m_ptr);  return *m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE pointer operator->()  const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      pointer operator->()  const BOOST_NOEXCEPT_OR_NOTHROW
    {  return m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE reference operator[](difference_type off) const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      reference operator[](difference_type off) const BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(!!m_ptr);  return m_ptr[off];  }
 
    //Increment / Decrement
@@ -150,35 +172,45 @@ class vec_iterator
    BOOST_CONTAINER_FORCEINLINE vec_iterator& operator-=(difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(m_ptr || !off); m_ptr -= off; return *this;   }
 
-   BOOST_CONTAINER_FORCEINLINE friend vec_iterator operator+(const vec_iterator &x, difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend vec_iterator operator+(const vec_iterator &x, difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(x.m_ptr || !off); return vec_iterator(x.m_ptr+off);  }
 
-   BOOST_CONTAINER_FORCEINLINE friend vec_iterator operator+(difference_type off, vec_iterator right) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend vec_iterator operator+(difference_type off, vec_iterator right) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(right.m_ptr || !off); right.m_ptr += off;  return right; }
 
-   BOOST_CONTAINER_FORCEINLINE friend vec_iterator operator-(vec_iterator left, difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend vec_iterator operator-(vec_iterator left, difference_type off) BOOST_NOEXCEPT_OR_NOTHROW
    {  BOOST_ASSERT(left.m_ptr || !off); left.m_ptr -= off;  return left; }
 
-   BOOST_CONTAINER_FORCEINLINE friend difference_type operator-(const vec_iterator &left, const vec_iterator& right) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend difference_type operator-(const vec_iterator &left, const vec_iterator& right) BOOST_NOEXCEPT_OR_NOTHROW
    {  return left.m_ptr - right.m_ptr;   }
 
    //Comparison operators
-   BOOST_CONTAINER_FORCEINLINE friend bool operator==   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend bool operator==   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr == r.m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!=   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend bool operator!=   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr != r.m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator<    (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend bool operator<    (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr < r.m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator<=   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend bool operator<=   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr <= r.m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator>    (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend bool operator>    (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr > r.m_ptr;  }
 
-   BOOST_CONTAINER_FORCEINLINE friend bool operator>=   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      friend bool operator>=   (const vec_iterator& l, const vec_iterator& r) BOOST_NOEXCEPT_OR_NOTHROW
    {  return l.m_ptr >= r.m_ptr;  }
 };
 
@@ -230,13 +262,8 @@ struct vector_value_traits_base
 {
    static const bool trivial_dctr = dtl::is_trivially_destructible<T>::value;
    static const bool trivial_dctr_after_move = has_trivial_destructor_after_move<T>::value;
-   static const bool trivial_copy = dtl::is_trivially_copy_constructible<T>::value;
-   static const bool nothrow_copy = dtl::is_nothrow_copy_constructible<T>::value || trivial_copy;
-   static const bool trivial_assign = dtl::is_trivially_copy_assignable<T>::value;
-   static const bool nothrow_assign = dtl::is_nothrow_copy_assignable<T>::value || trivial_assign;
 };
 
-
 template <class Allocator>
 struct vector_value_traits
    : public vector_value_traits_base<typename Allocator::value_type>
@@ -265,14 +292,15 @@ struct vector_alloc_holder
    BOOST_MOVABLE_BUT_NOT_COPYABLE(vector_alloc_holder)
 
    public:
-   typedef Allocator                                     allocator_type;
-   typedef StoredSizeType                                stored_size_type;
-   typedef boost::container::allocator_traits<Allocator> allocator_traits_type;
-   typedef typename allocator_traits_type::pointer       pointer;
-   typedef typename allocator_traits_type::size_type     size_type;
-   typedef typename allocator_traits_type::value_type    value_type;
+   typedef Allocator                                           allocator_type;
+   typedef StoredSizeType                                      stored_size_type;
+   typedef boost::container::allocator_traits<allocator_type>  allocator_traits_type;
+   typedef typename allocator_traits_type::pointer             pointer;
+   typedef typename allocator_traits_type::size_type           size_type;
+   typedef typename allocator_traits_type::value_type          value_type;
 
-   static bool is_propagable_from(const allocator_type &from_alloc, pointer p, const allocator_type &to_alloc, bool const propagate_allocator)
+   BOOST_CONTAINER_FORCEINLINE
+      static bool is_propagable_from(const allocator_type &from_alloc, pointer p, const allocator_type &to_alloc, bool const propagate_allocator)
    {
       (void)propagate_allocator; (void)p; (void)to_alloc; (void)from_alloc;
       const bool all_storage_propagable = !allocator_traits_type::is_partially_propagable::value ||
@@ -280,7 +308,8 @@ struct vector_alloc_holder
       return all_storage_propagable && (propagate_allocator || allocator_traits_type::equal(from_alloc, to_alloc));
    }
 
-   static bool are_swap_propagable(const allocator_type &l_a, pointer l_p, const allocator_type &r_a, pointer r_p, bool const propagate_allocator)
+   BOOST_CONTAINER_FORCEINLINE
+      static bool are_swap_propagable(const allocator_type &l_a, pointer l_p, const allocator_type &r_a, pointer r_p, bool const propagate_allocator)
    {
       (void)propagate_allocator; (void)l_p; (void)r_p; (void)l_a; (void)r_a;
       const bool all_storage_propagable = !allocator_traits_type::is_partially_propagable::value || 
@@ -290,51 +319,58 @@ struct vector_alloc_holder
 
    //Constructor, does not throw
    vector_alloc_holder()
-      BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<Allocator>::value)
-      : Allocator(), m_start(), m_size(), m_capacity()
+      BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value)
+      : allocator_type(), m_start(), m_size(), m_capacity()
    {}
 
    //Constructor, does not throw
    template<class AllocConvertible>
    explicit vector_alloc_holder(BOOST_FWD_REF(AllocConvertible) a) BOOST_NOEXCEPT_OR_NOTHROW
-      : Allocator(boost::forward<AllocConvertible>(a)), m_start(), m_size(), m_capacity()
+      : allocator_type(boost::forward<AllocConvertible>(a)), m_start(), m_size(), m_capacity()
    {}
 
    //Constructor, does not throw
-   template<class AllocConvertible>
-   vector_alloc_holder(vector_uninitialized_size_t, BOOST_FWD_REF(AllocConvertible) a, size_type initial_size)
-      : Allocator(boost::forward<AllocConvertible>(a))
+   template<class AllocConvertible, class SizeType>
+   vector_alloc_holder(vector_uninitialized_size_t, BOOST_FWD_REF(AllocConvertible) a, SizeType initial_size)
+      : allocator_type(boost::forward<AllocConvertible>(a))
       , m_start()
       //Size is initialized here so vector should only call uninitialized_xxx after this
       , m_size(static_cast<stored_size_type>(initial_size))
       , m_capacity()
    {
-      if(initial_size){
+      if (initial_size > size_type(-1)){
+         boost::container::throw_length_error("get_next_capacity, allocator's max size reached");
+      }
+      else if(initial_size){
          pointer reuse = pointer();
-         size_type final_cap = initial_size;
-         m_start = this->allocation_command(allocate_new, initial_size, final_cap, reuse);
-         m_capacity = static_cast<stored_size_type>(final_cap);
+         size_type final_cap = static_cast<size_type>(initial_size);
+         m_start = this->allocation_command(allocate_new, final_cap, final_cap, reuse);
+         this->set_stored_capacity(final_cap);
       }
    }
 
    //Constructor, does not throw
-   vector_alloc_holder(vector_uninitialized_size_t, size_type initial_size)
-      : Allocator()
+   template<class SizeType>
+   vector_alloc_holder(vector_uninitialized_size_t, SizeType initial_size)
+      : allocator_type()
       , m_start()
       //Size is initialized here so vector should only call uninitialized_xxx after this
       , m_size(static_cast<stored_size_type>(initial_size))
       , m_capacity()
    {
-      if(initial_size){
+      if (initial_size > size_type(-1)){
+         boost::container::throw_length_error("get_next_capacity, allocator's max size reached");
+      }
+      else if(initial_size){
          pointer reuse = pointer();
          size_type final_cap = initial_size;
-         m_start = this->allocation_command(allocate_new, initial_size, final_cap, reuse);
-         m_capacity = static_cast<stored_size_type>(final_cap);
+         m_start = this->allocation_command(allocate_new, final_cap, final_cap, reuse);
+         this->set_stored_capacity(final_cap);
       }
    }
 
    vector_alloc_holder(BOOST_RV_REF(vector_alloc_holder) holder) BOOST_NOEXCEPT_OR_NOTHROW
-      : Allocator(BOOST_MOVE_BASE(Allocator, holder))
+      : allocator_type(BOOST_MOVE_BASE(allocator_type, holder))
       , m_start(holder.m_start)
       , m_size(holder.m_size)
       , m_capacity(holder.m_capacity)
@@ -343,38 +379,9 @@ struct vector_alloc_holder
       holder.m_size = holder.m_capacity = 0;
    }
 
-   vector_alloc_holder(initial_capacity_t, pointer p, size_type capacity, BOOST_RV_REF(vector_alloc_holder) holder)
-      : Allocator(BOOST_MOVE_BASE(Allocator, holder))
-      , m_start(p)
-      , m_size(holder.m_size)
-      , m_capacity(static_cast<stored_size_type>(capacity))
-   {
-      allocator_type &this_alloc = this->alloc();
-      allocator_type &x_alloc = holder.alloc();
-      if(this->is_propagable_from(x_alloc, holder.start(), this_alloc, true)){
-         if(this->m_capacity){
-            this->deallocate(this->m_start, this->m_capacity);
-         }
-         m_start = holder.m_start;
-         m_capacity = holder.m_capacity;
-         holder.m_start = pointer();
-         holder.m_capacity = holder.m_size = 0;
-      }
-      else if(this->m_capacity < holder.m_size){
-         size_type const n = holder.m_size;
-         pointer reuse = pointer();
-         size_type final_cap = n;
-         m_start = this->allocation_command(allocate_new, n, final_cap, reuse);
-         m_capacity = static_cast<stored_size_type>(final_cap);
-         #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
-         this->num_alloc += n != 0;
-         #endif
-      }
-   }
-
    vector_alloc_holder(initial_capacity_t, pointer p, size_type n)
-      BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<Allocator>::value)
-      : Allocator()
+      BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value)
+      : allocator_type()
       , m_start(p)
       , m_size()
       //n is guaranteed to fit into stored_size_type
@@ -383,7 +390,7 @@ struct vector_alloc_holder
 
    template<class AllocFwd>
    vector_alloc_holder(initial_capacity_t, pointer p, size_type n, BOOST_FWD_REF(AllocFwd) a)
-      : Allocator(::boost::forward<AllocFwd>(a))
+      : allocator_type(::boost::forward<AllocFwd>(a))
       , m_start(p)
       , m_size()
       , m_capacity(n)
@@ -396,10 +403,22 @@ struct vector_alloc_holder
       }
    }
 
+   BOOST_CONTAINER_FORCEINLINE void set_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+      {  this->m_size = static_cast<stored_size_type>(s);   }
+
+   BOOST_CONTAINER_FORCEINLINE void dec_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+      {  this->m_size -= static_cast<stored_size_type>(s);   }
+
+   BOOST_CONTAINER_FORCEINLINE void inc_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+      {  this->m_size += static_cast<stored_size_type>(s);   }
+
+   BOOST_CONTAINER_FORCEINLINE void set_stored_capacity(size_type c) BOOST_NOEXCEPT_OR_NOTHROW
+      {  this->m_capacity = static_cast<stored_size_type>(c);  }
+
    BOOST_CONTAINER_FORCEINLINE pointer allocation_command(boost::container::allocation_type command,
-                              size_type limit_size, size_type &prefer_in_recvd_out_size, pointer &reuse)
+                                 size_type limit_size, size_type &prefer_in_recvd_out_size, pointer &reuse)
    {
-      typedef typename dtl::version<Allocator>::type alloc_version;
+      typedef typename dtl::version<allocator_type>::type alloc_version;
       return this->priv_allocation_command(alloc_version(), command, limit_size, prefer_in_recvd_out_size, reuse);
    }
 
@@ -440,7 +459,7 @@ struct vector_alloc_holder
    {
       BOOST_ASSERT(additional_objects > size_type(this->m_capacity - this->m_size));
       size_type max = allocator_traits_type::max_size(this->alloc());
-      (clamp_by_stored_size_type)(max, stored_size_type());
+      (clamp_by_stored_size_type<size_type>)(max, stored_size_type());
       const size_type remaining_cap = max - size_type(this->m_capacity);
       const size_type min_additional_cap = additional_objects - size_type(this->m_capacity - this->m_size);
 
@@ -470,10 +489,10 @@ struct vector_alloc_holder
       x.m_size = x.m_capacity = 0;
    }
 
-   BOOST_CONTAINER_FORCEINLINE Allocator &alloc() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_FORCEINLINE allocator_type &alloc() BOOST_NOEXCEPT_OR_NOTHROW
    {  return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE const Allocator &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_FORCEINLINE const allocator_type &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return *this;  }
 
    BOOST_CONTAINER_FORCEINLINE const pointer   &start() const     BOOST_NOEXCEPT_OR_NOTHROW
@@ -483,7 +502,10 @@ struct vector_alloc_holder
    BOOST_CONTAINER_FORCEINLINE void start(const pointer &p)       BOOST_NOEXCEPT_OR_NOTHROW
       {  m_start = p;  }
    BOOST_CONTAINER_FORCEINLINE void capacity(const size_type &c)  BOOST_NOEXCEPT_OR_NOTHROW
-      {  BOOST_ASSERT( c <= stored_size_type(-1)); m_capacity = c;  }
+      {  BOOST_ASSERT( c <= stored_size_type(-1)); this->set_stored_capacity(c);  }
+
+   static BOOST_CONTAINER_FORCEINLINE void on_capacity_overflow()
+   { }
 
    private:
    void priv_first_allocation(size_type cap)
@@ -498,17 +520,7 @@ struct vector_alloc_holder
       }
    }
 
-   BOOST_CONTAINER_FORCEINLINE static void clamp_by_stored_size_type(size_type &, size_type)
-   {}
-
-   template<class SomeStoredSizeType>
-   BOOST_CONTAINER_FORCEINLINE static void clamp_by_stored_size_type(size_type &s, SomeStoredSizeType)
-   {
-      if (s >= SomeStoredSizeType(-1) ) 
-         s = SomeStoredSizeType(-1);
-   }
-
-   BOOST_CONTAINER_FORCEINLINE pointer priv_allocation_command(version_1, boost::container::allocation_type command,
+   pointer priv_allocation_command(version_1, boost::container::allocation_type command,
                          size_type limit_size,
                          size_type &prefer_in_recvd_out_size,
                          pointer &reuse)
@@ -520,7 +532,7 @@ struct vector_alloc_holder
       if (limit_size > stored_size_type(-1)){
          boost::container::throw_length_error("get_next_capacity, allocator's max size reached");
       }
-      (clamp_by_stored_size_type)(prefer_in_recvd_out_size, stored_size_type());
+      (clamp_by_stored_size_type<size_type>)(prefer_in_recvd_out_size, stored_size_type());
       pointer const p = this->allocate(prefer_in_recvd_out_size);
       reuse = pointer();
       return p;
@@ -535,11 +547,11 @@ struct vector_alloc_holder
       if (limit_size > stored_size_type(-1)){
          boost::container::throw_length_error("get_next_capacity, allocator's max size reached");
       }
-      (clamp_by_stored_size_type)(prefer_in_recvd_out_size, stored_size_type());
+      (clamp_by_stored_size_type<size_type>)(prefer_in_recvd_out_size, stored_size_type());
       //Allocate memory 
       pointer p = this->alloc().allocation_command(command, limit_size, prefer_in_recvd_out_size, reuse);
       //If after allocation prefer_in_recvd_out_size is not representable by stored_size_type, truncate it.
-      (clamp_by_stored_size_type)(prefer_in_recvd_out_size, stored_size_type());
+      (clamp_by_stored_size_type<size_type>)(prefer_in_recvd_out_size, stored_size_type());
       return p;
    }
 };
@@ -553,31 +565,33 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
    BOOST_MOVABLE_BUT_NOT_COPYABLE(vector_alloc_holder)
 
    public:
-   typedef boost::container::allocator_traits<Allocator> allocator_traits_type;
+   typedef Allocator                                     allocator_type;
+   typedef boost::container::
+      allocator_traits<allocator_type>                   allocator_traits_type;
    typedef typename allocator_traits_type::pointer       pointer;
    typedef typename allocator_traits_type::size_type     size_type;
    typedef typename allocator_traits_type::value_type    value_type;
    typedef StoredSizeType                                stored_size_type;
-
+      
    template <class OtherAllocator, class OtherStoredSizeType, class OtherAllocatorVersion>
    friend struct vector_alloc_holder;
 
    //Constructor, does not throw
    vector_alloc_holder()
-      BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<Allocator>::value)
-      : Allocator(), m_size()
+      BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value)
+      : allocator_type(), m_size()
    {}
 
    //Constructor, does not throw
    template<class AllocConvertible>
    explicit vector_alloc_holder(BOOST_FWD_REF(AllocConvertible) a) BOOST_NOEXCEPT_OR_NOTHROW
-      : Allocator(boost::forward<AllocConvertible>(a)), m_size()
+      : allocator_type(boost::forward<AllocConvertible>(a)), m_size()
    {}
 
    //Constructor, does not throw
    template<class AllocConvertible>
    vector_alloc_holder(vector_uninitialized_size_t, BOOST_FWD_REF(AllocConvertible) a, size_type initial_size)
-      : Allocator(boost::forward<AllocConvertible>(a))
+      : allocator_type(boost::forward<AllocConvertible>(a))
       , m_size(initial_size)  //Size is initialized here...
    {
       //... and capacity here, so vector, must call uninitialized_xxx in the derived constructor
@@ -586,7 +600,7 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
 
    //Constructor, does not throw
    vector_alloc_holder(vector_uninitialized_size_t, size_type initial_size)
-      : Allocator()
+      : allocator_type()
       , m_size(initial_size)  //Size is initialized here...
    {
       //... and capacity here, so vector, must call uninitialized_xxx in the derived constructor
@@ -594,16 +608,19 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
    }
 
    vector_alloc_holder(BOOST_RV_REF(vector_alloc_holder) holder)
-      : Allocator(BOOST_MOVE_BASE(Allocator, holder))
+      : allocator_type(BOOST_MOVE_BASE(allocator_type, holder))
       , m_size(holder.m_size) //Size is initialized here so vector should only call uninitialized_xxx after this
    {
       ::boost::container::uninitialized_move_alloc_n
          (this->alloc(), boost::movelib::to_raw_pointer(holder.start()), m_size, boost::movelib::to_raw_pointer(this->start()));
+      ::boost::container::destroy_alloc_n
+         (this->alloc(), boost::movelib::to_raw_pointer(holder.start()), m_size);
+      holder.m_size = 0;
    }
 
    template<class OtherAllocator, class OtherStoredSizeType, class OtherAllocatorVersion>
    vector_alloc_holder(BOOST_RV_REF_BEG vector_alloc_holder<OtherAllocator, OtherStoredSizeType, OtherAllocatorVersion> BOOST_RV_REF_END holder)
-      : Allocator()
+      : allocator_type()
       , m_size(holder.m_size) //Initialize it to m_size as first_allocation can only succeed or abort
    {
       //Different allocator type so we must check we have enough storage
@@ -613,10 +630,22 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
          (this->alloc(), boost::movelib::to_raw_pointer(holder.start()), n, boost::movelib::to_raw_pointer(this->start()));
    }
 
+   static BOOST_CONTAINER_FORCEINLINE void on_capacity_overflow()
+   {  allocator_type::on_capacity_overflow();  }
+
+   BOOST_CONTAINER_FORCEINLINE void set_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+      {  this->m_size = static_cast<stored_size_type>(s);   }
+
+   BOOST_CONTAINER_FORCEINLINE void dec_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+      {  this->m_size -= static_cast<stored_size_type>(s);   }
+
+   BOOST_CONTAINER_FORCEINLINE void inc_stored_size(size_type s) BOOST_NOEXCEPT_OR_NOTHROW
+      {  this->m_size += static_cast<stored_size_type>(s);   }
+
    BOOST_CONTAINER_FORCEINLINE void priv_first_allocation(size_type cap)
    {
-      if(cap > Allocator::internal_capacity){
-         throw_bad_alloc();
+      if(cap > allocator_type::internal_capacity){
+         on_capacity_overflow();
       }
    }
 
@@ -628,34 +657,39 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
    template<class OtherAllocator, class OtherStoredSizeType, class OtherAllocatorVersion>
    void deep_swap(vector_alloc_holder<OtherAllocator, OtherStoredSizeType, OtherAllocatorVersion> &x)
    {
-      if(this->m_size > OtherAllocator::internal_capacity || x.m_size > Allocator::internal_capacity){
-         throw_bad_alloc();
+      typedef typename real_allocator<value_type, OtherAllocator>::type other_allocator_type;
+      if(this->m_size > other_allocator_type::internal_capacity || x.m_size > allocator_type::internal_capacity){
+         on_capacity_overflow();
       }
       this->priv_deep_swap(x);
    }
 
    BOOST_CONTAINER_FORCEINLINE void swap_resources(vector_alloc_holder &) BOOST_NOEXCEPT_OR_NOTHROW
    {  //Containers with version 0 allocators can't be moved without moving elements one by one
-      throw_bad_alloc();
+      on_capacity_overflow();
    }
 
 
    BOOST_CONTAINER_FORCEINLINE void steal_resources(vector_alloc_holder &)
    {  //Containers with version 0 allocators can't be moved without moving elements one by one
-      throw_bad_alloc();
+      on_capacity_overflow();
    }
 
-   BOOST_CONTAINER_FORCEINLINE Allocator &alloc() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_FORCEINLINE allocator_type &alloc() BOOST_NOEXCEPT_OR_NOTHROW
    {  return *this;  }
 
-   BOOST_CONTAINER_FORCEINLINE const Allocator &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_FORCEINLINE const allocator_type &alloc() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return *this;  }
 
    BOOST_CONTAINER_FORCEINLINE bool try_expand_fwd(size_type at_least)
    {  return !at_least;  }
 
-   BOOST_CONTAINER_FORCEINLINE pointer start() const       BOOST_NOEXCEPT_OR_NOTHROW {  return Allocator::internal_storage();  }
-   BOOST_CONTAINER_FORCEINLINE size_type  capacity() const BOOST_NOEXCEPT_OR_NOTHROW {  return Allocator::internal_capacity;  }
+   BOOST_CONTAINER_FORCEINLINE pointer start() const       BOOST_NOEXCEPT_OR_NOTHROW
+   {  return allocator_type::internal_storage();  }
+   
+   BOOST_CONTAINER_FORCEINLINE size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
+   {  return allocator_type::internal_capacity;  }
+   
    stored_size_type m_size;
 
    private:
@@ -663,7 +697,7 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
    template<class OtherAllocator, class OtherStoredSizeType, class OtherAllocatorVersion>
    void priv_deep_swap(vector_alloc_holder<OtherAllocator, OtherStoredSizeType, OtherAllocatorVersion> &x)
    {
-      const size_type MaxTmpStorage = sizeof(value_type)*Allocator::internal_capacity;
+      const size_type MaxTmpStorage = sizeof(value_type)*allocator_type::internal_capacity;
       value_type *const first_this = boost::movelib::to_raw_pointer(this->start());
       value_type *const first_x = boost::movelib::to_raw_pointer(x.start());
 
@@ -679,18 +713,6 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
 
 struct growth_factor_60;
 
-template<class T, class Default>
-struct default_if_void
-{
-   typedef T type;
-};
-
-template<class Default>
-struct default_if_void<void, Default>
-{
-   typedef Default type;
-};
-
 template<class Options, class AllocatorSizeType>
 struct get_vector_opt
 {
@@ -705,7 +727,6 @@ struct get_vector_opt<void, AllocatorSizeType>
    typedef vector_opt<growth_factor_60, AllocatorSizeType> type;
 };
 
-
 #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 //! A vector is a sequence that supports random access to elements, constant
@@ -714,14 +735,39 @@ struct get_vector_opt<void, AllocatorSizeType>
 //! elements in a vector may vary dynamically; memory management is automatic.
 //!
 //! \tparam T The type of object that is stored in the vector
-//! \tparam Allocator The allocator used for all internal memory management
+//! \tparam A The allocator used for all internal memory management, use void
+//!   for the default allocator
 //! \tparam Options A type produced from \c boost::container::vector_options.
-template <class T, class Allocator BOOST_CONTAINER_DOCONLY(= new_allocator<T>), class Options BOOST_CONTAINER_DOCONLY(= void) >
+template <class T, class A BOOST_CONTAINER_DOCONLY(= void), class Options BOOST_CONTAINER_DOCONLY(= void) >
 class vector
 {
-   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
+public:
+   //////////////////////////////////////////////
+   //
+   //                    types
+   //
+   //////////////////////////////////////////////
+   typedef T                                                                           value_type;
+   typedef BOOST_CONTAINER_IMPDEF
+      (typename real_allocator<T BOOST_MOVE_I A>::type)                                allocator_type;
+   typedef ::boost::container::allocator_traits<allocator_type>                        allocator_traits_t;
+   typedef typename   allocator_traits<allocator_type>::pointer                        pointer;
+   typedef typename   allocator_traits<allocator_type>::const_pointer                  const_pointer;
+   typedef typename   allocator_traits<allocator_type>::reference                      reference;
+   typedef typename   allocator_traits<allocator_type>::const_reference                const_reference;
+   typedef typename   allocator_traits<allocator_type>::size_type                      size_type;
+   typedef typename   allocator_traits<allocator_type>::difference_type                difference_type;
+   typedef allocator_type                                                              stored_allocator_type;
+   typedef BOOST_CONTAINER_IMPDEF(vec_iterator<pointer BOOST_MOVE_I false>)            iterator;
+   typedef BOOST_CONTAINER_IMPDEF(vec_iterator<pointer BOOST_MOVE_I true >)            const_iterator;
+   typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator<iterator>)        reverse_iterator;
+   typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator<const_iterator>)  const_reverse_iterator;
+
+private:
 
-   typedef typename boost::container::allocator_traits<Allocator>::size_type  alloc_size_type;
+   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
+   typedef typename boost::container::
+      allocator_traits<allocator_type>::size_type                             alloc_size_type;
    typedef typename get_vector_opt<Options, alloc_size_type>::type            options_type;
    typedef typename options_type::growth_factor_type                          growth_factor_type;
    typedef typename options_type::stored_size_type                            stored_size_type;
@@ -731,51 +777,32 @@ class vector
    BOOST_STATIC_ASSERT( (sizeof(stored_size_type) < sizeof(alloc_size_type) ||
                         dtl::is_same<stored_size_type, alloc_size_type>::value) );
 
-   typedef typename dtl::version<Allocator>::type alloc_version;
-   typedef boost::container::vector_alloc_holder<Allocator, stored_size_type> alloc_holder_t;
+   typedef typename dtl::version<allocator_type>::type alloc_version;
+   typedef boost::container::vector_alloc_holder
+      <allocator_type, stored_size_type> alloc_holder_t;
+
    alloc_holder_t m_holder;
-   typedef allocator_traits<Allocator>                      allocator_traits_type;
-   template <class U, class UAllocator, class UOptions>
+
+   typedef allocator_traits<allocator_type>                      allocator_traits_type;
+   template <class U, class UA, class UOptions>
    friend class vector;
 
-   typedef typename allocator_traits_type::pointer  pointer_impl;
-   typedef vec_iterator<pointer_impl, false> iterator_impl;
-   typedef vec_iterator<pointer_impl, true > const_iterator_impl;
 
    protected:
-   static bool is_propagable_from(const Allocator &from_alloc, pointer_impl p, const Allocator &to_alloc, bool const propagate_allocator)
+   BOOST_CONTAINER_FORCEINLINE
+      static bool is_propagable_from(const allocator_type &from_alloc, pointer p, const allocator_type &to_alloc, bool const propagate_allocator)
    {  return alloc_holder_t::is_propagable_from(from_alloc, p, to_alloc, propagate_allocator);  }
 
-   static bool are_swap_propagable( const Allocator &l_a, pointer_impl l_p
-                                  , const Allocator &r_a, pointer_impl r_p, bool const propagate_allocator)
+   BOOST_CONTAINER_FORCEINLINE
+      static bool are_swap_propagable( const allocator_type &l_a, pointer l_p
+                                     , const allocator_type &r_a, pointer r_p, bool const propagate_allocator)
    {  return alloc_holder_t::are_swap_propagable(l_a, l_p, r_a, r_p, propagate_allocator);  }
 
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
-   public:
-   //////////////////////////////////////////////
-   //
-   //                    types
-   //
-   //////////////////////////////////////////////
-
-   typedef T                                                                           value_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;
-   typedef typename ::boost::container::allocator_traits<Allocator>::const_reference   const_reference;
-   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 Allocator                                                                   stored_allocator_type;
-   typedef BOOST_CONTAINER_IMPDEF(iterator_impl)                                       iterator;
-   typedef BOOST_CONTAINER_IMPDEF(const_iterator_impl)                                 const_iterator;
-   typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator<iterator>)        reverse_iterator;
-   typedef BOOST_CONTAINER_IMPDEF(boost::container::reverse_iterator<const_iterator>)  const_reverse_iterator;
-
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
    BOOST_COPYABLE_AND_MOVABLE(vector)
-   typedef vector_value_traits<Allocator> value_traits;
+   typedef vector_value_traits<allocator_type> value_traits;
    typedef constant_iterator<T, difference_type>            cvalue_iterator;
 
    protected:
@@ -806,7 +833,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   vector() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<Allocator>::value)
+   vector() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value)
       : m_holder()
    {}
 
@@ -953,12 +980,6 @@ class vector
    //!   throws or T's constructor taking a dereferenced InIt throws.
    //!
    //! <b>Complexity</b>: Linear to the range [first, last).
-//    template <class InIt>
-//    vector(InIt first, InIt last, const allocator_type& a
-//           BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_c
-//                                  < dtl::is_convertible<InIt BOOST_MOVE_I size_type>::value
-//                                  BOOST_MOVE_I dtl::nat >::type * = 0)
-//           ) -> vector<typename iterator_traits<InIt>::value_type, new_allocator<typename iterator_traits<InIt>::value_type>>;
    template <class InIt>
    vector(InIt first, InIt last, const allocator_type& a
       BOOST_CONTAINER_DOCIGN(BOOST_MOVE_I typename dtl::disable_if_c
@@ -1006,9 +1027,14 @@ class vector
    //!
    //! <b>Complexity</b>: Linear to the range [il.begin(), il.end()).
    vector(std::initializer_list<value_type> il, const allocator_type& a = allocator_type())
-      : m_holder(a)
+      :  m_holder(vector_uninitialized_size, a, il.size())
    {
-      this->assign(il.begin(), il.end());
+      #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
+      this->num_alloc += il.size() != 0;
+      #endif
+      ::boost::container::uninitialized_copy_alloc_n_source
+         ( this->m_holder.alloc(), il.begin()
+         , static_cast<size_type>(il.size()), this->priv_raw_begin());
    }
    #endif
 
@@ -1021,15 +1047,15 @@ class vector
    //! <b>Complexity</b>: Linear.
    //!
    //! <b>Note</b>: Non-standard extension to support static_vector
-   template<class OtherAllocator>
-   vector(BOOST_RV_REF_BEG vector<T, OtherAllocator> BOOST_RV_REF_END x
+   template<class OtherA>
+   vector(BOOST_RV_REF_BEG vector<T, OtherA, Options> BOOST_RV_REF_END x
          , typename dtl::enable_if_c
-            < dtl::is_version<OtherAllocator, 0>::value>::type * = 0
+            < dtl::is_version<typename real_allocator<T, OtherA>::type, 0>::value>::type * = 0
          )
       :  m_holder(boost::move(x.m_holder))
    {}
 
-   #endif   //!defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #endif   // defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    //! <b>Effects</b>: Copy constructs a vector using the specified allocator.
    //!
@@ -1059,10 +1085,12 @@ class vector
    //! <b>Complexity</b>: Constant if a == x.get_allocator(), linear otherwise.
    vector(BOOST_RV_REF(vector) x, const allocator_type &a)
       :  m_holder( vector_uninitialized_size, a
-                 , is_propagable_from(x.get_stored_allocator(), x.m_holder.start(), a, true) ? 0 : x.size()
+                 //In this allocator move constructor the allocator won't be propagated --v
+                 , is_propagable_from(x.get_stored_allocator(), x.m_holder.start(), a, false) ? 0 : x.size()
                  )
    {
-      if(is_propagable_from(x.get_stored_allocator(), x.m_holder.start(), a, true)){
+      //In this allocator move constructor the allocator won't be propagated ---v
+      if(is_propagable_from(x.get_stored_allocator(), x.m_holder.start(), a, false)){
          this->m_holder.steal_resources(x.m_holder);
       }
       else{
@@ -1099,7 +1127,7 @@ class vector
    //! <b>Complexity</b>: Linear to the number of elements in x.
    BOOST_CONTAINER_FORCEINLINE vector& operator=(BOOST_COPY_ASSIGN_REF(vector) x)
    {
-      if (&x != this){
+      if (BOOST_LIKELY(&x != this)){
          this->priv_copy_assign(x);
       }
       return *this;
@@ -1131,7 +1159,9 @@ class vector
       BOOST_NOEXCEPT_IF(allocator_traits_type::propagate_on_container_move_assignment::value
                         || allocator_traits_type::is_always_equal::value)
    {
-      this->priv_move_assign(boost::move(x));
+      if (BOOST_LIKELY(&x != this)){
+         this->priv_move_assign(boost::move(x));
+      }
       return *this;
    }
 
@@ -1147,13 +1177,13 @@ class vector
    //! <b>Complexity</b>: Linear.
    //!
    //! <b>Note</b>: Non-standard extension to support static_vector
-   template<class OtherAllocator>
+   template<class OtherA>
    BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and
                            < vector&
-                           , dtl::is_version<OtherAllocator, 0>
-                           , dtl::is_different<OtherAllocator, allocator_type>
+                           , dtl::is_version<typename real_allocator<T, OtherA>::type, 0>
+                           , dtl::is_different<typename real_allocator<T, OtherA>::type, allocator_type>
                            >::type
-      operator=(BOOST_RV_REF_BEG vector<value_type, OtherAllocator> BOOST_RV_REF_END x)
+      operator=(BOOST_RV_REF_BEG vector<value_type, OtherA, Options> BOOST_RV_REF_END x)
    {
       this->priv_move_assign(boost::move(x));
       return *this;
@@ -1169,13 +1199,13 @@ class vector
    //! <b>Complexity</b>: Linear.
    //!
    //! <b>Note</b>: Non-standard extension to support static_vector
-   template<class OtherAllocator>
+   template<class OtherA>
    BOOST_CONTAINER_FORCEINLINE typename dtl::enable_if_and
                            < vector&
-                           , dtl::is_version<OtherAllocator, 0>
-                           , dtl::is_different<OtherAllocator, allocator_type>
+                           , dtl::is_version<typename real_allocator<T, OtherA>::type, 0>
+                           , dtl::is_different<typename real_allocator<T, OtherA>::type, allocator_type>
                            >::type
-      operator=(const vector<value_type, OtherAllocator> &x)
+      operator=(const vector<value_type, OtherA, Options> &x)
    {
       this->priv_copy_assign(x);
       return *this;
@@ -1252,7 +1282,12 @@ class vector
    {
       //For Fwd iterators the standard only requires EmplaceConstructible and assignable from *first
       //so we can't do any backwards allocation
-      const size_type input_sz = static_cast<size_type>(boost::container::iterator_distance(first, last));
+      const typename iterator_traits<FwdIt>::size_type sz = boost::container::iterator_distance(first, last);
+      if (sz > size_type(-1)){
+         boost::container::throw_length_error("vector::assign, FwdIt's max length reached");
+      }
+
+      const size_type input_sz = static_cast<size_type>(sz);
       const size_type old_capacity = this->capacity();
       if(input_sz > old_capacity){  //If input range is too big, we need to reallocate
          size_type real_cap = 0;
@@ -1283,7 +1318,7 @@ class vector
       }
 
       boost::container::copy_assign_range_alloc_n(this->m_holder.alloc(), first, input_sz, this->priv_raw_begin(), this->size());
-      this->m_holder.m_size = input_sz;
+      m_holder.set_stored_size(input_sz);
    }
 
    //! <b>Effects</b>: Assigns the n copies of val to *this.
@@ -1300,7 +1335,7 @@ class vector
    //! <b>Throws</b>: If allocator's copy constructor throws.
    //!
    //! <b>Complexity</b>: Constant.
-   allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->m_holder.alloc();  }
 
    //! <b>Effects</b>: Returns a reference to the internal allocator.
@@ -1310,7 +1345,8 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE 
+      stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->m_holder.alloc(); }
 
    //! <b>Effects</b>: Returns a reference to the internal allocator.
@@ -1320,7 +1356,8 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   BOOST_CONTAINER_FORCEINLINE const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->m_holder.alloc(); }
 
    //////////////////////////////////////////////
@@ -1334,7 +1371,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
    { return iterator(this->m_holder.start()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the vector.
@@ -1342,7 +1379,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_iterator(this->m_holder.start()); }
 
    //! <b>Effects</b>: Returns an iterator to the end of the vector.
@@ -1350,11 +1387,11 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE iterator end() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE iterator end() BOOST_NOEXCEPT_OR_NOTHROW
    {
-      pointer   const bg = this->m_holder.start();
-      size_type const sz = this->m_holder.m_size;
-      return iterator(BOOST_LIKELY(sz) ? bg + sz : bg);  //Avoid UB on null-pointer arithmetic
+      iterator it (this->m_holder.start());
+      it += this->m_holder.m_size;
+      return it;  //Adding zero to null pointer is allowed (non-UB)
    }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the vector.
@@ -1362,7 +1399,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->cend(); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
@@ -1371,7 +1408,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reverse_iterator rbegin() BOOST_NOEXCEPT_OR_NOTHROW
    { return reverse_iterator(this->end());      }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
@@ -1380,7 +1417,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->crbegin(); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
@@ -1389,7 +1426,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reverse_iterator rend() BOOST_NOEXCEPT_OR_NOTHROW
    { return reverse_iterator(this->begin());       }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
@@ -1398,7 +1435,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->crend(); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the vector.
@@ -1406,7 +1443,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_iterator(this->m_holder.start()); }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the vector.
@@ -1414,13 +1451,12 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
    {
-      pointer   const bg = this->m_holder.start();
-      size_type const sz = this->m_holder.m_size;
-      return const_iterator(BOOST_LIKELY(sz) ? bg + sz : bg);  //Avoid UB on null-pointer arithmetic
+      const_iterator it (this->m_holder.start());
+      it += this->m_holder.m_size;
+      return it;  //Adding zero to null pointer is allowed (non-UB)
    }
-   //{ return const_iterator(this->m_holder.start() + this->m_holder.m_size); }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
    //! of the reversed vector.
@@ -1428,7 +1464,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_reverse_iterator(this->end());}
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
@@ -1437,7 +1473,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_reverse_iterator(this->begin()); }
 
    //////////////////////////////////////////////
@@ -1451,7 +1487,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
    { return !this->m_holder.m_size; }
 
    //! <b>Effects</b>: Returns the number of the elements contained in the vector.
@@ -1459,7 +1495,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE size_type size() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE size_type size() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->m_holder.m_size; }
 
    //! <b>Effects</b>: Returns the largest possible size of the vector.
@@ -1467,7 +1503,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    { return allocator_traits_type::max_size(this->m_holder.alloc()); }
 
    //! <b>Effects</b>: Inserts or erases elements at the end such that
@@ -1476,8 +1512,8 @@ class vector
    //! <b>Throws</b>: If memory allocation throws, or T's copy/move or value initialization throws.
    //!
    //! <b>Complexity</b>: Linear to the difference between size() and new_size.
-   void resize(size_type new_size)
-   {  this->priv_resize(new_size, value_init);  }
+   BOOST_CONTAINER_FORCEINLINE void resize(size_type new_size)
+   {  this->priv_resize(new_size, value_init, alloc_version());  }
 
    //! <b>Effects</b>: Inserts or erases elements at the end such that
    //!   the size becomes n. New elements are default initialized.
@@ -1487,8 +1523,8 @@ class vector
    //! <b>Complexity</b>: Linear to the difference between size() and new_size.
    //!
    //! <b>Note</b>: Non-standard extension
-   void resize(size_type new_size, default_init_t)
-   {  this->priv_resize(new_size, default_init);  }
+   BOOST_CONTAINER_FORCEINLINE void resize(size_type new_size, default_init_t)
+   {  this->priv_resize(new_size, default_init, alloc_version());  }
 
    //! <b>Effects</b>: Inserts or erases elements at the end such that
    //!   the size becomes n. New elements are copy constructed from x.
@@ -1496,8 +1532,8 @@ class vector
    //! <b>Throws</b>: If memory allocation throws, or T's copy/move constructor throws.
    //!
    //! <b>Complexity</b>: Linear to the difference between size() and new_size.
-   void resize(size_type new_size, const T& x)
-   {  this->priv_resize(new_size, x);  }
+   BOOST_CONTAINER_FORCEINLINE void resize(size_type new_size, const T& x)
+   {  this->priv_resize(new_size, x, alloc_version());  }
 
    //! <b>Effects</b>: Number of elements for which memory has been allocated.
    //!   capacity() is always greater than or equal to size().
@@ -1505,7 +1541,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   BOOST_CONTAINER_FORCEINLINE size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->m_holder.capacity(); }
 
    //! <b>Effects</b>: If n is less than or equal to capacity(), this call has no
@@ -1517,7 +1553,7 @@ class vector
    BOOST_CONTAINER_FORCEINLINE void reserve(size_type new_cap)
    {
       if (this->capacity() < new_cap){
-         this->priv_reserve_no_capacity(new_cap, alloc_version());
+         this->priv_move_to_new_buffer(new_cap, alloc_version());
       }
    }
 
@@ -1544,7 +1580,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reference         front() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reference front() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return *this->m_holder.start();
@@ -1558,7 +1594,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reference   front() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reference front() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return *this->m_holder.start();
@@ -1572,7 +1608,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reference         back() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reference back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return this->m_holder.start()[this->m_holder.m_size - 1];
@@ -1586,7 +1622,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reference   back()  const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reference back()  const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return this->m_holder.start()[this->m_holder.m_size - 1];
@@ -1600,7 +1636,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reference operator[](size_type n) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reference operator[](size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->m_holder.m_size > n);
       return this->m_holder.start()[n];
@@ -1614,7 +1650,8 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reference operator[](size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      const_reference operator[](size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->m_holder.m_size > n);
       return this->m_holder.start()[n];
@@ -1631,7 +1668,8 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->m_holder.m_size >= n);
       return iterator(this->m_holder.start()+n);
@@ -1648,7 +1686,8 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->m_holder.m_size >= n);
       return const_iterator(this->m_holder.start()+n);
@@ -1664,7 +1703,8 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       //Range check assert done in priv_index_of
       return this->priv_index_of(vector_iterator_get_ptr(p));
@@ -1680,7 +1720,8 @@ class vector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE
+      size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       //Range check assert done in priv_index_of
       return this->priv_index_of(vector_iterator_get_ptr(p));
@@ -1691,10 +1732,10 @@ class vector
    //! <b>Effects</b>: Returns a reference to the nth element
    //!   from the beginning of the container.
    //!
-   //! <b>Throws</b>: std::range_error if n >= size()
+   //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   reference at(size_type n)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE reference at(size_type n)
    {
       this->priv_throw_if_out_of_range(n);
       return this->m_holder.start()[n];
@@ -1705,10 +1746,10 @@ class vector
    //! <b>Effects</b>: Returns a const reference to the nth element
    //!   from the beginning of the container.
    //!
-   //! <b>Throws</b>: std::range_error if n >= size()
+   //! <b>Throws</b>: range_error if n >= size()
    //!
    //! <b>Complexity</b>: Constant.
-   const_reference at(size_type n) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const_reference at(size_type n) const
    {
       this->priv_throw_if_out_of_range(n);
       return this->m_holder.start()[n];
@@ -1726,7 +1767,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   T* data() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE T* data() BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_raw_begin(); }
 
    //! <b>Returns</b>: A pointer such that [data(),data() + size()) is a valid range.
@@ -1735,7 +1776,7 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const T * data()  const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE const T * data()  const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_raw_begin(); }
 
    //////////////////////////////////////////////
@@ -1757,17 +1798,17 @@ class vector
    template<class ...Args>
    BOOST_CONTAINER_FORCEINLINE reference emplace_back(BOOST_FWD_REF(Args)...args)
    {
+      T* const p = this->priv_raw_end();
       if (BOOST_LIKELY(this->room_enough())){
          //There is more memory, just construct a new object at the end
-         T* const p = this->priv_raw_end();
          allocator_traits_type::construct(this->m_holder.alloc(), p, ::boost::forward<Args>(args)...);
          ++this->m_holder.m_size;
          return *p;
       }
       else{
-         typedef dtl::insert_emplace_proxy<Allocator, T*, Args...> type;
-         return *this->priv_forward_range_insert_no_capacity
-            (this->back_ptr(), 1, type(::boost::forward<Args>(args)...), alloc_version());
+         typedef dtl::insert_emplace_proxy<allocator_type, T*, Args...> proxy_t;
+         return *this->priv_insert_forward_range_no_capacity
+            (p, 1, proxy_t(::boost::forward<Args>(args)...), alloc_version());
       }
    }
 
@@ -1802,13 +1843,13 @@ class vector
    //! <b>Complexity</b>: If position is end(), amortized constant time
    //!   Linear time otherwise.
    template<class ...Args>
-   iterator emplace(const_iterator position, BOOST_FWD_REF(Args) ...args)
+   BOOST_CONTAINER_FORCEINLINE iterator emplace(const_iterator position, BOOST_FWD_REF(Args) ...args)
    {
       BOOST_ASSERT(this->priv_in_range_or_end(position));
       //Just call more general insert(pos, size, value) and return iterator
-      typedef dtl::insert_emplace_proxy<Allocator, T*, Args...> type;
-      return this->priv_forward_range_insert( vector_iterator_get_ptr(position), 1
-                                            , type(::boost::forward<Args>(args)...));
+      typedef dtl::insert_emplace_proxy<allocator_type, T*, Args...> proxy_t;
+      return this->priv_insert_forward_range( vector_iterator_get_ptr(position), 1
+                                            , proxy_t(::boost::forward<Args>(args)...));
    }
 
    #else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
@@ -1817,17 +1858,17 @@ class vector
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
    BOOST_CONTAINER_FORCEINLINE reference emplace_back(BOOST_MOVE_UREF##N)\
    {\
+      T* const p = this->priv_raw_end();\
       if (BOOST_LIKELY(this->room_enough())){\
-         T* const p = this->priv_raw_end();\
          allocator_traits_type::construct (this->m_holder.alloc()\
             , this->priv_raw_end() BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
          ++this->m_holder.m_size;\
          return *p;\
       }\
       else{\
-         typedef dtl::insert_emplace_proxy_arg##N<Allocator, T* BOOST_MOVE_I##N BOOST_MOVE_TARG##N> type;\
-         return *this->priv_forward_range_insert_no_capacity\
-            ( this->back_ptr(), 1, type(BOOST_MOVE_FWD##N), alloc_version());\
+         typedef dtl::insert_emplace_proxy_arg##N<allocator_type, T* BOOST_MOVE_I##N BOOST_MOVE_TARG##N> proxy_t;\
+         return *this->priv_insert_forward_range_no_capacity\
+            ( p, 1, proxy_t(BOOST_MOVE_FWD##N), alloc_version());\
       }\
    }\
    \
@@ -1844,11 +1885,11 @@ class vector
    }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
-   iterator emplace(const_iterator pos BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
+   BOOST_CONTAINER_FORCEINLINE iterator emplace(const_iterator pos BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
       BOOST_ASSERT(this->priv_in_range_or_end(pos));\
-      typedef dtl::insert_emplace_proxy_arg##N<Allocator, T* BOOST_MOVE_I##N BOOST_MOVE_TARG##N> type;\
-      return this->priv_forward_range_insert(vector_iterator_get_ptr(pos), 1, type(BOOST_MOVE_FWD##N));\
+      typedef dtl::insert_emplace_proxy_arg##N<allocator_type, T* BOOST_MOVE_I##N BOOST_MOVE_TARG##N> proxy_t;\
+      return this->priv_insert_forward_range(vector_iterator_get_ptr(pos), 1, proxy_t(BOOST_MOVE_FWD##N));\
    }\
    //
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_VECTOR_EMPLACE_CODE)
@@ -1910,11 +1951,11 @@ class vector
    //! <b>Throws</b>: If memory allocation throws or T's copy/move constructor throws.
    //!
    //! <b>Complexity</b>: Linear to n.
-   iterator insert(const_iterator p, size_type n, const T& x)
+   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator p, size_type n, const T& x)
    {
       BOOST_ASSERT(this->priv_in_range_or_end(p));
-      dtl::insert_n_copies_proxy<Allocator, T*> proxy(x);
-      return this->priv_forward_range_insert(vector_iterator_get_ptr(p), n, proxy);
+      dtl::insert_n_copies_proxy<allocator_type, T*> proxy(x);
+      return this->priv_insert_forward_range(vector_iterator_get_ptr(p), n, proxy);
    }
 
    //! <b>Requires</b>: p must be a valid iterator of *this.
@@ -1950,7 +1991,7 @@ class vector
 
    #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    template <class FwdIt>
-   iterator insert(const_iterator pos, FwdIt first, FwdIt last
+   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator pos, FwdIt first, FwdIt last
       , typename dtl::disable_if_or
          < void
          , dtl::is_convertible<FwdIt, size_type>
@@ -1959,8 +2000,13 @@ class vector
       )
    {
       BOOST_ASSERT(this->priv_in_range_or_end(pos));
-      dtl::insert_range_proxy<Allocator, FwdIt, T*> proxy(first);
-      return this->priv_forward_range_insert(vector_iterator_get_ptr(pos), boost::container::iterator_distance(first, last), proxy);
+      const typename iterator_traits<FwdIt>::size_type sz = boost::container::iterator_distance(first, last);
+      if (sz > size_type(-1)){
+         boost::container::throw_length_error("vector::insert, FwdIt's max length reached");
+      }
+
+      dtl::insert_range_proxy<allocator_type, FwdIt, T*> proxy(first);
+      return this->priv_insert_forward_range(vector_iterator_get_ptr(pos), static_cast<size_type>(sz), proxy);
    }
    #endif
 
@@ -1981,14 +2027,14 @@ class vector
    //!   a non-standard extension.
    #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
    template <class InIt>
-   iterator insert(const_iterator pos, size_type num, InIt first, InIt last)
+   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator pos, size_type num, InIt first, InIt last)
    {
       BOOST_ASSERT(this->priv_in_range_or_end(pos));
       BOOST_ASSERT(dtl::is_input_iterator<InIt>::value ||
                    num == static_cast<size_type>(boost::container::iterator_distance(first, last)));
       (void)last;
-      dtl::insert_range_proxy<Allocator, InIt, T*> proxy(first);
-      return this->priv_forward_range_insert(vector_iterator_get_ptr(pos), num, proxy);
+      dtl::insert_range_proxy<allocator_type, InIt, T*> proxy(first);
+      return this->priv_insert_forward_range(vector_iterator_get_ptr(pos), num, proxy);
    }
    #endif
 
@@ -2000,7 +2046,7 @@ class vector
    //! <b>Returns</b>: an iterator to the first inserted element or position if first == last.
    //!
    //! <b>Complexity</b>: Linear to the range [il.begin(), il.end()).
-   iterator insert(const_iterator position, std::initializer_list<value_type> il)
+   BOOST_CONTAINER_FORCEINLINE iterator insert(const_iterator position, std::initializer_list<value_type> il)
    {
       //Assertion done in insert()
       return this->insert(position, il.begin(), il.end());
@@ -2012,11 +2058,12 @@ class vector
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant time.
-   void pop_back() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_FORCEINLINE void pop_back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       //Destroy last element
-      this->priv_destroy_last();
+      allocator_traits_type::destroy(this->get_stored_allocator(), this->priv_raw_end() - 1);
+      --this->m_holder.m_size;
    }
 
    //! <b>Effects</b>: Erases the element at position pos.
@@ -2030,10 +2077,16 @@ class vector
       BOOST_ASSERT(this->priv_in_range(position));
       const pointer p = vector_iterator_get_ptr(position);
       T *const pos_ptr = boost::movelib::to_raw_pointer(p);
-      T *const beg_ptr = this->priv_raw_begin();
-      T *const new_end_ptr = ::boost::container::move(pos_ptr + 1, beg_ptr + this->m_holder.m_size, pos_ptr);
+      T *const end_ptr = this->priv_raw_end();
+
       //Move elements forward and destroy last
-      this->priv_destroy_last(pos_ptr != new_end_ptr);
+      (void)::boost::container::move(pos_ptr + 1, end_ptr, pos_ptr);
+
+      T *const last_ptr = end_ptr-1;
+      if(!value_traits::trivial_dctr_after_move || pos_ptr == last_ptr){
+         allocator_traits_type::destroy(this->get_stored_allocator(), last_ptr);
+      }
+      --this->m_holder.m_size;
       return iterator(p);
    }
 
@@ -2045,15 +2098,19 @@ class vector
    //!   plus linear to the elements between pos and the last element.
    iterator erase(const_iterator first, const_iterator last)
    {
-      if (first != last){
-         BOOST_ASSERT(this->priv_in_range(first));
-         BOOST_ASSERT(this->priv_in_range_or_end(last));
-         BOOST_ASSERT(first < last);
+      BOOST_ASSERT(this->priv_in_range_or_end(first));
+      BOOST_ASSERT(this->priv_in_range_or_end(last));
+      BOOST_ASSERT(first <= last);
+      if(first != last){
          T* const old_end_ptr = this->priv_raw_end();
          T* const first_ptr = boost::movelib::to_raw_pointer(vector_iterator_get_ptr(first));
          T* const last_ptr  = boost::movelib::to_raw_pointer(vector_iterator_get_ptr(last));
-         T* const ptr = boost::movelib::to_raw_pointer(boost::container::move(last_ptr, old_end_ptr, first_ptr));
-         this->priv_destroy_last_n(old_end_ptr - ptr);
+         T* const new_last_ptr = boost::movelib::to_raw_pointer(boost::container::move(last_ptr, old_end_ptr, first_ptr));
+         const size_type n = static_cast<size_type>(old_end_ptr - new_last_ptr);
+         if(!value_traits::trivial_dctr_after_move || old_end_ptr == last_ptr){
+            boost::container::destroy_alloc_n(this->get_stored_allocator(), new_last_ptr, n);
+         }
+         this->m_holder.dec_stored_size(n);
       }
       return iterator(vector_iterator_get_ptr(first));
    }
@@ -2066,9 +2123,9 @@ class vector
    BOOST_CONTAINER_FORCEINLINE void swap(vector& x)
       BOOST_NOEXCEPT_IF( ((allocator_traits_type::propagate_on_container_swap::value
                                     || allocator_traits_type::is_always_equal::value) &&
-                                    !dtl::is_version<Allocator, 0>::value))
+                                    !dtl::is_version<allocator_type, 0>::value))
    {
-      this->priv_swap(x, dtl::bool_<dtl::is_version<Allocator, 0>::value>());
+      this->priv_swap(x, dtl::bool_<dtl::is_version<allocator_type, 0>::value>());
    }
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -2080,12 +2137,12 @@ class vector
    //! <b>Complexity</b>: Linear
    //!
    //! <b>Note</b>: Non-standard extension to support static_vector
-   template<class OtherAllocator>
-   BOOST_CONTAINER_FORCEINLINE void swap(vector<T, OtherAllocator> & x
+   template<class OtherA>
+   BOOST_CONTAINER_FORCEINLINE void swap(vector<T, OtherA, Options> & x
             , typename dtl::enable_if_and
                      < void
-                     , dtl::is_version<OtherAllocator, 0>
-                     , dtl::is_different<OtherAllocator, allocator_type>
+                     , dtl::is_version<typename real_allocator<T, OtherA>::type, 0>
+                     , dtl::is_different<typename real_allocator<T, OtherA>::type, allocator_type>
                      >::type * = 0
             )
    {  this->m_holder.deep_swap(x.m_holder); }
@@ -2103,51 +2160,44 @@ class vector
    //! <b>Effects</b>: Returns true if x and y are equal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_FORCEINLINE friend bool operator==(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator==(const vector& x, const vector& y)
    {  return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());  }
 
    //! <b>Effects</b>: Returns true if x and y are unequal
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_FORCEINLINE friend bool operator!=(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator!=(const vector& x, const vector& 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 vector& x, const vector& y)
-   {
-      const_iterator first1(x.cbegin()), first2(y.cbegin());
-      const const_iterator last1(x.cend()), last2(y.cend());
-      for ( ; (first1 != last1) && (first2 != last2); ++first1, ++first2 ) {
-         if (*first1 < *first2) return true;
-         if (*first2 < *first1) return false;
-      }
-      return (first1 == last1) && (first2 != last2);
-   }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD friend bool operator<(const vector& x, const vector& y)
+   {  return boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());  }
 
    //! <b>Effects</b>: Returns true if x is greater than y
    //!
    //! <b>Complexity</b>: Linear to the number of elements in the container.
-   BOOST_CONTAINER_FORCEINLINE friend bool operator>(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator>(const vector& x, const vector& 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.
-   BOOST_CONTAINER_FORCEINLINE friend bool operator<=(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator<=(const vector& x, const vector& y)
    {  return !(y < x);  }
 
    //! <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.
-   BOOST_CONTAINER_FORCEINLINE friend bool operator>=(const vector& x, const vector& y)
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD BOOST_CONTAINER_FORCEINLINE friend bool operator>=(const vector& x, const vector& y)
    {  return !(x < y);  }
 
    //! <b>Effects</b>: x.swap(y)
    //!
    //! <b>Complexity</b>: Constant.
    BOOST_CONTAINER_FORCEINLINE friend void swap(vector& x, vector& y)
+       BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
    {  x.swap(y);  }
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -2254,14 +2304,14 @@ class vector
             else{
                //Hole was just filled, disable exception rollback and change vector size
                past_hole_values_destroyer.release();
-               this->m_holder.m_size += element_count;
+               this->m_holder.inc_stored_size(element_count);
             }
          }
          else{
             if(old_hole_size){
                //Hole was just filled by priv_insert_ordered_at_shift_range, disable exception rollback and change vector size
                past_hole_values_destroyer.release();
-               this->m_holder.m_size += element_count;
+               this->m_holder.inc_stored_size(element_count);
             }
             //Insert the new value in the already constructed range
             begin_ptr[pos + insertions_left - 1] = position_value.get_val();
@@ -2309,7 +2359,7 @@ class vector
    template<class FwdIt, class Compare>
    BOOST_CONTAINER_FORCEINLINE void priv_merge_in_new_buffer(FwdIt, size_type, Compare, version_0)
    {
-      throw_bad_alloc();
+      alloc_holder_t::on_capacity_overflow();
    }
 
    template<class FwdIt, class Compare, class Version>
@@ -2359,8 +2409,10 @@ class vector
       pointer const old_p     = this->m_holder.start();
       size_type const old_cap = this->m_holder.capacity();
       boost::container::destroy_alloc_n(a, boost::movelib::to_raw_pointer(old_p), old_size);
-      this->m_holder.deallocate(old_p, old_cap);
-      this->m_holder.m_size = old_size + added;
+      if (old_cap > 0) {
+         this->m_holder.deallocate(old_p, old_cap);
+      }
+      m_holder.set_stored_size(old_size + added);
       this->m_holder.start(new_storage);
       this->m_holder.capacity(new_cap);
       new_buffer_deallocator.release();
@@ -2368,41 +2420,44 @@ class vector
    }
 
    BOOST_CONTAINER_FORCEINLINE bool room_enough() const
-   {  return this->m_holder.m_size < this->m_holder.capacity();   }
+   {  return this->m_holder.m_size != this->m_holder.capacity();   }
 
    BOOST_CONTAINER_FORCEINLINE pointer back_ptr() const
    {  return this->m_holder.start() + this->m_holder.m_size;  }
 
-   size_type priv_index_of(pointer p) const
+   BOOST_CONTAINER_FORCEINLINE size_type priv_index_of(pointer p) const
    {
       BOOST_ASSERT(this->m_holder.start() <= p);
       BOOST_ASSERT(p <= (this->m_holder.start()+this->size()));
       return static_cast<size_type>(p - this->m_holder.start());
    }
 
-   template<class OtherAllocator>
-   void priv_move_assign(BOOST_RV_REF_BEG vector<T, OtherAllocator> BOOST_RV_REF_END x
+   template<class OtherA>
+   void priv_move_assign(BOOST_RV_REF_BEG vector<T, OtherA, Options> BOOST_RV_REF_END x
       , typename dtl::enable_if_c
-         < dtl::is_version<OtherAllocator, 0>::value >::type * = 0)
+         < dtl::is_version<typename real_allocator<T, OtherA>::type, 0>::value >::type * = 0)
    {
-      if(!dtl::is_same<OtherAllocator, allocator_type>::value &&
+      if(!dtl::is_same<typename real_allocator<T, OtherA>::type, allocator_type>::value &&
           this->capacity() < x.size()){
-         throw_bad_alloc();
+         alloc_holder_t::on_capacity_overflow();
       }
       T* const this_start  = this->priv_raw_begin();
       T* const other_start = x.priv_raw_begin();
       const size_type this_sz  = m_holder.m_size;
       const size_type other_sz = static_cast<size_type>(x.m_holder.m_size);
       boost::container::move_assign_range_alloc_n(this->m_holder.alloc(), other_start, other_sz, this_start, this_sz);
-      this->m_holder.m_size = other_sz;
+      m_holder.set_stored_size(other_sz);
+      //Not emptying the source container seems to be confusing for users as drop-in
+      //replacement for non-static vectors, so clear it.
+      x.clear();
    }
 
-   template<class OtherAllocator>
-   void priv_move_assign(BOOST_RV_REF_BEG vector<T, OtherAllocator> BOOST_RV_REF_END x
+   template<class OtherA>
+   void priv_move_assign(BOOST_RV_REF_BEG vector<T, OtherA, Options> BOOST_RV_REF_END x
       , typename dtl::disable_if_or
          < void
-         , dtl::is_version<OtherAllocator, 0>
-         , dtl::is_different<OtherAllocator, allocator_type>
+         , dtl::is_version<typename real_allocator<T, OtherA>::type, 0>
+         , dtl::is_different<typename real_allocator<T, OtherA>::type, allocator_type>
          >::type * = 0)
    {
       //for move assignment, no aliasing (&x != this) is assumed.
@@ -2412,6 +2467,7 @@ class vector
       allocator_type &x_alloc    = x.m_holder.alloc();
       const bool propagate_alloc = allocator_traits_type::propagate_on_container_move_assignment::value;
 
+      //In this allocator move constructor the allocator maybe will be propagated -----------------------v
       const bool is_propagable_from_x = is_propagable_from(x_alloc, x.m_holder.start(), this_alloc, propagate_alloc);
 
       //Resources can be transferred if both allocators are
@@ -2422,40 +2478,42 @@ class vector
             this->m_holder.deallocate(this->m_holder.m_start, this->m_holder.m_capacity);
          this->m_holder.steal_resources(x.m_holder);
       }
-      //Else do a one by one move
+      //Else do a one by one move. Also, clear the source as users find confusing
+      //elements are still alive in the source container.
       else{
          this->assign( boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.begin()))
                      , boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.end()  ))
                      );
+         x.clear();
       }
       //Move allocator if needed
       dtl::move_alloc(this_alloc, x_alloc, dtl::bool_<propagate_alloc>());
    }
 
-   template<class OtherAllocator>
-   void priv_copy_assign(const vector<T, OtherAllocator> &x
+   template<class OtherA>
+   void priv_copy_assign(const vector<T, OtherA, Options> &x
       , typename dtl::enable_if_c
-         < dtl::is_version<OtherAllocator, 0>::value >::type * = 0)
+         < dtl::is_version<typename real_allocator<T, OtherA>::type, 0>::value >::type * = 0)
    {
-      if(!dtl::is_same<OtherAllocator, allocator_type>::value &&
+      if(!dtl::is_same<typename real_allocator<T, OtherA>::type, allocator_type>::value &&
          this->capacity() < x.size()){
-         throw_bad_alloc();
+         alloc_holder_t::on_capacity_overflow();
       }
       T* const this_start  = this->priv_raw_begin();
       T* const other_start = x.priv_raw_begin();
       const size_type this_sz  = m_holder.m_size;
       const size_type other_sz = static_cast<size_type>(x.m_holder.m_size);
       boost::container::copy_assign_range_alloc_n(this->m_holder.alloc(), other_start, other_sz, this_start, this_sz);
-      this->m_holder.m_size = other_sz;
+      m_holder.set_stored_size(other_sz);
    }
 
-   template<class OtherAllocator>
+   template<class OtherA>
    typename dtl::disable_if_or
       < void
-      , dtl::is_version<OtherAllocator, 0>
-      , dtl::is_different<OtherAllocator, allocator_type>
+      , dtl::is_version<typename real_allocator<T, OtherA>::type, 0>
+      , dtl::is_different<typename real_allocator<T, OtherA>::type, allocator_type>
       >::type
-      priv_copy_assign(const vector<T, OtherAllocator> &x)
+      priv_copy_assign(const vector<T, OtherA, Options> &x)
    {
       allocator_type &this_alloc     = this->m_holder.alloc();
       const allocator_type &x_alloc  = x.m_holder.alloc();
@@ -2470,7 +2528,7 @@ class vector
    }
 
    template<class Vector>  //Template it to avoid it in explicit instantiations
-   void priv_swap(Vector &x, dtl::true_type)   //version_0
+   BOOST_CONTAINER_FORCEINLINE void priv_swap(Vector &x, dtl::true_type)   //version_0
    {  this->m_holder.deep_swap(x.m_holder);  }
 
    template<class Vector>  //Template it to avoid it in explicit instantiations
@@ -2507,26 +2565,29 @@ class vector
       dtl::swap_alloc(this->m_holder.alloc(), x.m_holder.alloc(), dtl::bool_<propagate_alloc>());
    }
 
-   void priv_reserve_no_capacity(size_type, version_0)
-   {  throw_bad_alloc();  }
+   BOOST_CONTAINER_FORCEINLINE void priv_move_to_new_buffer(size_type, version_0)
+   {  alloc_holder_t::on_capacity_overflow();  }
 
-   dtl::insert_range_proxy<Allocator, boost::move_iterator<T*>, T*> priv_dummy_empty_proxy()
+   BOOST_CONTAINER_FORCEINLINE dtl::insert_range_proxy<allocator_type, boost::move_iterator<T*>, T*> priv_dummy_empty_proxy()
    {
-      return dtl::insert_range_proxy<Allocator, boost::move_iterator<T*>, T*>
+      return dtl::insert_range_proxy<allocator_type, boost::move_iterator<T*>, T*>
          (::boost::make_move_iterator((T *)0));
    }
 
-   void priv_reserve_no_capacity(size_type new_cap, version_1)
+   BOOST_CONTAINER_FORCEINLINE void priv_move_to_new_buffer(size_type new_cap, version_1)
    {
       //There is not enough memory, allocate a new buffer
       //Pass the hint so that allocators can take advantage of this.
       pointer const p = this->m_holder.allocate(new_cap);
+      #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
+      ++this->num_alloc;
+      #endif
       //We will reuse insert code, so create a dummy input iterator
-      this->priv_forward_range_insert_new_allocation
+      this->priv_insert_forward_range_new_allocation
          ( boost::movelib::to_raw_pointer(p), new_cap, this->priv_raw_end(), 0, this->priv_dummy_empty_proxy());
    }
 
-   void priv_reserve_no_capacity(size_type new_cap, version_2)
+   void priv_move_to_new_buffer(size_type new_cap, version_2)
    {
       //There is not enough memory, allocate a new
       //buffer or expand the old one.
@@ -2550,38 +2611,24 @@ class vector
             #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
             ++this->num_expand_bwd;
             #endif
-            this->priv_forward_range_insert_expand_backwards
+            this->priv_insert_forward_range_expand_backwards
                ( new_mem , real_cap, ins_pos, 0, this->priv_dummy_empty_proxy());
          }
          else{ //New buffer
             #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
             ++this->num_alloc;
             #endif
-            this->priv_forward_range_insert_new_allocation
+            this->priv_insert_forward_range_new_allocation
                ( new_mem, real_cap, ins_pos, 0, this->priv_dummy_empty_proxy());
          }
       }
    }
 
-   void priv_destroy_last(const bool moved = false) BOOST_NOEXCEPT_OR_NOTHROW
-   {
-      (void)moved;
-      const bool skip_destructor = value_traits::trivial_dctr || (value_traits::trivial_dctr_after_move && moved);
-      if(!skip_destructor){
-         value_type* const p = this->priv_raw_end() - 1;
-         allocator_traits_type::destroy(this->get_stored_allocator(), p);
-      }
-      --this->m_holder.m_size;
-   }
-
    void priv_destroy_last_n(const size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(n <= this->m_holder.m_size);
-      if(!value_traits::trivial_dctr){
-         T* const destroy_pos = this->priv_raw_begin() + (this->m_holder.m_size-n);
-         boost::container::destroy_alloc_n(this->get_stored_allocator(), destroy_pos, n);
-      }
-      this->m_holder.m_size -= n;
+      boost::container::destroy_alloc_n(this->get_stored_allocator(), this->priv_raw_end() - n, n);
+      this->m_holder.dec_stored_size(n);
    }
 
    template<class InpIt>
@@ -2589,7 +2636,7 @@ class vector
    {
       T* const old_end_pos = this->priv_raw_end();
       T* const new_end_pos = boost::container::uninitialized_copy_alloc(this->m_holder.alloc(), first, last, old_end_pos);
-      this->m_holder.m_size += new_end_pos - old_end_pos;
+      this->m_holder.inc_stored_size(static_cast<size_type>(new_end_pos - old_end_pos));
    }
 
    void priv_destroy_all() BOOST_NOEXCEPT_OR_NOTHROW
@@ -2600,57 +2647,32 @@ class vector
    }
 
    template<class U>
-   iterator priv_insert(const const_iterator &p, BOOST_FWD_REF(U) x)
+   BOOST_CONTAINER_FORCEINLINE iterator priv_insert(const const_iterator &p, BOOST_FWD_REF(U) u)
    {
-      BOOST_ASSERT(this->priv_in_range_or_end(p));
-      return this->priv_forward_range_insert
-         ( vector_iterator_get_ptr(p), 1, dtl::get_insert_value_proxy<T*, Allocator>(::boost::forward<U>(x)));
+      return this->emplace(p, ::boost::forward<U>(u));
    }
 
-   dtl::insert_copy_proxy<Allocator, T*> priv_single_insert_proxy(const T &x)
-   {  return dtl::insert_copy_proxy<Allocator, T*> (x);  }
-
-   dtl::insert_move_proxy<Allocator, T*> priv_single_insert_proxy(BOOST_RV_REF(T) x)
-   {  return dtl::insert_move_proxy<Allocator, T*> (x);  }
-
    template <class U>
-   void priv_push_back(BOOST_FWD_REF(U) u)
+   BOOST_CONTAINER_FORCEINLINE void priv_push_back(BOOST_FWD_REF(U) u)
    {
-      if (BOOST_LIKELY(this->room_enough())){
-         //There is more memory, just construct a new object at the end
-         allocator_traits_type::construct
-            ( this->m_holder.alloc(), this->priv_raw_end(), ::boost::forward<U>(u) );
-         ++this->m_holder.m_size;
-      }
-      else{
-         this->priv_forward_range_insert_no_capacity
-            ( this->back_ptr(), 1
-            , this->priv_single_insert_proxy(::boost::forward<U>(u)), alloc_version());
-      }
+      this->emplace_back(::boost::forward<U>(u));
    }
 
-   BOOST_CONTAINER_FORCEINLINE dtl::insert_n_copies_proxy<Allocator, T*> priv_resize_proxy(const T &x)
-   {  return dtl::insert_n_copies_proxy<Allocator, T*>(x);   }
+   //Overload to support compiler errors that instantiate too much
+   BOOST_CONTAINER_FORCEINLINE void priv_push_back(::boost::move_detail::nat)
+   {}
+
+   BOOST_CONTAINER_FORCEINLINE iterator priv_insert(const_iterator, ::boost::move_detail::nat)
+   {  return iterator();  }
 
-   BOOST_CONTAINER_FORCEINLINE dtl::insert_default_initialized_n_proxy<Allocator, T*> priv_resize_proxy(default_init_t)
-   {  return dtl::insert_default_initialized_n_proxy<Allocator, T*>();  }
+   BOOST_CONTAINER_FORCEINLINE dtl::insert_n_copies_proxy<allocator_type, T*> priv_resize_proxy(const T &x)
+   {  return dtl::insert_n_copies_proxy<allocator_type, T*>(x);   }
 
-   BOOST_CONTAINER_FORCEINLINE dtl::insert_value_initialized_n_proxy<Allocator, T*> priv_resize_proxy(value_init_t)
-   {  return dtl::insert_value_initialized_n_proxy<Allocator, T*>(); }
+   BOOST_CONTAINER_FORCEINLINE dtl::insert_default_initialized_n_proxy<allocator_type, T*> priv_resize_proxy(default_init_t)
+   {  return dtl::insert_default_initialized_n_proxy<allocator_type, T*>();  }
 
-   template <class U>
-   void priv_resize(size_type new_size, const U& u)
-   {
-      const size_type sz = this->size();
-      if (new_size < sz){
-         //Destroy last elements
-         this->priv_destroy_last_n(sz - new_size);
-      }
-      else{
-         const size_type n = new_size - this->size();
-         this->priv_forward_range_insert_at_end(n, this->priv_resize_proxy(u), alloc_version());
-      }
-   }
+   BOOST_CONTAINER_FORCEINLINE dtl::insert_value_initialized_n_proxy<allocator_type, T*> priv_resize_proxy(value_init_t)
+   {  return dtl::insert_value_initialized_n_proxy<allocator_type, T*>(); }
 
    BOOST_CONTAINER_FORCEINLINE void priv_shrink_to_fit(version_0) BOOST_NOEXCEPT_OR_NOTHROW
    {}
@@ -2667,17 +2689,7 @@ class vector
             this->m_holder.m_capacity  = 0;
          }
          else if(sz < cp){
-            //Allocate a new buffer.
-            //Pass the hint so that allocators can take advantage of this.
-            pointer const p = this->m_holder.allocate(sz);
-
-            //We will reuse insert code, so create a dummy input iterator
-            #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
-            ++this->num_alloc;
-            #endif
-            this->priv_forward_range_insert_new_allocation
-               ( boost::movelib::to_raw_pointer(p), sz
-               , this->priv_raw_begin(), 0, this->priv_dummy_empty_proxy());
+            this->priv_move_to_new_buffer(sz, alloc_version());
          }
       }
    }
@@ -2708,20 +2720,18 @@ class vector
    }
 
    template <class InsertionProxy>
-   iterator priv_forward_range_insert_no_capacity
-      (const pointer &pos, const size_type, const InsertionProxy , version_0)
+   BOOST_CONTAINER_FORCEINLINE iterator priv_insert_forward_range_no_capacity
+      (T * const, const size_type, const InsertionProxy , version_0)
    {
-      throw_bad_alloc();
-      return iterator(pos);
+      return alloc_holder_t::on_capacity_overflow(), iterator();
    }
 
    template <class InsertionProxy>
-   iterator priv_forward_range_insert_no_capacity
-      (const pointer &pos, const size_type n, const InsertionProxy insert_range_proxy, version_1)
+   BOOST_CONTAINER_NOINLINE iterator priv_insert_forward_range_no_capacity
+      (T *const raw_pos, const size_type n, const InsertionProxy insert_range_proxy, version_1)
    {
       //Check if we have enough memory or try to expand current memory
-      const size_type n_pos = pos - this->m_holder.start();
-      T *const raw_pos = boost::movelib::to_raw_pointer(pos);
+      const size_type n_pos = static_cast<size_type>(raw_pos - this->priv_raw_begin());
 
       const size_type new_cap = this->m_holder.template next_capacity<growth_factor_type>(n);
       //Pass the hint so that allocators can take advantage of this.
@@ -2729,17 +2739,15 @@ class vector
       #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
       ++this->num_alloc;
       #endif
-      this->priv_forward_range_insert_new_allocation
-         ( new_buf, new_cap, raw_pos, n, insert_range_proxy);
+      this->priv_insert_forward_range_new_allocation(new_buf, new_cap, raw_pos, n, insert_range_proxy);
       return iterator(this->m_holder.start() + n_pos);
    }
 
    template <class InsertionProxy>
-   iterator priv_forward_range_insert_no_capacity
-      (const pointer &pos, const size_type n, const InsertionProxy insert_range_proxy, version_2)
+   BOOST_CONTAINER_NOINLINE iterator priv_insert_forward_range_no_capacity
+      (T *const raw_pos, const size_type n, const InsertionProxy insert_range_proxy, version_2)
    {
       //Check if we have enough memory or try to expand current memory
-      T *const raw_pos = boost::movelib::to_raw_pointer(pos);
       const size_type n_pos = raw_pos - this->priv_raw_begin();
 
       //There is not enough memory, allocate a new
@@ -2758,14 +2766,15 @@ class vector
             #endif
             this->m_holder.capacity(real_cap);
             //Expand forward
-            this->priv_forward_range_insert_expand_forward(raw_pos, n, insert_range_proxy);
+            this->priv_insert_forward_range_expand_forward
+               (raw_pos, n, insert_range_proxy, dtl::bool_<dtl::is_single_value_proxy<InsertionProxy>::value>());
          }
          //Backwards (and possibly forward) expansion
          else{
             #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
             ++this->num_expand_bwd;
             #endif
-            this->priv_forward_range_insert_expand_backwards
+            this->priv_insert_forward_range_expand_backwards
                (boost::movelib::to_raw_pointer(ret), real_cap, raw_pos, n, insert_range_proxy);
          }
       }
@@ -2774,7 +2783,7 @@ class vector
          #ifdef BOOST_CONTAINER_VECTOR_ALLOC_STATS
          ++this->num_alloc;
          #endif
-         this->priv_forward_range_insert_new_allocation
+         this->priv_insert_forward_range_new_allocation
             ( boost::movelib::to_raw_pointer(ret), real_cap, raw_pos, n, insert_range_proxy);
       }
 
@@ -2782,46 +2791,53 @@ class vector
    }
 
    template <class InsertionProxy>
-   iterator priv_forward_range_insert
+   BOOST_CONTAINER_FORCEINLINE iterator priv_insert_forward_range
       (const pointer &pos, const size_type n, const InsertionProxy insert_range_proxy)
    {
       BOOST_ASSERT(this->m_holder.capacity() >= this->m_holder.m_size);
+      T *const p = boost::movelib::to_raw_pointer(pos);
       //Check if we have enough memory or try to expand current memory
-      const size_type remaining = this->m_holder.capacity() - this->m_holder.m_size;
-
-      bool same_buffer_start = n <= remaining;
-      if (!same_buffer_start){
-         return priv_forward_range_insert_no_capacity(pos, n, insert_range_proxy, alloc_version());
+      if (BOOST_LIKELY(n <= (this->m_holder.capacity() - this->m_holder.m_size))){
+         //Expand forward
+         this->priv_insert_forward_range_expand_forward
+            (p, n, insert_range_proxy, dtl::bool_<dtl::is_single_value_proxy<InsertionProxy>::value>());
+         return iterator(pos);
       }
       else{
-         //Expand forward
-         T *const raw_pos = boost::movelib::to_raw_pointer(pos);
-         const size_type n_pos = raw_pos - this->priv_raw_begin();
-         this->priv_forward_range_insert_expand_forward(raw_pos, n, insert_range_proxy);
-         return iterator(this->m_holder.start() + n_pos);
+         return this->priv_insert_forward_range_no_capacity(p, n, insert_range_proxy, alloc_version());
       }
    }
 
-   template <class InsertionProxy>
-   iterator priv_forward_range_insert_at_end
-      (const size_type n, const InsertionProxy insert_range_proxy, version_0)
+   template <class U>
+   void priv_resize(const size_type new_size, const U &u, version_0)
    {
-      //Check if we have enough memory or try to expand current memory
-      const size_type remaining = this->m_holder.capacity() - this->m_holder.m_size;
-
-      if (n > remaining){
+      const size_type sz = this->m_holder.m_size;
+      if (new_size > this->capacity()){
          //This will trigger an error
-         throw_bad_alloc();
+         alloc_holder_t::on_capacity_overflow();
+      }
+      else if (new_size < sz){
+         //Destroy last elements
+         this->priv_destroy_last_n(sz - new_size);
+      }
+      else{
+         T* const old_finish = this->priv_raw_end();
+         this->priv_resize_proxy(u).uninitialized_copy_n_and_update(this->m_holder.alloc(), old_finish, new_size - sz);
+         this->m_holder.set_stored_size(new_size);
       }
-      this->priv_forward_range_insert_at_end_expand_forward(n, insert_range_proxy);
-      return this->end();
    }
 
-   template <class InsertionProxy, class AllocVersion>
-   BOOST_CONTAINER_FORCEINLINE iterator priv_forward_range_insert_at_end
-      (const size_type n, const InsertionProxy insert_range_proxy, AllocVersion)
+   template <class U, class AllocVersion>
+   void priv_resize(const size_type new_size, const U &u, AllocVersion)
    {
-      return this->priv_forward_range_insert(this->back_ptr(), n, insert_range_proxy);
+      const size_type sz = this->m_holder.m_size;
+      if (new_size < sz){
+         //Destroy last elements
+         this->priv_destroy_last_n(sz - new_size);
+      }
+      else {
+         this->priv_insert_forward_range(this->back_ptr(), new_size - sz, this->priv_resize_proxy(u));
+      }
    }
 
    //Takes the range pointed by [first_pos, last_pos) and shifts it to the right
@@ -2917,103 +2933,69 @@ class vector
    BOOST_CONTAINER_FORCEINLINE T* priv_raw_end() const
    {  return this->priv_raw_begin() + this->m_holder.m_size;  }
 
-   template <class InsertionProxy>
-   void priv_forward_range_insert_at_end_expand_forward(const size_type n, InsertionProxy insert_range_proxy)
-   {
-      T* const old_finish = this->priv_raw_end();
-      insert_range_proxy.uninitialized_copy_n_and_update(this->m_holder.alloc(), old_finish, n);
-      this->m_holder.m_size += n;
-   }
-
-   template <class InsertionProxy>
-   void priv_forward_range_insert_expand_forward(T* const pos, const size_type n, InsertionProxy insert_range_proxy)
+   template <class InsertionProxy>  //inline single-element version as it is significantly smaller
+   BOOST_CONTAINER_FORCEINLINE void priv_insert_forward_range_expand_forward
+      (T* const raw_pos, const size_type, InsertionProxy insert_range_proxy, dtl::true_type)
    {
-      //n can't be 0, because there is nothing to do in that case
-      if(BOOST_UNLIKELY(!n)) return;
+      BOOST_ASSERT(this->room_enough());
       //There is enough memory
       T* const old_finish = this->priv_raw_end();
-      const size_type elems_after = old_finish - pos;
+      allocator_type & a = this->m_holder.alloc();
 
-      if (!elems_after){
-         insert_range_proxy.uninitialized_copy_n_and_update(this->m_holder.alloc(), old_finish, n);
-         this->m_holder.m_size += n;
+      if (old_finish == raw_pos){
+         insert_range_proxy.uninitialized_copy_n_and_update(a, old_finish, 1);
+         ++this->m_holder.m_size;
       }
-      else if (elems_after >= n){
+      else{
          //New elements can be just copied.
          //Move to uninitialized memory last objects
-         ::boost::container::uninitialized_move_alloc
-            (this->m_holder.alloc(), old_finish - n, old_finish, old_finish);
-         this->m_holder.m_size += n;
+         T * const before_old_finish = old_finish-1;
+
+         allocator_traits_type::construct(a, old_finish, ::boost::move(*before_old_finish));
+         ++this->m_holder.m_size;
          //Copy previous to last objects to the initialized end
-         boost::container::move_backward(pos, old_finish - n, old_finish);
-         //Insert new objects in the pos
-         insert_range_proxy.copy_n_and_update(this->m_holder.alloc(), pos, n);
-      }
-      else {
-         //The new elements don't fit in the [pos, end()) range.
-
-         //Copy old [pos, end()) elements to the uninitialized memory (a gap is created)
-         ::boost::container::uninitialized_move_alloc(this->m_holder.alloc(), pos, old_finish, pos + n);
-         BOOST_TRY{
-            //Copy first new elements in pos (gap is still there)
-            insert_range_proxy.copy_n_and_update(this->m_holder.alloc(), pos, elems_after);
-            //Copy to the beginning of the unallocated zone the last new elements (the gap is closed).
-            insert_range_proxy.uninitialized_copy_n_and_update(this->m_holder.alloc(), old_finish, n - elems_after);
-            this->m_holder.m_size += n;
-         }
-         BOOST_CATCH(...){
-            boost::container::destroy_alloc_n(this->get_stored_allocator(), pos + n, elems_after);
-            BOOST_RETHROW
-         }
-         BOOST_CATCH_END
+         boost::container::move_backward(raw_pos, before_old_finish, old_finish);
+         //Insert new objects in the raw_pos
+         insert_range_proxy.copy_n_and_update(a, raw_pos, 1);
       }
    }
 
    template <class InsertionProxy>
-   void priv_forward_range_insert_new_allocation
+   BOOST_CONTAINER_FORCEINLINE void priv_insert_forward_range_expand_forward(T* const raw_pos, const size_type n, InsertionProxy insert_range_proxy, dtl::false_type)
+   {
+      //There is enough memory
+      boost::container::expand_forward_and_insert_alloc
+         ( this->m_holder.alloc(), raw_pos, this->priv_raw_end(), n, insert_range_proxy);
+      this->m_holder.inc_stored_size(n);
+   }
+
+   template <class InsertionProxy>
+   void priv_insert_forward_range_new_allocation
       (T* const new_start, size_type new_cap, T* const pos, const size_type n, InsertionProxy insert_range_proxy)
    {
       //n can be zero, if we want to reallocate!
-      T *new_finish = new_start;
-      T *old_finish;
-      //Anti-exception rollbacks
-      typename value_traits::ArrayDeallocator new_buffer_deallocator(new_start, this->m_holder.alloc(), new_cap);
-      typename value_traits::ArrayDestructor  new_values_destroyer(new_start, this->m_holder.alloc(), 0u);
-
-      //Initialize with [begin(), pos) old buffer
-      //the start of the new buffer
-      T * const old_buffer = this->priv_raw_begin();
-      if(old_buffer){
-         new_finish = ::boost::container::uninitialized_move_alloc
-            (this->m_holder.alloc(), this->priv_raw_begin(), pos, old_finish = new_finish);
-         new_values_destroyer.increment_size(new_finish - old_finish);
-      }
-      //Initialize new objects, starting from previous point
-      old_finish = new_finish;
-      insert_range_proxy.uninitialized_copy_n_and_update(this->m_holder.alloc(), old_finish, n);
-      new_finish += n;
-      new_values_destroyer.increment_size(new_finish - old_finish);
-      //Initialize from the rest of the old buffer,
-      //starting from previous point
-      if(old_buffer){
-         new_finish = ::boost::container::uninitialized_move_alloc
-            (this->m_holder.alloc(), pos, old_buffer + this->m_holder.m_size, new_finish);
-         //Destroy and deallocate old elements
-         //If there is allocated memory, destroy and deallocate
-         if(!value_traits::trivial_dctr_after_move)
-            boost::container::destroy_alloc_n(this->get_stored_allocator(), old_buffer, this->m_holder.m_size);
+      allocator_type &a =  this->m_holder.alloc();
+      T * const raw_old_buffer = this->priv_raw_begin();
+
+      typename value_traits::ArrayDeallocator new_buffer_deallocator(new_start, a, new_cap);
+      boost::container::uninitialized_move_and_insert_alloc
+         (a, raw_old_buffer, pos, this->priv_raw_end(), new_start, n, insert_range_proxy);
+      new_buffer_deallocator.release();
+
+      //Destroy and deallocate old elements
+      if(raw_old_buffer){
+         BOOST_IF_CONSTEXPR(!has_trivial_destructor_after_move<value_type>::value)
+            boost::container::destroy_alloc_n(a, raw_old_buffer, this->m_holder.m_size);
          this->m_holder.deallocate(this->m_holder.start(), this->m_holder.capacity());
       }
+
       this->m_holder.start(new_start);
-      this->m_holder.m_size = size_type(new_finish - new_start);
+      this->m_holder.inc_stored_size(n);
       this->m_holder.capacity(new_cap);
-      //All construction successful, disable rollbacks
-      new_values_destroyer.release();
-      new_buffer_deallocator.release();
    }
 
    template <class InsertionProxy>
-   void priv_forward_range_insert_expand_backwards
+   void priv_insert_forward_range_expand_backwards
          (T* const new_start, const size_type new_capacity,
           T* const pos, const size_type n, InsertionProxy insert_range_proxy)
    {
@@ -3022,28 +3004,31 @@ class vector
       T* const old_start  = this->priv_raw_begin();
       const size_type old_size = this->m_holder.m_size;
       T* const old_finish = old_start + old_size;
+      allocator_type &a = this->m_holder.alloc();
+
+      //Update the vector buffer information to a safe state
+      this->m_holder.start(new_start);
+      this->m_holder.capacity(new_capacity);
+      this->m_holder.m_size = 0;
 
       //We can have 8 possibilities:
       const size_type elemsbefore = static_cast<size_type>(pos - old_start);
       const size_type s_before    = static_cast<size_type>(old_start - new_start);
       const size_type before_plus_new = elemsbefore + n;
 
-      //Update the vector buffer information to a safe state
-      this->m_holder.start(new_start);
-      this->m_holder.capacity(new_capacity);
-      this->m_holder.m_size = 0;
+      typedef typename value_traits::ArrayDestructor array_destructor_t;
 
       //If anything goes wrong, this object will destroy
       //all the old objects to fulfill previous vector state
-      typename value_traits::ArrayDestructor old_values_destroyer(old_start, this->m_holder.alloc(), old_size);
+      array_destructor_t old_values_destroyer(old_start, a, old_size);
       //Check if s_before is big enough to hold the beginning of old data + new data
       if(s_before >= before_plus_new){
          //Copy first old values before pos, after that the new objects
          T *const new_elem_pos =
-            ::boost::container::uninitialized_move_alloc(this->m_holder.alloc(), old_start, pos, new_start);
-         this->m_holder.m_size = elemsbefore;
-         insert_range_proxy.uninitialized_copy_n_and_update(this->m_holder.alloc(), new_elem_pos, n);
-         this->m_holder.m_size = before_plus_new;
+            ::boost::container::uninitialized_move_alloc(a, old_start, pos, new_start);
+         this->m_holder.set_stored_size(elemsbefore);
+         insert_range_proxy.uninitialized_copy_n_and_update(a, new_elem_pos, n);
+         this->m_holder.set_stored_size(before_plus_new);
          const size_type new_size = old_size + n;
          //Check if s_before is so big that even copying the old data + new data
          //there is a gap between the new data and the old data
@@ -3060,15 +3045,14 @@ class vector
             //
             //Now initialize the rest of memory with the last old values
             if(before_plus_new != new_size){ //Special case to avoid operations in back insertion
-               ::boost::container::uninitialized_move_alloc
-                  (this->m_holder.alloc(), pos, old_finish, new_start + before_plus_new);
+               ::boost::container::uninitialized_move_alloc(a, pos, old_finish, new_start + before_plus_new);
                //All new elements correctly constructed, avoid new element destruction
-               this->m_holder.m_size = new_size;
+               this->m_holder.set_stored_size(new_size);
             }
             //Old values destroyed automatically with "old_values_destroyer"
             //when "old_values_destroyer" goes out of scope unless the have trivial
             //destructor after move.
-            if(value_traits::trivial_dctr_after_move)
+            BOOST_IF_CONSTEXPR(value_traits::trivial_dctr_after_move)
                old_values_destroyer.release();
          }
          //s_before is so big that divides old_end
@@ -3085,30 +3069,29 @@ class vector
             //
             //Now initialize the rest of memory with the last old values
             //All new elements correctly constructed, avoid new element destruction
-            const size_type raw_gap = s_before - before_plus_new;
-            if(!value_traits::trivial_dctr){
+            BOOST_IF_CONSTEXPR(!value_traits::trivial_dctr){
+               const size_type raw_gap = s_before - before_plus_new;
                //Now initialize the rest of s_before memory with the
                //first of elements after new values
-               ::boost::container::uninitialized_move_alloc_n
-                  (this->m_holder.alloc(), pos, raw_gap, new_start + before_plus_new);
+               ::boost::container::uninitialized_move_alloc_n(a, pos, raw_gap, new_start + before_plus_new);
                //Now we have a contiguous buffer so program trailing element destruction
                //and update size to the final size.
                old_values_destroyer.shrink_forward(new_size-s_before);
-               this->m_holder.m_size = new_size;
+               this->m_holder.set_stored_size(new_size);
                //Now move remaining last objects in the old buffer begin
                T * const remaining_pos = pos + raw_gap;
                if(remaining_pos != old_start){  //Make sure data has to be moved
                   ::boost::container::move(remaining_pos, old_finish, old_start);
                }
                //Once moved, avoid calling the destructors if trivial after move
-               if(value_traits::trivial_dctr_after_move){
+               BOOST_IF_CONSTEXPR(value_traits::trivial_dctr_after_move){
                   old_values_destroyer.release();
                }
             }
             else{ //If trivial destructor, we can uninitialized copy + copy in a single uninitialized copy
                ::boost::container::uninitialized_move_alloc_n
-                  (this->m_holder.alloc(), pos, static_cast<size_type>(old_finish - pos), new_start + before_plus_new);
-               this->m_holder.m_size = new_size;
+                  (a, pos, static_cast<size_type>(old_finish - pos), new_start + before_plus_new);
+               this->m_holder.set_stored_size(new_size);
                old_values_destroyer.release();
             }
          }
@@ -3162,8 +3145,7 @@ class vector
             //|___________|_____|_________|_____________________|
             //
             //Copy the first part of old_begin to raw_mem
-            ::boost::container::uninitialized_move_alloc_n
-               (this->m_holder.alloc(), old_start, s_before, new_start);
+            ::boost::container::uninitialized_move_alloc_n(a, old_start, s_before, new_start);
             //The buffer is all constructed until old_end,
             //so program trailing destruction and assign final size
             //if !do_after, s_before+n otherwise.
@@ -3175,17 +3157,18 @@ class vector
             }
             else{
                new_1st_range = n;
-               if(value_traits::trivial_dctr_after_move)
+               BOOST_IF_CONSTEXPR(value_traits::trivial_dctr_after_move){
                   old_values_destroyer.release();
+               }
                else{
                   old_values_destroyer.shrink_forward(old_size - (s_before - n));
                }
             }
-            this->m_holder.m_size = old_size + new_1st_range;
+            this->m_holder.set_stored_size(old_size + new_1st_range);
             //Now copy the second part of old_begin overwriting itself
             T *const next = ::boost::container::move(old_start + s_before, pos, old_start);
             //Now copy the new_beg elements
-            insert_range_proxy.copy_n_and_update(this->m_holder.alloc(), next, new_1st_range);
+            insert_range_proxy.copy_n_and_update(a, next, new_1st_range);
 
             //If there is no after work and the last old part needs to be moved to front, do it
             if(!do_after && (n != s_before)){
@@ -3221,33 +3204,37 @@ class vector
             //
             //First copy whole old_begin and part of new to raw_mem
             T * const new_pos = ::boost::container::uninitialized_move_alloc
-               (this->m_holder.alloc(), old_start, pos, new_start);
-            this->m_holder.m_size = elemsbefore;
+               (a, old_start, pos, new_start);
+            this->m_holder.set_stored_size(elemsbefore);
             const size_type mid_n = s_before - elemsbefore;
-            insert_range_proxy.uninitialized_copy_n_and_update(this->m_holder.alloc(), new_pos, mid_n);
+            insert_range_proxy.uninitialized_copy_n_and_update(a, new_pos, mid_n);
             //The buffer is all constructed until old_end,
             //release destroyer
-            this->m_holder.m_size = old_size + s_before;
+            this->m_holder.set_stored_size(old_size + s_before);
             old_values_destroyer.release();
 
             if(do_after){
                //Copy new_beg part
-               insert_range_proxy.copy_n_and_update(this->m_holder.alloc(), old_start, elemsbefore);
+               insert_range_proxy.copy_n_and_update(a, old_start, elemsbefore);
             }
             else{
                //Copy all new elements
                const size_type rest_new = n - mid_n;
-               insert_range_proxy.copy_n_and_update(this->m_holder.alloc(), old_start, rest_new);
+               insert_range_proxy.copy_n_and_update(a, old_start, rest_new);
+
                T* const move_start = old_start + rest_new;
                //Displace old_end, but make sure data has to be moved
                T* const move_end = move_start != pos ? ::boost::container::move(pos, old_finish, move_start)
                                                      : old_finish;
+               (void)move_end;   //To avoid warnings of unused initialization for move_end in case
+                                 //trivial_dctr_after_move is true
                //Destroy remaining moved elements from old_end except if they
                //have trivial destructor after being moved
-               size_type n_destroy = s_before - n;
-               if(!value_traits::trivial_dctr_after_move)
-                  boost::container::destroy_alloc_n(this->get_stored_allocator(), move_end, n_destroy);
-               this->m_holder.m_size -= n_destroy;
+               const size_type n_destroy = s_before - n;
+               BOOST_IF_CONSTEXPR(!value_traits::trivial_dctr_after_move){
+                  boost::container::destroy_alloc_n(a, move_end, n_destroy);
+               }
+               this->m_holder.dec_stored_size(n_destroy);
             }
          }
 
@@ -3289,14 +3276,13 @@ class vector
                //
                //First copy the part of old_end raw_mem
                T* finish_n = old_finish - n_after;
-               ::boost::container::uninitialized_move_alloc
-                  (this->m_holder.alloc(), finish_n, old_finish, old_finish);
-               this->m_holder.m_size += n_after;
+               ::boost::container::uninitialized_move_alloc(a, finish_n, old_finish, old_finish);
+               this->m_holder.inc_stored_size(n_after);
                //Displace the rest of old_end to the new position
                boost::container::move_backward(pos, finish_n, old_finish);
                //Now overwrite with new_end
                //The new_end part is [first + (n - n_after), last)
-               insert_range_proxy.copy_n_and_update(this->m_holder.alloc(), pos, n_after);
+               insert_range_proxy.copy_n_and_update(a, pos, n_after);
             }
             else {
                //The raw_mem from end will divide new_end part
@@ -3310,23 +3296,20 @@ class vector
                // _____________________________________________________________
                //| old_begin   +   new_beg  |     new_end   |old_end | raw_mem |
                //|__________________________|_______________|________|_________|
-               //
 
-               const size_type mid_last_dist = n_after - elemsafter;
                //First initialize data in raw memory
+               const size_type mid_last_dist = n_after - elemsafter;
 
                //Copy to the old_end part to the uninitialized zone leaving a gap.
-               ::boost::container::uninitialized_move_alloc
-                  (this->m_holder.alloc(), pos, old_finish, old_finish + mid_last_dist);
+               ::boost::container::uninitialized_move_alloc(a, pos, old_finish, old_finish + mid_last_dist);
 
-               typename value_traits::ArrayDestructor old_end_destroyer
-                  (old_finish + mid_last_dist, this->m_holder.alloc(), old_finish - pos);
+               array_destructor_t old_end_destroyer(old_finish + mid_last_dist, a, static_cast<size_type>(old_finish - pos));
 
                //Copy the first part to the already constructed old_end zone
-               insert_range_proxy.copy_n_and_update(this->m_holder.alloc(), pos, elemsafter);
+               insert_range_proxy.copy_n_and_update(a, pos, elemsafter);
                //Copy the rest to the uninitialized zone filling the gap
-               insert_range_proxy.uninitialized_copy_n_and_update(this->m_holder.alloc(), old_finish, mid_last_dist);
-               this->m_holder.m_size += n_after;
+               insert_range_proxy.uninitialized_copy_n_and_update(a, old_finish, mid_last_dist);
+               this->m_holder.inc_stored_size(n_after);
                old_end_destroyer.release();
             }
          }
@@ -3384,11 +3367,12 @@ namespace boost {
 
 //!has_trivial_destructor_after_move<> == true_type
 //!specialization for optimizations
-template <class T, class Allocator>
-struct has_trivial_destructor_after_move<boost::container::vector<T, Allocator> >
+template <class T, class Allocator, class Options>
+struct has_trivial_destructor_after_move<boost::container::vector<T, Allocator, Options> >
 {
-   typedef typename ::boost::container::allocator_traits<Allocator>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<Allocator>::value &&
+   typedef typename boost::container::vector<T, Allocator, Options>::allocator_type allocator_type;
+   typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
+   static const bool value = ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
                              ::boost::has_trivial_destructor_after_move<pointer>::value;
 };