From: mpv <mpv@opencascade.com>
Date: Tue, 17 Dec 2019 11:37:02 +0000 (+0300)
Subject: Fixes for SMESH working with SHAPERSTUDY
X-Git-Tag: V9_5_0a1~5^2~30
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b6155253f8dcf165edf0b6d0d65165594abf61fb;p=modules%2Fsmesh.git

Fixes for SMESH working with SHAPERSTUDY
---

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index e87641eed..3003a0a52 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -278,7 +278,7 @@ SALOME_LifeCycleCORBA*  SMESH_Gen_i::GetLCC()
 GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( bool isShaper )
 {
   Engines::EngineComponent_ptr temp =
-    GetLCC()->FindOrLoad_Component( isShaper ? "FactoryServerPy" : "FactoryServer",
+    GetLCC()->FindOrLoad_Component( isShaper ? "FactoryServer" : "FactoryServer",
                                     isShaper ? "SHAPERSTUDY" : "GEOM" );
   myGeomGen = GEOM::GEOM_Gen::_narrow( temp );
 
@@ -295,7 +295,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( bool isShaper )
 
 GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( GEOM::GEOM_Object_ptr go )
 {
-  GEOM::GEOM_Gen_var gen;
+  GEOM::GEOM_Gen_ptr gen;
   if ( !CORBA::is_nil( go ))
     gen = go->GetGen();
   return gen;
diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx
index 1e0d6187b..0b258bf08 100644
--- a/src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/src/SMESH_I/SMESH_Gen_i_1.cxx
@@ -255,7 +255,7 @@ TopoDS_Shape SMESH_Gen_i::GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject)
   if ( !theGeomObject->_is_nil() && !theGeomObject->_non_existent() )
   {
     GEOM_Client*           aClient = GetShapeReader();
-    GEOM::GEOM_Gen_ptr aGeomEngine = GetGeomEngine( theGeomObject );
+    GEOM::GEOM_Gen_var aGeomEngine = GetGeomEngine( theGeomObject );
     if ( aClient && !aGeomEngine->_is_nil () )
       S = aClient->GetShape( aGeomEngine, theGeomObject );
   }