From ffc58e9806176caca24d1bc9b569b88794e7849a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 20 Mar 2019 17:18:45 +0100 Subject: [PATCH] Fix compilation --- include/Nazara/Utility/GuillotineImageAtlas.hpp | 7 ++++++- src/Nazara/Utility/GuillotineImageAtlas.cpp | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/Nazara/Utility/GuillotineImageAtlas.hpp b/include/Nazara/Utility/GuillotineImageAtlas.hpp index 5a1633113..506922c46 100644 --- a/include/Nazara/Utility/GuillotineImageAtlas.hpp +++ b/include/Nazara/Utility/GuillotineImageAtlas.hpp @@ -21,7 +21,9 @@ namespace Nz { public: GuillotineImageAtlas(); - virtual ~GuillotineImageAtlas(); + GuillotineImageAtlas(const GuillotineImageAtlas&) = delete; + GuillotineImageAtlas(GuillotineImageAtlas&&) noexcept = default; + ~GuillotineImageAtlas() = default; void Clear() override; @@ -38,6 +40,9 @@ namespace Nz void SetRectChoiceHeuristic(GuillotineBinPack::FreeRectChoiceHeuristic heuristic); void SetRectSplitHeuristic(GuillotineBinPack::GuillotineSplitHeuristic heuristic); + GuillotineImageAtlas& operator=(const GuillotineImageAtlas&) = delete; + GuillotineImageAtlas& operator=(GuillotineImageAtlas&&) noexcept = default; + protected: struct Layer; diff --git a/src/Nazara/Utility/GuillotineImageAtlas.cpp b/src/Nazara/Utility/GuillotineImageAtlas.cpp index 4660a69b8..2593bc368 100644 --- a/src/Nazara/Utility/GuillotineImageAtlas.cpp +++ b/src/Nazara/Utility/GuillotineImageAtlas.cpp @@ -19,8 +19,6 @@ namespace Nz { } - GuillotineImageAtlas::~GuillotineImageAtlas() = default; - void GuillotineImageAtlas::Clear() { m_layers.clear();