feedc0de/boost_intrusive
1
0
Fork 0
forked from boostorg/intrusive
Code Pull Requests Activity

Fixes when using pointers as key_type

Browse Source 
[SVN r70659]
This commit is contained in:
Ion Gaztañaga
2011-03-28 08:50:35 +00:00
parent 3d0b456316
commit 7b1f0e0e53
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/boost/intrusive/detail/utilities.hpp
View File

@@ -207,32 +207,33 @@ struct key_nodeptr_comp
: private detail::ebo_functor_holder<KeyValueCompare> : private detail::ebo_functor_holder<KeyValueCompare>
{ {
typedef typename Container::real_value_traits real_value_traits; typedef typename Container::real_value_traits real_value_traits;
typedef typename Container::value_type value_type;
typedef typename real_value_traits::node_ptr node_ptr; typedef typename real_value_traits::node_ptr node_ptr;
typedef typename real_value_traits::const_node_ptr const_node_ptr; typedef typename real_value_traits::const_node_ptr const_node_ptr;
typedef detail::ebo_functor_holder<KeyValueCompare> base_t; typedef detail::ebo_functor_holder<KeyValueCompare> base_t;
key_nodeptr_comp(KeyValueCompare kcomp, const Container *cont) key_nodeptr_comp(KeyValueCompare kcomp, const Container *cont)
: base_t(kcomp), cont_(cont) : base_t(kcomp), cont_(cont)
{} {}
template<class KeyType> template<class T>
bool operator()( const_node_ptr node, const KeyType &key struct is_node_ptr
, typename enable_if_c
<!is_convertible<KeyType, const_node_ptr>::value>::type * = 0) const
{ return base_t::get()(*cont_->get_real_value_traits().to_value_ptr(node), key); }
template<class KeyType>
bool operator()(const KeyType &key, const_node_ptr node
, typename enable_if_c
<!is_convertible<KeyType, const_node_ptr>::value>::type * = 0) const
{ return base_t::get()(key, *cont_->get_real_value_traits().to_value_ptr(node)); }
bool operator()(const_node_ptr node1, const_node_ptr node2) const
{ {
return base_t::get() static const bool value = is_same<T, const_node_ptr>::value || is_same<T, node_ptr>::value;
( *cont_->get_real_value_traits().to_value_ptr(node1) };
, *cont_->get_real_value_traits().to_value_ptr(node2)
); template<class T>
} typename enable_if_c<is_node_ptr<T>::value, const value_type &>::type
key_forward(const T &node) const
{ return *cont_->get_real_value_traits().to_value_ptr(node); }
template<class T>
typename enable_if_c<!is_node_ptr<T>::value, const T &>::type
key_forward(const T &key) const
{ return key;}
template<class KeyType, class KeyType2>
bool operator()(const KeyType &key1, const KeyType2 &key2) const
{ return base_t::get()(this->key_forward(key1), this->key_forward(key2)); }
const Container *cont_; const Container *cont_;
}; };