archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for getting gcc compile GE with Py 2.5

Browse Source 
PYobject type has changed

Usual C++ pickyness about implicit casts

debug made with erwin. thanks

Note to python mainteners :

even if it compiles there is a *Huge* list of warnings about deprecated
and incompatible pointers in api2.2. this should be corrected
This commit is contained in:
JLuc Peuriere
2006-12-03 20:27:59 +00:00
parent 13d466fe77
commit d7aaa84dd9
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/gameengine/Expressions/ListValue.cpp
View File

@@ -23,12 +23,16 @@
#include <config.h> #include <config.h>
#endif #endif
int listvalue_bufferlen(PyObject* list) #if ((PY_MAJOR_VERSION == 2) &&(PY_MINOR_VERSION < 5))
#define Py_ssize_t int
#endif
Py_ssize_t listvalue_bufferlen(PyObject* list)
{ {
return ( ((CListValue*)list)->GetCount()); return (Py_ssize_t)( ((CListValue*)list)->GetCount());
} }
PyObject* listvalue_buffer_item(PyObject* list,int index) PyObject* listvalue_buffer_item(PyObject* list,Py_ssize_t index)
{ {
if (index >= 0 && index < ((CListValue*) list)->GetCount()) if (index >= 0 && index < ((CListValue*) list)->GetCount())
{ {
@@ -68,7 +72,7 @@ PyObject* listvalue_mapping_subscript(PyObject* list,PyObject* pyindex)
/* just slice it into a python list... */ /* just slice it into a python list... */
PyObject* listvalue_buffer_slice(PyObject* list,int ilow, int ihigh) PyObject* listvalue_buffer_slice(PyObject* list,Py_ssize_t ilow, Py_ssize_t ihigh)
{ {
int i, j; int i, j;
PyListObject *newlist; PyListObject *newlist;
@@ -163,22 +167,22 @@ listvalue_buffer_concat(PyObject * self, PyObject * other)
static PySequenceMethods listvalue_as_sequence = { static PySequenceMethods listvalue_as_sequence = {
(inquiry)listvalue_bufferlen,//(inquiry)buffer_length, /*sq_length*/ listvalue_bufferlen,//(inquiry)buffer_length, /*sq_length*/
(binaryfunc)listvalue_buffer_concat, /*sq_concat*/ listvalue_buffer_concat, /*sq_concat*/
0,//(intargfunc)buffer_repeat, /*sq_repeat*/ NULL, /*sq_repeat*/
(intargfunc)listvalue_buffer_item, /*sq_item*/ listvalue_buffer_item, /*sq_item*/
(intintargfunc)listvalue_buffer_slice, /*sq_slice*/ listvalue_buffer_slice, /*sq_slice*/
0,//(intobjargproc)buffer_ass_item, /*sq_ass_item*/ NULL, /*sq_ass_item*/
0,//(intintobjargproc)buffer_ass_slice, /*sq_ass_slice*/ NULL /*sq_ass_slice*/
}; };
/* Is this one used ? */ /* Is this one used ? */
static PyMappingMethods instance_as_mapping = { static PyMappingMethods instance_as_mapping = {
(inquiry)listvalue_bufferlen, /*mp_length*/ listvalue_bufferlen, /*mp_length*/
(binaryfunc)listvalue_mapping_subscript, /*mp_subscript*/ listvalue_mapping_subscript, /*mp_subscript*/
0,//(objobjargproc)instance_ass_subscript, /*mp_ass_subscript*/ NULL /*mp_ass_subscript*/
}; };