From: vsr <vsr@opencascade.com>
Date: Wed, 15 Oct 2008 10:24:52 +0000 (+0000)
Subject: Issue 0019981: integrate patch for compilation with cmake (from E.Adam)
X-Git-Tag: V5_1_0a3~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=01b6488d807a7c45e4f4a420b7a297a5e60d4215;p=modules%2Fkernel.git

Issue 0019981: integrate patch for compilation with cmake (from E.Adam)
---

diff --git a/src/TestContainer/TestContainer.cxx b/src/TestContainer/TestContainer.cxx
index b8f4dfd57..b0893a7a4 100644
--- a/src/TestContainer/TestContainer.cxx
+++ b/src/TestContainer/TestContainer.cxx
@@ -28,7 +28,9 @@
 
 #include "utilities.h"
 #include <iostream>
+#ifndef WNT
 #include <unistd.h>
+#endif
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Component)
 #include CORBA_CLIENT_HEADER(SALOME_TestComponent)
@@ -40,9 +42,8 @@
 #include "Utils_SINGLETON.hxx"
 #include "Utils_SALOME_Exception.hxx"
 #include "Utils_CommException.hxx"
-using namespace std;
 
-static ostream& operator<<(ostream& os, const CORBA::Exception& e)
+static std::ostream& operator<<(std::ostream& os, const CORBA::Exception& e)
 {
   CORBA::Any tmp;
   tmp<<= e;
@@ -60,7 +61,7 @@ static ostream& operator<<(ostream& os, const CORBA::Exception& e)
 }
 
 Engines::TestComponent_ptr create_instance(Engines::Container_ptr iGenFact,
-					   string componenttName)
+					   std::string componenttName)
 {
 #if defined(_DEBUG_) || defined(_DEBUG)
   bool isLib =
@@ -90,8 +91,8 @@ int main (int argc, char * argv[])
   try
     {
       SALOME_NamingService _NS(orb) ;
-      string containerName = "/Containers/" ;
-      string hostName = Kernel_Utils::GetHostname();
+      std::string containerName = "/Containers/" ;
+      std::string hostName = Kernel_Utils::GetHostname();
       containerName += hostName + "/FactoryServer";
       NamingService_WaitForServerReadiness(&_NS,containerName);
 
@@ -101,7 +102,7 @@ int main (int argc, char * argv[])
 
       int nbInstances = 5;
 
-      vector<Engines::TestComponent_var> instances(nbInstances);
+      std::vector<Engines::TestComponent_var> instances(nbInstances);
     
       MESSAGE("------------------------------- create instances ");
       for (int iter = 0; iter < nbInstances ; iter++)
diff --git a/src/TestContainer/TestLogger.cxx b/src/TestContainer/TestLogger.cxx
index 7de0f81e9..0bf2a183e 100644
--- a/src/TestContainer/TestLogger.cxx
+++ b/src/TestContainer/TestLogger.cxx
@@ -28,11 +28,12 @@
 
 #include "utilities.h"
 #include <iostream>
+#ifndef WNT
 #include <unistd.h>
+#endif
 #include <SALOMEconfig.h>
 #include "SALOME_NamingService.hxx"
 #include "OpUtil.hxx"
-using namespace std;
 
 int main (int argc, char * argv[])
 {