com php-src: Merge branch 'PHP-5.6': Zend/zend_exceptions.c
| From: | Stanislav Malyshev | Date: | Tue, 04 Aug 2015 23:14:32 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': Zend/zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88336@lists.php.net to get a copy of this message | ||
Commit: 54daa5317f8af16ca7a14ae7a66c00ddd87a6e70
Author: Stanislav Malyshev <stas@php.net> Tue, 4 Aug 2015 16:14:32 -0700
Parents: 97047e7665368d0cf30501f7a4b6a124de25957b 568a35f84f934d1fe1b9817b4226cf2bd9d8f4cc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54daa5317f8af16ca7a14ae7a66c00ddd87a6e70
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
__wakeup doesn't have to be final
Changed paths:
MM Zend/zend_exceptions.c
Diff:
diff --cc Zend/zend_exceptions.c
index 51ea231,40248f7..f03bc40
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@@ -805,10 -752,10 +805,10 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_exceptio
ZEND_ARG_INFO(0, previous)
ZEND_END_ARG_INFO()
-const static zend_function_entry default_exception_functions[] = {
+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)