Merge pull request ufz#1037 from rinkk/memfix20160212

fixing memleak when generating regular prism mesh
rinkk · Feb 12, 2016 · 3d40bc1 · 3d40bc1
2 parents cc1e38a + df8a274
commit 3d40bc1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/MeshLib/MeshGenerators/MeshGenerator.cpp b/MeshLib/MeshGenerators/MeshGenerator.cpp
@@ -9,6 +9,7 @@
 
 #include "MeshGenerator.h"
 
+#include <memory>
 #include <numeric>
 
 #include "MeshLib/Node.h"
@@ -449,11 +450,11 @@ Mesh* MeshGenerator::generateRegularPrismMesh(
 	GeoLib::Point const& origin,
 	std::string   const& mesh_name)
 {
-	MeshLib::Mesh* mesh (
+	std::unique_ptr<MeshLib::Mesh> mesh (
 		generateRegularTriMesh(n_x_cells, n_y_cells, cell_size_x, cell_size_y, origin, mesh_name));
 	std::size_t const n_tris (mesh->getNElements());
 	for (std::size_t i=0; i<n_z_cells; ++i)
-		mesh = MeshLib::addTopLayerToMesh(*mesh, cell_size_z, mesh_name);
+		mesh.reset(MeshLib::addTopLayerToMesh(*mesh, cell_size_z, mesh_name));
 	std::vector<std::size_t> elem_ids (n_tris);
 	std::iota(elem_ids.begin(), elem_ids.end(), 0);
 	return MeshLib::removeElements(*mesh, elem_ids, mesh_name);