boost_mirror/multi_index
1
0
Fork 0
mirror of https://github.com/boostorg/multi_index.git synced 2025-05-11 13:24:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

provided erase() reentrancy even in invariant checking mode

Browse Source 
[SVN r53633]
This commit is contained in:
Joaquín M López Muñoz 2009-06-04 13:05:10 +00:00
parent 45adb9c08a
commit 06b509b35c
2 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/multi_index_container.hpp
View File

@ -1,6 +1,6 @@
/* Multiply indexed container. /* 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. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
@ -522,9 +522,9 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
void erase_(node_type* x) void erase_(node_type* x)
{ {
--node_count;
super::erase_(x); super::erase_(x);
deallocate_node(x); deallocate_node(x);
--node_count;
} }
void delete_node_(node_type* x) void delete_node_(node_type* x)

60
test/test_modifiers.cpp
View File

@ -1,6 +1,6 @@
/* Boost.MultiIndex test for modifier memfuns. /* 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. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
@ -11,14 +11,17 @@
#include "test_modifiers.hpp" #include "test_modifiers.hpp"
#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */ #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/next_prior.hpp>
#include <boost/shared_ptr.hpp>
#include <iterator> #include <iterator>
#include <vector> #include <vector>
#include "pre_multi_index.hpp" #include "pre_multi_index.hpp"
#include "employee.hpp" #include "employee.hpp"
#include <boost/next_prior.hpp>
#include <boost/test/test_tools.hpp> #include <boost/test/test_tools.hpp>
using namespace boost::multi_index;
class always_one class always_one
{ {
public: public:
@ -49,7 +52,51 @@ inline std::size_t hash_value(const always_one& x)
} /* namespace boost */ } /* namespace boost */
#endif #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() void test_modifiers()
{ {
@ -312,4 +359,11 @@ void test_modifiers()
BOOST_CHECK(std::distance(c.begin(),c.insert(c.upper_bound(1),1))==8); 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(boost::prior(c.end()),1))==9);
BOOST_CHECK(std::distance(c.begin(),c.insert(c.end(),1))==10); 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;
}
} }