From 2ad3befbcf497e32b901cad28605dc667a07c6c7 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 21 Jan 2021 16:56:50 +0100 Subject: [PATCH] Minimize delta --- src/GEOM_I/GEOM_Gen_Session_i.cc | 4 +--- src/GEOM_I/GEOM_Gen_i.cc | 2 +- src/GEOM_SWIG/GeomHelper.cxx | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/GEOM_I/GEOM_Gen_Session_i.cc b/src/GEOM_I/GEOM_Gen_Session_i.cc index 21a8777f2..6c8528309 100644 --- a/src/GEOM_I/GEOM_Gen_Session_i.cc +++ b/src/GEOM_I/GEOM_Gen_Session_i.cc @@ -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(); } } diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index c13676827..4edd22303 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -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 diff --git a/src/GEOM_SWIG/GeomHelper.cxx b/src/GEOM_SWIG/GeomHelper.cxx index e0a82b384..f4121d9b9 100644 --- a/src/GEOM_SWIG/GeomHelper.cxx +++ b/src/GEOM_SWIG/GeomHelper.cxx @@ -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(&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); -- 2.39.2