diff options
| author | Nikita Popov <nikic@php.net> | 2014-10-09 14:08:10 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-10-09 14:08:10 +0200 |
| commit | b3a779de68efcf2cff265cae30e45f1ada834064 (patch) | |
| tree | 05252edcaf3c9ae1232bf0656051639b61b0fdc7 /Zend/zend_object_handlers.c | |
| parent | 116c5ecda1bc276c421b9598a9c8cd845f7efe84 (diff) | |
| download | php-git-b3a779de68efcf2cff265cae30e45f1ada834064.tar.gz | |
Remove get_class_entry object handler
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 9b7e579ea3..c02cda64b9 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1089,7 +1089,7 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr, zend_str /* Ensure that if we're calling a private function, we're allowed to do so. * If we're not and __call() handler exists, invoke it, otherwise error out. */ - updated_fbc = zend_check_private_int(fbc, zobj->handlers->get_class_entry(zobj TSRMLS_CC), lc_method_name TSRMLS_CC); + updated_fbc = zend_check_private_int(fbc, zobj->ce, lc_method_name TSRMLS_CC); if (EXPECTED(updated_fbc != NULL)) { fbc = updated_fbc; } else { @@ -1525,12 +1525,6 @@ exit: } /* }}} */ -zend_class_entry *zend_std_object_get_class(const zend_object *object TSRMLS_DC) /* {{{ */ -{ - return object->ce; -} -/* }}} */ - zend_string* zend_std_object_get_class_name(const zend_object *zobj, int parent TSRMLS_DC) /* {{{ */ { zend_class_entry *ce; @@ -1660,7 +1654,6 @@ ZEND_API zend_object_handlers std_object_handlers = { zend_std_get_method, /* get_method */ NULL, /* call_method */ zend_std_get_constructor, /* get_constructor */ - zend_std_object_get_class, /* get_class_entry */ zend_std_object_get_class_name, /* get_class_name */ zend_std_compare_objects, /* compare_objects */ zend_std_cast_object_tostring, /* cast_object */ |