From: Dmitry Stogov Date: Wed, 22 Apr 2015 10:14:03 +0000 (+0300) Subject: Removred temporary code X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~182 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2d87429d56847b2e0d0d19444e3ee57217859e6;p=php Removred temporary code --- diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 50cc3fe66a..52f4994c7b 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -748,8 +748,6 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent if (ce->default_properties_count) { zval *table = pemalloc(sizeof(zval) * (ce->default_properties_count + parent_ce->default_properties_count), ce->type == ZEND_INTERNAL_CLASS); src = ce->default_properties_table + ce->default_properties_count; -// zval *table = perealloc(ce->default_properties_table, sizeof(zval) * (ce->default_properties_count + parent_ce->default_properties_count), ce->type == ZEND_INTERNAL_CLASS); -// src = table + ce->default_properties_count; end = table + parent_ce->default_properties_count; dst = end + ce->default_properties_count; ce->default_properties_table = table; @@ -793,8 +791,6 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent if (ce->default_static_members_count) { zval *table = pemalloc(sizeof(zval) * (ce->default_static_members_count + parent_ce->default_static_members_count), ce->type == ZEND_INTERNAL_CLASS); src = ce->default_static_members_table + ce->default_static_members_count; -// zval *table = perealloc(ce->default_static_members_table, sizeof(zval) * (ce->default_static_members_count + parent_ce->default_static_members_count), ce->type == ZEND_INTERNAL_CLASS); -// src = table + ce->default_static_members_count; end = table + parent_ce->default_static_members_count; dst = end + ce->default_static_members_count; ce->default_static_members_table = table;