passenger 5.3.7 → 6.0.26

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

@@ -38,22 +38,19 @@
 #include <boost/move/detail/to_raw_pointer.hpp>
 #include <boost/container/detail/version_type.hpp>
 #include <boost/container/detail/type_traits.hpp>
-#include <boost/container/detail/minimal_char_traits_header.hpp>
 #include <boost/container/detail/algorithm.hpp>
-
+#include <boost/container/detail/minimal_char_traits_header.hpp>  // for char_traits
+//intrusive
 #include <boost/intrusive/pointer_traits.hpp>
-
+#include <boost/intrusive/detail/hash_combine.hpp>
+#include <boost/move/detail/launder.hpp>
+//move
 #include <boost/move/utility_core.hpp>
 #include <boost/move/adl_move_swap.hpp>
 #include <boost/move/traits.hpp>
 
-#include <boost/static_assert.hpp>
-#include <boost/core/no_exceptions_support.hpp>
-#include <boost/functional/hash.hpp>
-
-#include <algorithm>
-#include <iosfwd>
-#include <istream>
+#include <iosfwd> 
+#include <istream>   //
 #include <ostream>
 #include <ios>
 #include <locale>
@@ -65,6 +62,12 @@
 #include <initializer_list>   //for std::initializer_list
 #endif
 
+//GCC 12 has a regression for array-bounds warnings
+#if defined(BOOST_GCC) && (BOOST_GCC >= 120000) && (BOOST_GCC < 130000)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+
 
 namespace boost {
 namespace container {
@@ -87,42 +90,42 @@ class basic_string_base
    basic_string_base & operator=(const basic_string_base &);
    basic_string_base(const basic_string_base &);
 
-   typedef allocator_traits<Allocator> allocator_traits_type;
+   typedef Allocator allocator_type;
  public:
-   typedef Allocator                                   allocator_type;
-   typedef allocator_type                              stored_allocator_type;
-   typedef typename allocator_traits_type::pointer     pointer;
-   typedef typename allocator_traits_type::value_type  value_type;
-   typedef typename allocator_traits_type::size_type   size_type;
+   typedef allocator_traits<allocator_type>                 allocator_traits_type;
+   typedef allocator_type                                   stored_allocator_type;
+   typedef typename allocator_traits_type::pointer          pointer;
+   typedef typename allocator_traits_type::value_type       value_type;
+   typedef typename allocator_traits_type::size_type        size_type;
+   typedef typename allocator_traits_type::difference_type  difference_type;
+
    typedef ::boost::intrusive::pointer_traits<pointer> pointer_traits;
 
-   basic_string_base()
+   inline basic_string_base()
       : members_()
-   {  init(); }
+   {}
 
-   explicit basic_string_base(const allocator_type& a)
+   inline explicit basic_string_base(const allocator_type& a)
       : members_(a)
-   {  init(); }
+   {}
 
-   explicit basic_string_base(BOOST_RV_REF(allocator_type) a)
+   inline explicit basic_string_base(BOOST_RV_REF(allocator_type) a)
       :  members_(boost::move(a))
-   {  this->init();  }
+   {}
 
-   basic_string_base(const allocator_type& a, size_type n)
+   inline basic_string_base(const allocator_type& a, size_type n)
       : members_(a)
    {
-      this->init();
       this->allocate_initial_block(n);
    }
 
-   explicit basic_string_base(size_type n)
+   inline explicit basic_string_base(size_type n)
       : members_()
    {
-      this->init();
       this->allocate_initial_block(n);
    }
 
-   ~basic_string_base()
+   inline ~basic_string_base()
    {
       if(!this->is_short()){
          this->deallocate(this->priv_long_addr(), this->priv_long_storage());
@@ -131,6 +134,11 @@ class basic_string_base
 
    private:
 
+   #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+   #pragma GCC diagnostic push
+   #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+   #endif
+
    //This is the structure controlling a long string
    struct long_t
    {
@@ -139,10 +147,15 @@ class basic_string_base
       size_type      storage;
       pointer        start;
 
-      long_t()
+      inline long_t()
+         : is_short(0)
+      {}
+
+      inline long_t(size_type len, size_type stor, pointer ptr)
+         : is_short(0), length(len), storage(stor), start(ptr)
       {}
 
-      long_t(const long_t &other)
+      inline long_t(const long_t &other)
       {
          this->is_short = false;
          length   = other.length;
@@ -150,7 +163,7 @@ class basic_string_base
          start    = other.start;
       }
 
-      long_t &operator= (const long_t &other)
+      inline long_t &operator= (const long_t &other)
       {
          length   = other.length;
          storage  = other.storage;
@@ -159,6 +172,11 @@ class basic_string_base
       }
    };
 
+   #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+   #pragma GCC diagnostic pop
+   #endif
+
+
    //This type is the first part of the structure controlling a short string
    //The "data" member stores
    struct short_header
@@ -174,13 +192,13 @@ class basic_string_base
       <sizeof(long_t), dtl::alignment_of<long_t>::value>::type   long_raw_t;
 
    protected:
-   static const size_type  MinInternalBufferChars = 8;
-   static const size_type  AlignmentOfValueType =
+   BOOST_STATIC_CONSTEXPR size_type  MinInternalBufferChars = 8;
+   BOOST_STATIC_CONSTEXPR size_type  AlignmentOfValueType =
       alignment_of<value_type>::value;
-   static const size_type  ShortDataOffset = ((sizeof(short_header)-1)/AlignmentOfValueType+1)*AlignmentOfValueType;
-   static const size_type  ZeroCostInternalBufferChars =
+   BOOST_STATIC_CONSTEXPR size_type  ShortDataOffset = ((sizeof(short_header)-1)/AlignmentOfValueType+1)*AlignmentOfValueType;
+   BOOST_STATIC_CONSTEXPR size_type  ZeroCostInternalBufferChars =
       (sizeof(long_t) - ShortDataOffset)/sizeof(value_type);
-   static const size_type  UnalignedFinalInternalBufferChars =
+   BOOST_STATIC_CONSTEXPR size_type  UnalignedFinalInternalBufferChars =
       (ZeroCostInternalBufferChars > MinInternalBufferChars) ?
                 ZeroCostInternalBufferChars : MinInternalBufferChars;
 
@@ -190,92 +208,125 @@ class basic_string_base
       value_type     data[UnalignedFinalInternalBufferChars];
    };
 
-   union repr_t
+   union repr_t_size_t
    {
       long_raw_t  r;
       short_t     s;
+   };
 
-      const short_t &short_repr() const
-      {  return s;  }
-
-      const long_t &long_repr() const
-      {  return *static_cast<const long_t*>(static_cast<const void*>(r.data));  }
-
-      short_t &short_repr()
-      {  return s;  }
-
-      long_t &long_repr()
-      {  return *static_cast<long_t*>(static_cast<void*>(&r));  }
+   union repr_t
+   {
+      long_raw_t  r_aligner;
+      short_t     s_aligner;
+      unsigned char data[sizeof(repr_t_size_t)];
    };
 
    struct members_holder
-      :  public Allocator
+      :  public allocator_type
    {
-      members_holder()
-         : Allocator()
-      {}
+      inline void init()
+      {
+         short_t &s = *::new(&this->m_repr) short_t;
+         s.h.is_short = 1;
+         s.h.length = 0;
+      }
+
+      inline members_holder()
+         : allocator_type()
+      { this->init(); }
 
       template<class AllocatorConvertible>
-      explicit members_holder(BOOST_FWD_REF(AllocatorConvertible) a)
-         :  Allocator(boost::forward<AllocatorConvertible>(a))
-      {}
+      inline explicit members_holder(BOOST_FWD_REF(AllocatorConvertible) a)
+         :  allocator_type(boost::forward<AllocatorConvertible>(a))
+      { this->init(); }
+
+      inline const short_t *pshort_repr() const
+      {  return move_detail::launder_cast<const short_t*>(&m_repr);  }
+
+      inline const long_t *plong_repr() const
+      {  return move_detail::launder_cast<const long_t*>(&m_repr);  }
+
+      inline short_t *pshort_repr()
+      {  return move_detail::launder_cast<short_t*>(&m_repr);  }
+
+      inline long_t *plong_repr()
+      {  return move_detail::launder_cast<long_t*>(&m_repr);  }
 
       repr_t m_repr;
    } members_;
 
-   const Allocator &alloc() const
+   inline const allocator_type &alloc() const
    {  return members_;  }
 
-   Allocator &alloc()
+   inline allocator_type &alloc()
    {  return members_;  }
 
-   static const size_type InternalBufferChars = (sizeof(repr_t) - ShortDataOffset)/sizeof(value_type);
+   BOOST_STATIC_CONSTEXPR size_type InternalBufferChars = (sizeof(repr_t) - ShortDataOffset)/sizeof(value_type);
 
    private:
 
-   static const size_type MinAllocation = InternalBufferChars*2;
+   BOOST_STATIC_CONSTEXPR size_type MinAllocation = InternalBufferChars*2;
 
    protected:
-   bool is_short() const
+   inline bool is_short() const
    {
       //Access and copy (to avoid UB) the first byte of the union to know if the
       //active representation is short or long
       short_header hdr;
-      BOOST_STATIC_ASSERT((sizeof(short_header) == 1));
+      BOOST_CONTAINER_STATIC_ASSERT((sizeof(short_header) == 1));
       *(unsigned char*)&hdr = *(unsigned char*)&this->members_.m_repr;
       return hdr.is_short != 0;
    }
 
-   void is_short(bool yes)
+   inline short_t *construct_short()
    {
-      const bool was_short = this->is_short();
-      if(yes && !was_short){
-         allocator_traits_type::destroy
-            ( this->alloc()
-            , static_cast<long_t*>(static_cast<void*>(&this->members_.m_repr.r))
-            );
-         this->members_.m_repr.s.h.is_short = true;
-      }
-      else if(!yes && was_short){
-         allocator_traits_type::construct
-            ( this->alloc()
-            , static_cast<long_t*>(static_cast<void*>(&this->members_.m_repr.r))
-            );
-         this->members_.m_repr.s.h.is_short = false;
+      short_t *ps = ::new(&this->members_.m_repr) short_t;
+      ps->h.is_short = 1;
+      return ps;
+   }
+
+   inline void destroy_short()
+   {
+      BOOST_ASSERT(this->is_short());
+      this->members_.pshort_repr()->~short_t();
+   }
+
+   short_t *assure_short()
+   {
+      if (!this->is_short()){
+         this->destroy_long();
+         return construct_short();
       }
+      return this->members_.pshort_repr();
    }
 
-   private:
-   void init()
+   inline long_t *construct_long()
+   {
+      long_t *pl = ::new(&this->members_.m_repr) long_t;
+      //is_short flag is written in the constructor
+      return pl;
+   }
+
+   inline void destroy_long()
    {
-      this->members_.m_repr.s.h.is_short = 1;
-      this->members_.m_repr.s.h.length   = 0;
+      BOOST_ASSERT(!this->is_short());
+      this->members_.plong_repr()->~long_t();
    }
 
+   long_t *assure_long()
+   {
+      if (this->is_short()){
+         this->destroy_short();
+         return this->construct_long();
+      }
+      return this->members_.plong_repr();
+   }
+
+  
    protected:
 
    typedef dtl::integral_constant<unsigned,
-      boost::container::dtl::version<Allocator>::value> alloc_version;
+      boost::container::dtl::version<allocator_type>::value> alloc_version;
 
    pointer allocation_command(allocation_type command,
                          size_type limit_size,
@@ -286,7 +337,7 @@ class basic_string_base
          reuse = 0;
          command &= ~(expand_fwd | expand_bwd);
       }
-      return dtl::allocator_version_traits<Allocator>::allocation_command
+      return dtl::allocator_version_traits<allocator_type>::allocation_command
          (this->alloc(), command, limit_size, prefer_in_recvd_out_size, reuse);
    }
 
@@ -302,15 +353,6 @@ class basic_string_base
          this->alloc().deallocate(p, n);
    }
 
-   void construct(pointer p, const value_type &value = value_type())
-   {
-      allocator_traits_type::construct
-         ( this->alloc()
-         , boost::movelib::to_raw_pointer(p)
-         , value
-         );
-   }
-
    void destroy(pointer p, size_type n)
    {
       value_type *raw_p = boost::movelib::to_raw_pointer(p);
@@ -319,7 +361,7 @@ class basic_string_base
       }
    }
 
-   void destroy(pointer p)
+   inline void destroy(pointer p)
    {
       allocator_traits_type::destroy
          ( this->alloc()
@@ -334,7 +376,8 @@ class basic_string_base
             size_type new_cap = this->next_capacity(n);
             pointer reuse = 0;
             pointer p = this->allocation_command(allocate_new, n, new_cap, reuse);
-            this->is_short(false);
+            BOOST_ASSERT(this->is_short());
+            this->construct_long();
             this->priv_long_addr(p);
             this->priv_long_size(0);
             this->priv_storage(new_cap);
@@ -345,23 +388,29 @@ class basic_string_base
       }
    }
 
-   void deallocate_block()
+   inline void deallocate_block()
    {  this->deallocate(this->priv_addr(), this->priv_storage());  }
 
-   size_type max_size() const
+   inline size_type max_size() const
    {  return allocator_traits_type::max_size(this->alloc()) - 1; }
 
    protected:
-   size_type priv_capacity() const
+   inline size_type priv_capacity() const
    { return this->priv_storage() - 1; }
 
-   pointer priv_short_addr() const
-   {  return pointer_traits::pointer_to(const_cast<value_type&>(this->members_.m_repr.short_repr().data[0]));  }
+   inline pointer priv_short_addr() const
+   {  return pointer_traits::pointer_to(const_cast<value_type&>(this->members_.pshort_repr()->data[0]));  }
+
+   //GCC seems a bit confused about uninitialized accesses
+   #if defined(BOOST_GCC) && (BOOST_GCC >= 40700)
+   #pragma GCC diagnostic push
+   #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+   #endif
 
-   pointer priv_long_addr() const
-   {  return this->members_.m_repr.long_repr().start;  }
+   inline pointer priv_long_addr() const
+   {  return this->members_.plong_repr()->start;  }
 
-   pointer priv_addr() const
+   inline pointer priv_addr() const
    {
       return this->is_short()
          ? priv_short_addr()
@@ -369,47 +418,47 @@ class basic_string_base
          ;
    }
 
-   pointer priv_end_addr() const
+   inline pointer priv_end_addr() const
    {
       return this->is_short()
-         ? this->priv_short_addr() + this->priv_short_size()
-         : this->priv_long_addr()  + this->priv_long_size()
+         ? this->priv_short_addr() + difference_type(this->priv_short_size())
+         : this->priv_long_addr()  + difference_type(this->priv_long_size())
          ;
    }
 
-   void priv_long_addr(pointer addr)
-   {  this->members_.m_repr.long_repr().start = addr;  }
+   inline void priv_long_addr(pointer addr)
+   {  this->members_.plong_repr()->start = addr;  }
 
-   size_type priv_storage() const
+   inline size_type priv_storage() const
    {  return this->is_short() ? priv_short_storage() : priv_long_storage();  }
 
-   size_type priv_short_storage() const
+   inline size_type priv_short_storage() const
    {  return InternalBufferChars;  }
 
-   size_type priv_long_storage() const
-   {  return this->members_.m_repr.long_repr().storage;  }
+   inline size_type priv_long_storage() const
+   {  return this->members_.plong_repr()->storage;  }
 
-   void priv_storage(size_type storage)
+   inline void priv_storage(size_type storage)
    {
       if(!this->is_short())
          this->priv_long_storage(storage);
    }
 
-   void priv_long_storage(size_type storage)
+   inline void priv_long_storage(size_type storage)
    {
-      this->members_.m_repr.long_repr().storage = storage;
+      this->members_.plong_repr()->storage = storage;
    }
 
-   size_type priv_size() const
+   inline size_type priv_size() const
    {  return this->is_short() ? this->priv_short_size() : this->priv_long_size();  }
 
-   size_type priv_short_size() const
-   {  return this->members_.m_repr.short_repr().h.length;  }
+   inline size_type priv_short_size() const
+   {  return this->members_.pshort_repr()->h.length;  }
 
-   size_type priv_long_size() const
-   {  return this->members_.m_repr.long_repr().length;  }
+   inline size_type priv_long_size() const
+   {  return this->members_.plong_repr()->length;  }
 
-   void priv_size(size_type sz)
+   inline void priv_size(size_type sz)
    {
       if(this->is_short())
          this->priv_short_size(sz);
@@ -417,15 +466,25 @@ class basic_string_base
          this->priv_long_size(sz);
    }
 
-   void priv_short_size(size_type sz)
+   inline void priv_short_size(size_type sz)
    {
-      this->members_.m_repr.s.h.length = (unsigned char)sz;
+      typedef unsigned char uchar_type;
+      BOOST_STATIC_CONSTEXPR uchar_type mask = uchar_type(uchar_type(-1) >> 1U);
+      BOOST_ASSERT( sz <= mask );
+      //Make -Wconversion happy
+      this->members_.pshort_repr()->h.length = uchar_type(uchar_type(sz) & mask);
    }
 
-   void priv_long_size(size_type sz)
+   inline void priv_long_size(size_type sz)
    {
-      this->members_.m_repr.long_repr().length = sz;
+      BOOST_STATIC_CONSTEXPR size_type mask = size_type(-1) >> 1U;
+      BOOST_ASSERT( sz <= mask );
+      //Make -Wconversion happy
+      this->members_.plong_repr()->length = sz & mask;
    }
+   #if defined(BOOST_GCC) && (BOOST_GCC >= 40700)
+   #pragma GCC diagnostic pop
+   #endif
 
    void swap_data(basic_string_base& other)
    {
@@ -436,23 +495,23 @@ class basic_string_base
             other.members_.m_repr = tmp;
          }
          else{
-            short_t short_backup(this->members_.m_repr.short_repr());
-            this->members_.m_repr.short_repr().~short_t();
-            ::new(&this->members_.m_repr.long_repr()) long_t(other.members_.m_repr.long_repr());
-            other.members_.m_repr.long_repr().~long_t();
-            ::new(&other.members_.m_repr.short_repr()) short_t(short_backup);
+            short_t short_backup(*this->members_.pshort_repr());
+            this->members_.pshort_repr()->~short_t();
+            ::new(this->members_.plong_repr()) long_t(*other.members_.plong_repr());
+            other.members_.plong_repr()->~long_t();
+            ::new(other.members_.pshort_repr()) short_t(short_backup);
          }
       }
       else{
          if(other.is_short()){
-            short_t short_backup(other.members_.m_repr.short_repr());
-            other.members_.m_repr.short_repr().~short_t();
-            ::new(&other.members_.m_repr.long_repr()) long_t(this->members_.m_repr.long_repr());
-            this->members_.m_repr.long_repr().~long_t();
-            ::new(&this->members_.m_repr.short_repr()) short_t(short_backup);
+            short_t short_backup(*other.members_.pshort_repr());
+            other.members_.pshort_repr()->~short_t();
+            ::new(other.members_.plong_repr()) long_t(*this->members_.plong_repr());
+            this->members_.plong_repr()->~long_t();
+            ::new(this->members_.pshort_repr()) short_t(short_backup);
          }
          else{
-            boost::adl_move_swap(this->members_.m_repr.long_repr(), other.members_.m_repr.long_repr());
+            boost::adl_move_swap(*this->members_.plong_repr(), *other.members_.plong_repr());
          }
       }
    }
@@ -495,19 +554,19 @@ class basic_string_base
 //! \tparam Traits The Character Traits type, which encapsulates basic character operations
 //! \tparam Allocator The allocator, used for internal memory management.
 #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
-template <class CharT, class Traits = std::char_traits<CharT>, class Allocator = new_allocator<CharT> >
+template <class CharT, class Traits = std::char_traits<CharT>, class Allocator = void >
 #else
 template <class CharT, class Traits, class Allocator>
 #endif
 class basic_string
-   :  private dtl::basic_string_base<Allocator>
+   :  private dtl::basic_string_base<typename real_allocator<CharT, Allocator>::type>
 {
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
-   typedef allocator_traits<Allocator> allocator_traits_type;
    BOOST_COPYABLE_AND_MOVABLE(basic_string)
-   typedef dtl::basic_string_base<Allocator> base_t;
-   static const typename base_t::size_type InternalBufferChars = base_t::InternalBufferChars;
+   typedef dtl::basic_string_base<typename real_allocator<CharT, Allocator>::type> base_t;
+   typedef typename base_t::allocator_traits_type allocator_traits_type;
+   BOOST_STATIC_CONSTEXPR typename base_t::size_type InternalBufferChars = base_t::InternalBufferChars;
 
    protected:
    // Allocator helper class to use a char_traits as a function object.
@@ -553,23 +612,23 @@ class basic_string
    //////////////////////////////////////////////
    typedef Traits                                                                      traits_type;
    typedef CharT                                                                       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 typename real_allocator<CharT, Allocator>::type                             allocator_type;
+   typedef typename ::boost::container::allocator_traits<allocator_type>::pointer           pointer;
+   typedef typename ::boost::container::allocator_traits<allocator_type>::const_pointer     const_pointer;
+   typedef typename ::boost::container::allocator_traits<allocator_type>::reference         reference;
+   typedef typename ::boost::container::allocator_traits<allocator_type>::const_reference   const_reference;
+   typedef typename ::boost::container::allocator_traits<allocator_type>::size_type         size_type;
+   typedef typename ::boost::container::allocator_traits<allocator_type>::difference_type   difference_type;
    typedef BOOST_CONTAINER_IMPDEF(allocator_type)                                      stored_allocator_type;
    typedef BOOST_CONTAINER_IMPDEF(pointer)                                             iterator;
    typedef BOOST_CONTAINER_IMPDEF(const_pointer)                                       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;
-   static const size_type npos = size_type(-1);
+   BOOST_STATIC_CONSTEXPR size_type npos = size_type(-1);
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
-   typedef constant_iterator<CharT, difference_type> cvalue_iterator;
+   typedef constant_iterator<CharT> cvalue_iterator;
    typedef typename base_t::alloc_version  alloc_version;
    typedef ::boost::intrusive::pointer_traits<pointer> pointer_traits;
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -596,7 +655,7 @@ class basic_string
    //! <b>Effects</b>: Default constructs a basic_string.
    //!
    //! <b>Throws</b>: If allocator_type's default constructor throws.
-   basic_string() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<Allocator>::value)
+   basic_string() BOOST_NOEXCEPT_IF(dtl::is_nothrow_default_constructible<allocator_type>::value)
       : base_t()
    { this->priv_terminate_string(); }
 
@@ -624,7 +683,7 @@ class basic_string
    //!
    //! <b>Throws</b>: If allocator_type's default constructor or allocation throws.
    template<template <class, class> class BasicStringView>
-   explicit basic_string(BasicStringView<CharT, Traits> sv, const Allocator& a = Allocator())
+   explicit basic_string(BasicStringView<CharT, Traits> sv, const allocator_type& a = allocator_type())
       :  base_t(allocator_traits_type::select_on_container_copy_construction(a))
    {
       this->priv_terminate_string();
@@ -669,7 +728,7 @@ class basic_string
       : base_t(a)
    {
       this->priv_terminate_string();
-      if(a == this->alloc()){
+      if(s.alloc() == this->alloc()){
          this->swap_data(s);
       }
       else{
@@ -709,7 +768,7 @@ class basic_string
       : base_t()
    {
       this->priv_terminate_string();
-      this->assign(s, s + n);
+      this->assign(s, s + difference_type(n));
    }
 
    //! <b>Effects</b>: Constructs a basic_string taking the allocator as parameter,
@@ -718,7 +777,7 @@ class basic_string
       : base_t(a)
    {
       this->priv_terminate_string();
-      this->assign(s, s + n);
+      this->assign(s, s + difference_type(n));
    }
 
    //! <b>Effects</b>: Constructs a basic_string with a default-constructed allocator,
@@ -822,7 +881,7 @@ class basic_string
    //! <b>Complexity</b>: Linear to the elements x contains.
    basic_string& operator=(BOOST_COPY_ASSIGN_REF(basic_string) x)
    {
-      if (&x != this){
+      if (BOOST_LIKELY(this != &x)) {
          allocator_type &this_alloc     = this->alloc();
          const allocator_type &x_alloc  = x.alloc();
          dtl::bool_<allocator_traits_type::
@@ -830,7 +889,7 @@ class basic_string
          if(flag && this_alloc != x_alloc){
             if(!this->is_short()){
                this->deallocate_block();
-               this->is_short(true);
+               this->assure_short();
                Traits::assign(*this->priv_addr(), CharT(0));
                this->priv_short_size(0);
             }
@@ -853,27 +912,14 @@ class basic_string
       BOOST_NOEXCEPT_IF(allocator_traits_type::propagate_on_container_move_assignment::value
                                   || allocator_traits_type::is_always_equal::value)
    {
-      //for move constructor, no aliasing (&x != this) is assummed.
-      BOOST_ASSERT(this != &x);
-      allocator_type &this_alloc = this->alloc();
-      allocator_type &x_alloc    = x.alloc();
-      const bool propagate_alloc = allocator_traits_type::
-            propagate_on_container_move_assignment::value;
-      dtl::bool_<propagate_alloc> flag;
-      const bool allocators_equal = this_alloc == x_alloc; (void)allocators_equal;
-      //Resources can be transferred if both allocators are
-      //going to be equal after this function (either propagated or already equal)
-      if(propagate_alloc || allocators_equal){
-         //Destroy objects but retain memory in case x reuses it in the future
-         this->clear();
-         //Move allocator if needed
-         dtl::move_alloc(this_alloc, x_alloc, flag);
-         //Nothrow swap
-         this->swap_data(x);
-      }
-      //Else do a one by one move
-      else{
-         this->assign( x.begin(), x.end());
+      if (BOOST_LIKELY(this != &x)) {
+         //We know resources can be transferred at comiple time if both allocators are
+         //always equal or the allocator is going to be propagated
+         const bool can_steal_resources_alloc
+            =  allocator_traits_type::propagate_on_container_move_assignment::value
+            || allocator_traits_type::is_always_equal::value;
+         dtl::bool_<can_steal_resources_alloc> flag;
+         this->priv_move_assign(boost::move(x), flag);
       }
       return *this;
    }
@@ -908,7 +954,8 @@ class basic_string
    //! <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 inline
+      allocator_type get_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->alloc(); }
 
    //! <b>Effects</b>: Returns a reference to the internal allocator.
@@ -918,7 +965,8 @@ class basic_string
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      stored_allocator_type &get_stored_allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->alloc(); }
 
    //! <b>Effects</b>: Returns a reference to the internal allocator.
@@ -928,7 +976,8 @@ class basic_string
    //! <b>Complexity</b>: Constant.
    //!
    //! <b>Note</b>: Non-standard extension.
-   const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const stored_allocator_type &get_stored_allocator() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return this->alloc(); }
 
    //////////////////////////////////////////////
@@ -942,7 +991,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      iterator begin() BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_addr(); }
 
    //! <b>Effects</b>: Returns a const_iterator to the first element contained in the vector.
@@ -950,7 +1000,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_iterator begin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_addr(); }
 
    //! <b>Effects</b>: Returns an iterator to the end of the vector.
@@ -958,7 +1009,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   iterator end() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      iterator end() BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_end_addr(); }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the vector.
@@ -966,7 +1018,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_iterator end() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_end_addr(); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the beginning
@@ -975,7 +1028,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reverse_iterator rbegin()  BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      reverse_iterator rbegin()  BOOST_NOEXCEPT_OR_NOTHROW
    { return reverse_iterator(this->priv_end_addr()); }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
@@ -984,7 +1038,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_reverse_iterator rbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->crbegin(); }
 
    //! <b>Effects</b>: Returns a reverse_iterator pointing to the end
@@ -993,7 +1048,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reverse_iterator rend()  BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      reverse_iterator rend()  BOOST_NOEXCEPT_OR_NOTHROW
    { return reverse_iterator(this->priv_addr()); }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
@@ -1002,7 +1058,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reverse_iterator rend() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      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.
@@ -1010,7 +1067,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_iterator cbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_addr(); }
 
    //! <b>Effects</b>: Returns a const_iterator to the end of the vector.
@@ -1018,7 +1076,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_iterator cend() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_end_addr(); }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the beginning
@@ -1027,7 +1086,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_reverse_iterator crbegin() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_reverse_iterator(this->priv_end_addr()); }
 
    //! <b>Effects</b>: Returns a const_reverse_iterator pointing to the end
@@ -1036,7 +1096,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_reverse_iterator crend() const BOOST_NOEXCEPT_OR_NOTHROW
    { return const_reverse_iterator(this->priv_addr()); }
 
    //////////////////////////////////////////////
@@ -1050,7 +1111,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      bool empty() const BOOST_NOEXCEPT_OR_NOTHROW
    { return !this->priv_size(); }
 
    //! <b>Effects</b>: Returns the number of the elements contained in the vector.
@@ -1058,7 +1120,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   size_type size() const    BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type size() const    BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_size(); }
 
    //! <b>Effects</b>: Returns the number of the elements contained in the vector.
@@ -1066,15 +1129,17 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   size_type length() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type length() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->size(); }
 
    //! <b>Effects</b>: Returns the largest possible size of the vector.
    //!
    //! <b>Throws</b>: Nothing.
    //!
-   //! <b>Complexity</b>: Constant.
-   size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
+   //! <b>Complexity</b>: Constant
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    { return base_t::max_size(); }
 
    //! <b>Effects</b>: Inserts or erases elements at the end such that
@@ -1086,7 +1151,7 @@ class basic_string
    void resize(size_type n, CharT c)
    {
       if (n <= this->size())
-         this->erase(this->begin() + n, this->end());
+         this->erase(this->begin() + difference_type(n), this->end());
       else
          this->append(n - this->size(), c);
    }
@@ -1100,7 +1165,6 @@ class basic_string
    void resize(size_type n)
    { resize(n, CharT()); }
 
-
    //! <b>Effects</b>: Inserts or erases elements at the end such that
    //!   the size becomes n. New elements are uninitialized.
    //!
@@ -1112,9 +1176,9 @@ class basic_string
    void resize(size_type n, default_init_t)
    {
       if (n <= this->size())
-         this->erase(this->begin() + n, this->end());
+         this->erase(this->begin() + difference_type(n), this->end());
       else{
-         this->priv_reserve(n, false);
+         this->priv_reserve_no_null_end(n);
          this->priv_size(n);
          this->priv_terminate_string();
       }
@@ -1126,7 +1190,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type capacity() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->priv_capacity(); }
 
    //! <b>Effects</b>: If n is less than or equal to capacity(), this call has no
@@ -1159,7 +1224,9 @@ class basic_string
             Traits::copy( boost::movelib::to_raw_pointer(this->priv_short_addr())
                         , boost::movelib::to_raw_pointer(long_addr)
                         , long_size+1);
-            this->is_short(true);
+            BOOST_ASSERT(!this->is_short());
+            this->destroy_long();
+            this->construct_short();
             this->alloc().deallocate(long_addr, long_storage);
          }
          else{
@@ -1183,7 +1250,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reference         front() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      reference         front() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return *this->priv_addr();
@@ -1197,7 +1265,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reference   front() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_reference   front() const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return *this->priv_addr();
@@ -1211,7 +1280,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reference         back() BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      reference         back() BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return *(this->priv_addr() + (this->size() - 1u) );
@@ -1225,7 +1295,8 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reference   back()  const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_reference   back()  const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(!this->empty());
       return *(this->priv_addr() + (this->size() - 1u) );
@@ -1239,10 +1310,11 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   reference operator[](size_type n) BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      reference operator[](size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() > n);
-      return *(this->priv_addr() + n);
+      return *(this->priv_addr() + difference_type(n));
    }
 
    //! <b>Requires</b>: size() > n.
@@ -1253,10 +1325,11 @@ class basic_string
    //! <b>Throws</b>: Nothing.
    //!
    //! <b>Complexity</b>: Constant.
-   const_reference operator[](size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const_reference operator[](size_type n) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_ASSERT(this->size() > n);
-      return *(this->priv_addr() + n);
+      return *(this->priv_addr() + difference_type(n));
    }
 
    //! <b>Requires</b>: size() > n.
@@ -1264,14 +1337,15 @@ class basic_string
    //! <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 inline
+      reference at(size_type n)
    {
       if (n >= this->size())
          throw_out_of_range("basic_string::at invalid subscript");
-      return *(this->priv_addr() + n);
+      return *(this->priv_addr() + difference_type(n));
    }
 
    //! <b>Requires</b>: size() > n.
@@ -1279,13 +1353,14 @@ class basic_string
    //! <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 inline
+      const_reference at(size_type n) const {
       if (n >= this->size())
          throw_out_of_range("basic_string::at invalid subscript");
-      return *(this->priv_addr() + n);
+      return *(this->priv_addr() + difference_type(n));
    }
 
    //////////////////////////////////////////////
@@ -1368,7 +1443,7 @@ class basic_string
    //!
    //! <b>Returns</b>: *this
    basic_string& append(const CharT* s, size_type n)
-   {  return this->append(s, s + n);  }
+   {  return this->append(s, s + difference_type(n));  }
 
    //! <b>Requires</b>: s points to an array of at least traits::length(s) + 1 elements of CharT.
    //!
@@ -1409,9 +1484,9 @@ class basic_string
       const size_type old_size = this->priv_size();
       if (old_size < this->capacity()){
          const pointer addr = this->priv_addr();
-         this->priv_construct_null(addr + old_size + 1);
-         Traits::assign(addr[old_size], c);
-         this->priv_size(old_size+1);
+         this->priv_construct_null(addr + difference_type(old_size + 1u));
+         Traits::assign(addr[difference_type(old_size)], c);
+         this->priv_size(old_size+1u);
       }
       else{
          //No enough memory, insert a new object at the end
@@ -1467,7 +1542,7 @@ class basic_string
    //!
    //! <b>Returns</b>: *this
    basic_string& assign(const CharT* s, size_type n)
-   {  return this->assign(s, s + n);   }
+   {  return this->assign(s, s + difference_type(n));   }
 
    //! <b>Requires</b>: s points to an array of at least traits::length(s) + 1 elements of CharT.
    //!
@@ -1492,7 +1567,7 @@ class basic_string
        this->reserve(n);
        CharT* ptr = boost::movelib::to_raw_pointer(this->priv_addr());
        Traits::copy(ptr, first, n);
-       this->priv_construct_null(ptr + n);
+       this->priv_construct_null(ptr + difference_type(n));
        this->priv_size(n);
        return *this;
     }
@@ -1518,7 +1593,7 @@ class basic_string
          ++ptr;
       }
       if (first == last)
-         this->erase(addr + cur, addr + old_size);
+         this->erase(addr + difference_type(cur), addr + difference_type(old_size));
       else
          this->append(first, last);
       return *this;
@@ -1591,7 +1666,7 @@ class basic_string
          throw_out_of_range("basic_string::insert out of range position");
       if (this->size() > this->max_size() - n)
          throw_length_error("basic_string::insert max_size() exceeded");
-      this->insert(this->priv_addr() + pos, s, s + n);
+      this->insert(this->priv_addr() + pos, s, s + difference_type(n));
       return *this;
    }
 
@@ -1643,7 +1718,7 @@ class basic_string
    //! <b>Returns</b>: An iterator which refers to the copy of the inserted character.
    iterator insert(const_iterator p, CharT c)
    {
-      size_type new_offset = p - this->priv_addr();
+      size_type new_offset = size_type(p - this->priv_addr());
       this->insert(p, cvalue_iterator(c, 1), cvalue_iterator());
       return this->priv_addr() + new_offset;
    }
@@ -1676,7 +1751,7 @@ class basic_string
       for ( ; first != last; ++first, ++p) {
          p = this->insert(p, *first);
       }
-      return this->begin() + n_pos;
+      return this->begin() + difference_type(n_pos);
    }
 
    #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -1689,9 +1764,9 @@ class basic_string
          >::type * = 0
       )
    {
-      const size_type n_pos = p - this->cbegin();
+      const size_type n_pos = size_type(p - this->cbegin());
       if (first != last) {
-         const size_type n = boost::container::iterator_distance(first, last);
+         const size_type n = boost::container::iterator_udistance(first, last);
          const size_type old_size = this->priv_size();
          const size_type remaining = this->capacity() - old_size;
          const pointer old_start = this->priv_addr();
@@ -1709,7 +1784,7 @@ class basic_string
             new_cap  = this->next_capacity(n);
             hint = old_start;
             allocation_ret = this->allocation_command
-                  (allocate_new | expand_fwd | expand_bwd, old_size + n + 1, new_cap, hint);
+                  (allocate_new | expand_fwd | expand_bwd, old_size + n + 1u, new_cap, hint);
 
             //Check forward expansion
             if(old_start == allocation_ret){
@@ -1720,32 +1795,35 @@ class basic_string
 
          //Reuse same buffer
          if(enough_capacity){
-            const size_type elems_after = old_size - (p - old_start);
+            const size_type elems_after = old_size - size_type(p - old_start);
             const size_type old_length = old_size;
+            size_type new_size = 0;
             if (elems_after >= n) {
-               const pointer pointer_past_last = old_start + old_size + 1;
-               priv_uninitialized_copy(old_start + (old_size - n + 1),
+               const pointer pointer_past_last = old_start + difference_type(old_size + 1u);
+               priv_uninitialized_copy(old_start + difference_type(old_size - n + 1u),
                                        pointer_past_last, pointer_past_last);
 
-               this->priv_size(old_size+n);
-               Traits::move(const_cast<CharT*>(boost::movelib::to_raw_pointer(p + n)),
+               Traits::move(const_cast<CharT*>(boost::movelib::to_raw_pointer(p + difference_type(n))),
                            boost::movelib::to_raw_pointer(p),
-                           (elems_after - n) + 1);
-               this->priv_copy(first, last, const_cast<CharT*>(boost::movelib::to_raw_pointer(p)));
+                           (elems_after - n) + 1u);
+               (priv_copy)(first, last, const_cast<CharT*>(boost::movelib::to_raw_pointer(p)));
+               new_size = old_size + n;
             }
             else {
                ForwardIter mid = first;
-               boost::container::iterator_advance(mid, elems_after + 1);
+               boost::container::iterator_uadvance(mid, elems_after + 1u);
 
-               priv_uninitialized_copy(mid, last, old_start + old_size + 1);
+               priv_uninitialized_copy(mid, last, old_start + difference_type(old_size + 1u));
                const size_type newer_size = old_size + (n - elems_after);
                this->priv_size(newer_size);
                priv_uninitialized_copy
-                  (p, const_iterator(old_start + old_length + 1),
-                  old_start + newer_size);
-               this->priv_size(newer_size + elems_after);
-               this->priv_copy(first, mid, const_cast<CharT*>(boost::movelib::to_raw_pointer(p)));
+                  (p, const_iterator(old_start + difference_type(old_length + 1u)),
+                  old_start + difference_type(newer_size));
+               (priv_copy)(first, mid, const_cast<CharT*>(boost::movelib::to_raw_pointer(p)));
+               new_size = newer_size + elems_after;
             }
+            this->priv_size(new_size);
+            this->priv_construct_null(old_start + difference_type(new_size));
          }
          else{
             pointer new_start = allocation_ret;
@@ -1756,14 +1834,14 @@ class basic_string
                new_length += priv_uninitialized_copy
                               (const_iterator(old_start), p, new_start);
                new_length += priv_uninitialized_copy
-                              (first, last, new_start + new_length);
+                              (first, last, new_start + difference_type(new_length));
                new_length += priv_uninitialized_copy
-                              (p, const_iterator(old_start + old_size),
-                              new_start + new_length);
-               this->priv_construct_null(new_start + new_length);
+                              (p, const_iterator(old_start + difference_type(old_size)),
+                              new_start + difference_type(new_length));
+               this->priv_construct_null(new_start + difference_type(new_length));
 
                this->deallocate_block();
-               this->is_short(false);
+               this->assure_long();
                this->priv_long_addr(new_start);
                this->priv_long_size(new_length);
                this->priv_long_storage(new_cap);
@@ -1774,22 +1852,22 @@ class basic_string
                value_type * const oldbuf     = boost::movelib::to_raw_pointer(old_start);
                value_type * const newbuf     = boost::movelib::to_raw_pointer(new_start);
                const value_type *const pos   = boost::movelib::to_raw_pointer(p);
-               const size_type before  = pos - oldbuf;
+               const size_type before  = size_type(pos - oldbuf);
 
                //First move old data
                Traits::move(newbuf, oldbuf, before);
-               Traits::move(newbuf + before + n, pos, old_size - before);
+               Traits::move(newbuf + difference_type(before + n), pos, old_size - before);
                //Now initialize the new data
-               priv_uninitialized_copy(first, last, new_start + before);
-               this->priv_construct_null(new_start + (old_size + n));
-               this->is_short(false);
+               priv_uninitialized_copy(first, last, new_start + difference_type(before));
+               this->priv_construct_null(new_start + difference_type(old_size + n));
+               this->assure_long();
                this->priv_long_addr(new_start);
                this->priv_long_size(old_size + n);
                this->priv_long_storage(new_cap);
             }
          }
       }
-      return this->begin() + n_pos;
+      return this->begin() + difference_type(n_pos);
    }
    #endif
 
@@ -1798,7 +1876,7 @@ class basic_string
    //!
    //! <b>Returns</b>: An iterator which refers to the copy of the first inserted
    //!   character, or p if i1 is empty.
-   iterator insert(const_iterator p, std::initializer_list<CharT> il)
+   inline iterator insert(const_iterator p, std::initializer_list<CharT> il)
    {
       return this->insert(p, il.begin(), il.end());
    }
@@ -1832,7 +1910,7 @@ class basic_string
       if (pos > this->size())
          throw_out_of_range("basic_string::erase out of range position");
       const pointer addr = this->priv_addr();
-      erase(addr + pos, addr + pos + dtl::min_value(n, this->size() - pos));
+      erase(addr + difference_type(pos), addr + difference_type(pos) + dtl::min_value(n, this->size() - pos));
       return *this;
    }
 
@@ -1849,8 +1927,8 @@ class basic_string
       const size_type old_size = this->priv_size();
       Traits::move(ptr,
                    boost::movelib::to_raw_pointer(p + 1),
-                   old_size - (p - this->priv_addr()));
-      this->priv_size(old_size-1);
+                   old_size - size_type(p - this->priv_addr()));
+      this->priv_size(old_size-1u);
       return iterator(ptr);
    }
 
@@ -1866,11 +1944,11 @@ class basic_string
    {
       CharT * f = const_cast<CharT*>(boost::movelib::to_raw_pointer(first));
       if (first != last) { // The move includes the terminating null.
-         const size_type num_erased = last - first;
+         const size_type num_erased = size_type(last - first);
          const size_type old_size = this->priv_size();
          Traits::move(f,
                       boost::movelib::to_raw_pointer(last),
-                      (old_size + 1)-(last - this->priv_addr()));
+                      old_size + 1u - size_type(last - this->priv_addr()));
          const size_type new_length = old_size - num_erased;
          this->priv_size(new_length);
       }
@@ -1884,10 +1962,14 @@ class basic_string
    //! <b>Complexity</b>: Linear to the number of elements in the vector.
    void clear() BOOST_NOEXCEPT_OR_NOTHROW
    {
-      if (!this->empty()) {
-         Traits::assign(*this->priv_addr(), CharT(0));
-         this->priv_size(0);
-      }
+       if(this->is_short()) {
+           Traits::assign(*this->priv_short_addr(), CharT(0));
+           this->priv_short_size(0);
+       }
+       else {
+           Traits::assign(*this->priv_long_addr(), CharT(0));
+           this->priv_long_size(0);
+       }
    }
 
    //! <b>Requires</b>: pos1 <= size().
@@ -1905,15 +1987,15 @@ class basic_string
       if (this->size() - len >= this->max_size() - str.size())
          throw_length_error("basic_string::replace max_size() exceeded");
       const pointer addr = this->priv_addr();
-      return this->replace( const_iterator(addr + pos1)
-                          , const_iterator(addr + pos1 + len)
+      return this->replace( const_iterator(addr + difference_type(pos1))
+                          , const_iterator(addr + difference_type(pos1 + len))
                           , str.begin(), str.end());
    }
 
    //! <b>Effects</b>: Calls `return replace(pos1, n1, sv.data(), sv.size());`.
    //!
    template<template<class, class> class BasicStringView>
-   basic_string& replace(size_type pos1, size_type n1, BasicStringView<CharT, Traits> sv)
+   inline basic_string& replace(size_type pos1, size_type n1, BasicStringView<CharT, Traits> sv)
    {
       return this->replace(pos1, n1, sv.data(), sv.size());
    }
@@ -1969,11 +2051,11 @@ class basic_string
       if (pos1 > this->size())
          throw_out_of_range("basic_string::replace out of range position");
       const size_type len = dtl::min_value(n1, this->size() - pos1);
-      const size_type max_size = this->max_size();
-      if (n2 > max_size || (this->size() - len) >= (max_size - n2))
+      const size_type max_sz = this->max_size();
+      if (n2 > max_sz || (this->size() - len) >= (max_sz - n2))
          throw_length_error("basic_string::replace max_size() exceeded");
       const pointer addr = this->priv_addr() + pos1;
-      return this->replace(addr, addr + len, s, s + n2);
+      return this->replace(addr, addr + difference_type(len), s, s + difference_type(n2));
    }
 
    //! <b>Requires</b>: pos1 <= size() and s points to an array of at least n2 elements of CharT.
@@ -1990,7 +2072,7 @@ class basic_string
    //!   if the length of the resulting string would exceed max_size()
    //!
    //! <b>Returns</b>: *this
-   basic_string& replace(size_type pos, size_type n1, const CharT* s)
+   inline basic_string& replace(size_type pos, size_type n1, const CharT* s)
    {
       return this->replace(pos, n1, s, Traits::length(s));
    }
@@ -2011,7 +2093,7 @@ class basic_string
       if (n2 > this->max_size() || this->size() - len >= this->max_size() - n2)
          throw_length_error("basic_string::replace max_size() exceeded");
       const pointer addr    = this->priv_addr();
-      return this->replace(addr + pos1, addr + pos1 + len, n2, c);
+      return this->replace(addr + difference_type(pos1), addr + difference_type(pos1 + len), n2, c);
    }
 
    //! <b>Requires</b>: [begin(),i1) and [i1,i2) are valid ranges.
@@ -2021,7 +2103,7 @@ class basic_string
    //! <b>Throws</b>: if memory allocation throws
    //!
    //! <b>Returns</b>: *this
-   basic_string& replace(const_iterator i1, const_iterator i2, const basic_string& str)
+   inline basic_string& replace(const_iterator i1, const_iterator i2, const basic_string& str)
    { return this->replace(i1, i2, str.data(), str.data()+str.size()); }
 
    //! <b>Requires</b>: [begin(),i1) and [i1,i2) are valid ranges and
@@ -2032,8 +2114,8 @@ class basic_string
    //! <b>Throws</b>: if memory allocation throws
    //!
    //! <b>Returns</b>: *this
-   basic_string& replace(const_iterator i1, const_iterator i2, const CharT* s, size_type n)
-   { return this->replace(i1, i2, s, s + n); }
+   inline basic_string& replace(const_iterator i1, const_iterator i2, const CharT* s, size_type n)
+   { return this->replace(i1, i2, s, s + difference_type(n)); }
 
    //! <b>Requires</b>: [begin(),i1) and [i1,i2) are valid ranges and s points to an
    //!   array of at least traits::length(s) + 1 elements of CharT.
@@ -2043,7 +2125,7 @@ class basic_string
    //! <b>Throws</b>: if memory allocation throws
    //!
    //! <b>Returns</b>: *this
-   basic_string& replace(const_iterator i1, const_iterator i2, const CharT* s)
+   inline basic_string& replace(const_iterator i1, const_iterator i2, const CharT* s)
    {  return this->replace(i1, i2, s, s + Traits::length(s));   }
 
    //! <b>Requires</b>: [begin(),i1) and [i1,i2) are valid ranges.
@@ -2058,7 +2140,7 @@ class basic_string
       const size_type len = static_cast<size_type>(i2 - i1);
       if (len >= n) {
          Traits::assign(const_cast<CharT*>(boost::movelib::to_raw_pointer(i1)), n, c);
-         erase(i1 + n, i2);
+         erase(i1 + difference_type(n), i2);
       }
       else {
          Traits::assign(const_cast<CharT*>(boost::movelib::to_raw_pointer(i1)), len, c);
@@ -2110,7 +2192,7 @@ class basic_string
       const difference_type len = i2 - i1;
       if (len >= n) {
          this->priv_copy(j1, j2, const_cast<CharT*>(boost::movelib::to_raw_pointer(i1)));
-         this->erase(i1 + n, i2);
+         this->erase(i1 + difference_type(n), i2);
       }
       else {
          ForwardIter m = j1;
@@ -2128,7 +2210,7 @@ class basic_string
    //!
    //! <b>Returns</b>: *this.
    template<template <class, class> class BasicStringView>
-   basic_string& replace(const_iterator i1, const_iterator i2, BasicStringView<CharT, Traits> sv)
+   inline basic_string& replace(const_iterator i1, const_iterator i2, BasicStringView<CharT, Traits> sv)
    {
       return this->replace( static_cast<size_type>(i1 - this->cbegin())
                           , static_cast<size_type>(i2 - i1), sv);
@@ -2140,7 +2222,7 @@ class basic_string
    //! <b>Effects</b>: Calls replace(i1 - begin(), i2 - i1, il.begin(), il.size()).
    //!
    //! <b>Returns</b>: *this.
-   basic_string& replace(const_iterator i1, const_iterator i2, std::initializer_list<CharT> il)
+   inline basic_string& replace(const_iterator i1, const_iterator i2, std::initializer_list<CharT> il)
    {
       return this->replace( static_cast<size_type>(i1 - this->cbegin())
                           , static_cast<size_type>(i2 - i1)
@@ -2192,7 +2274,8 @@ class basic_string
    //! <b>Returns</b>: A pointer p such that p + i == &operator[](i) for each i in [0,size()].
    //!
    //! <b>Complexity</b>: constant time.
-   const CharT* c_str() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const CharT* c_str() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return boost::movelib::to_raw_pointer(this->priv_addr()); }
 
    //! <b>Requires</b>: The program shall not alter any of the values stored in the character array.
@@ -2200,13 +2283,15 @@ class basic_string
    //! <b>Returns</b>: A pointer p such that p + i == &operator[](i) for each i in [0,size()].
    //!
    //! <b>Complexity</b>: constant time.
-   const CharT* data()  const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      const CharT* data()  const BOOST_NOEXCEPT_OR_NOTHROW
    {  return boost::movelib::to_raw_pointer(this->priv_addr()); }
 
    //! <b>Returns</b>: A pointer p such that p + i == &operator[](i) for each i in [0,size()].
    //!
    //! <b>Complexity</b>: constant time.
-   CharT* data()  BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      CharT* data()  BOOST_NOEXCEPT_OR_NOTHROW
    {  return boost::movelib::to_raw_pointer(this->priv_addr()); }
 
    #ifndef BOOST_CONTAINER_TEMPLATED_CONVERSION_OPERATOR_BROKEN
@@ -2214,7 +2299,7 @@ class basic_string
    //!
    //! <b>Complexity</b>: constant time.
    template<template <class, class> class BasicStringView>
-   operator BasicStringView<CharT, Traits>() const BOOST_NOEXCEPT_OR_NOTHROW
+   inline operator BasicStringView<CharT, Traits>() const BOOST_NOEXCEPT_OR_NOTHROW
    { return this->to_view< BasicStringView<CharT, Traits> >(); }
    #endif
 
@@ -2225,7 +2310,8 @@ class basic_string
    //! <b>Note</b>: This function is available to write portable code for compilers
    //!   that don't support templated conversion operators.
    template<class BasicStringView>
-   BasicStringView to_view() const BOOST_NOEXCEPT_OR_NOTHROW
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      BasicStringView to_view() const BOOST_NOEXCEPT_OR_NOTHROW
    { return BasicStringView(this->data(), this->size()); }
 
    //////////////////////////////////////////////
@@ -2242,7 +2328,8 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   size_type find(const basic_string& s, size_type pos = 0) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find(const basic_string& s, size_type pos = 0) const
    { return find(s.c_str(), pos, s.size()); }
 
    //! <b>Effects</b>: Determines the lowest position xpos, if possible, such that both
@@ -2254,26 +2341,28 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   size_type find(BasicStringView<CharT, Traits> sv, size_type pos = 0) const
-   { return find(sv.data(), pos, sv.size()); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find(BasicStringView<CharT, Traits> sv, size_type pos = 0) const
+   { return this->find(sv.data(), pos, sv.size()); }
 
    //! <b>Requires</b>: s points to an array of at least n elements of CharT.
    //!
    //! <b>Throws</b>: Nothing
    //!
-   //! <b>Returns</b>: find(basic_string<CharT,traits,Allocator>(s,n),pos).
-   size_type find(const CharT* s, size_type pos, size_type n) const
+   //! <b>Returns</b>: find(basic_string<CharT,traits,allocator_type>(s,n),pos).
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find(const CharT* s, size_type pos, size_type n) const
    {
       if (pos + n > this->size())
          return npos;
       else {
          const pointer addr = this->priv_addr();
-         pointer finish = addr + this->priv_size();
+         pointer finish = addr + difference_type(this->priv_size());
          const const_iterator result =
-            boost::container::search(boost::movelib::to_raw_pointer(addr + pos),
+            boost::container::search(boost::movelib::to_raw_pointer(addr + difference_type(pos)),
                    boost::movelib::to_raw_pointer(finish),
-                   s, s + n, Eq_traits<Traits>());
-         return result != finish ? result - begin() : npos;
+                   s, s + difference_type(n), Eq_traits<Traits>());
+         return result != finish ? size_type(result - begin()) : npos;
       }
    }
 
@@ -2282,24 +2371,26 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find(basic_string(s), pos).
-   size_type find(const CharT* s, size_type pos = 0) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find(const CharT* s, size_type pos = 0) const
    { return this->find(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
-   //! <b>Returns</b>: find(basic_string<CharT,traits,Allocator>(1,c), pos).
-   size_type find(CharT c, size_type pos = 0) const
+   //! <b>Returns</b>: find(basic_string<CharT,traits,allocator_type>(1,c), pos).
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find(CharT c, size_type pos = 0) const
    {
       const size_type sz = this->size();
       if (pos >= sz)
          return npos;
       else {
          const pointer addr    = this->priv_addr();
-         pointer finish = addr + sz;
+         pointer finish = addr + difference_type(sz);
          const const_iterator result =
-            boost::container::find_if(addr + pos, finish,
+            boost::container::find_if(addr + difference_type(pos), finish,
                   boost::container::bind2nd(Eq_traits<Traits>(), c));
-         return result != finish ? result - begin() : npos;
+         return result != finish ? size_type(result - begin()) : npos;
       }
    }
 
@@ -2311,8 +2402,9 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   size_type rfind(const basic_string& str, size_type pos = npos) const
-      { return rfind(str.c_str(), pos, str.size()); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type rfind(const basic_string& str, size_type pos = npos) const
+      { return this->rfind(str.c_str(), pos, str.size()); }
 
    //! <b>Effects</b>: Determines the highest position xpos, if possible, such
    //!   that both of the following conditions obtain:
@@ -2323,15 +2415,17 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   size_type rfind(BasicStringView<CharT, Traits> sv, size_type pos = npos) const
-      { return rfind(sv.data(), pos, sv.size()); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type rfind(BasicStringView<CharT, Traits> sv, size_type pos = npos) const
+      { return this->rfind(sv.data(), pos, sv.size()); }
 
    //! <b>Requires</b>: s points to an array of at least n elements of CharT.
    //!
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: rfind(basic_string(s, n), pos).
-   size_type rfind(const CharT* s, size_type pos, size_type n) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type rfind(const CharT* s, size_type pos, size_type n) const
    {
       const size_type len = this->size();
 
@@ -2340,11 +2434,10 @@ class basic_string
       else if (n == 0)
          return dtl::min_value(len, pos);
       else {
-         const const_iterator last = begin() + dtl::min_value(len - n, pos) + n;
-         const const_iterator result = find_end(begin(), last,
-                                                s, s + n,
-                                                Eq_traits<Traits>());
-         return result != last ? result - begin() : npos;
+         const const_iterator last = begin() + difference_type(dtl::min_value(len - n, pos) + n);
+         const const_iterator result = boost::container::find_end
+            (begin(), last, s, s + difference_type(n), Eq_traits<Traits>());
+         return result != last ? size_type(result - begin()) : npos;
       }
    }
 
@@ -2354,13 +2447,15 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: rfind(basic_string(s), pos).
-   size_type rfind(const CharT* s, size_type pos = npos) const
-      { return rfind(s, pos, Traits::length(s)); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type rfind(const CharT* s, size_type pos = npos) const
+      { return this->rfind(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
-   //! <b>Returns</b>: rfind(basic_string<CharT,traits,Allocator>(1,c),pos).
-   size_type rfind(CharT c, size_type pos = npos) const
+   //! <b>Returns</b>: rfind(basic_string<CharT,traits,allocator_type>(1,c),pos).
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type rfind(CharT c, size_type pos = npos) const
    {
       const size_type len = this->size();
 
@@ -2371,7 +2466,7 @@ class basic_string
          const_reverse_iterator rresult =
             boost::container::find_if(const_reverse_iterator(last), rend(),
                   boost::container::bind2nd(Eq_traits<Traits>(), c));
-         return rresult != rend() ? (rresult.base() - 1) - begin() : npos;
+         return rresult != rend() ? size_type((rresult.base() - 1) - begin()) : npos;
       }
    }
 
@@ -2382,7 +2477,8 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   size_type find_first_of(const basic_string& str, size_type pos = 0) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_of(const basic_string& str, size_type pos = 0) const
       { return this->find_first_of(str.c_str(), pos, str.size()); }
 
    //! <b>Effects</b>: Determines the lowest position xpos, if possible, such that both of the
@@ -2393,7 +2489,8 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   size_type find_first_of(BasicStringView<CharT, Traits> sv, size_type pos = 0) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_of(BasicStringView<CharT, Traits> sv, size_type pos = 0) const
       { return this->find_first_of(sv.data(), pos, sv.size()); }
 
    //! <b>Requires</b>: s points to an array of at least n elements of CharT.
@@ -2401,17 +2498,18 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_of(basic_string(s, n), pos).
-   size_type find_first_of(const CharT* s, size_type pos, size_type n) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_of(const CharT* s, size_type pos, size_type n) const
    {
       const size_type sz = this->size();
       if (pos >= sz)
          return npos;
       else {
          const pointer addr    = this->priv_addr();
-         pointer finish = addr + sz;
+         pointer finish = addr + difference_type(sz);
          const_iterator result = boost::container::find_first_of
-            (addr + pos, finish, s, s + n, Eq_traits<Traits>());
-         return result != finish ? result - this->begin() : npos;
+            (addr + difference_type(pos), finish, s, s + difference_type(n), Eq_traits<Traits>());
+         return result != finish ? size_type(result - this->begin()) : npos;
       }
    }
 
@@ -2420,15 +2518,17 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_of(basic_string(s), pos).
-   size_type find_first_of(const CharT* s, size_type pos = 0) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_of(const CharT* s, size_type pos = 0) const
       { return this->find_first_of(s, pos, Traits::length(s)); }
 
    //! <b>Requires</b>: s points to an array of at least traits::length(s) + 1 elements of CharT.
    //!
    //! <b>Throws</b>: Nothing
    //!
-   //! <b>Returns</b>: find_first_of(basic_string<CharT,traits,Allocator>(1,c), pos).
-   size_type find_first_of(CharT c, size_type pos = 0) const
+   //! <b>Returns</b>: find_first_of(basic_string<CharT,traits,allocator_type>(1,c), pos).
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_of(CharT c, size_type pos = 0) const
     { return this->find(c, pos); }
 
    //! <b>Effects</b>: Determines the highest position xpos, if possible, such that both of
@@ -2438,7 +2538,8 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   size_type find_last_of(const basic_string& str, size_type pos = npos) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_of(const basic_string& str, size_type pos = npos) const
       { return this->find_last_of(str.c_str(), pos, str.size()); }
 
    //! <b>Effects</b>: Determines the highest position xpos, if possible, such that both of
@@ -2449,7 +2550,8 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   size_type find_last_of(BasicStringView<CharT, Traits> sv, size_type pos = npos) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_of(BasicStringView<CharT, Traits> sv, size_type pos = npos) const
       { return this->find_last_of(sv.data(), pos, sv.size()); }
 
    //! <b>Requires</b>: s points to an array of at least n elements of CharT.
@@ -2457,7 +2559,8 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_of(basic_string(s, n), pos).
-   size_type find_last_of(const CharT* s, size_type pos, size_type n) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_of(const CharT* s, size_type pos, size_type n) const
    {
       const size_type len = this->size();
 
@@ -2465,11 +2568,11 @@ class basic_string
          return npos;
       else {
          const pointer addr    = this->priv_addr();
-         const const_iterator last = addr + dtl::min_value(len - 1, pos) + 1;
+         const const_iterator last = addr + difference_type(dtl::min_value(len - 1, pos) + 1);
          const const_reverse_iterator rresult =
             boost::container::find_first_of(const_reverse_iterator(last), rend(),
-                               s, s + n, Eq_traits<Traits>());
-         return rresult != rend() ? (rresult.base() - 1) - addr : npos;
+                               s, s + difference_type(n), Eq_traits<Traits>());
+         return rresult != rend() ? size_type((rresult.base() - 1) - addr) : npos;
       }
    }
 
@@ -2477,15 +2580,17 @@ class basic_string
    //!
    //! <b>Throws</b>: Nothing
    //!
-   //! <b>Returns</b>: find_last_of(basic_string<CharT,traits,Allocator>(1,c),pos).
-   size_type find_last_of(const CharT* s, size_type pos = npos) const
-      { return find_last_of(s, pos, Traits::length(s)); }
+   //! <b>Returns</b>: find_last_of(basic_string<CharT,traits,allocator_type>(1,c),pos).
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_of(const CharT* s, size_type pos = npos) const
+      { return this->find_last_of(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_of(basic_string(s), pos).
-   size_type find_last_of(CharT c, size_type pos = npos) const
-      {  return rfind(c, pos);   }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_of(CharT c, size_type pos = npos) const
+      {  return this->rfind(c, pos);   }
 
    //! <b>Effects</b>: Determines the lowest position xpos, if possible, such that
    //!   both of the following conditions obtain:
@@ -2495,8 +2600,9 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   size_type find_first_not_of(const basic_string& str, size_type pos = 0) const
-      { return find_first_not_of(str.c_str(), pos, str.size()); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_not_of(const basic_string& str, size_type pos = 0) const
+      { return this->find_first_not_of(str.c_str(), pos, str.size()); }
 
    //! <b>Effects</b>: Determines the lowest position xpos, if possible, such that
    //!   both of the following conditions obtain:
@@ -2507,24 +2613,26 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   size_type find_first_not_of(BasicStringView<CharT, Traits> sv, size_type pos = 0) const
-      { return find_first_not_of(sv.data(), pos, sv.size()); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_not_of(BasicStringView<CharT, Traits> sv, size_type pos = 0) const
+      { return this->find_first_not_of(sv.data(), pos, sv.size()); }
 
    //! <b>Requires</b>: s points to an array of at least traits::length(s) + 1 elements of CharT.
    //!
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_not_of(basic_string(s, n), pos).
-   size_type find_first_not_of(const CharT* s, size_type pos, size_type n) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_not_of(const CharT* s, size_type pos, size_type n) const
    {
       if (pos > this->size())
          return npos;
       else {
          const pointer addr   = this->priv_addr();
-         const pointer finish = addr + this->priv_size();
+         const pointer finish = addr + difference_type(this->priv_size());
          const const_iterator result = boost::container::find_if
-            (addr + pos, finish, Not_within_traits<Traits>(s, s + n));
-         return result != finish ? result - addr : npos;
+            (addr + difference_type(pos), finish, Not_within_traits<Traits>(s, s + difference_type(n)));
+         return result != finish ? size_type(result - addr) : npos;
       }
    }
 
@@ -2533,23 +2641,25 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_not_of(basic_string(s), pos).
-   size_type find_first_not_of(const CharT* s, size_type pos = 0) const
-      { return find_first_not_of(s, pos, Traits::length(s)); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_not_of(const CharT* s, size_type pos = 0) const
+      { return this->find_first_not_of(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_first_not_of(basic_string(1, c), pos).
-   size_type find_first_not_of(CharT c, size_type pos = 0) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_first_not_of(CharT c, size_type pos = 0) const
    {
       if (pos > this->size())
          return npos;
       else {
          const pointer addr   = this->priv_addr();
-         const pointer finish = addr + this->priv_size();
+         const pointer finish = addr + difference_type(this->priv_size());
          const const_iterator result
-            = boost::container::find_if(addr + pos, finish,
+            = boost::container::find_if(addr + difference_type(pos), finish,
                      boost::container::not1(boost::container::bind2nd(Eq_traits<Traits>(), c)));
-         return result != finish ? result - begin() : npos;
+         return result != finish ? size_type(result - begin()) : npos;
       }
    }
 
@@ -2560,8 +2670,9 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
-   size_type find_last_not_of(const basic_string& str, size_type pos = npos) const
-      { return find_last_not_of(str.c_str(), pos, str.size()); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_not_of(const basic_string& str, size_type pos = npos) const
+      { return this->find_last_not_of(str.c_str(), pos, str.size()); }
 
    //! <b>Effects</b>: Determines the highest position xpos, if possible, such that
    //!   both of the following conditions obtain: a) xpos <= pos and xpos < size();
@@ -2571,15 +2682,17 @@ class basic_string
    //!
    //! <b>Returns</b>: xpos if the function can determine such a value for xpos. Otherwise, returns npos.
    template<template <class, class> class BasicStringView>
-   size_type find_last_not_of(BasicStringView<CharT, Traits> sv, size_type pos = npos) const
-      { return find_last_not_of(sv.data(), pos, sv.size()); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_not_of(BasicStringView<CharT, Traits> sv, size_type pos = npos) const
+      { return this->find_last_not_of(sv.data(), pos, sv.size()); }
 
    //! <b>Requires</b>: s points to an array of at least n elements of CharT.
    //!
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_not_of(basic_string(s, n), pos).
-   size_type find_last_not_of(const CharT* s, size_type pos, size_type n) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_not_of(const CharT* s, size_type pos, size_type n) const
    {
       const size_type len = this->size();
 
@@ -2589,8 +2702,8 @@ class basic_string
          const const_iterator last = begin() + dtl::min_value(len - 1, pos) + 1;
          const const_reverse_iterator rresult =
             boost::container::find_if(const_reverse_iterator(last), rend(),
-                    Not_within_traits<Traits>(s, s + n));
-         return rresult != rend() ? (rresult.base() - 1) - begin() : npos;
+                    Not_within_traits<Traits>(s, s + difference_type(n)));
+         return rresult != rend() ? size_type((rresult.base() - 1) - begin()) : npos;
       }
    }
 
@@ -2599,13 +2712,15 @@ class basic_string
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_not_of(basic_string(s), pos).
-   size_type find_last_not_of(const CharT* s, size_type pos = npos) const
-      { return find_last_not_of(s, pos, Traits::length(s)); }
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_not_of(const CharT* s, size_type pos = npos) const
+      { return this->find_last_not_of(s, pos, Traits::length(s)); }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: find_last_not_of(basic_string(1, c), pos).
-   size_type find_last_not_of(CharT c, size_type pos = npos) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      size_type find_last_not_of(CharT c, size_type pos = npos) const
    {
       const size_type len = this->size();
 
@@ -2616,7 +2731,7 @@ class basic_string
          const const_reverse_iterator rresult =
             boost::container::find_if(const_reverse_iterator(last), rend(),
                   boost::container::not1(boost::container::bind2nd(Eq_traits<Traits>(), c)));
-         return rresult != rend() ? (rresult.base() - 1) - begin() : npos;
+         return rresult != rend() ? size_type((rresult.base() - 1) - begin()) : npos;
       }
    }
 
@@ -2627,14 +2742,15 @@ class basic_string
    //!
    //! <b>Throws</b>: If memory allocation throws or out_of_range if pos > size().
    //!
-   //! <b>Returns</b>: basic_string<CharT,traits,Allocator>(data()+pos,rlen).
-   basic_string substr(size_type pos = 0, size_type n = npos) const
+   //! <b>Returns</b>: basic_string<CharT,traits,allocator_type>(data()+pos,rlen).
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      basic_string substr(size_type pos = 0, size_type n = npos) const
    {
       if (pos > this->size())
          throw_out_of_range("basic_string::substr out of range position");
       const pointer addr = this->priv_addr();
-      return basic_string(addr + pos,
-                          addr + pos + dtl::min_value(n, size() - pos), this->alloc());
+      return basic_string(addr + difference_type(pos),
+                          addr + difference_type(pos + dtl::min_value(n, size() - pos)), this->alloc());
    }
 
    //! <b>Effects</b>: Determines the effective length rlen of the string to compare as
@@ -2646,21 +2762,23 @@ class basic_string
    //! <b>Returns</b>: The nonzero result if the result of the comparison is nonzero.
    //!   Otherwise, returns a value < 0 if size() < str.size(), a 0 value if size() == str.size(),
    //!   and value > 0 if size() > str.size()
-   int compare(const basic_string& str) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      int compare(const basic_string& str) const
    {
       const pointer addr     = this->priv_addr();
       const pointer str_addr = str.priv_addr();
-      return s_compare(addr, addr + this->priv_size(), str_addr, str_addr + str.priv_size());
+      return this->s_compare(addr, addr + difference_type(this->priv_size()), str_addr, str_addr + difference_type(str.priv_size()));
    }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: compare(basic_string(sv)).
    template<template <class, class> class BasicStringView>
-   int compare(BasicStringView<CharT,Traits> sv) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      int compare(BasicStringView<CharT,Traits> sv) const
    {
       const pointer addr = this->priv_addr();
-      return s_compare(addr, addr + this->priv_size(), sv.data(), sv.data() + sv.size());
+      return this->s_compare(addr, addr + difference_type(this->priv_size()), sv.data(), sv.data() + difference_type(sv.size()));
    }
 
    //! <b>Requires</b>: pos1 <= size()
@@ -2672,15 +2790,16 @@ class basic_string
    //! <b>Throws</b>: out_of_range if pos1 > size()
    //!
    //! <b>Returns</b>:basic_string(*this,pos1,n1).compare(str).
-   int compare(size_type pos1, size_type n1, const basic_string& str) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      int compare(size_type pos1, size_type n1, const basic_string& str) const
    {
       if (pos1 > this->size())
          throw_out_of_range("basic_string::compare out of range position");
       const pointer addr    = this->priv_addr();
       const pointer str_addr = str.priv_addr();
-      return s_compare(addr + pos1,
-                        addr + pos1 + dtl::min_value(n1, this->size() - pos1),
-                        str_addr, str_addr + str.priv_size());
+      return this->s_compare(addr + difference_type(pos1),
+                        addr + difference_type(pos1 + dtl::min_value(n1, this->size() - pos1)),
+                        str_addr, str_addr + difference_type(str.priv_size()));
    }
 
    //! <b>Requires</b>: pos1 <= size()
@@ -2689,13 +2808,14 @@ class basic_string
    //!
    //! <b>Returns</b>:basic_string(*this,pos1,n1).compare(sv).
    template<template <class, class> class BasicStringView>
-   int compare(size_type pos1, size_type n1, BasicStringView<CharT,Traits> sv) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      int compare(size_type pos1, size_type n1, BasicStringView<CharT,Traits> sv) const
    {
       if (pos1 > this->size())
          throw_out_of_range("basic_string::compare out of range position");
       const pointer addr    = this->priv_addr() + pos1;
       const CharT* str_addr = sv.data();
-      return s_compare(addr, addr + dtl::min_value(n1, this->size() - pos1),
+      return this->s_compare(addr, addr + difference_type(dtl::min_value(n1, this->size() - pos1)),
                        str_addr, str_addr + sv.size());
    }
 
@@ -2707,14 +2827,15 @@ class basic_string
    //! <b>Throws</b>: out_of_range if pos1 > size() or pos2 > str.size()
    //!
    //! <b>Returns</b>: basic_string(*this, pos1, n1).compare(basic_string(str, pos2, n2)).
-   int compare(size_type pos1, size_type n1, const basic_string& str, size_type pos2, size_type n2 = npos) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      int compare(size_type pos1, size_type n1, const basic_string& str, size_type pos2, size_type n2 = npos) const
    {
       if (pos1 > this->size() || pos2 > str.size())
          throw_out_of_range("basic_string::compare out of range position");
       const pointer addr     = this->priv_addr() + pos1;
       const pointer str_addr = str.priv_addr() + pos2;
-      return s_compare(addr, addr + dtl::min_value(n1, this->size() - pos1),
-                        str_addr, str_addr + dtl::min_value(n2, str.size() - pos2));
+      return this->s_compare(addr, addr + difference_type(dtl::min_value(n1, this->size() - pos1)),
+                             str_addr, str_addr + difference_type(dtl::min_value(n2, str.size() - pos2)));
    }
 
    //! <b>Requires</b>: pos1 <= size() and pos2 <= str.size()
@@ -2726,23 +2847,25 @@ class basic_string
    //!
    //! <b>Returns</b>: basic_string(*this, pos1, n1).compare(BasicStringView<CharT, Traits>(sv, pos2, n2)).
    template<template <class, class> class BasicStringView>
-   int compare(size_type pos1, size_type n1, BasicStringView<CharT,Traits> sv, size_type pos2, size_type n2) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      int compare(size_type pos1, size_type n1, BasicStringView<CharT,Traits> sv, size_type pos2, size_type n2) const
    {
       if (pos1 > this->size() || pos2 > sv.size())
          throw_out_of_range("basic_string::compare out of range position");
       const pointer addr     = this->priv_addr() + pos1;
       const CharT * str_addr = sv.data() + pos2;
-      return s_compare(addr, addr + dtl::min_value(n1, this->size() - pos1),
-                       str_addr, str_addr + dtl::min_value(n2, sv.size() - pos2));
+      return this->s_compare(addr, addr + difference_type(dtl::min_value(n1, this->size() - pos1)),
+                       str_addr, str_addr + difference_type(dtl::min_value(n2, sv.size() - pos2)));
    }
 
    //! <b>Throws</b>: Nothing
    //!
    //! <b>Returns</b>: compare(basic_string(s)).
-   int compare(const CharT* s) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      int compare(const CharT* s) const
    {
       const pointer addr = this->priv_addr();
-      return s_compare(addr, addr + this->priv_size(), s, s + Traits::length(s));
+      return this->s_compare(addr, addr + difference_type(this->priv_size()), s, s + Traits::length(s));
    }
 
    //! <b>Requires</b>: pos1 > size() and s points to an array of at least n2 elements of CharT.
@@ -2750,14 +2873,15 @@ class basic_string
    //! <b>Throws</b>: out_of_range if pos1 > size()
    //!
    //! <b>Returns</b>: basic_string(*this, pos, n1).compare(basic_string(s, n2)).
-   int compare(size_type pos1, size_type n1, const CharT* s, size_type n2) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      int compare(size_type pos1, size_type n1, const CharT* s, size_type n2) const
    {
       if (pos1 > this->size())
          throw_out_of_range("basic_string::compare out of range position");
       const pointer addr = this->priv_addr();
-      return s_compare( addr + pos1,
-                        addr + pos1 + dtl::min_value(n1, this->size() - pos1),
-                        s, s + n2);
+      return this->s_compare( addr + difference_type(pos1),
+                        addr + difference_type(pos1 + dtl::min_value(n1, this->size() - pos1)),
+                        s, s + difference_type(n2));
    }
 
    //! <b>Requires</b>: pos1 > size() and s points to an array of at least traits::length(s) + 1 elements of CharT.
@@ -2765,43 +2889,73 @@ class basic_string
    //! <b>Throws</b>: out_of_range if pos1 > size()
    //!
    //! <b>Returns</b>: basic_string(*this, pos, n1).compare(basic_string(s, n2)).
-   int compare(size_type pos1, size_type n1, const CharT* s) const
+   BOOST_CONTAINER_ATTRIBUTE_NODISCARD inline
+      int compare(size_type pos1, size_type n1, const CharT* s) const
    {  return this->compare(pos1, n1, s, Traits::length(s)); }
 
    #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
    private:
-   void priv_reserve(size_type res_arg, const bool null_terminate = true)
+   void priv_move_assign(BOOST_RV_REF(basic_string) x, dtl::bool_<true> /*steal_resources*/)
+   {
+      //Destroy objects but retain memory in case x reuses it in the future
+      this->clear();
+      //Move allocator if needed
+      dtl::bool_<allocator_traits_type::
+         propagate_on_container_move_assignment::value> flag;
+      dtl::move_alloc(this->alloc(), x.alloc(), flag);
+      //Nothrow swap
+      this->swap_data(x);
+   }
+
+   void priv_move_assign(BOOST_RV_REF(basic_string) x, dtl::bool_<false> /*steal_resources*/)
+   {
+      //We can't guarantee a compile-time equal allocator or propagation so fallback to runtime
+      //Resources can be transferred if both allocators are equal
+      if (this->alloc() == x.alloc()) {
+         this->priv_move_assign(boost::move(x), dtl::true_());
+      }
+      else {
+         this->assign(x.begin(), x.end());
+      }
+   }
+
+   bool priv_reserve_no_null_end(size_type res_arg)
    {
       if (res_arg > this->max_size()){
          throw_length_error("basic_string::reserve max_size() exceeded");
       }
 
-      if (this->capacity() < res_arg){
-         size_type n = dtl::max_value(res_arg, this->size()) + 1;
+      const bool do_alloc = this->capacity() < res_arg;
+      if (do_alloc){
+         //size_type n = dtl::max_value(res_arg, this->size()) + 1;
+         size_type n = res_arg + 1;
          size_type new_cap = this->next_capacity(n);
          pointer reuse = 0;
          pointer new_start = this->allocation_command(allocate_new, n, new_cap, reuse);
-         size_type new_length = 0;
 
          const pointer addr = this->priv_addr();
-         new_length += priv_uninitialized_copy
-            (addr, addr + this->priv_size(), new_start);
-         if(null_terminate){
-            this->priv_construct_null(new_start + new_length);
-         }
+         size_type new_length = priv_uninitialized_copy
+            (addr, addr + difference_type(this->priv_size()), new_start);
          this->deallocate_block();
-         this->is_short(false);
+         this->assure_long();
          this->priv_long_addr(new_start);
          this->priv_long_size(new_length);
          this->priv_storage(new_cap);
       }
+      return do_alloc;
+   }
+
+   void priv_reserve(size_type res_arg)
+   {
+      if(this->priv_reserve_no_null_end(res_arg))
+         this->priv_terminate_string();
    }
 
    template<class It1, class It2>
    static int s_compare(It1 f1, It1 l1, It2 f2, It2 l2)
    {
-      const difference_type n1 = l1 - f1;
-      const difference_type n2 = l2 - f2;
+      const std::size_t n1 = std::size_t(l1 - f1);
+      const std::size_t n2 = std::size_t(l2 - f2);
       const int cmp = Traits::compare(boost::movelib::to_raw_pointer(f1),
                                       boost::movelib::to_raw_pointer(f2),
                                       dtl::min_value(n1, n2));
@@ -2819,7 +2973,7 @@ class basic_string
       const size_type long_size    = this->priv_long_size();
       const size_type long_storage = this->priv_long_storage();
       //We can make this nothrow as chars are always NoThrowCopyables
-      BOOST_TRY{
+      BOOST_CONTAINER_TRY{
          pointer reuse = 0;
          real_cap = long_size+1;
          const pointer ret = this->allocation_command(allocate_new, long_size+1, real_cap, reuse);
@@ -2832,10 +2986,10 @@ class basic_string
          //And release old buffer
          this->alloc().deallocate(long_addr, long_storage);
       }
-      BOOST_CATCH(...){
+      BOOST_CONTAINER_CATCH(...){
          return;
       }
-      BOOST_CATCH_END
+      BOOST_CONTAINER_CATCH_END
    }
 
    template<class AllocVersion>
@@ -2851,78 +3005,44 @@ class basic_string
       }
    }
 
-   void priv_construct_null(pointer p)
-   {  this->construct(p, CharT(0));  }
+   inline void priv_construct_null(pointer p)
+   {  traits_type::assign(*p, CharT());  }
 
    // Helper functions used by constructors.  It is a severe error for
    // any of them to be called anywhere except from within constructors.
-   void priv_terminate_string()
+   inline void priv_terminate_string()
    {  this->priv_construct_null(this->priv_end_addr());  }
 
-   template<class FwdIt, class Count> inline
-   void priv_uninitialized_fill_n(FwdIt first, Count count, const CharT val)
-   {
-      //Save initial position
-      FwdIt init = first;
-
-      BOOST_TRY{
-         //Construct objects
-         for (; count--; ++first){
-            this->construct(first, val);
-         }
-      }
-      BOOST_CATCH(...){
-         //Call destructors
-         for (; init != first; ++init){
-            this->destroy(init);
-         }
-         BOOST_RETHROW
-      }
-      BOOST_CATCH_END
-   }
-
    template<class InpIt, class FwdIt> inline
    size_type priv_uninitialized_copy(InpIt first, InpIt last, FwdIt dest)
    {
       //Save initial destination position
-      FwdIt dest_init = dest;
       size_type constructed = 0;
 
-      BOOST_TRY{
-         //Try to build objects
-         for (; first != last; ++dest, ++first, ++constructed){
-            this->construct(dest, *first);
-         }
-      }
-      BOOST_CATCH(...){
-         //Call destructors
-         for (; constructed--; ++dest_init){
-            this->destroy(dest_init);
-         }
-         BOOST_RETHROW
+      for (; first != last; ++dest, ++first, ++constructed){
+         traits_type::assign(*dest, *first);
       }
-      BOOST_CATCH_END
-      return (constructed);
+      return constructed;
    }
 
    template <class InputIterator, class OutIterator>
-   void priv_copy(InputIterator first, InputIterator last, OutIterator result)
+   static void priv_copy(InputIterator first, InputIterator last, OutIterator result)
    {
       for ( ; first != last; ++first, ++result)
          Traits::assign(*result, *first);
    }
 
-   void priv_copy(const CharT* first, const CharT* last, CharT* result)
-   {  Traits::copy(result, first, last - first);  }
+   static inline void priv_copy(const CharT* first, const CharT* last, CharT* result)
+   {  Traits::copy(result, first, std::size_t(last - first));  }
 
    template <class Integer>
-   basic_string& priv_replace_dispatch(const_iterator first, const_iterator last,
+   inline basic_string& priv_replace_dispatch(const_iterator first, const_iterator last,
                                        Integer n, Integer x,
                                        dtl::true_)
    {  return this->replace(first, last, (size_type) n, (CharT) x);   }
 
    template <class InputIter>
-   basic_string& priv_replace_dispatch(const_iterator first, const_iterator last,
+   inline basic_string& priv_replace_dispatch(const_iterator first, const_iterator last,
                                        InputIter f, InputIter l,
                                        dtl::false_)
    {
@@ -2933,6 +3053,18 @@ class basic_string
    #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 };
 
+#ifndef BOOST_CONTAINER_NO_CXX17_CTAD
+
+template <typename InputIterator>
+basic_string(InputIterator, InputIterator) ->
+   basic_string<typename iterator_traits<InputIterator>::value_type>;
+
+template <typename InputIterator, typename Allocator>
+basic_string(InputIterator, InputIterator, Allocator const&) ->
+   basic_string<typename iterator_traits<InputIterator>::value_type, Allocator>;
+
+#endif
+
 #ifdef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 //!Typedef for a basic_string of
@@ -2953,20 +3085,16 @@ wstring;
 
 #else
 
-template <class CharT, class Traits, class Allocator>
-const typename basic_string<CharT,Traits,Allocator>::size_type
-   basic_string<CharT,Traits,Allocator>::npos;
-
 template<class S>
 struct is_string
 {
-   static const bool value = false;
+   BOOST_STATIC_CONSTEXPR bool value = false;
 };
 
 template<class C, class T, class A>
 struct is_string< basic_string<C, T, A> >
 {
-   static const bool value = true;
+   BOOST_STATIC_CONSTEXPR bool value = true;
 };
 
 #endif
@@ -3271,6 +3399,7 @@ operator>=( const basic_string<CharT,Traits,Allocator>& x, BasicStringView<CharT
 // Swap.
 template <class CharT, class Traits, class Allocator>
 inline void swap(basic_string<CharT,Traits,Allocator>& x, basic_string<CharT,Traits,Allocator>& y)
+    BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT(x.swap(y)))
 {  x.swap(y);  }
 
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -3419,11 +3548,26 @@ getline(std::basic_istream<CharT, Traits>& is, basic_string<CharT,Traits,Allocat
 template <class Ch, class Allocator>
 inline std::size_t hash_value(basic_string<Ch, std::char_traits<Ch>, Allocator> const& v)
 {
-   return hash_range(v.begin(), v.end());
+   std::size_t seed = 0;
+   const Ch *first = v.data();
+
+   for(std::size_t i = 0, i_max = v.size(); i != i_max; ++i)
+   {
+      boost::intrusive::detail::hash_combine_size_t(seed, static_cast<std::size_t>(*first));
+      ++first;
+   }
+
+   return seed;
 }
 
 }}
 
+//GCC 12 has a regression for array-bounds warnings
+#if defined(BOOST_GCC) && (BOOST_GCC >= 120000) && (BOOST_GCC < 130000)
+#pragma GCC diagnostic pop
+#endif
+
+
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 namespace boost {
@@ -3433,9 +3577,11 @@ namespace boost {
 template <class C, class T, class Allocator>
 struct has_trivial_destructor_after_move<boost::container::basic_string<C, T, Allocator> >
 {
-   typedef typename ::boost::container::allocator_traits<Allocator>::pointer pointer;
-   static const bool value = ::boost::has_trivial_destructor_after_move<Allocator>::value &&
-                             ::boost::has_trivial_destructor_after_move<pointer>::value;
+   typedef typename boost::container::basic_string<C, T, Allocator>::allocator_type allocator_type;
+   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;
 };
 
 }