Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #26457 Factorization of ORB initialization
[modules/kernel.git]
/
src
/
NamingService
/
SALOME_NamingService.cxx
diff --git
a/src/NamingService/SALOME_NamingService.cxx
b/src/NamingService/SALOME_NamingService.cxx
index 898a83c163bd2dcd6055ca2d028f6ec1061c9242..b8daccf6c45d41223ca5f5870ac9f1a7b885f311 100644
(file)
--- a/
src/NamingService/SALOME_NamingService.cxx
+++ b/
src/NamingService/SALOME_NamingService.cxx
@@
-28,6
+28,7
@@
//
#include "SALOME_NamingService.hxx"
#include "ServiceUnreachable.hxx"
//
#include "SALOME_NamingService.hxx"
#include "ServiceUnreachable.hxx"
+#include "OpUtil.hxx"
#include "utilities.h"
#include "utilities.h"
@@
-113,10
+114,7
@@
void SALOME_NamingService::init_orb(CORBA::ORB_ptr orb)
if(orb)
_orb = CORBA::ORB::_duplicate(orb);
else
if(orb)
_orb = CORBA::ORB::_duplicate(orb);
else
- {
- int argc=0;
- _orb = CORBA::ORB_init(argc, 0); // Here we make the assumption that the orb has already been initialized
- }
+ _orb = KERNEL::GetRefToORB(); // Here we make the assumption that the orb has already been initialized
_initialize_root_context();
}
_initialize_root_context();
}