diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-03-24 14:51:41 +0100 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-03-24 14:51:41 +0100 |
| commit | aecf6c450fc4ad9b1b3ee0ce4450b9dac5ce2967 (patch) | |
| tree | 12ffe9aa7f6b4a6ac4c2273aa8e2063ce7b685b9 /include/iterator.h | |
| parent | 2fd4198b78358cf2ba527296fafb5b1728e28ea8 (diff) | |
fix compile issues for TRSM
Diffstat (limited to 'include/iterator.h')
| -rw-r--r-- | include/iterator.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/include/iterator.h b/include/iterator.h index d5f30c7..a7d4283 100644 --- a/include/iterator.h +++ b/include/iterator.h @@ -94,8 +94,7 @@ private: * @param iter * @param tsrm_ls */ -// static void destructor(struct _zend_object_iterator *iter); - static void destructor(struct _zend_object_iterator *iter, void ***tsrm_ls); + static void destructor(struct _zend_object_iterator *iter TSRMLS_DC); /** * Iterator valid function @@ -104,8 +103,7 @@ private: * @param tsrm_ls * @return int */ -// static int valid(struct _zend_object_iterator *iter); - static int valid(struct _zend_object_iterator *iter, void ***tsrm_ls); + static int valid(struct _zend_object_iterator *iter TSRMLS_DC); /** * Fetch the current item @@ -113,8 +111,7 @@ private: * @param data * @param tsrm_ls */ -// static void current(struct _zend_object_iterator *iter, struct _zval_struct ***data); - static void current(struct _zend_object_iterator *iter, struct _zval_struct ***data, void ***tsrm_ls); + static void current(struct _zend_object_iterator *iter, struct _zval_struct ***data TSRMLS_DC); /** * Fetch the key for the current element (optional, may be NULL). The key @@ -125,8 +122,7 @@ private: * @param data * @param tsrm_ls */ -// static void key(struct _zend_object_iterator *iter, struct _zval_struct *data); - static void key(struct _zend_object_iterator *iter, struct _zval_struct *data, void ***tsrm_ls); + static void key(struct _zend_object_iterator *iter, struct _zval_struct *data TSRMLS_DC); /** * Function to retrieve the current key, php 5.3 style @@ -137,24 +133,21 @@ private: * @param tsrm_ls * @return HASH_KEY_IS_STRING or HASH_KEY_IS_LONG */ -// static int key(struct _zend_object_iterator *iter, char **str_key, unsigned int *str_key_len, unsigned long *int_key); - static int key(struct _zend_object_iterator *iter, char **str_key, unsigned int *str_key_len, unsigned long *int_key, void ***tsrm_ls); + static int key(struct _zend_object_iterator *iter, char **str_key, unsigned int *str_key_len, unsigned long *int_key TSRMLS_DC); /** * Step forwards to the next element * @param iter * @param tsrm_ls */ -// static void next(struct _zend_object_iterator *iter); - static void next(struct _zend_object_iterator *iter, void ***tsrm_ls); + static void next(struct _zend_object_iterator *iter TSRMLS_DC); /** * Rewind the iterator back to the start * @param iter * @param tsrm_ls */ -// static void rewind(struct _zend_object_iterator *iter); - static void rewind(struct _zend_object_iterator *iter, void ***tsrm_ls); + static void rewind(struct _zend_object_iterator *iter TSRMLS_DC); /** * Get access to all iterator functions |