ENV: Windows porting

diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Client.cxx
index 580d16b5c537990178ce2b94a63829f2246172f7..81008bcc697b7c5ebc30dbd45228c3aec88cda65 100644 (file)
--- 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 fad902b73351a4795606fb3cf85afe74cee723c5..12eb91004bebbb790be27d983d2dc9e0d14eb554 100644 (file)
--- 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 ac02e32dbc2687bd0a1c096d159b2f16a59b9004..84a2f5ae633eb0cf75e0f30a7570f6039a9812b9 100644 (file)
--- 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 ee987f73a95848addc797c5d06c915889d519e45..02ed93f1f664c082067f7f840913af27ca2e72e8 100644 (file)
--- 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 58685ea6af7047bf327206a2c2b30bf4b2bd095c..4464c835b3601d3118b8ca00112c379b1bf8960e 100644 (file)
--- 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 4b1441bd119b05858b699ee307e1b8e560461018..086a0f7f9e727100be315f6b6112d03826b0e4f7 100644 (file)
--- 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 c5191de51d2b1105382b123b53fb14a3e5f6815c..ab79d199a134416547aae80d573afd0f835af470 100644 (file)
--- 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 e6704afc494720b9a8473936283a3c56aa4f0be5..9fef8478bfc9eaf64a8dde989373c1672fd4a902 100644 (file)
--- 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 e617f3e1e7f633651e17380193fa3282156dc036..a39ebf1e2f317e1d41d2097005451c4aa6a912c6 100644 (file)
--- 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 
 {