Commit: bc0425c02579dbbb9e9f9f38a835413c6c512eb3 Author: Dmitry Stogov <dmi...@zend.com> Tue, 25 Dec 2012 10:47:43 +0400 Parents: b8c719c0687aea8c13241abb5a52eefbac1a3a95 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bc0425c02579dbbb9e9f9f38a835413c6c512eb3 Log: Removed deprecated fields Changed paths: M Zend/zend.h M Zend/zend_compile.c Diff: diff --git a/Zend/zend.h b/Zend/zend.h index adeccc6..444b71e 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -451,8 +451,6 @@ struct _zend_trait_precedence { zend_trait_method_reference *trait_method; zend_class_entry** exclude_from_classes; - - union _zend_function* function; /* FIXME: kept in 5.4 for BC, not used */ }; typedef struct _zend_trait_precedence zend_trait_precedence; @@ -469,8 +467,6 @@ struct _zend_trait_alias { * modifiers to be set on trait method */ zend_uint modifiers; - - union _zend_function* function; /* FIXME: kept in 5.4 for BC, not used */ }; typedef struct _zend_trait_alias zend_trait_alias; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8998b07..0d9fb17 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4454,8 +4454,6 @@ void zend_add_trait_alias(znode *method_reference, znode *modifiers, znode *alia } else { trait_alias->alias = NULL; } - trait_alias->function = NULL; - zend_add_to_list(&ce->trait_aliases, trait_alias TSRMLS_CC); } /* }}} */ @@ -4468,8 +4466,6 @@ void zend_add_trait_precedence(znode *method_reference, znode *trait_list TSRMLS trait_precedence->trait_method = (zend_trait_method_reference*)method_reference->u.op.ptr; trait_precedence->exclude_from_classes = (zend_class_entry**) trait_list->u.op.ptr; - trait_precedence->function = NULL; - zend_add_to_list(&ce->trait_precedences, trait_precedence TSRMLS_CC); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
