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

Extracted key_node_compare from tree to tidy a bit the implementation and ease maintenance.

Browse Source
This commit is contained in:
Ion Gaztañaga
2013-12-24 18:58:01 +01:00
parent ed0704797d
commit 95e6ba9839
1 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
include/boost/container/detail/tree.hpp
View File

@@ -294,6 +294,36 @@ class RecyclingCloner
intrusive_container &m_icont; intrusive_container &m_icont;
}; };
template<class KeyValueCompare, class Node>
//where KeyValueCompare is tree_value_compare<Key, Value, KeyCompare, KeyOfValue>
struct key_node_compare
: private KeyValueCompare
{
explicit key_node_compare(const KeyValueCompare &comp)
: KeyValueCompare(comp)
{}
template<class T>
struct is_node
{
static const bool value = is_same<T, Node>::value;
};
template<class T>
typename enable_if_c<is_node<T>::value, const typename KeyValueCompare::value_type &>::type
key_forward(const T &node) const
{ return node.get_data(); }
template<class T>
typename enable_if_c<!is_node<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 KeyValueCompare::operator()(this->key_forward(key1), this->key_forward(key2)); }
};
template <class Key, class Value, class KeyOfValue, template <class Key, class Value, class KeyOfValue,
class KeyCompare, class A, class KeyCompare, class A,
boost::container::tree_type tree_type_value> boost::container::tree_type tree_type_value>
@@ -301,7 +331,7 @@ class tree
: protected container_detail::node_alloc_holder : protected container_detail::node_alloc_holder
< A < A
, typename container_detail::intrusive_tree_type , typename container_detail::intrusive_tree_type
< A, tree_value_compare<Key, Value, KeyCompare, KeyOfValue> < A, tree_value_compare<Key, Value, KeyCompare, KeyOfValue> //ValComp
, tree_type_value>::type , tree_type_value>::type
> >
{ {
@@ -354,36 +384,7 @@ class tree
private: private:
template<class KeyValueCompare> typedef key_node_compare<value_compare, Node> KeyNodeCompare;
struct key_node_compare
: private KeyValueCompare
{
key_node_compare(const KeyValueCompare &comp)
: KeyValueCompare(comp)
{}
template<class T>
struct is_node
{
static const bool value = is_same<T, Node>::value;
};
template<class T>
typename enable_if_c<is_node<T>::value, const value_type &>::type
key_forward(const T &node) const
{ return node.get_data(); }
template<class T>
typename enable_if_c<!is_node<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 KeyValueCompare::operator()(this->key_forward(key1), this->key_forward(key2)); }
};
typedef key_node_compare<value_compare> KeyNodeCompare;
public: public:
typedef container_detail::iterator<iiterator, false> iterator; typedef container_detail::iterator<iiterator, false> iterator;