Use std::unique_ptr for managing memory

[libs/gltk.git] / source / partcache.cpp

diff --git a/source/partcache.cpp b/source/partcache.cpp
index 8b425c2b0a5f255c553d91e67fcca67497c6dd0a..560db298e8edca248b42c32bbc0926f370b70e68 100644 (file)
--- a/source/partcache.cpp
+++ b/source/partcache.cpp
@@ -6,30 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-CachedPart::CachedPart(CachedPart &&other):
-       part(other.part),
-       texture(other.texture),
-       mesh(other.mesh)
-{
-       other.mesh = nullptr;
-}
-
-CachedPart &CachedPart::operator=(CachedPart &&other)
-{
-       delete mesh;
-       part = other.part;
-       texture = other.texture;
-       mesh = other.mesh;
-       other.mesh = nullptr;
-       return *this;
-}
-
-CachedPart::~CachedPart()
-{
-       delete mesh;
-}
-
-
 void PartCache::begin_rebuild()
 {
        if(rebuilding)
@@ -80,7 +56,7 @@ GL::Mesh &PartCache::create_mesh(const Part &part, const GL::Texture2D &tex)
        {
                current = parts.insert(next, CachedPart());
                current->texture = &tex;
-               current->mesh = new GL::Mesh((GL::TEXCOORD2, GL::COLOR4,GL::UNSIGNED_BYTE, GL::VERTEX2));
+               current->mesh = make_unique<GL::Mesh>((GL::TEXCOORD2, GL::COLOR4,GL::UNSIGNED_BYTE, GL::VERTEX2));
        }
        else
                current->mesh->clear();