helly Sat Nov 29 13:31:26 2003 EDT Modified files: /spl spl_directory.c spl_iterators.c Log: Caanot use REPLACE_ZVAL_VALUE here. Index: spl/spl_directory.c diff -u spl/spl_directory.c:1.14 spl/spl_directory.c:1.15 --- spl/spl_directory.c:1.14 Sat Nov 22 15:46:46 2003 +++ spl/spl_directory.c Sat Nov 29 13:31:24 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.14 2003/11/22 20:46:46 helly Exp $ */ +/* $Id: spl_directory.c,v 1.15 2003/11/29 18:31:24 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -296,7 +296,7 @@ Return this (needed for Iterator interface) */ SPL_METHOD(DirectoryIterator, current) { - REPLACE_ZVAL_VALUE(&return_value, getThis(), 1); + RETURN_ZVAL(getThis(), 1, 0); } /* }}} */ Index: spl/spl_iterators.c diff -u spl/spl_iterators.c:1.5 spl/spl_iterators.c:1.6 --- spl/spl_iterators.c:1.5 Sat Nov 22 15:49:15 2003 +++ spl/spl_iterators.c Sat Nov 29 13:31:24 2003 @@ -368,7 +368,7 @@ zval **data; iterator->funcs->get_current_data(iterator, &data TSRMLS_CC); - REPLACE_ZVAL_VALUE(&return_value, *data, 1); + RETURN_ZVAL(*data, 1, 0); } SPL_METHOD(RecursiveIteratorIterator, next) @@ -398,7 +398,7 @@ RETURN_NULL(); } zobject = object->iterators[level].zobject; - REPLACE_ZVAL_VALUE(&return_value, zobject, 1); + RETURN_ZVAL(zobject, 1, 0); } /* {{{ spl_dtor_RecursiveIteratorIterator */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php