diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-03-16 10:33:23 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-03-16 10:33:23 +0000 |
| commit | 7c0e534157ebf552c0393471ecd41b04fce35e17 (patch) | |
| tree | fbf73045089b3dcbfd36e1aa85ac7127c301fcf2 /Zend/zend_operators.c | |
| parent | 22055cb8fddf93085b518a5c21370c26c0a1cb2c (diff) | |
| download | php-git-7c0e534157ebf552c0393471ecd41b04fce35e17.tar.gz | |
Dropped zend.ze1_compatibility_mode
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 337c241e32..33c5b5df94 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -394,14 +394,8 @@ ZEND_API void convert_to_long_base(zval *op, int base) return; } - if (EG(ze1_compatibility_mode)) { - HashTable *ht = Z_OBJPROP_P(op); - if (ht) { - retval = (zend_hash_num_elements(ht)?1:0); - } - } else { - zend_error(E_NOTICE, "Object of class %v could not be converted to int", Z_OBJCE_P(op)->name); - } + zend_error(E_NOTICE, "Object of class %v could not be converted to int", Z_OBJCE_P(op)->name); + zval_dtor(op); ZVAL_LONG(op, retval); return; @@ -469,14 +463,7 @@ ZEND_API void convert_to_double(zval *op) return; } - if (EG(ze1_compatibility_mode)) { - HashTable *ht = Z_OBJPROP_P(op); - if (ht) { - retval = (zend_hash_num_elements(ht)?1.0:0.0); - } - } else { - zend_error(E_NOTICE, "Object of class %v could not be converted to double", Z_OBJCE_P(op)->name); - } + zend_error(E_NOTICE, "Object of class %v could not be converted to double", Z_OBJCE_P(op)->name); zval_dtor(op); ZVAL_DOUBLE(op, retval); @@ -579,13 +566,6 @@ ZEND_API void convert_to_boolean(zval *op) return; } - if (EG(ze1_compatibility_mode)) { - HashTable *ht = Z_OBJPROP_P(op); - if (ht) { - retval = (zend_hash_num_elements(ht)?1:0); - } - } - zval_dtor(op); ZVAL_BOOL(op, retval); break; @@ -1708,15 +1688,7 @@ ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) break; case IS_OBJECT: if (Z_OBJ_HT_P(op1) == Z_OBJ_HT_P(op2)) { - if (EG(ze1_compatibility_mode)) { - zend_compare_objects(result, op1, op2 TSRMLS_CC); - /* comparison returns 0 in case of equality and - * 1 in case of ineqaulity, we need to reverse it - */ - Z_LVAL_P(result) = !Z_LVAL_P(result); - } else { - Z_LVAL_P(result) = (Z_OBJ_HANDLE_P(op1) == Z_OBJ_HANDLE_P(op2)); - } + Z_LVAL_P(result) = (Z_OBJ_HANDLE_P(op1) == Z_OBJ_HANDLE_P(op2)); } else { Z_LVAL_P(result) = 0; } |