diff options
| author | 2009-10-26 18:39:39 +0100 | |
|---|---|---|
| committer | 2009-10-26 18:39:39 +0100 | |
| commit | bef50c0873aad5d8cd516428828e79fc05a43913 (patch) | |
| tree | ee25a75e5d7e47b6178110a46844c5acd6c8152c | |
| parent | 48032e8dffb48398ab79448c4db825e42f564f43 (diff) | |
| download | libplist-bef50c0873aad5d8cd516428828e79fc05a43913.tar.gz libplist-bef50c0873aad5d8cd516428828e79fc05a43913.tar.bz2 | |
Fix SwigPyIterators name depending on version of SWIG.
| -rw-r--r-- | swig/plist.i | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/swig/plist.i b/swig/plist.i index 4ba0ad3..2d5dfa7 100644 --- a/swig/plist.i +++ b/swig/plist.i | |||
| @@ -179,15 +179,20 @@ namespace std { | |||
| 179 | %include <plist/Utils.h> | 179 | %include <plist/Utils.h> |
| 180 | 180 | ||
| 181 | #if SWIGPYTHON | 181 | #if SWIGPYTHON |
| 182 | |||
| 183 | #if SWIG_VERSION <= 0x010336 | ||
| 184 | #define SwigPyIterator PySwigIterator | ||
| 185 | #endif | ||
| 186 | |||
| 182 | %extend PList::Dictionary { | 187 | %extend PList::Dictionary { |
| 183 | 188 | ||
| 184 | %newobject key_iterator(PyObject **PYTHON_SELF); | 189 | %newobject key_iterator(PyObject **PYTHON_SELF); |
| 185 | swig::PySwigIterator* key_iterator(PyObject **PYTHON_SELF) { | 190 | swig::SwigPyIterator* key_iterator(PyObject **PYTHON_SELF) { |
| 186 | return swig::make_output_key_iterator(self->Begin(), self->Begin(), self->End(), *PYTHON_SELF); | 191 | return swig::make_output_key_iterator(self->Begin(), self->Begin(), self->End(), *PYTHON_SELF); |
| 187 | } | 192 | } |
| 188 | 193 | ||
| 189 | %newobject value_iterator(PyObject **PYTHON_SELF); | 194 | %newobject value_iterator(PyObject **PYTHON_SELF); |
| 190 | swig::PySwigIterator* value_iterator(PyObject **PYTHON_SELF) { | 195 | swig::SwigPyIterator* value_iterator(PyObject **PYTHON_SELF) { |
| 191 | return swig::make_output_value_iterator(self->Begin(), self->Begin(), self->End(), *PYTHON_SELF); | 196 | return swig::make_output_value_iterator(self->Begin(), self->Begin(), self->End(), *PYTHON_SELF); |
| 192 | } | 197 | } |
| 193 | 198 | ||
| @@ -267,6 +272,8 @@ namespace std { | |||
| 267 | %pythoncode {def iterkeys(self): return self.key_iterator()} | 272 | %pythoncode {def iterkeys(self): return self.key_iterator()} |
| 268 | %pythoncode {def itervalues(self): return self.value_iterator()} | 273 | %pythoncode {def itervalues(self): return self.value_iterator()} |
| 269 | } | 274 | } |
| 275 | |||
| 276 | #undef SwigPyIterator | ||
| 270 | #endif | 277 | #endif |
| 271 | 278 | ||
| 272 | 279 | ||
