fixed DrawQueue iterator for msvc
This commit is contained in:
parent
328bee1656
commit
80c352f1d7
|
|
@ -81,7 +81,6 @@ project "Engine-Core"
|
||||||
"gdi32",
|
"gdi32",
|
||||||
"freetype",
|
"freetype",
|
||||||
"sfml-audio-s",
|
"sfml-audio-s",
|
||||||
"openal32",
|
|
||||||
"flac",
|
"flac",
|
||||||
"vorbisfile",
|
"vorbisfile",
|
||||||
"vorbis",
|
"vorbis",
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
|
|
||||||
|
|
||||||
class Sprite;
|
class Sprite;
|
||||||
|
|
||||||
namespace container
|
namespace container
|
||||||
|
|
@ -34,7 +35,8 @@ public:
|
||||||
difference_type operator-(iterator) const;
|
difference_type operator-(iterator) const;
|
||||||
friend iterator operator+(difference_type, iterator);
|
friend iterator operator+(difference_type, iterator);
|
||||||
|
|
||||||
Sprite& operator*();
|
Sprite& operator*() const;
|
||||||
|
|
||||||
Sprite* operator->();
|
Sprite* operator->();
|
||||||
Sprite& operator[](size_type);
|
Sprite& operator[](size_type);
|
||||||
|
|
||||||
|
|
@ -113,4 +115,4 @@ private:
|
||||||
size_type m_capacity;
|
size_type m_capacity;
|
||||||
};
|
};
|
||||||
|
|
||||||
}//namespace
|
}//namespace
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
#include <Entities/Components.h>
|
#include <Entities/Components.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
container::DrawQueue::iterator operator+(container::DrawQueue::iterator::difference_type offset, container::DrawQueue::iterator it)
|
static container::DrawQueue::iterator operator+(container::DrawQueue::iterator::difference_type offset, container::DrawQueue::iterator it)
|
||||||
{
|
{
|
||||||
return it + offset;
|
return it + offset;
|
||||||
}
|
}
|
||||||
|
|
@ -68,11 +68,12 @@ namespace container
|
||||||
return m_ptr - other.m_ptr;
|
return m_ptr - other.m_ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
Sprite& DrawQueue::iterator::operator*()
|
Sprite& DrawQueue::iterator::operator*() const
|
||||||
{
|
{
|
||||||
return *m_ptr;
|
return *m_ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Sprite* DrawQueue::iterator::operator->()
|
Sprite* DrawQueue::iterator::operator->()
|
||||||
{
|
{
|
||||||
return m_ptr;
|
return m_ptr;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue