aboutsummaryrefslogtreecommitdiff
path: root/lib/python/python.h
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-01-27 00:04:59 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-01-27 00:04:59 +0100
commit15d7074f55a2c3dd38ce9877626be6ec32b448d2 (patch)
treed00b0e0de23212eed1432c8661ac13e27728f107 /lib/python/python.h
parenta4fd5bddb0f8c1b05b963cb8af9692f6c89f3dab (diff)
downloadenigma2-15d7074f55a2c3dd38ce9877626be6ec32b448d2.tar.gz
enigma2-15d7074f55a2c3dd38ce9877626be6ec32b448d2.zip
fixes for python 2.6 by Moritz Venn
Diffstat (limited to 'lib/python/python.h')
-rw-r--r--lib/python/python.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/python/python.h b/lib/python/python.h
index f56d49bb..52ec6c1e 100644
--- a/lib/python/python.h
+++ b/lib/python/python.h
@@ -24,6 +24,7 @@ public:
#ifdef PYTHON_REFCOUNT_DEBUG
inline ePyObject(PyObject *ob, const char *file, int line);
#endif
+ inline ePyObject(PyVarObject *ob);
inline ePyObject(PyDictObject *ob);
inline ePyObject(PyTupleObject *ob);
inline ePyObject(PyListObject *ob);
@@ -32,11 +33,13 @@ public:
operator bool() { return !!m_ob; }
ePyObject &operator=(const ePyObject &);
ePyObject &operator=(PyObject *);
+ ePyObject &operator=(PyVarObject *ob) { return operator=((PyObject*)ob); }
ePyObject &operator=(PyDictObject *ob) { return operator=((PyObject*)ob); }
ePyObject &operator=(PyTupleObject *ob) { return operator=((PyObject*)ob); }
ePyObject &operator=(PyListObject *ob) { return operator=((PyObject*)ob); }
ePyObject &operator=(PyStringObject *ob) { return operator=((PyObject*)ob); }
operator PyObject*();
+ operator PyVarObject*() { return (PyVarObject*)operator PyVarObject*(); }
operator PyTupleObject*() { return (PyTupleObject*)operator PyObject*(); }
operator PyListObject*() { return (PyListObject*)operator PyObject*(); }
operator PyStringObject*() { return (PyStringObject*)operator PyObject*(); }
@@ -84,6 +87,14 @@ inline ePyObject::ePyObject(PyObject *ob, const char* file, int line)
}
#endif
+inline ePyObject::ePyObject(PyVarObject *ob)
+ :m_ob((PyObject*)ob)
+#ifdef PYTHON_REFCOUNT_DEBUG
+ ,m_file(0), m_line(0), m_from(0), m_to(0), m_erased(false)
+#endif
+{
+}
+
inline ePyObject::ePyObject(PyDictObject *ob)
:m_ob((PyObject*)ob)
#ifdef PYTHON_REFCOUNT_DEBUG