mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
Code Issues Projects Releases Wiki Activity

Define SharedIterator as proper random access iterator

Browse Source 
Drop Container template argument as it's always std::vector.
This commit is contained in:
elsid 2023-05-28 17:04:44 +02:00
parent 8e3e351015
commit b621bfcef0
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/openmw/mwworld/store.hpp
View File

@ -115,20 +115,20 @@ namespace MWWorld
const T* find(int index) const;
};
template <class T, class Container = std::vector<T*>>
template <class T>
class SharedIterator
{
typedef typename Container::const_iterator Iter;
Iter mIter;
public:
SharedIterator() {}
using Iter = typename std::vector<T*>::const_iterator;
using iterator_category = std::random_access_iterator_tag;
using value_type = T;
using difference_type = std::ptrdiff_t;
using pointer = T*;
using reference = T&;
SharedIterator(const SharedIterator& orig)
: mIter(orig.mIter)
{
}
SharedIterator() = default;
SharedIterator(const SharedIterator& other) = default;
SharedIterator(const Iter& iter)
: mIter(iter)
@ -151,7 +151,7 @@ namespace MWWorld
return iter;
}
SharedIterator& operator+=(int advance)
SharedIterator& operator+=(difference_type advance)
{
mIter += advance;
return *this;
@ -178,6 +178,14 @@ namespace MWWorld
const T& operator*() const { return **mIter; }
const T* operator->() const { return &(**mIter); }
private:
Iter mIter;
friend inline difference_type operator-(const SharedIterator& lhs, const SharedIterator& rhs)
{
return lhs.mIter - rhs.mIter;
}
};
class ESMStore;