PAL10715: Portability python 2.4. A fix by Erwan ADAM.

diff --git a/src/SALOMEGUI/PyInterp_PyQt.cxx b/src/SALOMEGUI/PyInterp_PyQt.cxx
index 29077ca0e87b8e128bcb5011a267f8df2f67f194..97e2775eabc4e760d6770d1b70af5842eb016c7b 100644 (file)
--- a/src/SALOMEGUI/PyInterp_PyQt.cxx
+++ b/src/SALOMEGUI/PyInterp_PyQt.cxx
@@ -65,7 +65,11 @@ void PyInterp_PyQt::run(const char *command)
     PyErr_Print();
     return;
   }
+#if PY_VERSION_HEX < 0x02040000 // python version earlier than 2.4.0
   PyObject *r = PyEval_EvalCode(code,_g,_g);
+#else
+  PyObject *r = PyEval_EvalCode((PyCodeObject*)code,_g,_g);
+#endif
   Py_DECREF(code);
   if(!r){
     // Une erreur s est produite a l execution

diff --git a/src/SALOMEGUI/PyInterp_base.cxx b/src/SALOMEGUI/PyInterp_base.cxx
index 1c4879d1d46d7e1b037c61bf22521350c4bd7b9b..ff714a5f4e6642fab51808fd85f85404dbfc53d1 100644 (file)
--- a/src/SALOMEGUI/PyInterp_base.cxx
+++ b/src/SALOMEGUI/PyInterp_base.cxx
@@ -240,7 +240,11 @@ int compile_command(const char *command,PyObject *context)
     return 1;
   }else{
     // Complete and correct text. We evaluate it.
+#if PY_VERSION_HEX < 0x02040000 // python version earlier than 2.4.0
     PyObjWrapper r(PyEval_EvalCode(v,context,context));
+#else
+    PyObjWrapper r(PyEval_EvalCode((PyCodeObject *)(void *)v,context,context));
+#endif
     if(!r){
       // Execution error. We return -1
       PyErr_Print();

diff --git a/src/SALOMEGUI/PyInterp_base.h b/src/SALOMEGUI/PyInterp_base.h
index 739b5d4f0b09cf3f8aba9d26b3f065c82e4a633a..6d7b2e4c929f31edfd827ad1c07e0c3a73b944b2 100644 (file)
--- a/src/SALOMEGUI/PyInterp_base.h
+++ b/src/SALOMEGUI/PyInterp_base.h
@@ -24,7 +24,9 @@
 class QSemaphore;
 class QMutex;
 
+#if PY_VERSION_HEX < 0x02040000 // python version earlier than 2.4.0
 extern "C" PyObject * PyEval_EvalCode(PyObject *co, PyObject *g, PyObject *l);
+#endif
 
 #define TOP_HISTORY_PY "--- top of history ---"
 #define BEGIN_HISTORY_PY "--- begin of history ---"