cvs: Zend(PHP_4_2_0) / zend_compile.c
| From: | Derick Rethans | Date: | Fri, 29 Mar 2002 12:27:46 +0000 |
| Subject: | cvs: Zend(PHP_4_2_0) / zend_compile.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-43@lists.php.net to get a copy of this message | ||
derick Fri Mar 29 07:27:46 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/Zend zend_compile.c
Log:
- Revert patch
Index: Zend/zend_compile.c
diff -u Zend/zend_compile.c:1.225.2.1 Zend/zend_compile.c:1.225.2.2
--- Zend/zend_compile.c:1.225.2.1 Mon Mar 25 15:31:48 2002
+++ Zend/zend_compile.c Fri Mar 29 07:27:46 2002
@@ -732,9 +732,7 @@
op_array.return_reference = return_reference;
if (is_method) {
- if (zend_hash_add(&CG(active_class_entry)->function_table, name, name_len+1,
&op_array, sizeof(zend_op_array), (void **) &CG(active_op_array)) == FAILURE) {
- zend_error(E_ERROR, "Cannot redeclare method %s()", name);
- }
+ zend_hash_update(&CG(active_class_entry)->function_table, name, name_len+1, &op_array,
sizeof(zend_op_array), (void **) &CG(active_op_array));
} else {
zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);