diff options
| author | Dan Olson <theoddone33@icculus.org> | 2004-08-18 04:20:41 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:37 +0200 |
| commit | ea1bc9bda924fcf38fa80314d2e5c1629f75e5fb (patch) | |
| tree | edca393175261555f07bb56a5bc324344b603892 /src/win95/hash_tem.hpp | |
| parent | de29fd1d10610c971d10a1f1c087a731ca037343 (diff) | |
gcc 3.4 fixes.
Diffstat (limited to 'src/win95/hash_tem.hpp')
| -rw-r--r-- | src/win95/hash_tem.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/win95/hash_tem.hpp b/src/win95/hash_tem.hpp index bc3e6ce..30df53e 100644 --- a/src/win95/hash_tem.hpp +++ b/src/win95/hash_tem.hpp @@ -432,24 +432,24 @@ class _base_HashTable // remove the current entry pointed to, advancing to the next void Remove() { - if (!nEntriesRemaining) + if (!ConstIterator::nEntriesRemaining) { HT_FAIL("HTT: Tried to Remove() via an iterator which was Done()"); } - Node * oldP = *nodePP; - *nodePP = oldP->nextP; + Node * oldP = *ConstIterator::nodePP; + *ConstIterator::nodePP = oldP->nextP; delete oldP; - if (!*nodePP) + if (!*ConstIterator::nodePP) { do { - ++ chainPP; - -- nChainsRemaining; + ++ ConstIterator::chainPP; + -- ConstIterator::nChainsRemaining; } - while (nChainsRemaining && !*chainPP); - nodePP = chainPP; + while (ConstIterator::nChainsRemaining && !*ConstIterator::chainPP); + ConstIterator::nodePP = ConstIterator::chainPP; } - -- nEntriesRemaining; + -- ConstIterator::nEntriesRemaining; -- *tableNEntriesP; } @@ -702,7 +702,7 @@ inline _base_HashTable<TYPE,ARG_TYPE,CMP_ARG_TYPE>::_base_HashTable(_base_HashTa // for(HashTable<TYPE>::ConstIterator it(ht); !it.Done(); it.Next() ) - for (_base_HashTable::ConstIterator it(ht); !it.Done(); it.Next() ) + for (typename _base_HashTable::ConstIterator it(ht); !it.Done(); it.Next() ) { AddRegardless( it.Get() ); } |