cvs: ZendEngine2(PHP_5_0) / zend_interfaces.c

helly Mon Sep 27 04:34:49 2004 EDT Modified files: (Branch: PHP_5_0) /ZendEngine2 zend_interfaces.c Log: MFH (1 fix, 1 warning) http://cvs.php.net/diff.php/ZendEngine2/zend_interfaces.c?r1=1.21&r2=1.21.2.1&ty=u Index: ZendEngine2/zend_interfaces.c diff -u ZendEngine2/zend_interfaces.c:1.21 ZendEngine2/zend_interfaces.c:1.21.2.1 --- ZendEngine2/zend_interfaces.c:1.21 Tue Apr 27 11:47:55 2004 +++ ZendEngine2/zend_interfaces.c Mon Sep 27 04:34:49 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_interfaces.c,v 1.21 2004/04/27 15:47:55 helly Exp $ */ +/* $Id: zend_interfaces.c,v 1.21.2.1 2004/09/27 08:34:49 helly Exp $ */ #include "zend.h" #include "zend_API.h" @@ -272,7 +272,7 @@ zend_class_entry *ce_it = Z_TYPE_P(iterator) == IS_OBJECT ? Z_OBJCE_P(iterator) : NULL; - if (!ce || !ce_it || !ce_it->get_iterator) { + if (!ce || !ce_it || !ce_it->get_iterator || (ce_it->get_iterator == zend_user_it_get_new_iterator && iterator == object)) { zend_error(E_WARNING, "Objects returned by %s::getIterator() must be traversable or implement interface Iterator", ce->name); zval_ptr_dtor(&iterator); return NULL; @@ -287,7 +287,7 @@ static int zend_implement_traversable(zend_class_entry *interface, zend_class_entry *class_type TSRMLS_DC) { /* check that class_type is traversable at c-level or implements at least one of 'aggregate' and 'Iterator' */ - int i; + zend_uint i; if (class_type->get_iterator || (class_type->parent && class_type->parent->get_iterator)) { return SUCCESS;