[Boost-commit] svn:boost r84902 - in branches/release: boost/container/detail libs/container/doc

Subject: [Boost-commit] svn:boost r84902 - in branches/release: boost/container/detail libs/container/doc
From: igaztanaga_at_[hidden]
Date: 2013-06-24 15:13:16

Author: igaztanaga
Date: 2013-06-24 15:13:16 EDT (Mon, 24 Jun 2013)
New Revision: 84902
URL: http://svn.boost.org/trac/boost/changeset/84902

Log:
Trivial fix for empty ranges in node_alloc_holder

Text files modified: 
   branches/release/boost/container/detail/node_alloc_holder.hpp |    82 ++++++++++++++++++++------------------- 
   branches/release/libs/container/doc/container.qbk             |     3                                         
   2 files changed, 44 insertions(+), 41 deletions(-)

Modified: branches/release/boost/container/detail/node_alloc_holder.hpp
==============================================================================
--- branches/release/boost/container/detail/node_alloc_holder.hpp	Mon Jun 24 15:11:43 2013	(r84901)
+++ branches/release/boost/container/detail/node_alloc_holder.hpp	2013-06-24 15:13:16 EDT (Mon, 24 Jun 2013)	(r84902)
@@ -229,48 +229,50 @@
    void allocate_many_and_construct
       (FwdIterator beg, difference_type n, Inserter inserter)
    {
-      /*
-      NodePtr p = this->allocate_one();
-      Deallocator node_deallocator(p, this->node_alloc());
-      ::boost::container::construct_in_place(this->node_alloc(), container_detail::addressof(p->m_data), it);
-      node_deallocator.release();
-      //This does not throw
-      typedef typename Node::hook_type hook_type;
-      ::new(static_cast<hook_type*>(container_detail::to_raw_pointer(p))) hook_type;
-      return (p);
-      */
-      typedef typename NodeAlloc::multiallocation_chain multiallocation_chain;
-
-      //Try to allocate memory in a single block
-      typedef typename multiallocation_chain::iterator multialloc_iterator;
-      multiallocation_chain mem;
-      this->node_alloc().allocate_individual(n, mem);
-      multialloc_iterator itbeg(mem.begin()), itlast(mem.last());
-      mem.clear();
-      Node *p = 0;
-      NodeAlloc &nalloc = this->node_alloc();
-      BOOST_TRY{
-         while(n--){
-            p = container_detail::to_raw_pointer(&*itbeg);
-            ++itbeg;
-            //This can throw
-            Deallocator node_deallocator(p, nalloc);
-            boost::container::construct_in_place(nalloc, container_detail::addressof(p->m_data), beg);
-            ++beg;
-            node_deallocator.release();
-            //This does not throw
-            typedef typename Node::hook_type hook_type;
-            ::new(static_cast<hook_type*>(p)) hook_type;
-            //This can throw in some containers (predicate might throw)
-            inserter(*p);
+      if(n){
+         /*
+         NodePtr p = this->allocate_one();
+         Deallocator node_deallocator(p, this->node_alloc());
+         ::boost::container::construct_in_place(this->node_alloc(), container_detail::addressof(p->m_data), it);
+         node_deallocator.release();
+         //This does not throw
+         typedef typename Node::hook_type hook_type;
+         ::new(static_cast<hook_type*>(container_detail::to_raw_pointer(p))) hook_type;
+         return (p);
+         */
+         typedef typename NodeAlloc::multiallocation_chain multiallocation_chain;
+
+         //Try to allocate memory in a single block
+         typedef typename multiallocation_chain::iterator multialloc_iterator;
+         multiallocation_chain mem;
+         this->node_alloc().allocate_individual(n, mem);
+         multialloc_iterator itbeg(mem.begin()), itlast(mem.last());
+         mem.clear();
+         Node *p = 0;
+         NodeAlloc &nalloc = this->node_alloc();
+         BOOST_TRY{
+            while(n--){
+               p = container_detail::to_raw_pointer(&*itbeg);
+               ++itbeg;
+               //This can throw
+               Deallocator node_deallocator(p, nalloc);
+               boost::container::construct_in_place(nalloc, container_detail::addressof(p->m_data), beg);
+               ++beg;
+               node_deallocator.release();
+               //This does not throw
+               typedef typename Node::hook_type hook_type;
+               ::new(static_cast<hook_type*>(p)) hook_type;
+               //This can throw in some containers (predicate might throw)
+               inserter(*p);
+            }
          }
+         BOOST_CATCH(...){
+            mem.incorporate_after(mem.last(), &*itbeg, &*itlast, n);
+            this->node_alloc().deallocate_individual(mem);
+            BOOST_RETHROW
+         }
+         BOOST_CATCH_END
       }
-      BOOST_CATCH(...){
-         mem.incorporate_after(mem.last(), &*itbeg, &*itlast, n);
-         this->node_alloc().deallocate_individual(mem);
-         BOOST_RETHROW
-      }
-      BOOST_CATCH_END
    }
 
    void clear(allocator_v1)

Modified: branches/release/libs/container/doc/container.qbk
==============================================================================
--- branches/release/libs/container/doc/container.qbk	Mon Jun 24 15:11:43 2013	(r84901)
+++ branches/release/libs/container/doc/container.qbk	2013-06-24 15:13:16 EDT (Mon, 24 Jun 2013)	(r84902)
@@ -698,7 +698,8 @@
               [@https://svn.boost.org/trac/boost/ticket/7969 #7969],
               [@https://svn.boost.org/trac/boost/ticket/8118 #8118],
               [@https://svn.boost.org/trac/boost/ticket/8294 #8294],
-              [@https://svn.boost.org/trac/boost/ticket/8553 #8553].
+              [@https://svn.boost.org/trac/boost/ticket/8553 #8553],
+              [@https://svn.boost.org/trac/boost/ticket/8724 #8724].
 
 [endsect]