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

diff --git a/src/TestContainer/TestContainer.cxx b/src/TestContainer/TestContainer.cxx
index b8f4dfd572badad2a8dcc5a7c7d55998e064ec42..b0893a7a4803fb7f0ec6d2580cd3b467d09ee22f 100644 (file)
--- 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 7de0f81e931e5e8c9baef9d7e8975c2188fbc32d..0bf2a183e105688e01e190e022ecd78ebe31a2d9 100644 (file)
--- 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[])
 {