passenger 6.2.1 → 6.2.2

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

@@ -12,6 +12,14 @@
 #ifndef BOOST_CONTAINER_DEVECTOR_HPP
 #define BOOST_CONTAINER_DEVECTOR_HPP
 
+#ifndef BOOST_CONFIG_HPP
+#  include <boost/config.hpp>
+#endif
+
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#  pragma once
+#endif
+
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 
@@ -271,8 +279,9 @@ class devector
    explicit devector(size_type n, const allocator_type& allocator = allocator_type())
       : m_(reserve_uninitialized_t(), allocator, n)
    {
-      allocation_guard buffer_guard(m_.buffer, m_.capacity, get_allocator_ref());
-      boost::container::uninitialized_value_init_alloc_n(get_allocator_ref(), n, this->priv_raw_begin());
+      allocator_type &al = this->get_allocator_ref();
+      allocation_guard buffer_guard(m_.buffer, m_.capacity, al);
+      boost::container::uninitialized_value_init_alloc_n(al, n, this->priv_raw_begin());
       buffer_guard.release();
       BOOST_ASSERT(invariants_ok());
    }
@@ -291,8 +300,9 @@ class devector
    explicit devector(size_type n, default_init_t, const allocator_type& allocator = allocator_type())
       : m_(reserve_uninitialized_t(), allocator, n)
    {
-      allocation_guard buffer_guard(m_.buffer, m_.capacity, get_allocator_ref());
-      boost::container::uninitialized_default_init_alloc_n(get_allocator_ref(), n, this->priv_raw_begin());
+      allocator_type &al = this->get_allocator_ref();
+      allocation_guard buffer_guard(m_.buffer, m_.capacity, al);
+      boost::container::uninitialized_default_init_alloc_n(al, n, this->priv_raw_begin());
       buffer_guard.release();
       BOOST_ASSERT(invariants_ok());
    }
@@ -324,14 +334,14 @@ class devector
    * iterator does not meet the forward iterator requirements, `T` shall also be [MoveInsertable]
    * into `*this`.
    *
-   * **Postcondition**: `size() == boost::container::iterator_distance(first, last)
+   * **Postcondition**: `size() == boost::container::iterator_distance(first, last)`
    *
    * **Exceptions**: Strong exception guarantee.
    *
    * **Complexity**: Makes only `N` calls to the copy constructor of `T` (where `N` is the distance between `first`
    * and `last`), at most one allocation and no reallocations if iterators first and last are of forward,
    * bidirectional, or random access categories. It makes `O(N)` calls to the copy constructor of `T`
-   * and `O(log(N)) reallocations if they are just input iterators.
+   * and `O(log(N))` reallocations if they are just input iterators.
    *
    * **Remarks**: Each iterator in the range `[first,last)` shall be dereferenced exactly once,
    * unless an exception is thrown.
@@ -415,7 +425,7 @@ class devector
    *
    * **Complexity**: Linear in the size of `x`.
    */
-   devector(const devector& x, const allocator_type& allocator)
+   devector(const devector& x, const BOOST_CONTAINER_DOC1ST(allocator_type, typename dtl::type_identity<allocator_type>::type)& allocator)
       : m_(reserve_uninitialized_t(), allocator, x.size())
    {
       this->construct_from_range(x.begin(), x.end());
@@ -453,7 +463,7 @@ class devector
    *
    * **Complexity**: Linear if allocator != rhs.get_allocator(), otherwise constant.
    */
-   devector(BOOST_RV_REF(devector) rhs, const allocator_type& allocator)
+   devector(BOOST_RV_REF(devector) rhs, const BOOST_CONTAINER_DOC1ST(allocator_type, typename dtl::type_identity<allocator_type>::type)& allocator)
       : m_(review_implementation_t(), allocator, rhs.m_.buffer, rhs.m_.front_idx, rhs.m_.back_idx, rhs.m_.capacity)
    {
       // TODO should move elems-by-elems if the two allocators differ
@@ -486,8 +496,8 @@ class devector
    */
 ~devector() BOOST_NOEXCEPT
 {
-   destroy_elements(m_.buffer + m_.front_idx, m_.buffer + m_.back_idx);
-   deallocate_buffer();
+   this->destroy_elements(m_.buffer + m_.front_idx, m_.buffer + m_.back_idx);
+   this->deallocate_buffer();
 }
 
 /**
@@ -535,13 +545,11 @@ class devector
       }
 
       size_type n = x.size();
-      if (m_.capacity >= n)
-      {
-            this->overwrite_buffer(x.begin(), x.end());
+      if (m_.capacity >= n) {
+         this->overwrite_buffer(x.begin(), x.end());
       }
-      else
-      {
-            this->allocate_and_copy_range(x.begin(), x.end());
+      else {
+         this->allocate_and_copy_range(x.begin(), x.end());
       }
 
       BOOST_ASSERT(invariants_ok());
@@ -667,13 +675,11 @@ class devector
    {
       const size_type n = boost::container::iterator_udistance(first, last);
 
-      if (m_.capacity >= n)
-      {
-         overwrite_buffer(first, last);
+      if (m_.capacity >= n) {
+         this->overwrite_buffer(first, last);
       }
-      else
-      {
-         allocate_and_copy_range(first, last);
+      else {
+         this->allocate_and_copy_range(first, last);
       }
 
       BOOST_ASSERT(invariants_ok());
@@ -721,19 +727,19 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     allocator_type get_allocator() const BOOST_NOEXCEPT
    {
       return static_cast<const allocator_type&>(m_);
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     const allocator_type &get_stored_allocator() const BOOST_NOEXCEPT
    {
       return static_cast<const allocator_type&>(m_);
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
          allocator_type &get_stored_allocator() BOOST_NOEXCEPT
    {
       return static_cast<allocator_type&>(m_);
@@ -747,7 +753,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
          iterator begin() BOOST_NOEXCEPT
    {
       return m_.buffer + m_.front_idx;
@@ -759,7 +765,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     const_iterator begin() const BOOST_NOEXCEPT
    {
       return m_.buffer + m_.front_idx;
@@ -770,7 +776,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
          iterator end() BOOST_NOEXCEPT
    {
       return m_.buffer + m_.back_idx;
@@ -781,7 +787,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     const_iterator end() const BOOST_NOEXCEPT
    {
       return m_.buffer + m_.back_idx;
@@ -793,7 +799,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     reverse_iterator rbegin() BOOST_NOEXCEPT
    {
       return reverse_iterator(m_.buffer + m_.back_idx);
@@ -806,7 +812,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     const_reverse_iterator rbegin() const BOOST_NOEXCEPT
    {
       return const_reverse_iterator(m_.buffer + m_.back_idx);
@@ -818,7 +824,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     reverse_iterator rend() BOOST_NOEXCEPT
    {
       return reverse_iterator(m_.buffer + m_.front_idx);
@@ -830,7 +836,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     const_reverse_iterator rend() const BOOST_NOEXCEPT
    {
       return const_reverse_iterator(m_.buffer + m_.front_idx);
@@ -842,7 +848,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     const_iterator cbegin() const BOOST_NOEXCEPT
    {
       return m_.buffer + m_.front_idx;
@@ -865,7 +871,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     const_reverse_iterator crbegin() const BOOST_NOEXCEPT
    {
       return const_reverse_iterator(m_.buffer + m_.back_idx);
@@ -877,7 +883,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     const_reverse_iterator crend() const BOOST_NOEXCEPT
    {
       return const_reverse_iterator(m_.buffer + m_.front_idx);
@@ -890,7 +896,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     bool empty() const BOOST_NOEXCEPT
    {
       return m_.front_idx == m_.back_idx;
@@ -901,7 +907,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     size_type size() const BOOST_NOEXCEPT
    {
       return size_type(m_.back_idx - m_.front_idx);
@@ -912,7 +918,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     size_type max_size() const BOOST_NOEXCEPT
    {
       size_type alloc_max = allocator_traits_type::max_size(get_allocator_ref());
@@ -929,7 +935,7 @@ class devector
    * 
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
    size_type capacity() const BOOST_NOEXCEPT
    {
       size_type const cap_reserve = m_.capacity/devector_min_free_fraction;
@@ -942,7 +948,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
    size_type front_free_capacity() const BOOST_NOEXCEPT
    {
       return m_.front_idx;
@@ -954,7 +960,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
     size_type back_free_capacity() const BOOST_NOEXCEPT
    {
       return size_type(m_.capacity - m_.back_idx);
@@ -1266,7 +1272,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
    reference operator[](size_type n) BOOST_NOEXCEPT
    {
       BOOST_ASSERT(n < size());
@@ -1280,7 +1286,7 @@ class devector
     *
     * **Complexity**: Constant.
     */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
    const_reference operator[](size_type n) const BOOST_NOEXCEPT
    {
       BOOST_ASSERT(n < size());
@@ -1298,7 +1304,7 @@ class devector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       iterator nth(size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(n <= size());
@@ -1316,7 +1322,7 @@ class devector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       const_iterator nth(size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(n <= size());
@@ -1333,7 +1339,7 @@ class devector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       size_type index_of(iterator p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(p >= begin());
@@ -1351,7 +1357,7 @@ class devector
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       size_type index_of(const_iterator p) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(p >= cbegin());
@@ -1366,7 +1372,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       reference at(size_type n)
    {
       if (size() <= n)
@@ -1381,7 +1387,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       const_reference at(size_type n) const
    {
       if (size() <= n)
@@ -1396,7 +1402,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       reference front() BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
@@ -1411,7 +1417,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       const_reference front() const BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
@@ -1426,7 +1432,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       reference back() BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
@@ -1441,7 +1447,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       const_reference back() const BOOST_NOEXCEPT
    {
       BOOST_ASSERT(!empty());
@@ -1456,7 +1462,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       T* data() BOOST_NOEXCEPT
    {
       return boost::movelib::to_raw_pointer(m_.buffer) + m_.front_idx;
@@ -1469,7 +1475,7 @@ class devector
    *
    * **Complexity**: Constant.
    */
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       const T* data() const BOOST_NOEXCEPT
    {
       return boost::movelib::to_raw_pointer(m_.buffer) + m_.front_idx;
@@ -1493,7 +1499,7 @@ class devector
    * [EmplaceConstructible]: http://en.cppreference.com/w/cpp/concept/EmplaceConstructible
    * [MoveInsertable]: http://en.cppreference.com/w/cpp/concept/MoveInsertable
    */
-   #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
    template <class... Args>
    reference emplace_front(Args&&... args)
    {
@@ -1512,7 +1518,7 @@ class devector
       }
    }
 
-   #else //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #else //defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #define BOOST_CONTAINER_DEVECTOR_EMPLACE_FRONT(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
@@ -1609,7 +1615,7 @@ class devector
    * [MoveInsertable]: http://en.cppreference.com/w/cpp/concept/MoveInsertable
    * [MoveAssignable]: http://en.cppreference.com/w/cpp/concept/MoveAssignable
    */
-   #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
    template <class... Args>
    inline reference emplace_back(Args&&... args)
    {
@@ -1626,7 +1632,7 @@ class devector
       }
    }
 
-   #else //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #else //defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #define BOOST_CONTAINER_DEVECTOR_EMPLACE_BACK(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
@@ -1647,7 +1653,7 @@ class devector
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_DEVECTOR_EMPLACE_BACK)
    #undef BOOST_CONTAINER_DEVECTOR_EMPLACE_BACK
 
-   #endif    //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #endif    //defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -1723,7 +1729,7 @@ class devector
    * [MoveInsertable]: http://en.cppreference.com/w/cpp/concept/MoveInsertable
    * [MoveAssignable]: http://en.cppreference.com/w/cpp/concept/MoveAssignable
    */
-   #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
    template <class... Args>
    iterator emplace(const_iterator position, Args&&... args)
    {
@@ -1754,11 +1760,12 @@ class devector
       else{
          iterator nonconst_pos = unconst_iterator(position);
          prefer_move_back = should_move_back(position);
+         allocator_type &al = this->get_allocator_ref();
 
          if(prefer_move_back){
             if(back_free_capacity()){
                boost::container::expand_forward_and_insert_nonempty_middle_alloc
-                  ( get_allocator_ref()
+                  ( al
                   , boost::movelib::to_raw_pointer(nonconst_pos)
                   , this->priv_raw_end()
                   , 1, proxy_t(::boost::forward<Args>(args)...));
@@ -1769,7 +1776,7 @@ class devector
          else{
             if (front_free_capacity()){
                boost::container::expand_backward_and_insert_nonempty_middle_alloc
-               (get_allocator_ref()
+               (al
                   , this->priv_raw_begin()
                   , boost::movelib::to_raw_pointer(nonconst_pos)
                   , 1, proxy_t(::boost::forward<Args>(args)...));
@@ -1781,7 +1788,7 @@ class devector
       return this->insert_range_slow_path(position, 1, proxy_t(::boost::forward<Args>(args)...));
    }
 
-   #else //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #else //defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
    #define BOOST_CONTAINER_DEVECTOR_EMPLACE(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
@@ -1814,11 +1821,12 @@ class devector
       else{\
          iterator nonconst_pos = unconst_iterator(position);\
          prefer_move_back = should_move_back(position);\
+         allocator_type &al = this->get_allocator_ref();\
          \
          if(prefer_move_back){\
             if(back_free_capacity()){\
                boost::container::expand_forward_and_insert_nonempty_middle_alloc\
-                  ( get_allocator_ref()\
+                  ( al\
                   , boost::movelib::to_raw_pointer(nonconst_pos)\
                   , this->priv_raw_end()\
                   , 1, proxy_t(BOOST_MOVE_FWD##N));\
@@ -1829,7 +1837,7 @@ class devector
          else{\
             if (front_free_capacity()){\
                boost::container::expand_backward_and_insert_nonempty_middle_alloc\
-               (get_allocator_ref()\
+               (al\
                   , this->priv_raw_begin()\
                   , boost::movelib::to_raw_pointer(nonconst_pos)\
                   , 1, proxy_t(BOOST_MOVE_FWD##N));\
@@ -1844,7 +1852,7 @@ class devector
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_DEVECTOR_EMPLACE)
    #undef BOOST_CONTAINER_DEVECTOR_EMPLACE
 
-   #endif    //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #endif    //defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
 
    #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -1927,7 +1935,7 @@ class devector
    * **Complexity**: Linear in the size of `*this` and `N` (where `N` is the distance between `first` and `last`).
    * Makes only `N` calls to the constructor of `T` and no reallocations if iterators `first` and `last`
    * are of forward, bidirectional, or random access categories. It makes 2N calls to the copy constructor of `T`
-   * and `O(log(N)) reallocations if they are just input iterators.
+   * and `O(log(N))` reallocations if they are just input iterators.
    *
    * **Exceptions**: Strong exception guarantee if `T` is `NothrowConstructible`
    * and `NothrowAssignable`, Basic exception guarantee otherwise.
@@ -2072,13 +2080,11 @@ class devector
       size_type back_distance  = size_type(end() - first);
       size_type n = boost::container::iterator_udistance(first, last);
 
-      if (front_distance < back_distance)
-      {
+      if (front_distance < back_distance) {
             // move n to the right
             boost::container::move_backward(begin(), first, last);
 
-            for (iterator i = begin(); i != begin() + n; ++i)
-            {
+            for (iterator i = begin(); i != begin() + n; ++i) {
                allocator_traits_type::destroy(get_allocator_ref(), boost::movelib::to_raw_pointer(i));
             }
             //n is always less than max stored_size_type
@@ -2152,30 +2158,30 @@ class devector
    void clear() BOOST_NOEXCEPT
    {
       destroy_elements(begin(), end());
-      m_.front_idx = m_.back_idx = 0;
+      m_.back_idx = m_.front_idx;
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       friend bool operator==(const devector& x, const devector& y)
    {   return x.size() == y.size() && ::boost::container::algo_equal(x.begin(), x.end(), y.begin());   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       friend bool operator!=(const devector& x, const devector& y)
    {   return !(x == y); }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       friend bool operator< (const devector& x, const devector& y)
    {   return boost::container::algo_lexicographical_compare(x.begin(), x.end(), y.begin(), y.end());   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       friend bool operator>(const devector& x, const devector& y)
    {   return y < x;   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       friend bool operator<=(const devector& x, const devector& y)
    {   return !(y < x);   }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
       friend bool operator>=(const devector& x, const devector& y)
    {   return !(x < y);   }
 
@@ -2204,8 +2210,6 @@ class devector
       }
    }
 
-   #endif
-
    private:
 
    void priv_move_assign(BOOST_RV_REF(devector) x, dtl::bool_<true> /*steal_resources*/)
@@ -2247,21 +2251,21 @@ class devector
          dtl::move_alloc(this->get_allocator_ref(), x.get_allocator_ref(), flag);
 
          if (m_.capacity >= x.size()) {
-            overwrite_buffer(xbegin, xend);
+            this->overwrite_buffer(xbegin, xend);
          }
          else {
-            allocate_and_copy_range(xbegin, xend);
+            this->allocate_and_copy_range(xbegin, xend);
          }
       }
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
    size_type pos_to_index(const_iterator i) const 
    {
       return static_cast<size_type>(i - cbegin());
    }
 
-   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+   BOOST_CONTAINER_NODISCARD inline
    bool should_move_back(const_iterator i) const 
    {
       return static_cast<size_type>(this->pos_to_index(i)) >= this->size()/2u;
@@ -2272,8 +2276,6 @@ class devector
       return boost::intrusive::pointer_traits<pointer>::const_cast_from(i);
    }
 
-   #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
-
    inline T* priv_raw_begin() BOOST_NOEXCEPT
    {   return boost::movelib::to_raw_pointer(m_.buffer) + m_.front_idx;   }
 
@@ -2322,16 +2324,14 @@ class devector
 
    void destroy_elements(pointer b, pointer e)
    {
-      for (; b != e; ++b)
-      {
+      for (; b != e; ++b) {
          allocator_traits_type::destroy(get_allocator_ref(), boost::movelib::to_raw_pointer(b));
       }
    }
 
    void deallocate_buffer()
    {
-      if (m_.buffer)
-      {
+      if (m_.buffer) {
          allocator_traits_type::deallocate(get_allocator_ref(), m_.buffer, m_.capacity);
       }
    }
@@ -2364,7 +2364,7 @@ class devector
       }
    }
 
-   #else //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #else //   !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    #define BOOST_CONTAINER_DEVECTOR_ALLOC_CONSTRUCT(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
@@ -2394,7 +2394,7 @@ class devector
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_DEVECTOR_ALLOC_CONSTRUCT)
    #undef BOOST_CONTAINER_DEVECTOR_ALLOC_CONSTRUCT
 
-   #endif    //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #endif    //   !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    size_type calculate_new_capacity(size_type requested_capacity)
    {
@@ -2408,31 +2408,6 @@ class devector
       return growth_factor_type()( size_type(m_.capacity), min_additional_cap, max);
    }
 
-   void buffer_move_or_copy(pointer dst)
-   {
-      detail::construction_guard<allocator_type> guard(dst, get_allocator_ref());
-
-      buffer_move_or_copy(dst, guard);
-
-      guard.release();
-   }
-
-   void buffer_move_or_copy(pointer dst, detail::construction_guard<allocator_type>& guard)
-   {
-      opt_move_or_copy(begin(), end(), dst, guard);
-
-      destroy_elements(data(), data() + size());
-      deallocate_buffer();
-   }
-
-   template <typename Guard>
-   void opt_move_or_copy(pointer b, pointer e, pointer dst, Guard& guard)
-   {
-      // if trivial copy and default allocator, memcpy
-      boost::container::uninitialized_move_alloc(get_allocator_ref(), b, e, dst);
-      guard.extend();
-   }
-
    #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    template <typename... Args>
@@ -2499,18 +2474,25 @@ class devector
    template <typename... Args>
    void resize_front_slow_path(size_type sz, size_type n, Args&&... args)
    {
-      const size_type new_capacity = calculate_new_capacity(sz + back_free_capacity());
+      const size_type back_free_cap = back_free_capacity();
+      const size_type new_capacity = calculate_new_capacity(sz + back_free_cap);
       pointer new_buffer = allocate(new_capacity);
-      allocation_guard new_buffer_guard(new_buffer, new_capacity, get_allocator_ref());
 
-      const size_type old_sz = this->size();
-      const size_type new_old_elem_index = new_capacity - old_sz;
+      allocator_type &al = this->get_allocator_ref();
+      allocation_guard new_buffer_guard(new_buffer, new_capacity, al);
+
+      const size_type new_old_elem_index = new_capacity - this->size() - back_free_cap;
       const size_type new_elem_index = new_old_elem_index - n;
 
-      detail::construction_guard<allocator_type> guard(new_buffer + new_elem_index, get_allocator_ref());
+      detail::construction_guard<allocator_type> guard(new_buffer + new_elem_index, al);
       guarded_construct_n(new_buffer + new_elem_index, n, guard, boost::forward<Args>(args)...);
 
-      buffer_move_or_copy(new_buffer + new_old_elem_index, guard);
+      //This might throw
+      boost::container::uninitialized_move_alloc(al, begin(), end(), new_buffer + new_old_elem_index);
+
+      //This can't throw
+      this->destroy_elements(data(), data() + size());
+      this->deallocate_buffer();
 
       guard.release();
       new_buffer_guard.release();
@@ -2518,7 +2500,7 @@ class devector
       m_.buffer = new_buffer;
       m_.set_capacity(new_capacity);
       m_.set_front_idx(new_elem_index);
-      m_.set_back_idx(new_elem_index + old_sz + n);
+      m_.set_back_idx(new_elem_index + sz);
    }
 
    template <typename... Args>
@@ -2553,12 +2535,19 @@ class devector
    {
       const size_type new_capacity = calculate_new_capacity(sz + front_free_capacity());
       pointer new_buffer = allocate(new_capacity);
-      allocation_guard new_buffer_guard(new_buffer, new_capacity, get_allocator_ref());
 
-      detail::construction_guard<allocator_type> guard(new_buffer + m_.back_idx, get_allocator_ref());
+      allocator_type &al = this->get_allocator_ref();
+      allocation_guard new_buffer_guard(new_buffer, new_capacity, al);
+
+      detail::construction_guard<allocator_type> guard(new_buffer + m_.back_idx, al);
       guarded_construct_n(new_buffer + m_.back_idx, n, guard, boost::forward<Args>(args)...);
 
-      buffer_move_or_copy(new_buffer + m_.front_idx);
+      //This might throw
+      boost::container::uninitialized_move_alloc(al, begin(), end(), new_buffer + m_.front_idx);
+
+      //This can't throw
+      this->destroy_elements(data(), data() + size());
+      this->deallocate_buffer();
 
       guard.release();
       new_buffer_guard.release();
@@ -2568,7 +2557,7 @@ class devector
       m_.set_back_idx(m_.back_idx + n);
    }
 
-   #else //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #else //   !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    #define BOOST_CONTAINER_DEVECTOR_SLOW_PATH(N) \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
@@ -2597,24 +2586,30 @@ class devector
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
    void resize_front_slow_path(size_type sz, size_type n BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
    {\
-      const size_type new_capacity = calculate_new_capacity(sz + back_free_capacity());\
+      const size_type back_free_cap = back_free_capacity();\
+      const size_type new_capacity = calculate_new_capacity(sz + back_free_cap);\
       pointer new_buffer = allocate(new_capacity);\
-      allocation_guard new_buffer_guard(new_buffer, new_capacity, get_allocator_ref());\
-   \
-      const size_type new_old_elem_index = new_capacity - size();\
+      allocator_type &al = this->get_allocator_ref();\
+      allocation_guard new_buffer_guard(new_buffer, new_capacity, al);\
+      \
+      const size_type new_old_elem_index = new_capacity - size() - back_free_cap;\
       const size_type new_elem_index = new_old_elem_index - n;\
-   \
-      detail::construction_guard<allocator_type> guard(new_buffer + new_elem_index, get_allocator_ref());\
+      \
+      detail::construction_guard<allocator_type> guard(new_buffer + new_elem_index, al);\
       guarded_construct_n(new_buffer + new_elem_index, n, guard BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
-   \
-      buffer_move_or_copy(new_buffer + new_old_elem_index, guard);\
-   \
+      \
+      boost::container::uninitialized_move_alloc(al, begin(), end(), new_buffer + new_old_elem_index);\
+      \
       guard.release();\
       new_buffer_guard.release();\
+      \
+      this->destroy_elements(data(), data() + size());\
+      this->deallocate_buffer();\
+      \
       m_.buffer = new_buffer;\
       m_.set_capacity(new_capacity);\
-      m_.set_back_idx(new_old_elem_index + m_.back_idx - m_.front_idx);\
       m_.set_front_idx(new_elem_index);\
+      m_.set_back_idx(new_elem_index + sz);\
    }\
    \
    BOOST_MOVE_TMPL_LT##N BOOST_MOVE_CLASS##N BOOST_MOVE_GT##N \
@@ -2648,12 +2643,16 @@ class devector
    {\
       const size_type new_capacity = calculate_new_capacity(sz + front_free_capacity());\
       pointer new_buffer = allocate(new_capacity);\
-      allocation_guard new_buffer_guard(new_buffer, new_capacity, get_allocator_ref());\
+      allocator_type &al = this->get_allocator_ref();\
+      allocation_guard new_buffer_guard(new_buffer, new_capacity, al);\
    \
-      detail::construction_guard<allocator_type> guard(new_buffer + m_.back_idx, get_allocator_ref());\
+      detail::construction_guard<allocator_type> guard(new_buffer + m_.back_idx, al);\
       guarded_construct_n(new_buffer + m_.back_idx, n, guard BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
    \
-      buffer_move_or_copy(new_buffer + m_.front_idx);\
+      boost::container::uninitialized_move_alloc(al, begin(), end(), new_buffer + m_.front_idx);\
+   \
+      this->destroy_elements(data(), data() + size());\
+      this->deallocate_buffer();\
    \
       guard.release();\
       new_buffer_guard.release();\
@@ -2667,18 +2666,19 @@ class devector
    BOOST_MOVE_ITERATE_0TO9(BOOST_CONTAINER_DEVECTOR_SLOW_PATH)
    #undef BOOST_CONTAINER_DEVECTOR_SLOW_PATH
 
-   #endif    //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+   #endif    //   !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
    void reallocate_at(size_type new_capacity, size_type buffer_offset)
    {
       pointer new_buffer = allocate(new_capacity);
       {
-         allocation_guard new_buffer_guard(new_buffer, new_capacity, get_allocator_ref());
-         boost::container::uninitialized_move_alloc(get_allocator_ref(), this->begin(), this->end(), new_buffer + buffer_offset);
+         allocator_type &al = this->get_allocator_ref();
+         allocation_guard new_buffer_guard(new_buffer, new_capacity, al);
+         boost::container::uninitialized_move_alloc(al, this->begin(), this->end(), new_buffer + buffer_offset);
          new_buffer_guard.release();
       }
-      destroy_elements(m_.buffer + m_.front_idx, m_.buffer + m_.back_idx);
-      deallocate_buffer();
+      this->destroy_elements(m_.buffer + m_.front_idx, m_.buffer + m_.back_idx);
+      this->deallocate_buffer();
 
       m_.buffer = new_buffer;
       //Safe cast, allocate() will handle stored_size_type overflow
@@ -2698,6 +2698,8 @@ class devector
 
       size_type const n = boost::container::iterator_udistance(first, last);
       bool prefer_move_back;
+      allocator_type &al = this->get_allocator_ref();
+
       if (BOOST_UNLIKELY(!n)) {
          return begin() + size_type(position - cbegin());
       }
@@ -2705,7 +2707,7 @@ class devector
          if(back_free_capacity() >= n) // fast path
          {
             iterator r(this->end());
-            boost::container::uninitialized_copy_alloc(get_allocator_ref(), first, last, this->priv_raw_end());
+            boost::container::uninitialized_copy_alloc(al, first, last, this->priv_raw_end());
             m_.set_back_idx(m_.back_idx + n);
             return r;
          }
@@ -2713,7 +2715,7 @@ class devector
       }
       else if (position == begin()) {
          if(front_free_capacity() >= n) {// secondary fast path
-            boost::container::uninitialized_copy_alloc(get_allocator_ref(), first, last, this->priv_raw_begin() - n);
+            boost::container::uninitialized_copy_alloc(al, first, last, this->priv_raw_begin() - n);
             m_.set_front_idx(m_.front_idx - n);
             return begin();
          }
@@ -2726,7 +2728,7 @@ class devector
          if(prefer_move_back){
             if(back_free_capacity() >= n){
                boost::container::expand_forward_and_insert_nonempty_middle_alloc
-                  ( get_allocator_ref()
+                  ( al
                   , boost::movelib::to_raw_pointer(nonconst_pos)
                   , this->priv_raw_end()
                   , n, proxy_t(first));
@@ -2737,7 +2739,7 @@ class devector
          else{
             if (front_free_capacity() >= n){
                boost::container::expand_backward_and_insert_nonempty_middle_alloc
-                  ( get_allocator_ref()
+                  ( al
                   , this->priv_raw_begin()
                   , boost::movelib::to_raw_pointer(nonconst_pos)
                   , n, proxy_t(first));
@@ -2759,6 +2761,8 @@ class devector
       size_type const index = size_type(p - cbegin());
 
       size_type const cap = m_.capacity;
+      allocator_type &al = this->get_allocator_ref();
+
       //Test if enough free memory would be left
       if (free_cap >= n && (free_cap - n) >= cap/devector_min_free_fraction) {
          size_type const old_size = this->size();
@@ -2771,7 +2775,7 @@ class devector
          m_.back_idx = 0u;
          m_.front_idx = 0u;
          boost::container::expand_backward_forward_and_insert_alloc
-            (raw_beg, old_size, new_raw_beg, raw_pos, n, proxy, get_allocator_ref());
+            (raw_beg, old_size, new_raw_beg, raw_pos, n, proxy, al);
          m_.set_front_idx(new_front_idx);
          m_.set_back_idx(new_front_idx + new_size);
       }
@@ -2781,7 +2785,7 @@ class devector
          pointer new_buffer = allocate(new_capacity);
 
          // guard allocation
-         allocation_guard new_buffer_guard(new_buffer, new_capacity, get_allocator_ref());
+         allocation_guard new_buffer_guard(new_buffer, new_capacity, al);
 
          size_type const old_size = this->size();
          const size_type new_front_index = (new_capacity - old_size - n) / 2u;
@@ -2790,7 +2794,7 @@ class devector
          T* const raw_new_start = const_cast<T*>(boost::movelib::to_raw_pointer(new_buffer)) + new_front_index;
 
          boost::container::uninitialized_move_and_insert_alloc
-            (get_allocator_ref(), this->priv_raw_begin(), raw_pos, this->priv_raw_end(), raw_new_start, n, proxy);
+            (al, this->priv_raw_begin(), raw_pos, this->priv_raw_end(), raw_new_start, n, proxy);
          new_buffer_guard.release();
 
          // cleanup
@@ -2821,10 +2825,11 @@ class devector
       size_type n = boost::container::iterator_udistance(first, last);
 
       pointer new_buffer = n ? allocate(n) : pointer();
-      allocation_guard new_buffer_guard(new_buffer, n, get_allocator_ref());
-      boost::container::uninitialized_copy_alloc(get_allocator_ref(), first, last, new_buffer);
-      destroy_elements(begin(), end());
-      deallocate_buffer();
+      allocator_type &al = this->get_allocator_ref();
+      allocation_guard new_buffer_guard(new_buffer, n, al);
+      boost::container::uninitialized_copy_alloc(al, first, last, new_buffer);
+      this->destroy_elements(begin(), end());
+      this->deallocate_buffer();
 
       m_.set_capacity(n);
       m_.buffer = new_buffer;
@@ -2857,7 +2862,8 @@ class devector
    InputIterator overwrite_buffer_impl(InputIterator first, InputIterator last, dtl::false_)
    {
       pointer pos = m_.buffer;
-      detail::construction_guard<allocator_type> front_guard(pos, get_allocator_ref());
+      allocator_type &al = this->get_allocator_ref();
+      detail::construction_guard<allocator_type> front_guard(pos, al);
 
       while (first != last && pos != begin()) {
          this->alloc_construct(pos++, *first++);
@@ -2868,7 +2874,7 @@ class devector
          *pos++ = *first++;
       }
 
-      detail::construction_guard<allocator_type> back_guard(pos, get_allocator_ref());
+      detail::construction_guard<allocator_type> back_guard(pos, al);
 
       iterator capacity_end = m_.buffer + m_.capacity;
       while (first != last && pos != capacity_end) {
@@ -3074,7 +3080,7 @@ template <class T, class Allocator, class Options>
 struct has_trivial_destructor_after_move<boost::container::devector<T, Allocator, Options> >
 {
     typedef typename boost::container::devector<T, Allocator, Options>::allocator_type allocator_type;
-    typedef typename ::boost::container::allocator_traits<allocator_type>::pointer pointer;
+    typedef typename boost::container::allocator_traits<allocator_type>::pointer pointer;
     BOOST_STATIC_CONSTEXPR bool value =
       ::boost::has_trivial_destructor_after_move<allocator_type>::value &&
       ::boost::has_trivial_destructor_after_move<pointer>::value;