remove deprecated macros
This commit is contained in:
parent
76279882da
commit
fc2bbf52f9
|
@ -134,10 +134,6 @@ inline void Assert(int expr, char *msg) // C++ assert
|
||||||
#define Py_Assert(A,E,M) {if (!(A)) {PyErr_SetString(E, M); return NULL;}}
|
#define Py_Assert(A,E,M) {if (!(A)) {PyErr_SetString(E, M); return NULL;}}
|
||||||
|
|
||||||
|
|
||||||
/// Define the PyParent Object
|
|
||||||
typedef PyTypeObject * PyParentObject;
|
|
||||||
|
|
||||||
|
|
||||||
/// This must be the first line of each PyC++ class
|
/// This must be the first line of each PyC++ class
|
||||||
#define Py_Header \
|
#define Py_Header \
|
||||||
public: \
|
public: \
|
||||||
|
@ -145,22 +141,6 @@ public: \
|
||||||
static PyMethodDef Methods[]; \
|
static PyMethodDef Methods[]; \
|
||||||
virtual PyTypeObject *GetType(void) {return &Type;}
|
virtual PyTypeObject *GetType(void) {return &Type;}
|
||||||
|
|
||||||
/** This defines the _getattr_up macro
|
|
||||||
* which allows attribute and method calls
|
|
||||||
* to be properly passed up the hierarchy.
|
|
||||||
*/
|
|
||||||
#define _getattr_up(Parent) \
|
|
||||||
{ \
|
|
||||||
PyObject *rvalue = Py_FindMethod(Methods, this, attr); \
|
|
||||||
if (rvalue == NULL) \
|
|
||||||
{ \
|
|
||||||
PyErr_Clear(); \
|
|
||||||
return Parent::_getattr(attr); \
|
|
||||||
} \
|
|
||||||
else \
|
|
||||||
return rvalue; \
|
|
||||||
}
|
|
||||||
|
|
||||||
/*------------------------------
|
/*------------------------------
|
||||||
* PyObjectBase
|
* PyObjectBase
|
||||||
------------------------------*/
|
------------------------------*/
|
||||||
|
|
Loading…
Reference in New Issue
Block a user