Commit: a47c11a13d005afb1b9b8382eb8f34f8dd632039 Author: Nikita Popov <ni...@php.net> Sun, 16 Sep 2012 22:01:07 +0200 Parents: 526db7db14f73c652a6b1a80149ede114ddd024c Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a47c11a13d005afb1b9b8382eb8f34f8dd632039 Log: Fix two op_array -> function cast warnings Changed paths: M Zend/zend_generators.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index 83025ea..01b33a3 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -371,7 +371,7 @@ zval *zend_generator_create_zval(zend_op_array *op_array TSRMLS_DC) /* {{{ */ if (op_array->fn_flags & ZEND_ACC_CLOSURE) { zend_op_array *op_array_copy = (zend_op_array*)emalloc(sizeof(zend_op_array)); *op_array_copy = *op_array; - function_add_ref(op_array_copy); + function_add_ref((zend_function *) op_array_copy); op_array = op_array_copy; } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index be2021a..e0fc1bf 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -5340,7 +5340,7 @@ ZEND_VM_HANDLER(153, ZEND_DECLARE_LAMBDA_FUNCTION, CONST, UNUSED) zend_error_noreturn(E_ERROR, "Base lambda function for closure not found"); } - zend_create_closure(&EX_T(opline->result.var).tmp_var, op_array, EG(scope), EG(This) TSRMLS_CC); + zend_create_closure(&EX_T(opline->result.var).tmp_var, (zend_function *) op_array, EG(scope), EG(This) TSRMLS_CC); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index bde11ea..b8dac02 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -6614,7 +6614,7 @@ static int ZEND_FASTCALL ZEND_DECLARE_LAMBDA_FUNCTION_SPEC_CONST_UNUSED_HANDLER zend_error_noreturn(E_ERROR, "Base lambda function for closure not found"); } - zend_create_closure(&EX_T(opline->result.var).tmp_var, op_array, EG(scope), EG(This) TSRMLS_CC); + zend_create_closure(&EX_T(opline->result.var).tmp_var, (zend_function *) op_array, EG(scope), EG(This) TSRMLS_CC); CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
