summaryrefslogtreecommitdiff
path: root/Zend/zend_iterators.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2014-02-27 16:56:17 +0800
committerXinchen Hui <laruence@gmail.com>2014-02-27 16:56:17 +0800
commit122cc5f495b46e8d85a98ee7c25500c4cef4ced1 (patch)
tree4ca47423b68d42c54ad1db681371c3954a66316e /Zend/zend_iterators.c
parent95320f1f468f7576c3536f42d5c03e118e45be23 (diff)
parent054917619af45870602b3ee669c86397b8162bda (diff)
downloadphp-git-122cc5f495b46e8d85a98ee7c25500c4cef4ced1.tar.gz
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_iterators.c')
-rw-r--r--Zend/zend_iterators.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c
index bb41ab9000..5514c8bba8 100644
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
@@ -65,9 +65,10 @@ static void iter_wrapper_dtor(zend_object *object TSRMLS_DC)
iter->funcs->dtor(iter TSRMLS_CC);
}
-ZEND_API void zend_iterator_wrap(zend_object_iterator *iter, zval *wrapped TSRMLS_DC)
+ZEND_API void zend_iterator_init(zend_object_iterator *iter TSRMLS_DC)
{
- ZVAL_OBJ(wrapped, &iter->std);
+ zend_object_std_init(&iter->std, &zend_iterator_class_entry);
+ iter->std.handlers = &iterator_object_handlers;
}
ZEND_API enum zend_object_iterator_kind zend_iterator_unwrap(