SMESH: Prevent generator from being deleted

FreeCAD · Jun 15, 2016 · 3814251 · 3814251
1 parent dcf2da7
commit 3814251
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx b/src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx
@@ -60,8 +60,7 @@ typedef std::set<int> TSetOfInt;
 class SMESH_EXPORT  SMESH_Gen
 {
 public:
-  ~SMESH_Gen();
-
+
   static SMESH_Gen* get();
 
   SMESH_Mesh* CreateMesh(int theStudyId, bool theIsEmbeddedMode)
@@ -161,7 +160,9 @@ public:
   // std::map < int, SMESH_3D_Algo * >_map3D_Algo;
 
 protected:
+  //Generator is designed to be a singleton, hence constructor and destructor are not allowed to be used
   SMESH_Gen();
+  ~SMESH_Gen();
   static SMESH_Gen* generator;
 
 private:

diff --git a/src/Mod/MeshPart/App/Mesher.cpp b/src/Mod/MeshPart/App/Mesher.cpp
@@ -368,8 +368,6 @@ Mesh::MeshObject* Mesher::createMesh() const
     delete mesh;
     for (std::list<SMESH_Hypothesis*>::iterator it = hypoth.begin(); it != hypoth.end(); ++it)
         delete *it;
-
-    delete meshgen;
 
     MeshCore::MeshKernel kernel;
     kernel.Adopt(verts, faces, true);