aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-29 15:45:15 +0000
committerdanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-29 15:45:15 +0000
commita4657c3be52f86660b46ef88e643c35f419de399 (patch)
tree7fb574be0b6f5cbce0c8307dfb23ac405e312056 /sci-misc/salome-gui/files
parentAdded Gcc-4.3 support. Thanks to Bert K. for his patches! (diff)
downloadsci-a4657c3be52f86660b46ef88e643c35f419de399.tar.gz
sci-a4657c3be52f86660b46ef88e643c35f419de399.tar.bz2
sci-a4657c3be52f86660b46ef88e643c35f419de399.zip
Added Gcc-4.3 support. Thanks to Bert K. for his patches!
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1119 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-misc/salome-gui/files')
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch71
1 files changed, 71 insertions, 0 deletions
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch
new file mode 100644
index 000000000..63eab18b9
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-3.2.6-gcc-4.3.patch
@@ -0,0 +1,71 @@
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/GLViewer/GLViewer_Tools.cxx 2008-05-26 00:04:12.000000000 +0200
+@@ -27,7 +27,9 @@
+
+ #include <GL/gl.h>
+
+-#include <iostream.h>
++#include <iostream>
++
++using std::cout;
+
+ /*!
+ Constructor
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/ResExporter/ResourceExporter.cxx 2008-05-26 00:38:10.000000000 +0200
+@@ -47,6 +47,7 @@
+ #include <qstringlist.h>
+ #include <qapplication.h>
+ #include <iostream>
++#include <cstdlib>
+
+ /*!
+ \return the SALOME version number
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/SalomeApp/SalomeApp_Study.cxx 2008-05-26 00:28:19.000000000 +0200
+@@ -36,7 +36,7 @@
+ #include <qdict.h>
+
+ #include "utilities.h"
+-#include <iostream.h>
++#include <iostream>
+ #include <string>
+ #include <vector>
+
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/SUIT/SUIT_ResourceMgr.cxx 2008-05-25 23:41:44.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include <qdir.h>
+ #include <qapplication.h>
+ #include <qregexp.h>
++#include <cstdlib>
+
+ /*!
+ Constructor
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/SVTK/SVTK_InteractorStyle.cxx 2008-05-26 00:19:17.000000000 +0200
+@@ -67,7 +67,7 @@
+ //VRV: porting on Qt 3.0.5
+ #include <algorithm>
+
+-#include <iostream.h>
++#include <iostream>
+
+ using namespace std;
+
+diff -aur src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx
+--- src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx 2008-05-25 19:32:46.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ConvexTool.cxx 2008-05-26 00:12:09.000000000 +0200
+@@ -31,6 +31,7 @@
+
+ #include <set>
+ #include <map>
++#include <algorithm>
+
+ #include <vtkUnstructuredGrid.h>
+ #include <vtkGeometryFilter.h>