X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_SWIG%2FSMeshHelper.cxx;h=ee2d54b05f57210512fe23eccb0696af91b19bcc;hp=036ef29735dd00c80d7a3c763ec0dde17afa623e;hb=9851a42aa94c3c0b3c0ef9a9f9c7a4e039298040;hpb=907c315580012ca7e75c640c88f79e3ff2239276 diff --git a/src/SMESH_SWIG/SMeshHelper.cxx b/src/SMESH_SWIG/SMeshHelper.cxx index 036ef2973..ee2d54b05 100644 --- a/src/SMESH_SWIG/SMeshHelper.cxx +++ b/src/SMESH_SWIG/SMeshHelper.cxx @@ -19,32 +19,15 @@ #include "SMeshHelper.h" -#include "SMESH_Gen_No_Session_i.hxx" -#include "SALOME_Container_i.hxx" #include "SALOME_KernelServices.hxx" +#include "SMESH_Component_Generator.hxx" + #include std::string BuildSMESHInstanceInternal() { - CORBA::ORB_var orb; - { int argc(0); orb = CORBA::ORB_init(argc,nullptr); } - CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); - PortableServer::POA_var poa = PortableServer::POA::_narrow(obj); - PortableServer::POAManager_var pman = poa->the_POAManager(); - PortableServer::ObjectId_var conId; - // - { - char *argv[4] = {"Container","FactoryServer","SMESH",nullptr}; - Engines_Container_i *cont = new Engines_Container_i(orb,poa,"FactoryServer",2,argv,false,false); - conId = poa->activate_object(cont); - } - // - pman->activate(); - // - SMESH_Gen_No_Session_i *servant = new SMESH_Gen_No_Session_i(orb,poa,const_cast(&conId.in()),"SMESH_inst_2","SMESH"); - PortableServer::ObjectId *zeId = servant->getId(); - CORBA::Object_var zeRef = poa->id_to_reference(*zeId); - CORBA::String_var ior = orb->object_to_string(zeRef); - return std::string(ior.in()); + Engines::EngineComponent_var zeRef = RetrieveSMESHInstance(); + CORBA::String_var ior = KERNEL::getORB()->object_to_string(zeRef); + return std::string(ior.in()); }