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

don't use extra space for rbtree checkers

Browse Source
This commit is contained in:
Matei David
2014-08-14 13:54:21 -04:00
parent 8d33637971
commit 11633b7d24
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/boost/intrusive/rbtree_algorithms.hpp
View File

@@ -68,12 +68,7 @@ struct rbtree_node_checker
typedef typename value_traits::node_traits node_traits; typedef typename value_traits::node_traits node_traits;
typedef typename node_traits::node_ptr node_ptr; typedef typename node_traits::node_ptr node_ptr;
struct return_type typedef typename base_checker_t::return_type return_type;
: public base_checker_t::return_type
{
return_type() : is_red(false) {}
bool is_red;
};
rbtree_node_checker(const NodePtrCompare& comp, ExtraChecker extra_checker) rbtree_node_checker(const NodePtrCompare& comp, ExtraChecker extra_checker)
: base_checker_t(comp, extra_checker) : base_checker_t(comp, extra_checker)
@@ -83,11 +78,12 @@ struct rbtree_node_checker
const return_type& check_return_left, const return_type& check_return_right, const return_type& check_return_left, const return_type& check_return_right,
return_type& check_return) return_type& check_return)
{ {
check_return.is_red = (node_traits::get_color(p) == node_traits::red()); if (node_traits::get_color(p) == node_traits::red())
if (check_return.is_red)
{ {
BOOST_INTRUSIVE_INVARIANT_ASSERT(!check_return_left.is_red); if (node_traits::get_left(p))
BOOST_INTRUSIVE_INVARIANT_ASSERT(!check_return_right.is_red); BOOST_INTRUSIVE_INVARIANT_ASSERT(node_traits::get_color(node_traits::get_left(p)) == node_traits::black());
if (node_traits::get_right(p))
BOOST_INTRUSIVE_INVARIANT_ASSERT(node_traits::get_color(node_traits::get_right(p)) == node_traits::black());
} }
base_checker_t::operator()(p, check_return_left, check_return_right, check_return); base_checker_t::operator()(p, check_return_left, check_return_right, check_return);
} }