Core: Remove NonCopyable

Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4
This commit is contained in:
Lynix
2015-09-24 00:37:21 +02:00
parent b16abf0d09
commit 2fd3872099
39 changed files with 205 additions and 112 deletions

View File

@@ -8,7 +8,6 @@
#define NDK_WORLD_HPP
#include <Nazara/Core/Bitset.hpp>
#include <Nazara/Core/NonCopyable.hpp>
#include <NDK/Entity.hpp>
#include <NDK/EntityHandle.hpp>
#include <NDK/System.hpp>
@@ -19,7 +18,7 @@
namespace Ndk
{
class NDK_API World : NzNonCopyable
class NDK_API World
{
friend Entity;
@@ -27,6 +26,8 @@ namespace Ndk
using EntityList = std::vector<EntityHandle>;
inline World(bool addDefaultSystems = true);
World(const World&) = delete;
World(World&&) = delete; ///TODO
~World();
void AddDefaultSystems();
@@ -60,6 +61,9 @@ namespace Ndk
void Update();
inline void Update(float elapsedTime);
World& operator=(const World&) = delete;
World& operator=(World&&) = delete; ///TODO
private:
inline void Invalidate();
inline void Invalidate(EntityId id);