diff options
| author | Guilherme Blanco <guilhermeblanco@hotmail.com> | 2015-02-12 23:19:14 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-02-12 23:20:19 +0100 |
| commit | 8c81d80e10e0f189307fc8ff4a8fb34bd0cb1fcb (patch) | |
| tree | 962ecf3dbea41b0d4d539a60498b6942304bd844 /Zend/zend_inheritance.c | |
| parent | a0d472e1dad4a1cb719ba56a1ca4da19fadfdfb3 (diff) | |
| download | php-git-8c81d80e10e0f189307fc8ff4a8fb34bd0cb1fcb.tar.gz | |
Made ZEND_ACC_TRAIT a saner value
CC_TRAIT valued as 0x120 is too magical to be comprehensible by others.
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index bcbf3c7b75..dbd81d8e1d 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1126,7 +1126,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s zend_get_function_declaration(existing_fn)->val); } return; - } else if ((existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) { + } else if (existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT) { /* two traits can't define the same non-abstract method */ #if 1 zend_error_noreturn(E_COMPILE_ERROR, "Trait method %s has not been applied, because there are collisions with other trait methods on %s", |