diff options
author | Martijn Otto <martijn.otto@copernica.com> | 2016-05-17 13:47:20 +0200 |
---|---|---|
committer | Martijn Otto <martijn.otto@copernica.com> | 2016-05-17 13:47:20 +0200 |
commit | dd5f3a635053aa03417cdab1228e03c94b9c3136 (patch) | |
tree | 53178a459fcefdfa551eb501064e70453611788a /zend/iteratorimpl.cpp | |
parent | 9f2e816c787c30ceeb139623c8dae594c4b4443d (diff) |
Fixed final compilation issues
Diffstat (limited to 'zend/iteratorimpl.cpp')
-rw-r--r-- | zend/iteratorimpl.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/zend/iteratorimpl.cpp b/zend/iteratorimpl.cpp index 9d57df7..4861e9e 100644 --- a/zend/iteratorimpl.cpp +++ b/zend/iteratorimpl.cpp @@ -49,21 +49,22 @@ int IteratorImpl::valid(zend_object_iterator *iter TSRMLS_DC) /** * Fetch the current item - * @param iter - * @param data - * @param tsrm_ls + * + * @param iter The iterator to retrieve the value from + * @param tsrm_ls Thread safety variable + * @return The current value of the iterator */ -void IteratorImpl::current(zend_object_iterator *iter, zval ***data TSRMLS_DC) +zval *IteratorImpl::current(zend_object_iterator *iter TSRMLS_DC) { // get the actual iterator - IteratorImpl *iterator = self(iter); + auto *iterator = self(iter); // retrieve the value (and store it in a member so that it is not // destructed when the function returns) iterator->_current = iterator->current(); - // copy the value - *data = &iterator->_current._val; + // return the value + return iterator->_current._val; } /** |