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 f16df6be74678e2195e91a0c924bf3849c73ed00..82d57ea11c1ced7e00f80b47f0aef2e7af8fbea1 100644 (file)
--- 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 b6e119b2f5577f45e5a6d10288a5d771ea7c69d2..6b9d4bdbaf935dd41e854b78bc000e90f03c4fdb 100644 (file)
--- 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 049e2afce2db5daeaec8bafde09d471121eee11a..2b97049136fd5d6c303bdad5b58f59c9f974c941 100644 (file)
--- 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 a005cec9c25eb32974de0b9f790957eb00838fd3..dea283578769ac2839c54ce4f30cdf41e4ed2d8e 100644 (file)
--- 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 2533a31862cdbae67504de25fcd46453df3f9826..6b50040446c6f5d5f47e87e7a5ed25fabfab5062 100644 (file)
--- 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 fa612adda414e8a0c204b06f1a036713f3116e9b..edca9119f5bd7ed6c781724424954ff25f6a70f9 100644 (file)
--- 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 b3b3503de70f602a63e6aac1e287907c8a9ba756..7d867eb5dc00170409de204d9b5fce7b6b37e3cb 100644 (file)
--- 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 76d3b031fc7a2040f0da52392e5556db85279cac..1e5bd68134a7ea3b3f0dd33103ef141837abb8dc 100644 (file)
--- 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 05b54ff8485f4b3af263b7d50636e557e51155fa..cd271d3f3b6167f5eb567cc22c6cc31f5c7d2a2e 100644 (file)
--- 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 b8450773e4b094011b39f525855c9079b1654a3b..f1e1a8e911c7bc00f289f692421c7ba0ebc45e9a 100644 (file)
--- 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 e18104592964aab61da3a057e8937ae7dcb1f692..5c711f1b5b96c5d8243abd86a121dde130b8f4ab 100644 (file)
--- 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 8a697a3da78643f341e3b4c7ad0dcb95a2d53c89..548851ed67c39a45b85de1119c8f110135667c4e 100644 (file)
--- 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 8b034c9957a111b2d28327772b1846a1507358da..72959f062bccf8a71815f0cfc773020ccd24c83e 100644 (file)
--- 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 ad4b3aac4257793c21530f1d83ef4bab5fcf1abc..79d1664ea162544701c4700944802114ba9005eb 100644 (file)
--- 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 3880fe7adcc02fd24e2c2e0086d1fc9b79513622..476c63a5eb8ce72dcc18731d69bb0603d697a8d0 100644 (file)
--- 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 b385b7baae4d37d5beecd0a4a6eae24b2d5193c8..b2f8ae3e4d277702542966580bad529f1135cfd2 100644 (file)
--- 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 34ee8ed7b5a04621cc266e05368ff1913b47d7a3..eff2b5d40d42c651ce7bf8ef6f3ffcd483e04a91 100644 (file)
--- 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 b65ad7bd565f79fc99bfa6100e5374f2c535b3c1..005487123a4c68724bb5a7375d4d968f274dd067 100644 (file)
--- 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 5e4bfba02edd47694a71db2a6d8fb6dd9fc583a3..45d05dd9ec6359103ca2d9aad5665be3be061502 100644 (file)
--- 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>