* explicit cast needed for mingw.
authorNathan Letwory <nathan@letworyinteractive.com>
Thu, 24 Sep 2009 20:20:43 +0000 (20:20 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Thu, 24 Sep 2009 20:20:43 +0000 (20:20 +0000)
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/Ketsji/KX_PyMath.h

index f9edb7877b0f5d60791a007743ca11df9ecb1cc3..d8ab007dde9755c28954ee8e040c302c9513992b 100644 (file)
@@ -112,13 +112,13 @@ typedef struct PyObjectPlus_Proxy {
   static PyAttributeDef Attributes[]; \
   virtual PyTypeObject *GetType(void) {return &Type;}; \
   virtual PyObject *GetProxy() {return GetProxy_Ext(this, &Type);}; \
-  virtual PyObject *NewProxy(bool py_owns) {return NewProxy_Ext(this, &Type, py_owns);}; \
+  virtual PyObject *NewProxy(bool py_owns) {return NewProxy_Ext(this, &Type, py_owns);}; 
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #define Py_Header __Py_Header \
   void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
-  void operator delete( void *mem ) { MEM_freeN(mem); } \
+  void operator delete( void *mem ) { MEM_freeN(mem); } 
 
 #else
 #define Py_Header __Py_Header
index 17102905607e7e54d983acfd34199e45a0807a06..1ce8bcafbb69af481e226f0eb2fdcb6c720e9b9a 100644 (file)
@@ -157,7 +157,7 @@ bool PyVecTo(PyObject* pyval, T& vec)
                
                return true;
        }
-       else if (PyObject_TypeCheck(pyval, &PyObjectPlus::Type))
+       else if (PyObject_TypeCheck(pyval, (PyTypeObject *)&PyObjectPlus::Type))
        {       /* note, include this check because PySequence_Check does too much introspection
                 * on the PyObject (like getting its __class__, on a BGE type this means searching up
                 * the parent list each time only to discover its not a sequence.