bos #26457 Factorization of ORB initialization

[modules/kernel.git] / src / Communication / SALOME_Comm_i.cxx

diff --git a/src/Communication/SALOME_Comm_i.cxx b/src/Communication/SALOME_Comm_i.cxx
index 8698acac42b24c2e81e8f2fcc8d8d728645724e4..57dea54c4e051f63311801ea0dac615cf10954d3 100644 (file)
--- a/src/Communication/SALOME_Comm_i.cxx
+++ b/src/Communication/SALOME_Comm_i.cxx
@@ -30,8 +30,7 @@
 #endif
 #include "omniORB4/poa.h"
 #include "omnithread.h"
-#include "Utils_SINGLETON.hxx"
-#include "Utils_ORB_INIT.hxx"
+#include "OpUtil.hxx"
 #include "Basics_MpiUtils.hxx"
 #include "utilities.h"
 
@@ -39,8 +38,7 @@
 
 #ifndef WIN32
 CORBA::ORB_var &getGlobalORB(){
-  ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance();
-  CORBA::ORB_var &orb = init(0,0);
+  CORBA::ORB_var orb = KERNEL::GetRefToORB();
   return orb;
 }
 #endif