diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-01 13:06:38 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-01 13:06:38 +0800 |
| commit | fd0baec2e9afbd6706f16c26d32ec038c192d7e5 (patch) | |
| tree | 0ba31b7242cc63451c84fb9fbb1172bffa9314e9 /Zend/zend_operators.c | |
| parent | af812eac4c9727bdfb90cac1a35ab53d741cb7eb (diff) | |
| parent | ed772e1a998ca72fc1c354fcefc05149ca7a2a56 (diff) | |
| download | php-git-fd0baec2e9afbd6706f16c26d32ec038c192d7e5.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 3475174513..daa3ada6ed 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -868,7 +868,7 @@ ZEND_API int ZEND_FASTCALL add_function(zval *result, zval *op1, zval *op2) /* { zendi_convert_scalar_to_number(op2, op2_copy, result); converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; /* unknown datatype */ } } @@ -921,7 +921,7 @@ ZEND_API int ZEND_FASTCALL sub_function(zval *result, zval *op1, zval *op2) /* { zendi_convert_scalar_to_number(op2, op2_copy, result); converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; /* unknown datatype */ } } @@ -968,7 +968,7 @@ ZEND_API int ZEND_FASTCALL mul_function(zval *result, zval *op1, zval *op2) /* { zendi_convert_scalar_to_number(op2, op2_copy, result); converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; /* unknown datatype */ } } @@ -1056,7 +1056,7 @@ ZEND_API int ZEND_FASTCALL pow_function(zval *result, zval *op1, zval *op2) /* { } converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; } } @@ -1127,7 +1127,7 @@ ZEND_API int ZEND_FASTCALL div_function(zval *result, zval *op1, zval *op2) /* { zendi_convert_scalar_to_number(op2, op2_copy, result); converted = 1; } else { - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; /* unknown datatype */ } } @@ -1263,7 +1263,7 @@ try_again: default: ZEND_TRY_UNARY_OBJECT_OPERATION(ZEND_BW_NOT); - zend_error(E_ERROR, "Unsupported operand types"); + zend_error(E_EXCEPTION | E_ERROR, "Unsupported operand types"); return FAILURE; } } |