boostorg/intrusive
1
0
Fork 1
mirror of https://github.com/boostorg/intrusive.git synced 2025-08-02 14:04:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #9961: tests for hooks not derived frorm generic_hook

Browse Source
This commit is contained in:
Ion Gaztañaga
2014-05-01 10:21:40 +02:00
parent 09991acfb5
commit 9169db7f57
3 changed files with 93 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/intrusive.qbk
View File

@@ -3800,6 +3800,7 @@ to be inserted in intrusive containers are allocated using `std::vector` or `std
* [@https://svn.boost.org/trac/boost/ticket/9746 #9746: Modern Sun CC compiler detects error in intrusive library header] * [@https://svn.boost.org/trac/boost/ticket/9746 #9746: Modern Sun CC compiler detects error in intrusive library header]
* [@https://svn.boost.org/trac/boost/ticket/9940 #9940: bad bug in intrusive list with safe_link (or auto_unlink) hooks] * [@https://svn.boost.org/trac/boost/ticket/9940 #9940: bad bug in intrusive list with safe_link (or auto_unlink) hooks]
* [@https://svn.boost.org/trac/boost/ticket/9949 #9949: clear header node hooks upon intrusive container destruction] * [@https://svn.boost.org/trac/boost/ticket/9949 #9949: clear header node hooks upon intrusive container destruction]
* [@https://svn.boost.org/trac/boost/ticket/9961 #9961: tests for hooks not derived frorm generic_hook]
* Optimized tree rebalancing code to avoid redundant assignments. * Optimized tree rebalancing code to avoid redundant assignments.

3
proj/vc7ide/_intrusivelib/_intrusivelib.vcproj
View File

@@ -318,6 +318,9 @@
<File <File
RelativePath="..\..\..\test\Jamfile.v2"> RelativePath="..\..\..\test\Jamfile.v2">
</File> </File>
<File
RelativePath="..\..\..\test\nonhook_node.hpp">
</File>
<File <File
RelativePath="..\..\..\test\smart_ptr.hpp"> RelativePath="..\..\..\test\smart_ptr.hpp">
</File> </File>

167
test/nonhook_node.hpp
View File

@@ -1,106 +1,117 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Matei David 2014-2014.
// (C) Copyright Ion Gaztanaga 2014-2014.
//
// 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)
//
// See http://www.boost.org/libs/intrusive for documentation.
//
/////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_INTRUSIVE_DETAIL_NONHOOK_NODE_HPP #ifndef BOOST_INTRUSIVE_DETAIL_NONHOOK_NODE_HPP
#define BOOST_INTRUSIVE_DETAIL_NONHOOK_NODE_HPP #define BOOST_INTRUSIVE_DETAIL_NONHOOK_NODE_HPP
#include <boost/intrusive/detail/config_begin.hpp> #include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/list.hpp>
#include <boost/intrusive/pointer_traits.hpp> #include <boost/intrusive/pointer_traits.hpp>
#include <boost/intrusive/detail/utilities.hpp> #include <boost/intrusive/detail/utilities.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <boost/static_assert.hpp>
namespace boost{ namespace boost{
namespace intrusive{ namespace intrusive{
//This node will only be used in safe or auto unlink modes
//so test it's been properly released
template < typename Node_Traits, template <typename> class Node_Algorithms > template < typename Node_Traits, template <typename> class Node_Algorithms >
struct nonhook_node_member : public Node_Traits::node struct nonhook_node_member : public Node_Traits::node
{ {
typedef Node_Traits node_traits; typedef Node_Traits node_traits;
typedef typename node_traits::node node; typedef typename node_traits::node node;
typedef typename node_traits::node_ptr node_ptr; typedef typename node_traits::node_ptr node_ptr;
typedef typename node_traits::const_node_ptr const_node_ptr; typedef typename node_traits::const_node_ptr const_node_ptr;
typedef Node_Algorithms< node_traits > node_algorithms; typedef Node_Algorithms< node_traits > node_algorithms;
nonhook_node_member() nonhook_node_member()
{ {
node_algorithms::init(pointer_traits<node_ptr>::pointer_to(static_cast< node& >(*this))); node_algorithms::init(pointer_traits<node_ptr>::pointer_to(static_cast< node& >(*this)));
} }
nonhook_node_member(const nonhook_node_member& rhs)
{
if (rhs.is_linked())
{
std::cerr << "nonhook_node_member copy ctor from linked: &=" << (void*)this << ", rhs=" << (void*)&rhs << std::endl;
}
*this = rhs;
}
nonhook_node_member& operator = (const nonhook_node_member& rhs)
{
if (is_linked() or rhs.is_linked())
{
std::cerr << "nonhook_node_member copy asop to/from linked: &=" << (void*)this << ", rhs=" << (void*)&rhs << std::endl;
}
static_cast< node& >(*this) = rhs;
return *this;
}
~nonhook_node_member()
{
if (is_linked())
{
std::cerr << "nonhook_node_member dtor of linked: &=" << (void*)this << std::endl;
}
node_algorithms::init(pointer_traits<node_ptr>::pointer_to(static_cast< node& >(*this)));
}
void swap_nodes(nonhook_node_member& other) nonhook_node_member(const nonhook_node_member& rhs)
{ {
node_algorithms::swap_nodes(pointer_traits<node_ptr>::pointer_to(static_cast< node& >(*this)), BOOST_TEST(!rhs.is_linked());
pointer_traits<node_ptr>::pointer_to(static_cast< node& >(other))); *this = rhs;
} }
bool is_linked() const
{ nonhook_node_member& operator = (const nonhook_node_member& rhs)
return !node_algorithms::unique(pointer_traits<const_node_ptr>::pointer_to(static_cast< const node& >(*this))); {
} BOOST_TEST(!this->is_linked() && !rhs.is_linked());
static_cast< node& >(*this) = rhs;
return *this;
}
~nonhook_node_member()
{
BOOST_TEST(!this->is_linked());
node_algorithms::init(pointer_traits<node_ptr>::pointer_to(static_cast< node& >(*this)));
}
void swap_nodes(nonhook_node_member& other)
{
node_algorithms::swap_nodes(pointer_traits<node_ptr>::pointer_to(static_cast< node& >(*this)),
pointer_traits<node_ptr>::pointer_to(static_cast< node& >(other)));
}
bool is_linked() const
{
return !node_algorithms::unique(pointer_traits<const_node_ptr>::pointer_to(static_cast< const node& >(*this)));
}
}; };
template < typename T, typename NonHook_Member, NonHook_Member T::* P, link_mode_type Link_Mode > template < typename T, typename NonHook_Member, NonHook_Member T::* P, link_mode_type Link_Mode >
struct nonhook_node_member_value_traits struct nonhook_node_member_value_traits
{ {
typedef T value_type; typedef T value_type;
typedef typename NonHook_Member::node_traits node_traits; typedef typename NonHook_Member::node_traits node_traits;
typedef typename node_traits::node node; typedef typename node_traits::node node;
typedef typename node_traits::node_ptr node_ptr; typedef typename node_traits::node_ptr node_ptr;
typedef typename node_traits::const_node_ptr const_node_ptr; typedef typename node_traits::const_node_ptr const_node_ptr;
typedef typename pointer_traits<node_ptr>:: typedef typename pointer_traits<node_ptr>::
template rebind_pointer<T>::type pointer; template rebind_pointer<T>::type pointer;
typedef typename pointer_traits<node_ptr>:: typedef typename pointer_traits<node_ptr>::
template rebind_pointer<const T>::type const_pointer; template rebind_pointer<const T>::type const_pointer;
typedef T & reference; typedef T & reference;
typedef const T & const_reference; typedef const T & const_reference;
static const link_mode_type link_mode = Link_Mode; static const link_mode_type link_mode = Link_Mode;
static node_ptr to_node_ptr(reference value) BOOST_STATIC_ASSERT((Link_Mode == safe_link || Link_Mode == auto_unlink));
{
return pointer_traits<node_ptr>::pointer_to(static_cast<node&>(value.*P));
}
static const_node_ptr to_node_ptr(const_reference value) static node_ptr to_node_ptr(reference value)
{ {
return pointer_traits<const_node_ptr>::pointer_to(static_cast<const node&>(value.*P)); return pointer_traits<node_ptr>::pointer_to(static_cast<node&>(value.*P));
} }
static pointer to_value_ptr(node_ptr n)
{
return pointer_traits<pointer>::pointer_to
(*detail::parent_from_member<T, NonHook_Member>
(static_cast<NonHook_Member*>(boost::intrusive::detail::to_raw_pointer(n)), P));
}
static const_pointer to_value_ptr(const_node_ptr n) static const_node_ptr to_node_ptr(const_reference value)
{ {
return pointer_traits<const_pointer>::pointer_to return pointer_traits<const_node_ptr>::pointer_to(static_cast<const node&>(value.*P));
(*detail::parent_from_member<T, NonHook_Member> }
(static_cast<const NonHook_Member*>(boost::intrusive::detail::to_raw_pointer(n)), P));
} static pointer to_value_ptr(node_ptr n)
{
return pointer_traits<pointer>::pointer_to
(*detail::parent_from_member<T, NonHook_Member>
(static_cast<NonHook_Member*>(boost::intrusive::detail::to_raw_pointer(n)), P));
}
static const_pointer to_value_ptr(const_node_ptr n)
{
return pointer_traits<const_pointer>::pointer_to
(*detail::parent_from_member<T, NonHook_Member>
(static_cast<const NonHook_Member*>(boost::intrusive::detail::to_raw_pointer(n)), P));
}
}; };
} }