helly Sun Mar 6 18:09:21 2005 EDT
Modified files:
/php-src/ext/spl spl_array.c
Log:
- Use new objects
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.61&r2=1.62&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.61 php-src/ext/spl/spl_array.c:1.62
--- php-src/ext/spl/spl_array.c:1.61 Sat Mar 5 06:35:11 2005
+++ php-src/ext/spl/spl_array.c Sun Mar 6 18:09:21 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.61 2005/03/05 11:35:11 helly Exp $ */
+/* $Id: spl_array.c,v 1.62 2005/03/06 23:09:21 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -975,8 +975,8 @@
PHP_MINIT_FUNCTION(spl_array)
{
REGISTER_SPL_STD_CLASS_EX(ArrayObject, spl_array_object_new,
spl_funcs_ArrayObject);
- zend_class_implements(spl_ce_ArrayObject TSRMLS_CC, 1,
zend_ce_aggregate);
- zend_class_implements(spl_ce_ArrayObject TSRMLS_CC, 1,
zend_ce_arrayaccess);
+ REGISTER_SPL_IMPLEMENTS(ArrayObject, Aggregate);
+ REGISTER_SPL_IMPLEMENTS(ArrayObject, ArrayAccess);
memcpy(&spl_handler_ArrayObject, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
spl_handler_ArrayObject.clone_obj = spl_array_object_clone;
spl_handler_ArrayObject.read_dimension = spl_array_read_dimension;
@@ -987,8 +987,8 @@
spl_handler_ArrayObject.count_elements =
spl_array_object_count_elements;
REGISTER_SPL_STD_CLASS_EX(ArrayIterator, spl_array_object_new,
spl_funcs_ArrayIterator);
- zend_class_implements(spl_ce_ArrayIterator TSRMLS_CC, 1,
zend_ce_iterator);
- zend_class_implements(spl_ce_ArrayIterator TSRMLS_CC, 1,
zend_ce_arrayaccess);
+ REGISTER_SPL_IMPLEMENTS(ArrayIterator, Iterator);
+ REGISTER_SPL_IMPLEMENTS(ArrayIterator, ArrayAccess);
REGISTER_SPL_IMPLEMENTS(ArrayIterator, SeekableIterator);
memcpy(&spl_handler_ArrayIterator, &spl_handler_ArrayObject,
sizeof(zend_object_handlers));
spl_ce_ArrayIterator->get_iterator = spl_array_get_iterator;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
