diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-17 15:40:45 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-17 15:40:45 +0400 |
| commit | e96073b1e40c4999dee70db684721a582ea5e055 (patch) | |
| tree | d2bfacb90dc6742450a5f6b6112c1db1d088d8ac /Zend/zend_objects_API.c | |
| parent | c92dd8eedf95f204520a3b2a15668d56a1aefbde (diff) | |
| download | php-git-e96073b1e40c4999dee70db684721a582ea5e055.tar.gz | |
Moved zend_literal->cache_slot right into zval.
It should be accessed using Z_CACHE_SLOT() macro.
zend_literal structure is removed.
API functions that accepted pointer to zend_literal now accept pointer to zval or cache_slot directly.
Calls of such functiond that now accept cache_slot need to be changed to pass -1 instead of NULL.
Diffstat (limited to 'Zend/zend_objects_API.c')
| -rw-r--r-- | Zend/zend_objects_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 3d97aaaf7a..285a752c2b 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -270,7 +270,7 @@ ZEND_API void zend_object_proxy_set(zval *property, zval *value TSRMLS_DC) zend_proxy_object *probj = (zend_proxy_object*)Z_OBJ_P(property); if (Z_OBJ_HT(probj->object) && Z_OBJ_HT(probj->object)->write_property) { - Z_OBJ_HT(probj->object)->write_property(&probj->object, &probj->property, value, 0 TSRMLS_CC); + Z_OBJ_HT(probj->object)->write_property(&probj->object, &probj->property, value, -1 TSRMLS_CC); } else { zend_error(E_WARNING, "Cannot write property of object - no write handler defined"); } @@ -281,7 +281,7 @@ ZEND_API zval* zend_object_proxy_get(zval *property TSRMLS_DC) zend_proxy_object *probj = (zend_proxy_object*)Z_OBJ_P(property); if (Z_OBJ_HT(probj->object) && Z_OBJ_HT(probj->object)->read_property) { - return Z_OBJ_HT(probj->object)->read_property(&probj->object, &probj->property, BP_VAR_R, 0, NULL TSRMLS_CC); + return Z_OBJ_HT(probj->object)->read_property(&probj->object, &probj->property, BP_VAR_R, -1, NULL TSRMLS_CC); } else { zend_error(E_WARNING, "Cannot read property of object - no read handler defined"); } |