sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'enet_wip_nothing_to_see_here' of https://github.com/DigitalPulseSoftware/NazaraEngine into enet_wip_nothing_to_see_here

This commit is contained in:
Jérôme Leclercq 2017-06-01 17:25:37 +02:00
parent 17d9cd6e7d 3b914422c8
commit b175122791
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SDK/include/NDK/EntityList.hpp
View File

@ -59,11 +59,11 @@ namespace Ndk
friend EntityList;
public:
inline iterator(const iterator& iterator);
inline iterator(const iterator& it);
const EntityHandle& operator*() const;
inline iterator& operator=(const iterator& iterator);
inline iterator& operator=(const iterator& it);
inline iterator& operator++();
inline iterator operator++(int);

12
SDK/include/NDK/EntityList.inl
View File

@ -207,16 +207,16 @@ namespace Ndk
{
}
inline EntityList::iterator::iterator(const iterator& iterator) :
m_nextEntityId(iterator.m_nextEntityId),
m_list(iterator.m_list)
inline EntityList::iterator::iterator(const iterator& it) :
m_nextEntityId(it.m_nextEntityId),
m_list(it.m_list)
{
}
inline EntityList::iterator& EntityList::iterator::operator=(const iterator& iterator)
inline EntityList::iterator& EntityList::iterator::operator=(const iterator& it)
{
m_nextEntityId = iterator.m_nextEntityId;
m_list = iterator.m_list;
m_nextEntityId = it.m_nextEntityId;
m_list = it.m_list;
return *this;
}