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

Merge branch 'master' into x86_64

Browse Source
This commit is contained in:
Alex Smith
2012-07-02 09:39:42 +01:00
parent 294711f98c fb8447d595
commit 120585d549
36 changed files with 6752 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/debug_heap.h
+1
View File
@@ -19,6 +19,7 @@ extern "C" {
debug_alloc_pool* create_debug_alloc_pool();
void delete_debug_alloc_pool(debug_alloc_pool* pool);
void* debug_malloc(size_t size);
void* debug_calloc(size_t num, size_t size);
void debug_free(void* address);
void debug_heap_init();
headers/private/kernel/util/AVLTreeMap.h
+2 -2
View File
@@ -26,7 +26,7 @@ namespace AVLTreeMapStrategy {
typename Node;
inline Node* Allocate(const Key& key, const Value& value)
inline void Free(Node* node)
inline Key GetKey(Node* node) const
inline const Key GetKey(const Node* node) const
inline Value& GetValue(Node* node) const
inline AVLTreeNode* GetAVLTreeNode(Node* node) const
inline Node* GetNode(AVLTreeNode* node) const
@@ -622,7 +622,7 @@ public:
fAllocator.Deallocate(node);
}
inline Key& GetKey(Node* node) const
inline const Key& GetKey(const Node* node) const
{
return node->key;
}