com php-src: "This" is C++ keyword: Zend/zend_generators.c Zend/zend_generators.h

Commit: 3eabf2bf199c26d9d2f2ba97ff3a8850d713e9fb Author: Xinchen Hui <laruence@php.net> Thu, 30 Jul 2015 11:30:34 +0800 Parents: ae1a4f47e6bd9f8d1d969e5080dae60136d7444b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3eabf2bf199c26d9d2f2ba97ff3a8850d713e9fb Log: "This" is C++ keyword Changed paths: M Zend/zend_generators.c M Zend/zend_generators.h Diff: diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index d98e271..1399762 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -463,12 +463,12 @@ static void zend_generator_add_child(zend_generator *generator, zend_generator * } } -void zend_generator_yield_from(zend_generator *this, zend_generator *from) +void zend_generator_yield_from(zend_generator *generator, zend_generator *from) { - zend_generator_add_child(from, this); + zend_generator_add_child(from, generator); - this->node.parent = from; - zend_generator_get_current(this); + generator->node.parent = from; + zend_generator_get_current(generator); --GC_REFCOUNT(from); } diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h index ae1e312..3b41ec9 100644 --- a/Zend/zend_generators.h +++ b/Zend/zend_generators.h @@ -103,7 +103,7 @@ ZEND_API void zend_generator_create_zval(zend_execute_data *call, zend_op_array ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished_execution); ZEND_API void zend_generator_resume(zend_generator *generator); -void zend_generator_yield_from(zend_generator *this, zend_generator *from); +void zend_generator_yield_from(zend_generator *generator, zend_generator *from); ZEND_API zend_generator *zend_generator_get_current(zend_generator *generator); ZEND_API zend_execute_data *zend_generator_check_placeholder_frame(zend_execute_data *ptr);