cvs: ZendEngine2(PHP_5_2) / zend_compile.c

tony2001 Tue Jun 6 14:17:22 2006 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2 zend_compile.c Log: revert by Andi's request http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.10&r2=1.647.2.27.2.11&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.10 ZendEngine2/zend_compile.c:1.647.2.27.2.11 --- ZendEngine2/zend_compile.c:1.647.2.27.2.10 Tue Jun 6 10:03:01 2006 +++ ZendEngine2/zend_compile.c Tue Jun 6 14:17:21 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.647.2.27.2.10 2006/06/06 10:03:01 tony2001 Exp $ */ +/* $Id: zend_compile.c,v 1.647.2.27.2.11 2006/06/06 14:17:21 tony2001 Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -2247,17 +2247,6 @@ ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface TSRMLS_DC) { - zend_uint i, if_num = ce->num_interfaces, cnt = 0; - - for (i = 0; i < if_num; i++) { - if (ce->interfaces[i] != NULL && ce->interfaces[i]->name_length == iface->name_length && !memcmp(ce->interfaces[i]->name, iface->name, iface->name_length)) { - cnt++; - if (cnt > 1) { - zend_error(E_COMPILE_ERROR, "Cannot implement previously implemented interface %s", iface->name); - } - } - } - zend_hash_merge_ex(&ce->constants_table, &iface->constants_table, (copy_ctor_func_t) zval_add_ref, sizeof(zval *), (merge_checker_func_t) do_inherit_constant_check, iface); zend_hash_merge_ex(&ce->function_table, &iface->function_table, (copy_ctor_func_t) do_inherit_method, sizeof(zend_function), (merge_checker_func_t) do_inherit_method_check, ce);