diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:14:32 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-08-04 16:14:32 -0700 |
| commit | 54daa5317f8af16ca7a14ae7a66c00ddd87a6e70 (patch) | |
| tree | 669b12dc15359e021c52be574f4ea0a5c51dff45 /Zend/zend_exceptions.c | |
| parent | 97047e7665368d0cf30501f7a4b6a124de25957b (diff) | |
| parent | 568a35f84f934d1fe1b9817b4226cf2bd9d8f4cc (diff) | |
| download | php-git-54daa5317f8af16ca7a14ae7a66c00ddd87a6e70.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
__wakeup doesn't have to be final
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 51ea2319bf..f03bc40e47 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -808,7 +808,7 @@ ZEND_END_ARG_INFO() static const zend_function_entry default_exception_functions[] = { ZEND_ME(exception, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL) ZEND_ME(exception, __construct, arginfo_exception___construct, ZEND_ACC_PUBLIC) - ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) + ZEND_ME(exception, __wakeup, NULL, ZEND_ACC_PUBLIC) ZEND_ME(exception, getMessage, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(exception, getCode, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(exception, getFile, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) |