From: env <env@opencascade.com>
Date: Wed, 13 Jul 2005 10:11:26 +0000 (+0000)
Subject: ENV: Windows porting. Removed reference to SALOME_container_i, which causes cyclic... 
X-Git-Tag: V3_0_1~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=83cb42511bee1d480192d5da72281e9759c69ece;p=modules%2Fkernel.git

ENV: Windows porting. Removed reference to SALOME_container_i, which causes cyclic dependency on WNT platform.
---

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 388cc4987..7466676a5 100644
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -1,5 +1,5 @@
 #include "SALOME_ResourcesManager.hxx"
-#include "SALOME_Container_i.hxx"
+//#include "SALOME_Container_i.hxx"
 #include "Utils_ExceptHandlers.hxx"
 #include "OpUtil.hxx"
 
@@ -181,16 +181,6 @@ string SALOME_ResourcesManager::FindBest(const Engines::MachineList& listOfMachi
   return _dynamicResourcesSelecter.FindBest(listOfMachines);
 }
 
-bool Engines_Container_i::isPythonContainer(const char* ContainerName)
-{
-  bool ret=false;
-  int len=strlen(ContainerName);
-  if(len>=2)
-    if(strcmp(ContainerName+len-2,"Py")==0)
-      ret=true;
-  return ret;
-}
-
 bool isPythonContainer(const char* ContainerName)
 {
   bool ret=false;
@@ -268,7 +258,7 @@ string SALOME_ResourcesManager::BuildCommandToLaunchLocalContainer(const char *c
 {
   _TmpFileName="";
   string command;
-  if(Engines_Container_i::isPythonContainer(containerName))
+  if(isPythonContainer(containerName))
     command="SALOME_ContainerPy.py ";
   else
     command="SALOME_Container ";
@@ -305,7 +295,7 @@ string SALOME_ResourcesManager::BuildCommand(const string& machine,const char *c
 {
 // rsh -n ikkyo /export/home/rahuel/SALOME_ROOT/bin/runSession SALOME_Container -ORBInitRef NameService=corbaname::dm2s0017:1515 &
   const ParserResourcesType& resInfo=_resourcesList[machine];
-  bool pyCont=Engines_Container_i::isPythonContainer(containerName);
+  bool pyCont=isPythonContainer(containerName);
   string command;
   if(resInfo.Protocol==rsh)
     command = "rsh -n " ;