Replaced BOOST_CONTIANER_NOEXCEPT with BOOST_NOEXCEPT

include/boost/container/allocator.hpp

@@ -155,12 +155,12 @@ class allocator
 
    //!Default constructor
    //!Never throws
-   allocator() BOOST_CONTAINER_NOEXCEPT
+   allocator() BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    //!Constructor from other allocator.
    //!Never throws
-   allocator(const allocator &) BOOST_CONTAINER_NOEXCEPT
+   allocator(const allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    //!Constructor from related allocator.
@@ -170,7 +170,7 @@ class allocator
             #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
             , Version, AllocationDisableMask
             #endif
-            > &) BOOST_CONTAINER_NOEXCEPT
+            > &) BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    //!Allocates memory for an array of count elements.
@@ -190,27 +190,27 @@ class allocator
 
    //!Deallocates previously allocated memory.
    //!Never throws
-   void deallocate(pointer ptr, size_type) BOOST_CONTAINER_NOEXCEPT
+   void deallocate(pointer ptr, size_type) BOOST_NOEXCEPT_OR_NOTHROW
    {  boost_cont_free(ptr);  }
 
    //!Returns the maximum number of elements that could be allocated.
    //!Never throws
-   size_type max_size() const BOOST_CONTAINER_NOEXCEPT
+   size_type max_size() const BOOST_NOEXCEPT_OR_NOTHROW
    {  return size_type(-1)/sizeof(T);   }
 
    //!Swaps two allocators, does nothing
    //!because this allocator is stateless
-   friend void swap(self_t &, self_t &) BOOST_CONTAINER_NOEXCEPT
+   friend void swap(self_t &, self_t &) BOOST_NOEXCEPT_OR_NOTHROW
    {}
 
    //!An allocator always compares to true, as memory allocated with one
    //!instance can be deallocated by another instance
-   friend bool operator==(const allocator &, const allocator &) BOOST_CONTAINER_NOEXCEPT
+   friend bool operator==(const allocator &, const allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {  return true;   }
 
    //!An allocator always compares to false, as memory allocated with one
    //!instance can be deallocated by another instance
-   friend bool operator!=(const allocator &, const allocator &) BOOST_CONTAINER_NOEXCEPT
+   friend bool operator!=(const allocator &, const allocator &) BOOST_NOEXCEPT_OR_NOTHROW
    {  return false;   }
 
    //!An advanced function that offers in-place expansion shrink to fit and new allocation
@@ -236,7 +236,7 @@ class allocator
    //!Memory must not have been allocated with
    //!allocate_one or allocate_individual.
    //!This function is available only with Version == 2
-   size_type size(pointer p) const BOOST_CONTAINER_NOEXCEPT
+   size_type size(pointer p) const BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_STATIC_ASSERT(( Version > 1 ));
       return boost_cont_size(p);
@@ -265,7 +265,7 @@ class allocator
    //!You should never use deallocate_one to deallocate memory allocated
    //!with other functions different from allocate_one() or allocate_individual.
    //Never throws
-   void deallocate_one(pointer p) BOOST_CONTAINER_NOEXCEPT
+   void deallocate_one(pointer p) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_STATIC_ASSERT(( Version > 1 ));
       return this->deallocate(p, 1);
@@ -273,7 +273,7 @@ class allocator
 
    //!Deallocates memory allocated with allocate_one() or allocate_individual().
    //!This function is available only with Version == 2
-   void deallocate_individual(multiallocation_chain &chain) BOOST_CONTAINER_NOEXCEPT
+   void deallocate_individual(multiallocation_chain &chain) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_STATIC_ASSERT(( Version > 1 ));
       return this->deallocate_many(chain);
@@ -323,7 +323,7 @@ class allocator
    //!Deallocates several elements allocated by
    //!allocate_many(), allocate(), or allocation_command().
    //!This function is available only with Version == 2
-   void deallocate_many(multiallocation_chain &chain) BOOST_CONTAINER_NOEXCEPT
+   void deallocate_many(multiallocation_chain &chain) BOOST_NOEXCEPT_OR_NOTHROW
    {
       BOOST_STATIC_ASSERT(( Version > 1 ));
       boost_cont_memchain ch;