aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-20 21:26:59 +0000
committerdanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-20 21:26:59 +0000
commit0f889d2bb37e15482e6fdc8abe443f829c303df8 (patch)
treef5d0fdd06c0317ade1d4a49a45711f31cb4a169d /sci-misc/salome-kernel/files/salome-kernel-gcc4.patch
parentAdded ~x86 in the KEYWORDS list. I tested it, it seems to work correctly. (diff)
downloadsci-0f889d2bb37e15482e6fdc8abe443f829c303df8.tar.gz
sci-0f889d2bb37e15482e6fdc8abe443f829c303df8.tar.bz2
sci-0f889d2bb37e15482e6fdc8abe443f829c303df8.zip
Initial update. There is still some work to do but it starts to get shape! ;)
See bug #155974 git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1075 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-misc/salome-kernel/files/salome-kernel-gcc4.patch')
-rw-r--r--sci-misc/salome-kernel/files/salome-kernel-gcc4.patch135
1 files changed, 135 insertions, 0 deletions
diff --git a/sci-misc/salome-kernel/files/salome-kernel-gcc4.patch b/sci-misc/salome-kernel/files/salome-kernel-gcc4.patch
new file mode 100644
index 000000000..45b06c336
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-gcc4.patch
@@ -0,0 +1,135 @@
+diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc src3.2.6/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc
+--- src3.2.6.orig/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc 2007-04-24 10:34:17.000000000 -0500
++++ src3.2.6/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc 2008-01-10 15:46:15.000000000 -0600
+@@ -42,9 +42,9 @@
+ "; CORBA::is_nil(thePOA) = "<<CORBA::is_nil(thePOA));
+ if(CORBA::is_nil(thePOA))
+ #ifndef WNT
+- myPOA = PortableServer::RefCountServantBase::_default_POA();
++ myPOA = PortableServer::ServantBase::_default_POA();
+ #else
+- myPOA = RefCountServantBase::_default_POA();
++ myPOA = ServantBase::_default_POA();
+ #endif
+ else
+ myPOA = PortableServer::POA::_duplicate(thePOA);
+diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp src3.2.6/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp
+--- src3.2.6.orig/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp 2007-04-24 10:58:15.000000000 -0500
++++ src3.2.6/KERNEL_SRC_3.2.6/src/LifeCycleCORBA_SWIG/swig_wrap.cpp 2008-01-10 16:05:05.000000000 -0600
+@@ -3236,7 +3236,7 @@
+ param->isMPI = false;
+ PyObject *key, *value;
+ int pos = 0;
+- while (PyDict_Next(obj1, &pos, &key, &value))
++ while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
+ {
+ char* keystr = PyString_AsString(key);
+ printf("key: %s\n", keystr);
+@@ -3366,7 +3366,7 @@
+ param->isMPI = false;
+ PyObject *key, *value;
+ int pos = 0;
+- while (PyDict_Next(obj1, &pos, &key, &value))
++ while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
+ {
+ char* keystr = PyString_AsString(key);
+ printf("key: %s\n", keystr);
+@@ -3558,7 +3558,7 @@
+ param->isMPI = false;
+ PyObject *key, *value;
+ int pos = 0;
+- while (PyDict_Next(obj1, &pos, &key, &value))
++ while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
+ {
+ char* keystr = PyString_AsString(key);
+ printf("key: %s\n", keystr);
+@@ -3688,7 +3688,7 @@
+ param->isMPI = false;
+ PyObject *key, *value;
+ int pos = 0;
+- while (PyDict_Next(obj1, &pos, &key, &value))
++ while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
+ {
+ char* keystr = PyString_AsString(key);
+ printf("key: %s\n", keystr);
+@@ -3880,7 +3880,7 @@
+ param->isMPI = false;
+ PyObject *key, *value;
+ int pos = 0;
+- while (PyDict_Next(obj1, &pos, &key, &value))
++ while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
+ {
+ char* keystr = PyString_AsString(key);
+ printf("key: %s\n", keystr);
+@@ -4010,7 +4010,7 @@
+ param->isMPI = false;
+ PyObject *key, *value;
+ int pos = 0;
+- while (PyDict_Next(obj1, &pos, &key, &value))
++ while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
+ {
+ char* keystr = PyString_AsString(key);
+ printf("key: %s\n", keystr);
+@@ -4329,7 +4329,7 @@
+ param->isMPI = false;
+ PyObject *key, *value;
+ int pos = 0;
+- while (PyDict_Next(obj1, &pos, &key, &value))
++ while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
+ {
+ char* keystr = PyString_AsString(key);
+ printf("key: %s\n", keystr);
+@@ -4463,7 +4463,7 @@
+ param->isMPI = false;
+ PyObject *key, *value;
+ int pos = 0;
+- while (PyDict_Next(obj1, &pos, &key, &value))
++ while (PyDict_Next(obj1, (Py_ssize_t*)&pos, &key, &value))
+ {
+ char* keystr = PyString_AsString(key);
+ printf("key: %s\n", keystr);
+diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx
+--- src3.2.6.orig/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx 2007-04-24 10:34:17.000000000 -0500
++++ src3.2.6/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx 2008-01-10 15:52:35.000000000 -0600
+@@ -93,14 +93,14 @@
+ };
+
+ if (status) {
+- char* Asender;
+- char* Agraph;
+- char* Atype;
++ const char* Asender;
++ const char* Agraph;
++ const char* Atype;
+ CORBA::ULong Acounter;
+ CORBA::ULong Astamp;
+- char* Adate;
+- char* Anode;
+- char* Amessage;
++ const char* Adate;
++ const char* Anode;
++ const char* Amessage;
+ event->filterable_data[0].value >>= Asender;
+ event->filterable_data[1].value >>= Agraph;
+ event->filterable_data[2].value >>= Atype;
+diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx src3.2.6/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx
+--- src3.2.6.orig/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx 2007-04-24 10:34:19.000000000 -0500
++++ src3.2.6/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx 2008-01-10 15:56:51.000000000 -0600
+@@ -44,7 +44,7 @@
+ MESSAGE("activate object");
+ _thisObj = this ;
+ _id = _poa->activate_object(_thisObj);
+- SCRUTE(pd_refCount);
++ //SCRUTE(pd_refCount);
+ }
+
+ Engines_TestComponent_i::Engines_TestComponent_i()
+@@ -60,7 +60,7 @@
+ {
+ char s[100];
+ sprintf(s, "TestComponent_i : L = %ld", (long) L);
+- SCRUTE(pd_refCount);
++ //SCRUTE(pd_refCount);
+
+ return CORBA::string_dup(s);
+ }