--- boost-orig/boost/container/detail/adaptive_node_pool_impl.hpp +++ boost/boost/container/detail/adaptive_node_pool_impl.hpp @@ -557,7 +557,7 @@ //element of the tree char *mem_address = static_cast (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,7 +584,7 @@ //element of the tree char *mem_address = static_cast (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-orig/boost/container/flat_map.hpp +++ boost/boost/container/flat_map.hpp @@ -410,7 +410,7 @@ { 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,7 +422,7 @@ { 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-orig/boost/container/list.hpp +++ boost/boost/container/list.hpp @@ -931,7 +931,7 @@ 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,7 +955,7 @@ 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,7 +978,7 @@ 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,7 +1002,7 @@ 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,7 +1107,7 @@ ValueCompareToNodeCompare(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-orig/boost/container/map.hpp +++ boost/boost/container/map.hpp @@ -363,7 +363,7 @@ { 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,7 +375,7 @@ { 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-orig/boost/container/slist.hpp +++ boost/boost/container/slist.hpp @@ -989,7 +989,7 @@ 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,7 +1013,7 @@ 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,7 +1039,7 @@ (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,7 +1067,7 @@ (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,7 +1222,7 @@ ValueCompareToNodeCompare(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-orig/boost/container/stable_vector.hpp +++ boost/boost/container/stable_vector.hpp @@ -819,7 +819,7 @@ { 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,7 +870,7 @@ 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,7 +885,7 @@ 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); }