From: vsr <vsr@opencascade.com>
Date: Tue, 19 Oct 2021 12:40:12 +0000 (+0300)
Subject: bos #26457 Factorization of ORB initialization
X-Git-Tag: V9_9_0a1~5^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cb56f5738d713d7f2ecb40b5925ce66b2aee734b;p=modules%2Fhomard.git

bos #26457 Factorization of ORB initialization
---

diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx
index 480dff24..a0759a26 100644
--- a/src/HOMARDGUI/HOMARDGUI.cxx
+++ b/src/HOMARDGUI/HOMARDGUI.cxx
@@ -24,8 +24,7 @@
 #include "HOMARDGUI.h"
 
 // SALOME Includes
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
+#include "OpUtil.hxx"
 #include "SALOME_LifeCycleCORBA.hxx"
 
 #include "SUIT_ResourceMgr.h"
@@ -721,9 +720,7 @@ void HOMARDGUI::setOrb()
 {
   try
   {
-     ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance();
-     ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
-     _orb = init( 0 , 0 );
+     _orb = KERNEL::GetRefToORB();
   }
   catch (...)
   {