Removed deprecated fields

diff --git a/Zend/zend.h b/Zend/zend.h
index adeccc6f39208c714d332529b52872a40b57dbb1..444b71ed64d2b87f12184455f7839152f3de3c14 100644 (file)
--- 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 8998b07eda2276ca9ba64f35225a34eaf754bee9..0d9fb17ab0c5cf1b6a163e349658b0afa292b4e9 100644 (file)
--- 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);
 }
 /* }}} */