From 6f50be82aac12d1edb72b127ee9f6b4c1eda57d4 Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Sat, 2 Dec 2017 17:15:57 +0200 Subject: [PATCH] 3MF: Replace ScopeGuard with std::unique_ptr --- code/D3MFImporter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp index 2fcfefa6d..3d1846d21 100644 --- a/code/D3MFImporter.cpp +++ b/code/D3MFImporter.cpp @@ -106,7 +106,7 @@ public: private: aiNode* ReadObject(aiScene* scene) { - ScopeGuard node(new aiNode()); + std::unique_ptr node(new aiNode()); std::vector meshIds; @@ -146,7 +146,7 @@ private: std::copy(meshIds.begin(), meshIds.end(), node->mMeshes); - return node.dismiss(); + return node.release(); }