cvs: spl / spl_functions.c
| From: | Marcus Boerger | Date: | Tue, 27 May 2003 00:14:04 +0000 |
| Subject: | cvs: spl / spl_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21281@lists.php.net to get a copy of this message | ||
helly Mon May 26 20:14:04 2003 EDT
Modified files:
/spl spl_functions.c
Log:
For now that works.
# However some of the register stuff must be moved to the engine.
# And inside the engine some fixes are needed, too.
Index: spl/spl_functions.c
diff -u spl/spl_functions.c:1.4 spl/spl_functions.c:1.5
--- spl/spl_functions.c:1.4 Mon May 26 18:06:49 2003
+++ spl/spl_functions.c Mon May 26 20:14:04 2003
@@ -100,13 +100,20 @@
}
/* }}} */
+/* {{{ spl_inherit method */
+static void spl_inherit_method(zend_function *function)
+{
+ function_add_ref(function);
+}
+/* }}} */
+
/* {{{ spl_register_implement */
void spl_register_implement(zend_class_entry * class_entry, zend_class_entry * interface_entry
TSRMLS_DC)
{
zend_uint num_interfaces = ++class_entry->num_interfaces;
class_entry->interfaces = (zend_class_entry **) realloc(class_entry->interfaces,
sizeof(zend_class_entry *) * num_interfaces);
class_entry->interfaces[num_interfaces-1] = interface_entry;
- zend_hash_copy(&class_entry->function_table, &interface_entry->function_table, NULL,
NULL, sizeof(zend_function));
+ zend_hash_merge(&class_entry->function_table, &interface_entry->function_table,
(copy_ctor_func_t) spl_inherit_method, NULL, sizeof(zend_function), 0);
}
/* }}} */