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

Sdk/EntityOwner: Prevent copy (Copying an EntityOwner has no use) 

Former-commit-id: 628eb865509a84de19bf97bf8253960d6bfb0005
This commit is contained in:
Lynix 2016-01-19 12:20:38 +01:00
parent e907db7de1
commit 2b85c93433
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SDK/include/NDK/EntityOwner.hpp
View File

@ -16,16 +16,15 @@ namespace Ndk
public: public:
EntityOwner() = default; EntityOwner() = default;
explicit EntityOwner(Entity* entity); explicit EntityOwner(Entity* entity);
EntityOwner(const EntityOwner& handle); EntityOwner(const EntityOwner& handle) = delete;
EntityOwner(EntityOwner&& handle); EntityOwner(EntityOwner&& handle);
~EntityOwner(); ~EntityOwner();
void Reset(Entity* entity = nullptr); void Reset(Entity* entity = nullptr);
void Reset(const EntityOwner& handle);
void Reset(EntityOwner&& handle); void Reset(EntityOwner&& handle);
EntityOwner& operator=(Entity* entity); EntityOwner& operator=(Entity* entity);
EntityOwner& operator=(const EntityOwner& handle); EntityOwner& operator=(const EntityOwner& handle) = delete;
EntityOwner& operator=(EntityOwner&& handle); EntityOwner& operator=(EntityOwner&& handle);
}; };
} }

18
SDK/include/NDK/EntityOwner.inl
View File

@ -14,11 +14,6 @@ namespace Ndk
Reset(entity); Reset(entity);
} }
inline EntityOwner::EntityOwner(const EntityOwner& handle) :
EntityHandle(handle)
{
}
inline EntityOwner::EntityOwner(EntityOwner&& handle) : inline EntityOwner::EntityOwner(EntityOwner&& handle) :
EntityHandle(std::move(handle)) EntityHandle(std::move(handle))
{ {
@ -37,14 +32,10 @@ namespace Ndk
EntityHandle::Reset(entity); EntityHandle::Reset(entity);
} }
inline void EntityOwner::Reset(const EntityOwner& handle)
{
Reset(handle.GetEntity());
}
inline void EntityOwner::Reset(EntityOwner&& handle) inline void EntityOwner::Reset(EntityOwner&& handle)
{ {
Reset(handle.GetEntity()); Reset(handle.GetEntity());
handle.m_entity = nullptr;
} }
inline EntityOwner& EntityOwner::operator=(Entity* entity) inline EntityOwner& EntityOwner::operator=(Entity* entity)
@ -54,13 +45,6 @@ namespace Ndk
return *this; return *this;
} }
inline EntityOwner& EntityOwner::operator=(const EntityOwner& handle)
{
Reset(handle);
return *this;
}
inline EntityOwner& EntityOwner::operator=(EntityOwner&& handle) inline EntityOwner& EntityOwner::operator=(EntityOwner&& handle)
{ {
Reset(std::move(handle)); Reset(std::move(handle));