[Boost-commit] svn:boost r53633 - in trunk: boost libs/multi_index/test

Subject: [Boost-commit] svn:boost r53633 - in trunk: boost libs/multi_index/test
From: joaquin_at_[hidden]
Date: 2009-06-04 09:05:11

Author: joaquin
Date: 2009-06-04 09:05:10 EDT (Thu, 04 Jun 2009)
New Revision: 53633
URL: http://svn.boost.org/trac/boost/changeset/53633

Log:
provided erase() reentrancy even in invariant checking mode
Text files modified: 
   trunk/boost/multi_index_container.hpp          |     4 +-                                      
   trunk/libs/multi_index/test/test_modifiers.cpp |    60 ++++++++++++++++++++++++++++++++++++++--
   2 files changed, 59 insertions(+), 5 deletions(-)

Modified: trunk/boost/multi_index_container.hpp
==============================================================================
--- trunk/boost/multi_index_container.hpp	(original)
+++ trunk/boost/multi_index_container.hpp	2009-06-04 09:05:10 EDT (Thu, 04 Jun 2009)
@@ -1,6 +1,6 @@
 /* Multiply indexed container.
  *
- * Copyright 2003-2008 Joaquin M Lopez Munoz.
+ * Copyright 2003-2009 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -522,9 +522,9 @@
 
   void erase_(node_type* x)
   {
+    --node_count;
     super::erase_(x);
     deallocate_node(x);
-    --node_count;
   }
 
   void delete_node_(node_type* x)

Modified: trunk/libs/multi_index/test/test_modifiers.cpp
==============================================================================
--- trunk/libs/multi_index/test/test_modifiers.cpp	(original)
+++ trunk/libs/multi_index/test/test_modifiers.cpp	2009-06-04 09:05:10 EDT (Thu, 04 Jun 2009)
@@ -1,6 +1,6 @@
 /* Boost.MultiIndex test for modifier memfuns.
  *
- * Copyright 2003-2008 Joaquin M Lopez Munoz.
+ * Copyright 2003-2009 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -11,14 +11,17 @@
 #include "test_modifiers.hpp"
 
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
+#include <boost/enable_shared_from_this.hpp>
 #include <boost/next_prior.hpp>
+#include <boost/shared_ptr.hpp>
 #include <iterator>
 #include <vector>
 #include "pre_multi_index.hpp"
 #include "employee.hpp"
-#include <boost/next_prior.hpp>
 #include <boost/test/test_tools.hpp>
 
+using namespace boost::multi_index;
+
 class always_one
 {
 public:
@@ -49,7 +52,51 @@
 } /* namespace boost */
 #endif
 
-using namespace boost::multi_index;
+class linked_object
+{
+  struct impl:boost::enable_shared_from_this<impl>
+  {
+    typedef boost::shared_ptr<const impl> ptr;
+
+    impl(int n_,ptr next_=ptr()):n(n_),next(next_){}
+
+    int n;
+    ptr next;
+  };
+
+  typedef multi_index_container<
+    impl,
+    indexed_by<
+      ordered_unique<member<impl,int,&impl::n> >,
+      hashed_non_unique<member<impl,int,&impl::n> >,
+      sequenced<>,
+      random_access<>
+    >
+  > impl_repository_t;
+
+  static impl_repository_t impl_repository;
+
+public:
+  linked_object(int n):pimpl(init(impl(n))){}
+  linked_object(int n,const linked_object& x):pimpl(init(impl(n,x.pimpl))){}
+
+private:
+  impl::ptr init(const impl& x)
+  {
+    std::pair<impl_repository_t::iterator,bool> p=impl_repository.insert(x);
+    if(p.second)return impl::ptr(&*p.first,&erase_impl);
+    else        return p.first->shared_from_this();
+  }
+
+  static void erase_impl(const impl* p)
+  {
+    impl_repository.erase(p->n);
+  }
+
+  impl::ptr pimpl;
+};
+
+linked_object::impl_repository_t linked_object::impl_repository;
 
 void test_modifiers()
 {
@@ -312,4 +359,11 @@
   BOOST_CHECK(std::distance(c.begin(),c.insert(c.upper_bound(1),1))==8);
   BOOST_CHECK(std::distance(c.begin(),c.insert(boost::prior(c.end()),1))==9);
   BOOST_CHECK(std::distance(c.begin(),c.insert(c.end(),1))==10);
+
+  /* testcase for erase() reentrancy */
+  {
+    linked_object o1(1);
+    linked_object o2(2,o1);
+    o1=o2;
+  }
 }