From 1086800958f46da503a1f8169ef32b1758109fdf Mon Sep 17 00:00:00 2001
From: env <env@opencascade.com>
Date: Thu, 4 Aug 2005 09:43:43 +0000
Subject: [PATCH] ENV: Windows porting

---
 src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx    | 2 +-
 src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx    | 2 +-
 src/HDFPersist/HDFdataset.cc                             | 2 +-
 src/HDFPersist/HDFfile.cc                                | 2 +-
 src/Logger/SALOME_Logger_Server.cxx                      | 5 +----
 src/Logger/SALOME_Logger_Server.hxx                      | 9 +++++++++
 src/Registry/SALOME_Registry_Server.cxx                  | 4 ++--
 .../SALOME_RessourcesCatalog_Client.cxx                  | 2 +-
 src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx                  | 9 +++++++++
 9 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx
index 580d16b5c..81008bcc6 100644
--- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx
+++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx
@@ -26,7 +26,7 @@
 
 /* $Header$ */
 
-#include <iostream.h>
+#include <iostream>
 #include "SALOME_NamingService.hxx"
 #include "SALOME_DataTypeCatalog.hh"
 #include <string>
diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx
index fad902b73..12eb91004 100644
--- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx
+++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx
@@ -26,7 +26,7 @@
 //  Module : SALOME
 //  $Header$
 
-#include <iostream.h>
+#include <iostream>
 #include "SALOME_NamingService.hxx"
 #include "SALOME_DataTypeCatalog_impl.hxx"
 #include "utilities.h"
diff --git a/src/HDFPersist/HDFdataset.cc b/src/HDFPersist/HDFdataset.cc
index ac02e32db..84a2f5ae6 100644
--- a/src/HDFPersist/HDFdataset.cc
+++ b/src/HDFPersist/HDFdataset.cc
@@ -33,7 +33,7 @@ extern "C"
 #include "HDFcontainerObject.hxx"
 #include "HDFexception.hxx"
 
-#include <iostream.h>
+#include <iostream>
 using namespace std;
 
 herr_t dataset_attr(hid_t loc_id, const char *attr_name, void *operator_data)
diff --git a/src/HDFPersist/HDFfile.cc b/src/HDFPersist/HDFfile.cc
index ee987f73a..02ed93f1f 100644
--- a/src/HDFPersist/HDFfile.cc
+++ b/src/HDFPersist/HDFfile.cc
@@ -35,7 +35,7 @@ extern "C"
 #endif
 #include <string.h>
 }
-#include <iostream.h>
+#include <iostream>
 #include "HDFfile.hxx"
 #include "HDFexception.hxx"
 using namespace std;
diff --git a/src/Logger/SALOME_Logger_Server.cxx b/src/Logger/SALOME_Logger_Server.cxx
index 58685ea6a..4464c835b 100644
--- a/src/Logger/SALOME_Logger_Server.cxx
+++ b/src/Logger/SALOME_Logger_Server.cxx
@@ -51,11 +51,8 @@ void Logger::putMessage(const char* message)
 {
   myLock.lock();
   if (m_putIntoFile)
-#ifndef WNT
+
 	m_outputFile << message << std::flush;
-#else
-	m_outputFile << message << flush;
-#endif
   else
     std::cout << message;
   myLock.unlock();
diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index 4b1441bd1..086a0f7f9 100644
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -11,7 +11,12 @@
 #if !defined SALOME_Logger_Server_include
 #define SALOME_Logger_Server_include
 
+#ifndef WNT
 #include <fstream.h>
+#else
+#include <fstream>
+#include <iosfwd>
+#endif
 #include <omnithread.h>
 #include "Logger.hh"
 
@@ -35,7 +40,11 @@ private:
 	//otherwise all messages will be put into terminal via cout 
         bool m_putIntoFile;
 	//ofstream class specialized for disk file output
+#ifndef WNT
         ofstream m_outputFile; 
+#else
+		std::ofstream m_outputFile; 
+#endif
 	//synchronisation object
 	static omni_mutex myLock;
 };
diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx
index c5191de51..ab79d199a 100644
--- a/src/Registry/SALOME_Registry_Server.cxx
+++ b/src/Registry/SALOME_Registry_Server.cxx
@@ -27,8 +27,8 @@
 //  $Header$
 
 #include <stdlib.h>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 
 extern "C"
 {
diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx
index e6704afc4..9fef8478b 100644
--- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx
+++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Client.cxx
@@ -26,7 +26,7 @@
 
 /* $Header$ */
 
-#include <iostream.h>
+#include <iostream>
 #include "SALOME_NamingService.hxx"
 #include <SALOMEconfig.h>
 #ifndef WNT
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
index e617f3e1e..a39ebf1e2 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx
@@ -24,7 +24,11 @@ DEFINE_STANDARD_HANDLE( SALOMEDSImpl_Study, MMgt_TShared )
 #include <TColStd_SequenceOfAsciiString.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
+#ifndef WNT
 #include <NCollection_DataMap.hxx>
+#else
+#include <NCollection_DataMap1.hxx>
+#endif
 
 //SALOMEDSImpl headers
 #include "SALOMEDSImpl_SComponentIterator.hxx"
@@ -40,8 +44,13 @@ DEFINE_STANDARD_HANDLE( SALOMEDSImpl_Study, MMgt_TShared )
 class SALOMEDSImpl_StudyManager;
 class SALOMEDSImpl_GenericAttribute;
 
+#ifndef WNT
 typedef NCollection_DataMap <TCollection_AsciiString, Handle_Standard_Transient> DataMapOfAsciiStringTransient;
 typedef NCollection_DataMap <TCollection_AsciiString, TDF_Label> DataMapAsciiStringLabel;
+#else
+typedef NCollection_DataMap1 <TCollection_AsciiString, Handle_Standard_Transient> DataMapOfAsciiStringTransient;
+typedef NCollection_DataMap1 <TCollection_AsciiString, TDF_Label> DataMapAsciiStringLabel;
+#endif
 
 class SALOMEDSImpl_Study : public MMgt_TShared 
 {
-- 
2.39.2