mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
/W4: Fixed name shadowing warning
This commit is contained in:
parent
4ed1ad75d1
commit
678199d6ca
@ -167,21 +167,21 @@ CConCommandHash::CCommandHashIterator_t
|
||||
CConCommandHash::Next(const CConCommandHash::CCommandHashIterator_t& iter) const
|
||||
{
|
||||
// look for the next entry in the current bucket
|
||||
CCommandHashHandle_t next = m_aDataPool.Next(iter.handle);
|
||||
CCommandHashHandle_t nextEntry = m_aDataPool.Next(iter.handle);
|
||||
const CCommandHashHandle_t invalidIndex = m_aDataPool.InvalidIndex();
|
||||
if (next != invalidIndex)
|
||||
if (nextEntry != invalidIndex)
|
||||
{
|
||||
// this bucket still has more elements in it
|
||||
return CCommandHashIterator_t(iter.bucket, next);
|
||||
return CCommandHashIterator_t(iter.bucket, nextEntry);
|
||||
}
|
||||
|
||||
// otherwise look for the next bucket with data
|
||||
int bucketCount = m_aBuckets.Count();
|
||||
for (int bucket = iter.bucket + 1; bucket < bucketCount; ++bucket)
|
||||
{
|
||||
CCommandHashHandle_t next = m_aBuckets[bucket]; // get the head of the bucket
|
||||
if (next != invalidIndex)
|
||||
return CCommandHashIterator_t(bucket, next);
|
||||
CCommandHashHandle_t nextBucket = m_aBuckets[bucket]; // get the head of the bucket
|
||||
if (nextBucket != invalidIndex)
|
||||
return CCommandHashIterator_t(bucket, nextBucket);
|
||||
}
|
||||
|
||||
// if we're here, there's no more data to be had
|
||||
|
Loading…
x
Reference in New Issue
Block a user