diff options
| author | Xinchen Hui <laruence@php.net> | 2014-12-21 21:53:32 -0500 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-12-21 21:53:32 -0500 |
| commit | 0adceaa87b908d077a140c56050cfdb6e7e6fb62 (patch) | |
| tree | 73c8919087a34102d1f3b13960d57bd4ca41e9d5 /Zend/zend_operators.c | |
| parent | abb98080c7fd6a23372d1641483dabeab58bf471 (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-0adceaa87b908d077a140c56050cfdb6e7e6fb62.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 70de104975..23f3ddcf7f 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -353,7 +353,7 @@ ZEND_API void convert_to_double(zval *op) /* {{{ */ if (Z_TYPE(dst) == IS_DOUBLE) { ZVAL_COPY_VALUE(op, &dst); } else { - zend_error(E_NOTICE, "Object of class %s could not be converted to double", Z_OBJCE_P(op)->name->val); + zend_error(E_NOTICE, "Object of class %s could not be converted to float", Z_OBJCE_P(op)->name->val); ZVAL_DOUBLE(op, 1.0); } |