Make value_to_node_compare return type configurable

This commit is contained in:
Ion Gaztañaga
2018-09-15 01:21:47 +02:00
parent 43c0d7a731
commit 60aea31db7

View File

@@ -19,6 +19,8 @@
# pragma once # pragma once
#endif #endif
#include <boost/intrusive/detail/ebo_functor_holder.hpp>
namespace boost { namespace boost {
namespace container { namespace container {
@@ -37,7 +39,7 @@ class equal_to_value
{ return t_ == t; } { return t_ == t; }
}; };
template<class Node, class Pred> template<class Node, class Pred, class Ret = bool>
struct value_to_node_compare struct value_to_node_compare
: Pred : Pred
{ {
@@ -52,22 +54,76 @@ struct value_to_node_compare
: Pred(pred) : Pred(pred)
{} {}
bool operator()(const Node &a, const Node &b) const Ret operator()(const Node &a, const Node &b) const
{ return static_cast<const Pred&>(*this)(a.get_data(), b.get_data()); } { return static_cast<const Pred&>(*this)(a.get_data(), b.get_data()); }
bool operator()(const Node &a) const Ret operator()(const Node &a) const
{ return static_cast<const Pred&>(*this)(a.get_data()); } { return static_cast<const Pred&>(*this)(a.get_data()); }
bool operator()(const Node &a, const Node &b) Ret operator()(const Node &a, const Node &b)
{ return static_cast<Pred&>(*this)(a.get_data(), b.get_data()); } { return static_cast<Pred&>(*this)(a.get_data(), b.get_data()); }
bool operator()(const Node &a) Ret operator()(const Node &a)
{ return static_cast<Pred&>(*this)(a.get_data()); } { return static_cast<Pred&>(*this)(a.get_data()); }
predicate_type & predicate() { return static_cast<predicate_type&>(*this); } predicate_type & predicate() { return static_cast<predicate_type&>(*this); }
const predicate_type & predicate() const { return static_cast<predicate_type&>(*this); } const predicate_type & predicate() const { return static_cast<predicate_type&>(*this); }
}; };
template<class KeyPred, class KeyOfValue, class Node, class Ret = bool>
struct key_node_pred
: public boost::intrusive::detail::ebo_functor_holder<KeyPred>
{
BOOST_CONTAINER_FORCEINLINE explicit key_node_pred(const KeyPred &comp)
: base_t(comp)
{}
typedef boost::intrusive::detail::ebo_functor_holder<KeyPred> base_t;
typedef KeyPred key_predicate;
typedef KeyOfValue key_of_value;
typedef typename KeyOfValue::type key_type;
BOOST_CONTAINER_FORCEINLINE static const key_type &key_from(const Node &n)
{
return key_of_value()(n.get_data());
}
template <class T>
BOOST_CONTAINER_FORCEINLINE static const T &
key_from(const T &t)
{ return t; }
BOOST_CONTAINER_FORCEINLINE const key_predicate &key_pred() const
{ return static_cast<const key_predicate &>(*this); }
BOOST_CONTAINER_FORCEINLINE key_predicate &key_pred()
{ return static_cast<key_predicate &>(*this); }
BOOST_CONTAINER_FORCEINLINE Ret operator()(const key_type &key) const
{ return this->key_pred()(key); }
template<class U>
BOOST_CONTAINER_FORCEINLINE Ret operator()(const U &nonkey) const
{ return this->key_pred()(this->key_from(nonkey)); }
BOOST_CONTAINER_FORCEINLINE bool operator()(const key_type &key1, const key_type &key2) const
{ return this->key_pred()(key1, key2); }
template<class U>
BOOST_CONTAINER_FORCEINLINE bool operator()(const key_type &key1, const U &nonkey2) const
{ return this->key_pred()(key1, this->key_from(nonkey2)); }
template<class U>
BOOST_CONTAINER_FORCEINLINE bool operator()(const U &nonkey1, const key_type &key2) const
{ return this->key_pred()(this->key_from(nonkey1), key2); }
template<class U, class V>
BOOST_CONTAINER_FORCEINLINE bool operator()(const U &nonkey1, const V &nonkey2) const
{ return this->key_pred()(this->key_from(nonkey1), this->key_from(nonkey2)); }
};
} //namespace container { } //namespace container {
} //namespace boost { } //namespace boost {