revert changes of SMESH_Gen class interface of bundled SMESH

src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx

@@ -60,8 +60,8 @@ typedef std::set<int> TSetOfInt;
 class SMESH_EXPORT  SMESH_Gen
 {
 public:
- 
-  static SMESH_Gen* get();
+  SMESH_Gen();
+  ~SMESH_Gen();
 
   SMESH_Mesh* CreateMesh(int theStudyId, bool theIsEmbeddedMode);
 
@@ -158,12 +158,6 @@ public:
   // std::map < int, SMESH_2D_Algo * >_map2D_Algo;
   // 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:
 
   int _localId;                         // unique Id of created objects, within SMESH_Gen entity

src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp

@@ -55,7 +55,6 @@ using namespace std;
 
 //#include <vtkDebugLeaks.h>
 
-SMESH_Gen* SMESH_Gen::generator = nullptr;
 
 //=============================================================================
 /*!
@@ -75,15 +74,6 @@ SMESH_Gen::SMESH_Gen()
   //vtkDebugLeaks::SetExitError(0);
 }
 
-SMESH_Gen* SMESH_Gen::get() {
-
-    if(!generator)
-        generator = new SMESH_Gen();
-    
-    return generator;
-}
-
-
 //=============================================================================
 /*!
  * Destructor

src/Mod/Fem/App/FemMesh.cpp

@@ -90,11 +90,10 @@ using namespace Base;
 using namespace boost;
 
 static int StatCount = 0;
-#if SMESH_VERSION_MAJOR >= 7
-    SMESH_Gen* FemMesh::_mesh_gen = 0;
-#endif
 
-TYPESYSTEM_SOURCE(Fem::FemMesh , Base::Persistence);
+SMESH_Gen* FemMesh::_mesh_gen = 0;
+
+TYPESYSTEM_SOURCE(Fem::FemMesh , Base::Persistence)
 
 FemMesh::FemMesh()
 {
@@ -493,13 +492,9 @@ SMESH_Mesh* FemMesh::getSMesh()
 
 SMESH_Gen * FemMesh::getGenerator()
 {
-#if SMESH_VERSION_MAJOR < 7
-    return SMESH_Gen::get();
-#else
     if (!FemMesh::_mesh_gen)
         FemMesh::_mesh_gen = new SMESH_Gen();
     return FemMesh::_mesh_gen;
-#endif
 }
 
 void FemMesh::addHypothesis(const TopoDS_Shape & aSubShape, SMESH_HypothesisPtr hyp)

src/Mod/Fem/App/FemMesh.h

@@ -161,9 +161,7 @@ private:
     SMESH_Mesh *myMesh;
 
     std::list<SMESH_HypothesisPtr> hypoth;
-#if SMESH_VERSION_MAJOR >= 7
     static SMESH_Gen *_mesh_gen;
-#endif
 };
 
 } //namespace Part

src/Mod/MeshPart/App/Mesher.cpp

@@ -75,9 +75,7 @@
 
 using namespace MeshPart;
 
-#if SMESH_VERSION_MAJOR >= 7
-    SMESH_Gen* Mesher::_mesh_gen = 0;
-#endif
+SMESH_Gen* Mesher::_mesh_gen = 0;
 
 
 MeshingOutput::MeshingOutput() 
@@ -323,13 +321,9 @@ Mesh::MeshObject* Mesher::createMesh() const
 #else
     std::list<SMESH_Hypothesis*> hypoth;
 
-#if SMESH_VERSION_MAJOR < 7
-    SMESH_Gen* meshgen = SMESH_Gen::get();
-#else
-    if (! Mesher::_mesh_gen)
+    if (!Mesher::_mesh_gen)
         Mesher::_mesh_gen = new SMESH_Gen();
     SMESH_Gen* meshgen = Mesher::_mesh_gen;
-#endif
 
     SMESH_Mesh* mesh = meshgen->CreateMesh(0, true);
 

src/Mod/MeshPart/App/Mesher.h

@@ -157,9 +157,7 @@ private:
     std::vector<uint32_t> colors;
     struct Vertex;
 
-#if SMESH_VERSION_MAJOR >= 7
     static SMESH_Gen *_mesh_gen;
-#endif
 };
 
 class MeshingOutput : public std::streambuf