From: vsr <vsr@opencascade.com>
Date: Wed, 15 Oct 2008 13:18:18 +0000 (+0000)
Subject: Issue 0020007: integrate patch for compilation with gcc 4.3.2 (from E.Adam)
X-Git-Tag: V5_1_0a3~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0643dad0725c643e80efa0f456907cd7d99c6752;p=modules%2Fkernel.git

Issue 0020007: integrate patch for compilation with gcc 4.3.2 (from E.Adam)
---

diff --git a/src/Basics/Basics_DirUtils.cxx b/src/Basics/Basics_DirUtils.cxx
index f16df6be7..82d57ea11 100644
--- a/src/Basics/Basics_DirUtils.cxx
+++ b/src/Basics/Basics_DirUtils.cxx
@@ -26,6 +26,7 @@
 #include "Basics_DirUtils.hxx"
 
 #include <errno.h>
+#include <stdlib.h>
 
 #ifndef WIN32
 # include <sys/stat.h>
diff --git a/src/Basics/Basics_Utils.cxx b/src/Basics/Basics_Utils.cxx
index b6e119b2f..6b9d4bdba 100644
--- a/src/Basics/Basics_Utils.cxx
+++ b/src/Basics/Basics_Utils.cxx
@@ -25,6 +25,8 @@
 
 #include "Basics_Utils.hxx"
 
+#include "string.h"
+
 #ifndef WIN32
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/src/Batch/Batch_BatchManager_Local.cxx b/src/Batch/Batch_BatchManager_Local.cxx
index 049e2afce..2b9704913 100644
--- a/src/Batch/Batch_BatchManager_Local.cxx
+++ b/src/Batch/Batch_BatchManager_Local.cxx
@@ -42,6 +42,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <string.h>
+#include <limits.h>
 #include "Batch_IOMutex.hxx"
 #include "Batch_BatchManager_Local.hxx"
 
diff --git a/src/Batch/Batch_BatchManager_eClient.cxx b/src/Batch/Batch_BatchManager_eClient.cxx
index a005cec9c..dea283578 100644
--- a/src/Batch/Batch_BatchManager_eClient.cxx
+++ b/src/Batch/Batch_BatchManager_eClient.cxx
@@ -34,6 +34,8 @@
 #include <fstream>
 #include <sstream>
 #include <sys/stat.h>
+#include <stdlib.h>
+#include <string.h>
 
 using namespace std;
 
diff --git a/src/Batch/Batch_BatchManager_eLSF.cxx b/src/Batch/Batch_BatchManager_eLSF.cxx
index 2533a3186..6b5004044 100644
--- a/src/Batch/Batch_BatchManager_eLSF.cxx
+++ b/src/Batch/Batch_BatchManager_eLSF.cxx
@@ -31,6 +31,8 @@
 #include <fstream>
 #include <sstream>
 #include <sys/stat.h>
+#include <stdlib.h>
+#include <libgen.h>
 #include "Batch_BatchManager_eLSF.hxx"
 #ifdef WIN32
 # include <time.h>
@@ -246,7 +248,7 @@ namespace Batch {
     string::size_type p1 = fileToExecute.find_last_of("/");
     string::size_type p2 = fileToExecute.find_last_of(".");
     std::string rootNameToExecute = fileToExecute.substr(p1+1,p2-p1-1);
-    std::string fileNameToExecute = "~/" + dirForTmpFiles + "/" + string(basename(fileToExecute.c_str()));
+    std::string fileNameToExecute = "~/" + dirForTmpFiles + "/" + string(basename((char*)(fileToExecute.c_str())));
 
     int idx = dirForTmpFiles.find("Batch/");
     std::string filelogtemp = dirForTmpFiles.substr(idx+6, dirForTmpFiles.length());
diff --git a/src/Batch/Batch_BatchManager_ePBS.cxx b/src/Batch/Batch_BatchManager_ePBS.cxx
index fa612adda..edca9119f 100644
--- a/src/Batch/Batch_BatchManager_ePBS.cxx
+++ b/src/Batch/Batch_BatchManager_ePBS.cxx
@@ -31,6 +31,8 @@
 #include <fstream>
 #include <sstream>
 #include <sys/stat.h>
+#include <stdlib.h>
+#include <libgen.h>
 #include "Batch_BatchManager_ePBS.hxx"
 #ifdef WIN32
 # include <time.h>
@@ -246,7 +248,7 @@ namespace Batch {
     string::size_type p1 = fileToExecute.find_last_of("/");
     string::size_type p2 = fileToExecute.find_last_of(".");
     std::string rootNameToExecute = fileToExecute.substr(p1+1,p2-p1-1);
-    std::string fileNameToExecute = "~/" + dirForTmpFiles + "/" + string(basename(fileToExecute.c_str()));
+    std::string fileNameToExecute = "~/" + dirForTmpFiles + "/" + string(basename((char*)(fileToExecute.c_str())));
 
     int idx = dirForTmpFiles.find("Batch/");
     std::string filelogtemp = dirForTmpFiles.substr(idx+6, dirForTmpFiles.length());
diff --git a/src/Container/Salome_file_i.hxx b/src/Container/Salome_file_i.hxx
index b3b3503de..7d867eb5d 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..1e5bd6813 100644
--- a/src/Container/TestSalome_file.cxx
+++ b/src/Container/TestSalome_file.cxx
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
+#include <stdlib.h>
 #include "HDFascii.hxx"
 
 using namespace std;
diff --git a/src/DF/testDF.cxx b/src/DF/testDF.cxx
index 05b54ff84..cd271d3f3 100644
--- a/src/DF/testDF.cxx
+++ b/src/DF/testDF.cxx
@@ -24,6 +24,7 @@
 #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 b8450773e..f1e1a8e91 100644
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -13,10 +13,8 @@
 
 #include <SALOMEconfig.h>
 
-#ifndef WIN32
-#include <fstream.h>
-#else
 #include <fstream>
+#ifdef WIN32
 #include <iosfwd>
 #endif
 #include <omnithread.h>
@@ -52,11 +50,7 @@ private:
 	//otherwise all messages will be put into terminal via cout 
         bool m_putIntoFile;
 	//ofstream class specialized for disk file output
-#ifndef WIN32
-        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 e18104592..5c711f1b5 100644
--- a/src/Logger/SALOME_Logger_Server_main.cxx
+++ b/src/Logger/SALOME_Logger_Server_main.cxx
@@ -9,6 +9,7 @@
 //  Module : SALOME
 
 #include <iostream>
+#include <stdlib.h>
 #include "SALOME_Logger_Server.hxx"
 #include <SALOMEconfig.h>
 #include <sys/types.h>
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx
index 8a697a3da..548851ed6 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfInteger.cxx
@@ -22,6 +22,7 @@
 //  Module : SALOME
 
 #include "SALOMEDSImpl_AttributeSequenceOfInteger.hxx"
+#include <string.h>
 
 using namespace std;
 
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx
index 8b034c995..72959f062 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeSequenceOfReal.cxx
@@ -22,6 +22,7 @@
 //  Module : SALOME
 
 #include "SALOMEDSImpl_AttributeSequenceOfReal.hxx"
+#include <string.h>
 
 using namespace std;
 
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
index ad4b3aac4..79d1664ea 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
@@ -22,6 +22,7 @@
 //  Module : SALOME
 
 #include "SALOMEDSImpl_AttributeStudyProperties.hxx"
+#include <string.h>
 
 using namespace std;
 
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx
index 3880fe7ad..476c63a5e 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTreeNode.cxx
@@ -23,6 +23,7 @@
 
 
 #include "SALOMEDSImpl_AttributeTreeNode.hxx"
+#include <string.h>
 
 using namespace std;
 
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_SObject.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_SObject.cxx
index b385b7baa..b2f8ae3e4 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_SObject.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_SObject.cxx
@@ -32,6 +32,7 @@
 using namespace std;
 
 #include <map>
+#include <string.h>
 
 //============================================================================
 /*! Function : empty constructor
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
index 34ee8ed7b..eff2b5d40 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
@@ -23,6 +23,7 @@
 
 
 #include "SALOMEDSImpl_Study.hxx"
+#include <string.h>
 
 using namespace std;
 
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx
index b65ad7bd5..005487123 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx
@@ -28,6 +28,7 @@
 #include <iostream> 
 #include <fstream>
 #include <stdlib.h>
+#include <string.h>
 
 #include "SALOMEDSImpl_Tool.hxx"
 
diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
index 5e4bfba02..45d05dd9e 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 WIN32
 #include <dlfcn.h>