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

headers/private/kernel/util/OpenHashTable.h, Hugo's version, is a bit nicer than

Browse Source 
Tracker's OpenHashTable.h which it should eventually replace. We've renamed the
class to BOpenHashTable and changed the interface slightly so that HashTableLink
became superfluous.
Adapted all the code that used it. Since the OpenHashTables no longer clash,
this should fix the GCC4 build.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31791 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-07-27 00:39:12 +00:00
parent 8e1857f795
commit 5147963dcd
59 changed files with 346 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/MultiHashTable.h
+9 -9
View File
@@ -21,10 +21,10 @@
template<typename Definition, bool AutoExpand = true,
bool CheckDuplicates = false>
class MultiHashTable : private OpenHashTable<Definition,
class MultiHashTable : private BOpenHashTable<Definition,
AutoExpand, CheckDuplicates> {
public:
typedef OpenHashTable<Definition, AutoExpand, CheckDuplicates> HashTable;
typedef BOpenHashTable<Definition, AutoExpand, CheckDuplicates> HashTable;
typedef MultiHashTable<Definition, AutoExpand, CheckDuplicates> MultiTable;
typedef typename HashTable::Iterator Iterator;
@@ -116,7 +116,7 @@ public:
while (slot) {
if (HashTable::fDefinition.Compare(key, slot))
break;
slot = HashTable::_Link(slot)->fNext;
slot = HashTable::_Link(slot);
}
if (slot == NULL)
@@ -140,18 +140,18 @@ private:
// group values with the same key
for (previous = table[index]; previous
&& !HashTable::fDefinition.CompareValues(previous, value);
previous = HashTable::_Link(previous)->fNext);
previous = HashTable::_Link(previous));
if (previous) {
_Link(value)->fNext = _Link(previous)->fNext;
_Link(previous)->fNext = value;
_Link(value) = _Link(previous);
_Link(previous) = value;
} else {
_Link(value)->fNext = table[index];
_Link(value) = table[index];
table[index] = value;
}
}
// TODO use OpenHashTable's _Resize
// TODO use BOpenHashTable's _Resize
bool _Resize(size_t newSize)
{
ValueType **newTable = new ValueType *[newSize];
@@ -165,7 +165,7 @@ private:
for (size_t i = 0; i < HashTable::fTableSize; i++) {
ValueType *bucket = HashTable::fTable[i];
while (bucket) {
ValueType *next = _Link(bucket)->fNext;
ValueType *next = _Link(bucket);
_Insert(newTable, newSize, bucket);
bucket = next;
}