AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-06 21:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from lioncash/iter

Browse Source 
CResourceIterator: Cleanup and undefined behavior prevention
This commit is contained in:
LC 2020-06-11 10:52:41 -04:00 committed by GitHub
commit 9c2b7e4c95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Core/GameProject/CResourceIterator.h
View File

@ -20,6 +20,8 @@ public:
Next();
}
virtual ~CResourceIterator() = default;
virtual CResourceEntry* Next()
{
do
@ -27,7 +29,7 @@ public:
if (mIter != mpkStore->mResourceEntries.end())
{
mpCurEntry = mIter->second;
mIter++;
++mIter;
}
else mpCurEntry = nullptr;
}
@ -36,33 +38,33 @@ public:
return mpCurEntry;
}
inline bool DoneIterating() const
bool DoneIterating() const
{
return mpCurEntry == nullptr;
}
inline operator bool() const
explicit operator bool() const
{
return !DoneIterating();
}
inline CResourceEntry* operator*() const
CResourceEntry* operator*() const
{
return mpCurEntry;
}
inline CResourceEntry* operator->() const
CResourceEntry* operator->() const
{
return mpCurEntry;
}
inline CResourceIterator& operator++()
CResourceIterator& operator++()
{
Next();
return *this;
}
inline CResourceIterator operator++(int)
CResourceIterator operator++(int)
{
CResourceIterator Copy = *this;
Next();
@ -81,7 +83,7 @@ public:
Next();
}
virtual CResourceEntry* Next()
CResourceEntry* Next() override
{
do {
CResourceIterator::Next();