i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AVLTreeMap fixes

Browse Source 
* AVLTreeMap::_GetKey(): Change return type from const Key& to Key, so
  the strategy can do that as well and doesn't have have a Key object in
  the node.
* Fix the Auto strategy: It was using the undefined _GetKey() instead
  of GetKey().
This commit is contained in:
Ingo Weinhold
2011-07-17 16:55:08 +02:00
parent 28559a4e24
commit 3877a7f4a0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/AVLTreeMap.h
+4 -4
View File
@@ -98,7 +98,7 @@ protected:
// strategy shortcuts // strategy shortcuts
inline Node* _Allocate(const Key& key, const Value& value); inline Node* _Allocate(const Key& key, const Value& value);
inline void _Free(Node* node); inline void _Free(Node* node);
inline const Key& _GetKey(Node* node) const; inline Key _GetKey(Node* node) const;
inline Value& _GetValue(Node* node) const; inline Value& _GetValue(Node* node) const;
inline AVLTreeNode* _GetAVLTreeNode(const Node* node) const; inline AVLTreeNode* _GetAVLTreeNode(const Node* node) const;
inline Node* _GetNode(const AVLTreeNode* node) const; inline Node* _GetNode(const AVLTreeNode* node) const;
@@ -486,7 +486,7 @@ _AVL_TREE_MAP_CLASS_NAME::_Free(Node* node)
// _GetKey // _GetKey
_AVL_TREE_MAP_TEMPLATE_LIST _AVL_TREE_MAP_TEMPLATE_LIST
inline const Key& inline Key
_AVL_TREE_MAP_CLASS_NAME::_GetKey(Node* node) const _AVL_TREE_MAP_CLASS_NAME::_GetKey(Node* node) const
{ {
return fStrategy.GetKey(node); return fStrategy.GetKey(node);
@@ -644,12 +644,12 @@ public:
inline int CompareKeyNode(const Key& a, const Node* b) const inline int CompareKeyNode(const Key& a, const Node* b) const
{ {
return fCompare(a, _GetKey(b)); return fCompare(a, GetKey(b));
} }
inline int CompareNodes(const Node* a, const Node* b) const inline int CompareNodes(const Node* a, const Node* b) const
{ {
return fCompare(_GetKey(a), _GetKey(b)); return fCompare(GetKey(a), GetKey(b));
} }
private: private: