vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* eina: some time compiler are really stupid... 

SVN revision: 55561
This commit is contained in:
Cedric BAIL 2010-12-15 11:56:50 +00:00
parent 72c9afd3cb
commit 701cfebbed
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/eina/src/include/eina_accessor.h
View File

@ -172,7 +172,7 @@ EAPI Eina_Bool eina_accessor_unlock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1)
*/ */
#define EINA_ACCESSOR_FOREACH(accessor, counter, data) \ #define EINA_ACCESSOR_FOREACH(accessor, counter, data) \
for ((counter) = 0; \ for ((counter) = 0; \
eina_accessor_data_get((accessor), (counter), (void **)&(data)); \ eina_accessor_data_get((accessor), (counter), (void **)(void *)&(data)); \
(counter)++) (counter)++)
/** /**

2
legacy/eina/src/include/eina_iterator.h
View File

@ -167,7 +167,7 @@ EAPI Eina_Bool eina_iterator_unlock(Eina_Iterator *iterator) EINA_ARG_NONNULL(1)
*/ */
#define EINA_ITERATOR_FOREACH(itr, \ #define EINA_ITERATOR_FOREACH(itr, \
data) while (eina_iterator_next((itr), \ data) while (eina_iterator_next((itr), \
(void **)&(data))) (void **)(void *)&(data)))
/** /**
* @} * @}

10
legacy/eina/src/lib/eina_hash.c
View File

@ -611,13 +611,13 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
} }
else else
{ {
ok = eina_iterator_next(it->list, (void **)&it->hash_element); ok = eina_iterator_next(it->list, (void **)(void*)&it->hash_element);
if (!ok) if (!ok)
{ {
eina_iterator_free(it->list); eina_iterator_free(it->list);
it->list = NULL; it->list = NULL;
ok = eina_iterator_next(it->current, (void **)&it->hash_head); ok = eina_iterator_next(it->current, (void **)(void*)&it->hash_head);
if (!ok) if (!ok)
{ {
eina_iterator_free(it->current); eina_iterator_free(it->current);
@ -627,7 +627,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
else else
{ {
it->list = eina_rbtree_iterator_prefix(it->hash_head->head); it->list = eina_rbtree_iterator_prefix(it->hash_head->head);
ok = eina_iterator_next(it->list, (void **)&it->hash_element); ok = eina_iterator_next(it->list, (void **)(void*)&it->hash_element);
} }
} }
@ -642,7 +642,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
{ {
it->current = it->current =
eina_rbtree_iterator_prefix(it->hash->buckets[bucket]); eina_rbtree_iterator_prefix(it->hash->buckets[bucket]);
ok = eina_iterator_next(it->current, (void **)&it->hash_head); ok = eina_iterator_next(it->current, (void **)(void*)&it->hash_head);
if (ok) if (ok)
break; break;
@ -656,7 +656,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
eina_iterator_free(it->list); eina_iterator_free(it->list);
it->list = eina_rbtree_iterator_prefix(it->hash_head->head); it->list = eina_rbtree_iterator_prefix(it->hash_head->head);
ok = eina_iterator_next(it->list, (void **)&it->hash_element); ok = eina_iterator_next(it->list, (void **)(void*)&it->hash_element);
if (bucket == it->hash->size) if (bucket == it->hash->size)
ok = EINA_FALSE; ok = EINA_FALSE;
} }