From 401762696eb2ae0ea1eb99cec2cf652cfa18ac08 Mon Sep 17 00:00:00 2001
From: ribes <ribes>
Date: Fri, 18 Jul 2008 13:07:11 +0000
Subject: [PATCH] - Patch for GCC 4.3

---
 src/Batch/Batch_BatchManager.hxx              |  4 ++++
 src/Container/Salome_file_i.hxx               |  1 +
 src/Container/TestSalome_file.cxx             |  1 +
 src/DF/testDF.cxx                             |  3 ++-
 src/Logger/SALOME_Logger_Server.hxx           | 11 +++--------
 src/Logger/SALOME_Logger_Server_main.cxx      |  2 ++
 src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx     |  1 +
 src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx        |  1 +
 src/SALOMELocalTrace/LocalTraceBufferPool.cxx |  1 +
 src/TOOLSDS/SALOMEDS_Tool.cxx                 |  4 ++--
 10 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/Batch/Batch_BatchManager.hxx b/src/Batch/Batch_BatchManager.hxx
index 92a81a732..a1f84bfed 100644
--- a/src/Batch/Batch_BatchManager.hxx
+++ b/src/Batch/Batch_BatchManager.hxx
@@ -29,6 +29,10 @@
 #ifndef _BATCHMANAGER_H_
 #define _BATCHMANAGER_H_
 
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+
 #include <string>
 #include <map>
 #include "Batch_Job.hxx"
diff --git a/src/Container/Salome_file_i.hxx b/src/Container/Salome_file_i.hxx
index b1337871f..03826f328 100644
--- a/src/Container/Salome_file_i.hxx
+++ b/src/Container/Salome_file_i.hxx
@@ -34,6 +34,7 @@
 #include <SALOME_Container.hxx>
 #include <map>
 #include <cstdio>
+#include <string>
 
 class CONTAINER_EXPORT Salome_file_i:
   public virtual POA_Engines::Salome_file
diff --git a/src/Container/TestSalome_file.cxx b/src/Container/TestSalome_file.cxx
index 76d3b031f..10ef21a21 100644
--- a/src/Container/TestSalome_file.cxx
+++ b/src/Container/TestSalome_file.cxx
@@ -3,6 +3,7 @@
 #include <fstream>
 #include <sstream>
 #include "HDFascii.hxx"
+#include <stdlib.h>
 
 using namespace std;
 
diff --git a/src/DF/testDF.cxx b/src/DF/testDF.cxx
index 69dd8920c..ae268e765 100644
--- a/src/DF/testDF.cxx
+++ b/src/DF/testDF.cxx
@@ -21,9 +21,10 @@
 //Author:  Sergey RUIN
 
 #include <stdio.h>
-#include <iostream.h> 
+#include <iostream> 
 #include <vector>
 #include <string>
+#include <string.h>
 
 #include "DF_definitions.hxx"
 #include "DF_Application.hxx"
diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index 6481eb995..cd0a304c8 100644
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -13,10 +13,8 @@
 
 #include <SALOMEconfig.h>
 
-#ifndef WNT
-#include <fstream.h>
-#else
 #include <fstream>
+#ifdef WNT
 #include <iosfwd>
 #endif
 #include <omnithread.h>
@@ -52,11 +50,8 @@ 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
+	std::ofstream m_outputFile; 
+
 	//synchronisation object
 	static omni_mutex myLock;
 };
diff --git a/src/Logger/SALOME_Logger_Server_main.cxx b/src/Logger/SALOME_Logger_Server_main.cxx
index c9551d567..1be06053f 100644
--- a/src/Logger/SALOME_Logger_Server_main.cxx
+++ b/src/Logger/SALOME_Logger_Server_main.cxx
@@ -12,6 +12,8 @@
 #include "SALOME_Logger_Server.hxx"
 #include <SALOMEconfig.h>
 #include <sys/types.h>
+#include <stdlib.h>
+
 #ifndef __WIN32__
 # include <unistd.h>
 #else
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx
index 80d797e41..e77436c81 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx
@@ -28,6 +28,7 @@
 #include "DF_Attribute.hxx"
 #include <string>
 #include <vector>
+#include <string.h>
 
 class SALOMEDSImpl_SComponent;
 class SALOMEDSImpl_Study;
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
index 36ca6874f..12ec13542 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.hxx
@@ -31,6 +31,7 @@
 #include <string>
 #include <vector>
 #include "DF_Label.hxx"
+#include <string.h>
 
 class SALOMEDSImpl_Tool                                
 {
diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
index f41e57593..435319a83 100644
--- a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
+++ b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
@@ -27,6 +27,7 @@
 #include <iostream>
 #include <limits.h>
 #include <cassert>
+#include <string.h>
 
 #ifndef WNT
 #include <dlfcn.h>
diff --git a/src/TOOLSDS/SALOMEDS_Tool.cxx b/src/TOOLSDS/SALOMEDS_Tool.cxx
index fcf2be69d..172e8359c 100644
--- a/src/TOOLSDS/SALOMEDS_Tool.cxx
+++ b/src/TOOLSDS/SALOMEDS_Tool.cxx
@@ -32,8 +32,8 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <iostream.h> 
-#include <fstream.h>
+#include <iostream> 
+#include <fstream>
 #include <pwd.h> 
 #include <unistd.h>
 #else
-- 
2.39.2