jetomit/avp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gcc 3.4 fixes.

Browse source
This commit is contained in:
Dan Olson 2004-08-18 04:20:41 +00:00 • committed by Patryk Obara
parent de29fd1d10
commit ea1bc9bda9
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/win95/hash_tem.hpp
View file

@ -432,24 +432,24 @@ class _base_HashTable
// remove the current entry pointed to, advancing to the next // remove the current entry pointed to, advancing to the next
void Remove() void Remove()
{ {
if (!nEntriesRemaining) if (!ConstIterator::nEntriesRemaining)
{ {
HT_FAIL("HTT: Tried to Remove() via an iterator which was Done()"); HT_FAIL("HTT: Tried to Remove() via an iterator which was Done()");
} }
Node * oldP = *nodePP; Node * oldP = *ConstIterator::nodePP;
*nodePP = oldP->nextP; *ConstIterator::nodePP = oldP->nextP;
delete oldP; delete oldP;
if (!*nodePP) if (!*ConstIterator::nodePP)
{ {
do do
{ {
++ chainPP; ++ ConstIterator::chainPP;
-- nChainsRemaining; -- ConstIterator::nChainsRemaining;
} }
while (nChainsRemaining && !*chainPP); while (ConstIterator::nChainsRemaining && !*ConstIterator::chainPP);
nodePP = chainPP; ConstIterator::nodePP = ConstIterator::chainPP;
} }
-- nEntriesRemaining; -- ConstIterator::nEntriesRemaining;
-- *tableNEntriesP; -- *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(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() ); AddRegardless( it.Get() );
} }