forked from enlightenment/efl
eo_compatible - improve usability of err/warnings by duplication impl
This commit is contained in:
parent
fc6759ef4d
commit
3ce5d1ebc7
|
@ -2094,7 +2094,12 @@ efl_domain_data_return(Efl_Id_Domain domain)
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
efl_compatible(const Eo *obj, const Eo *obj_target)
|
efl_compatible(const Eo *obj, const Eo *obj_target)
|
||||||
{
|
{
|
||||||
return _eo_id_domain_compatible(obj, obj_target);
|
Efl_Id_Domain domain1 = ((Eo_Id)obj >> SHIFT_DOMAIN) & MASK_DOMAIN;
|
||||||
|
Efl_Id_Domain domain2 = ((Eo_Id)obj_target >> SHIFT_DOMAIN) & MASK_DOMAIN;
|
||||||
|
if (domain1 == domain2) return EINA_TRUE;
|
||||||
|
DBG("Object %p and %p are not compatible. Domain %i and %i do not match",
|
||||||
|
obj, obj_target, domain1, domain2);
|
||||||
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
|
|
|
@ -370,13 +370,10 @@ _eo_id_domain_compatible(const Eo *o1, const Eo *o2)
|
||||||
{
|
{
|
||||||
Efl_Id_Domain domain1 = ((Eo_Id)o1 >> SHIFT_DOMAIN) & MASK_DOMAIN;
|
Efl_Id_Domain domain1 = ((Eo_Id)o1 >> SHIFT_DOMAIN) & MASK_DOMAIN;
|
||||||
Efl_Id_Domain domain2 = ((Eo_Id)o2 >> SHIFT_DOMAIN) & MASK_DOMAIN;
|
Efl_Id_Domain domain2 = ((Eo_Id)o2 >> SHIFT_DOMAIN) & MASK_DOMAIN;
|
||||||
if (domain1 != domain2)
|
if (domain1 == domain2) return EINA_TRUE;
|
||||||
{
|
ERR("Object %p and %p are not compatible. Domain %i and %i do not match",
|
||||||
ERR("Object %p and %p are not compatible. Domain %i and %i do not match",
|
o1, o2, domain1, domain2);
|
||||||
o1, o2, domain1, domain2);
|
return EINA_FALSE;
|
||||||
return EINA_FALSE;
|
|
||||||
}
|
|
||||||
return EINA_TRUE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
|
|
Loading…
Reference in New Issue