Ticket #7227: boost-container2.patch

boost/container/detail/adaptive_node_pool_impl.hpp

@@ -557 +557 @@
          //element of the tree
          char *mem_address = static_cast<char*>
             (mp_segment_mngr_base->allocate_aligned(real_block_size, m_real_block_alignment));
-         if(!mem_address)   throw std::bad_alloc();
+         if(!mem_address)   BOOST_THROW_EXCEPTION(std::bad_alloc());
          ++m_totally_free_blocks;
          block_info_t *c_info = new(mem_address)block_info_t;
          m_block_multiset.insert(m_block_multiset.end(), *c_info);
@@ -584 +584 @@
          //element of the tree
          char *mem_address = static_cast<char*>
             (mp_segment_mngr_base->allocate_aligned(real_block_size, m_real_block_alignment));
-         if(!mem_address)   throw std::bad_alloc();
+         if(!mem_address)   BOOST_THROW_EXCEPTION(std::bad_alloc());
          ++m_totally_free_blocks;
 
          //First initialize header information on the last subblock

boost/container/flat_map.hpp

@@ -410 +410 @@
    {
       iterator i = this->find(k);
       if(i == this->end()){
-         throw std::out_of_range("key not found");
+                 BOOST_THROW_EXCEPTION(std::out_of_range("key not found"));
       }
       return i->second;
    }
@@ -422 +422 @@
    {
       const_iterator i = this->find(k);
       if(i == this->end()){
-         throw std::out_of_range("key not found");
+                 BOOST_THROW_EXCEPTION(std::out_of_range("key not found"));
       }
       return i->second;
    }

boost/container/list.hpp

@@ -931 +931 @@
          this->icont().splice(p.get(), x.icont());
       }
       else{
-         throw std::runtime_error("list::splice called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("list::splice called with unequal allocators"));
       }
    }
 
@@ -955 +955 @@
          this->icont().splice(p.get(), x.icont(), i.get());
       }
       else{
-         throw std::runtime_error("list::splice called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("list::splice called with unequal allocators"));
       }
    }
 
@@ -978 +978 @@
          this->icont().splice(p.get(), x.icont(), first.get(), last.get());
       }
       else{
-         throw std::runtime_error("list::splice called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("list::splice called with unequal allocators"));
       }
    }
 
@@ -1002 +1002 @@
          this->icont().splice(p.get(), x.icont(), first.get(), last.get(), n);
       }
       else{
-         throw std::runtime_error("list::splice called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("list::splice called with unequal allocators"));
       }
    }
 
@@ -1107 +1107 @@
             ValueCompareToNodeCompare<StrictWeakOrdering>(comp));
       }
       else{
-         throw std::runtime_error("list::merge called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("list::merge called with unequal allocators"));
       }
    }
 

boost/container/map.hpp

@@ -363 +363 @@
    {
       iterator i = this->find(k);
       if(i == this->end()){
-         throw std::out_of_range("key not found");
+                 BOOST_THROW_EXCEPTION(std::out_of_range("key not found"));
       }
       return i->second;
    }
@@ -375 +375 @@
    {
       const_iterator i = this->find(k);
       if(i == this->end()){
-         throw std::out_of_range("key not found");
+                 BOOST_THROW_EXCEPTION(std::out_of_range("key not found"));
       }
       return i->second;
    }

boost/container/slist.hpp

@@ -989 +989 @@
          this->icont().splice_after(prev_pos.get(), x.icont());
       }
       else{
-         throw std::runtime_error("slist::splice called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("slist::splice called with unequal allocators"));
       }
    }
 
@@ -1013 +1013 @@
          this->icont().splice_after(prev_pos.get(), x.icont(), prev.get());
       }
       else{
-         throw std::runtime_error("slist::splice called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("slist::splice called with unequal allocators"));
       }
    }
 
@@ -1039 +1039 @@
             (prev_pos.get(), x.icont(), before_first.get(), before_last.get());
       }
       else{
-         throw std::runtime_error("slist::splice called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("slist::splice called with unequal allocators"));
       }
    }
 
@@ -1067 +1067 @@
             (prev_pos.get(), x.icont(), before_first.get(), before_last.get(), n);
       }
       else{
-         throw std::runtime_error("slist::splice called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("slist::splice called with unequal allocators"));
       }
    }
 
@@ -1222 +1222 @@
             ValueCompareToNodeCompare<StrictWeakOrdering>(comp));
       }
       else{
-         throw std::runtime_error("list::merge called with unequal allocators");
+                 BOOST_THROW_EXCEPTION(std::runtime_error("list::merge called with unequal allocators"));
       }
    }
 

boost/container/stable_vector.hpp

@@ -819 +819 @@
    {
       STABLE_VECTOR_CHECK_INVARIANT;
       if(n > this->max_size())
-         throw std::bad_alloc();
+                 BOOST_THROW_EXCEPTION(std::bad_alloc());
 
       size_type size = this->size();   
       size_type old_capacity = this->capacity();
@@ -870 +870 @@
    reference at(size_type n)
    {
       if(n>=size())
-         throw std::out_of_range("invalid subscript at stable_vector::at");
+                 BOOST_THROW_EXCEPTION(std::out_of_range("invalid subscript at stable_vector::at"));
       return operator[](n);
    }
 
@@ -885 +885 @@
    const_reference at(size_type n)const
    {
       if(n>=size())
-         throw std::out_of_range("invalid subscript at stable_vector::at");
+                 BOOST_THROW_EXCEPTION(std::out_of_range("invalid subscript at stable_vector::at"));
       return operator[](n);
    }