From 1437009867059c035a3c7b27d02e1ee8edb9b65a Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Fri, 26 Sep 2014 10:10:16 +0000 Subject: [PATCH] makefile, mesh shared ptr --- libsrc/geom2d/Makefile.am | 2 +- libsrc/geom2d/python_geom2d.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libsrc/geom2d/Makefile.am b/libsrc/geom2d/Makefile.am index 5e0b326b..757f9c1e 100644 --- a/libsrc/geom2d/Makefile.am +++ b/libsrc/geom2d/Makefile.am @@ -12,7 +12,7 @@ endif -libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp +libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp python_geom2d.cpp libgeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la libgeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp diff --git a/libsrc/geom2d/python_geom2d.cpp b/libsrc/geom2d/python_geom2d.cpp index 3f12be17..e8b94ce1 100644 --- a/libsrc/geom2d/python_geom2d.cpp +++ b/libsrc/geom2d/python_geom2d.cpp @@ -240,9 +240,9 @@ void ExportGeom2d() })) .def("GenerateMesh", FunctionPointer([](SplineGeometry2d &self, MeshingParameters & mparam) { - Mesh * mesh = NULL; + shared_ptr mesh; self.GenerateMesh(mesh, mparam, 0, 0); - return shared_ptr(mesh); + return mesh; })) ;