Fix compilation errors after merging KERNEL module from V4_1_0_maintainance branch

diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx
index 27535f84feb0a4463a239b80d10f46218bf00fbd..c2c0141cf1af670ad2fedceb7a5b855ab78c30c4 100644 (file)
--- a/src/Session/Session_ServerCheck.cxx
+++ b/src/Session/Session_ServerCheck.cxx
@@ -32,7 +32,7 @@
 #include "Utils_ORB_INIT.hxx"
 #include "Utils_SINGLETON.hxx"
 #include "SALOME_NamingService.hxx"
-#include "OpUtil.hxx"
+#include "Basics_Utils.hxx"
 #include "utilities.h"
 
 #include <QApplication> 
@@ -484,7 +484,7 @@ void Session_ServerCheck::run()
        SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance();
        ASSERT( SINGLETON_<SALOME_NamingService>::IsAlreadyExisting() );
        NS.init_orb( orb );
-       QString containerName = QString( "/Containers/%1/FactoryServer" ).arg( GetHostname().c_str() );
+       QString containerName = QString( "/Containers/%1/FactoryServer" ).arg( Kernel_Utils::GetHostname().c_str() );
        CORBA::Object_var obj = NS.Resolve( containerName.toLatin1() );
        Engines::Container_var FScontainer = Engines::Container::_narrow( obj );
        if ( !CORBA::is_nil( FScontainer ) ) {
@@ -535,7 +535,7 @@ void Session_ServerCheck::run()
        SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance();
        ASSERT( SINGLETON_<SALOME_NamingService>::IsAlreadyExisting() );
        NS.init_orb( orb );
-       QString containerName = QString( "/Containers/%1/FactoryServerPy" ).arg( GetHostname().c_str() );
+       QString containerName = QString( "/Containers/%1/FactoryServerPy" ).arg( Kernel_Utils::GetHostname().c_str() );
        CORBA::Object_var obj = NS.Resolve( containerName.toLatin1() );
        Engines::Container_var FSPcontainer = Engines::Container::_narrow( obj );
        if ( !CORBA::is_nil( FSPcontainer ) ) {
@@ -586,7 +586,7 @@ void Session_ServerCheck::run()
        SALOME_NamingService &NS = *SINGLETON_<SALOME_NamingService>::Instance();
        ASSERT( SINGLETON_<SALOME_NamingService>::IsAlreadyExisting() );
        NS.init_orb( orb );
-       QString containerName = QString( "/Containers/%1/SuperVisionContainer" ).arg( GetHostname().c_str() );
+       QString containerName = QString( "/Containers/%1/SuperVisionContainer" ).arg( Kernel_Utils::GetHostname().c_str() );
        CORBA::Object_var obj = NS.Resolve( containerName.toLatin1() );
        Engines::Container_var SVcontainer = Engines::Container::_narrow( obj );
        if ( !CORBA::is_nil( SVcontainer ) ) {

diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx
index 45bba979c1a422d43aae7f7feef74b17f978df9d..cf4fc2360f1f4737ed0521148bb1daae675334aa 100755 (executable)
--- a/src/Session/Session_ServerThread.cxx
+++ b/src/Session/Session_ServerThread.cxx
@@ -45,7 +45,7 @@
 #include <Utils_ORB_INIT.hxx>
 #include <Utils_SINGLETON.hxx>
 #include <Utils_SALOME_Exception.hxx>
-#include <OpUtil.hxx>
+#include <Basics_Utils.hxx>
 #include <NamingService_WaitForServerReadiness.hxx>
 #include <utilities.h>
 
@@ -153,7 +153,7 @@ void Session_ServerThread::Init()
        {
          NamingService_WaitForServerReadiness(_NS,"/myStudyManager");
          string containerName = "/Containers/";
-         containerName = containerName + GetHostname();
+         containerName = containerName + Kernel_Utils::GetHostname();
          containerName = containerName + "/FactoryServer";
          NamingService_WaitForServerReadiness(_NS,containerName);
          ActivateSession(_argc, _argv);