mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Zend/zend_inheritance: Use bool instead of uint32_t
This commit is contained in:
parent
dcf664963f
commit
462b170a30
1 changed files with 2 additions and 2 deletions
|
@ -2194,7 +2194,7 @@ static void do_interface_implementation(zend_class_entry *ce, zend_class_entry *
|
||||||
|
|
||||||
ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface) /* {{{ */
|
ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface) /* {{{ */
|
||||||
{
|
{
|
||||||
uint32_t ignore = 0;
|
bool ignore = false;
|
||||||
uint32_t current_iface_num = ce->num_interfaces;
|
uint32_t current_iface_num = ce->num_interfaces;
|
||||||
uint32_t parent_iface_num = ce->parent ? ce->parent->num_interfaces : 0;
|
uint32_t parent_iface_num = ce->parent ? ce->parent->num_interfaces : 0;
|
||||||
|
|
||||||
|
@ -2206,7 +2206,7 @@ ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry
|
||||||
i--;
|
i--;
|
||||||
} else if (ce->interfaces[i] == iface) {
|
} else if (ce->interfaces[i] == iface) {
|
||||||
if (EXPECTED(i < parent_iface_num)) {
|
if (EXPECTED(i < parent_iface_num)) {
|
||||||
ignore = 1;
|
ignore = true;
|
||||||
} else {
|
} else {
|
||||||
zend_error_noreturn(E_COMPILE_ERROR, "Class %s cannot implement previously implemented interface %s", ZSTR_VAL(ce->name), ZSTR_VAL(iface->name));
|
zend_error_noreturn(E_COMPILE_ERROR, "Class %s cannot implement previously implemented interface %s", ZSTR_VAL(ce->name), ZSTR_VAL(iface->name));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue