ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 09:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Minimize delta

Browse Source
This commit is contained in:
Anthony Geay 2021-01-21 16:56:50 +01:00
parent 0604a7961c
commit 2ad3befbcf
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/GEOM_I/GEOM_Gen_Session_i.cc
View File

@ -59,8 +59,6 @@ extern "C"
const char* interfaceName)
{
GEOM_Gen_Session_i* myGEOM_Gen_i = new GEOM_Gen_Session_i(orb, poa, contId, instanceName, interfaceName);
auto id = poa->activate_object(myGEOM_Gen_i);
myGEOM_Gen_i->setId(id);
return id;
return myGEOM_Gen_i->getId();
}
}

2
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -103,7 +103,7 @@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb,
Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, withRegistry)
{
_thisObj = this;
_id = _poa->activate_object(_thisObj);
_impl = new ::GEOMImpl_Gen;
//PAL10867: disable signals catching with "noexcepthandler" option

3
src/GEOM_SWIG/GeomHelper.cxx
View File

@ -45,8 +45,7 @@ std::string BuildGEOMInstance()
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");
PortableServer::ObjectId *zeId = poa->activate_object(servant);
servant->setId(zeId);
PortableServer::ObjectId *zeId = servant->getId();
CORBA::Object_var zeRef = poa->id_to_reference(*zeId);
char *interfaceName = servant->interfaceName();
std::string interfaceNameCpp(interfaceName);