diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /Zend/zend_inheritance.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index c140a18ec2..8983ddc936 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -32,7 +32,7 @@ static void ptr_dtor(zval *zv) /* {{{ */ static zend_property_info *zend_duplicate_property_info(zend_property_info *property_info) /* {{{ */ { zend_property_info* new_property_info; - + new_property_info = zend_arena_alloc(&CG(arena), sizeof(zend_property_info)); memcpy(new_property_info, property_info, sizeof(zend_property_info)); zend_string_addref(new_property_info->name); @@ -288,7 +288,7 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c zend_string *fe_class_name, *proto_class_name; const char *class_name; - if (fe->type == ZEND_INTERNAL_FUNCTION) { + if (fe->type == ZEND_INTERNAL_FUNCTION) { fe_class_name = NULL; class_name = ((zend_internal_arg_info*)fe_arg_info)->class_name; } else { @@ -305,7 +305,7 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c fe_class_name = zend_string_init(class_name, strlen(class_name), 0); } - if (proto->type == ZEND_INTERNAL_FUNCTION) { + if (proto->type == ZEND_INTERNAL_FUNCTION) { proto_class_name = NULL; class_name = ((zend_internal_arg_info*)proto_arg_info)->class_name; } else { @@ -1320,7 +1320,7 @@ static void zend_traits_compile_exclude_table(HashTable* exclude_table, zend_tra j = 0; while (precedences[i]->exclude_from_classes[j].ce) { if (precedences[i]->exclude_from_classes[j].ce == trait) { - zend_string *lcname = + zend_string *lcname = zend_string_tolower(precedences[i]->trait_method->method_name); if (zend_hash_add_empty_element(exclude_table, lcname) == NULL) { zend_string_release(lcname); |