mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-04 03:40:14 +00:00
Define SharedIterator as proper random access iterator
Drop Container template argument as it's always std::vector.
This commit is contained in:
parent
8e3e351015
commit
b621bfcef0
@ -115,20 +115,20 @@ namespace MWWorld
|
|||||||
const T* find(int index) const;
|
const T* find(int index) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class T, class Container = std::vector<T*>>
|
template <class T>
|
||||||
class SharedIterator
|
class SharedIterator
|
||||||
{
|
{
|
||||||
typedef typename Container::const_iterator Iter;
|
|
||||||
|
|
||||||
Iter mIter;
|
|
||||||
|
|
||||||
public:
|
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)
|
SharedIterator() = default;
|
||||||
: mIter(orig.mIter)
|
|
||||||
{
|
SharedIterator(const SharedIterator& other) = default;
|
||||||
}
|
|
||||||
|
|
||||||
SharedIterator(const Iter& iter)
|
SharedIterator(const Iter& iter)
|
||||||
: mIter(iter)
|
: mIter(iter)
|
||||||
@ -151,7 +151,7 @@ namespace MWWorld
|
|||||||
return iter;
|
return iter;
|
||||||
}
|
}
|
||||||
|
|
||||||
SharedIterator& operator+=(int advance)
|
SharedIterator& operator+=(difference_type advance)
|
||||||
{
|
{
|
||||||
mIter += advance;
|
mIter += advance;
|
||||||
return *this;
|
return *this;
|
||||||
@ -178,6 +178,14 @@ namespace MWWorld
|
|||||||
const T& operator*() const { return **mIter; }
|
const T& operator*() const { return **mIter; }
|
||||||
|
|
||||||
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;
|
class ESMStore;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user