diff options
| author | Stanislav Malyshev <stas@php.net> | 2004-03-28 10:44:48 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2004-03-28 10:44:48 +0000 |
| commit | c331afa2676dc986bba676b263da86b3f3a96e5a (patch) | |
| tree | 8975ffd0289107f0dafc64e433109091e0f02973 /Zend | |
| parent | 09d1d232fc57d57765f305929f5e5d75e25231e9 (diff) | |
| download | php-git-c331afa2676dc986bba676b263da86b3f3a96e5a.tar.gz | |
Use macros for object parts access
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_operators.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index cbc1235659..bbf382edbf 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -303,8 +303,8 @@ ZEND_API void convert_to_long_base(zval *op, int base) { TSRMLS_FETCH(); - if (op->value.obj.handlers->cast_object) { - if (op->value.obj.handlers->cast_object(op, op, IS_LONG, 1 TSRMLS_CC) == SUCCESS) { + if (Z_OBJ_HT_P(op)->cast_object) { + if (Z_OBJ_HT_P(op)->cast_object(op, op, IS_LONG, 1 TSRMLS_CC) == SUCCESS) { break; } } else { @@ -371,9 +371,9 @@ ZEND_API void convert_to_double(zval *op) { TSRMLS_FETCH(); - if (op->value.obj.handlers->cast_object) { + if (Z_OBJ_HT_P(op)->cast_object) { TSRMLS_FETCH(); - if (op->value.obj.handlers->cast_object(op, op, IS_DOUBLE, 1 TSRMLS_CC) == SUCCESS) { + if (Z_OBJ_HT_P(op)->cast_object(op, op, IS_DOUBLE, 1 TSRMLS_CC) == SUCCESS) { break; } } else { @@ -406,9 +406,9 @@ ZEND_API void convert_to_double(zval *op) ZEND_API void convert_to_null(zval *op) { if (op->type == IS_OBJECT) { - if (op->value.obj.handlers->cast_object) { + if (Z_OBJ_HT_P(op)->cast_object) { TSRMLS_FETCH(); - if (op->value.obj.handlers->cast_object(op, op, IS_NULL, 1 TSRMLS_CC) == SUCCESS) { + if (Z_OBJ_HT_P(op)->cast_object(op, op, IS_NULL, 1 TSRMLS_CC) == SUCCESS) { return; } } @@ -462,8 +462,8 @@ ZEND_API void convert_to_boolean(zval *op) { TSRMLS_FETCH(); - if (op->value.obj.handlers->cast_object) { - if (op->value.obj.handlers->cast_object(op, op, IS_BOOL, 1 TSRMLS_CC) == SUCCESS) { + if (Z_OBJ_HT_P(op)->cast_object) { + if (Z_OBJ_HT_P(op)->cast_object(op, op, IS_BOOL, 1 TSRMLS_CC) == SUCCESS) { break; } } else { @@ -542,8 +542,8 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC) break; case IS_OBJECT: { TSRMLS_FETCH(); - if (op->value.obj.handlers->cast_object) { - if (op->value.obj.handlers->cast_object(op, op, IS_STRING, 1 TSRMLS_CC) == SUCCESS) { + if (Z_OBJ_HT_P(op)->cast_object) { + if (Z_OBJ_HT_P(op)->cast_object(op, op, IS_STRING, 1 TSRMLS_CC) == SUCCESS) { break; } zend_error(E_NOTICE, "Object of class %s could not be converted to string", Z_OBJCE_P(op)->name); |