From: Anthony Geay <anthony.geay@edf.fr>
Date: Mon, 22 Feb 2021 15:22:23 +0000 (+0100)
Subject: Small modif due to modif of KERNEL Container modifications
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=75250946ae23aac1ec97d52a8c761321a1fecfa0;p=modules%2Fgeom.git

Small modif due to modif of KERNEL Container modifications
---

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index bc39a219f..0b9482dfb 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -195,7 +195,7 @@ bool GeometryGUI::IsInGeomComponent( _PTR(SObject) sobject )
 //=======================================================================
 SALOMEDS::Study_var GeometryGUI::getStudyServant()
 {
-  SALOME_NamingService *aNamingService = SalomeApp_Application::namingService();
+  SALOME_NamingService_Abstract *aNamingService = SalomeApp_Application::namingService();
   CORBA::Object_var aStudyObject = aNamingService->Resolve("/Study");
   SALOMEDS::Study_var aStudy = SALOMEDS::Study::_narrow(aStudyObject);
   return aStudy._retn();
diff --git a/src/GEOM_SWIG/GeomHelper.cxx b/src/GEOM_SWIG/GeomHelper.cxx
index 1b9eaa27f..c0601f7ff 100644
--- a/src/GEOM_SWIG/GeomHelper.cxx
+++ b/src/GEOM_SWIG/GeomHelper.cxx
@@ -34,17 +34,12 @@ std::string BuildGEOMInstance()
     PortableServer::POAManager_var pman = poa->the_POAManager();
     CORBA::PolicyList policies;
     policies.length(0);
-    PortableServer::ObjectId_var conId;
-    //
-    {
-        char *argv[4] = {"Container","FactoryServer","GEOM",nullptr};
-        Engines_Container_i *cont = new Engines_Container_i(orb,poa,"FactoryServer",2,argv,false,false);
-        conId = poa->activate_object(cont);
-    }
+    Engines_Container_i *cont( KERNEL::getContainerSA() );
+    PortableServer::ObjectId * conId ( cont->getCORBAId() );
     //
     pman->activate();
     //
-    GEOM_Gen_No_Session_i *servant = new GEOM_Gen_No_Session_i(orb,poa,const_cast<PortableServer::ObjectId*>(&conId.in()),"GEOM_inst_2","GEOM");
+    GEOM_Gen_No_Session_i *servant = new GEOM_Gen_No_Session_i(orb,poa,conId,"GEOM_inst_2","GEOM");
     PortableServer::ObjectId *zeId = servant->getId();
     CORBA::Object_var zeRef = poa->id_to_reference(*zeId);
     char *interfaceName = servant->interfaceName();