From f3bb0eaf118fba0e3fd56d4403c1961ca2193398 Mon Sep 17 00:00:00 2001 From: Jiyoun Park Date: Thu, 14 Dec 2017 16:26:32 +0900 Subject: [PATCH] eina_list: use old EINA_LIST_FOREACH to fix c++ casting warning. dali_adaptor and chromium-efl turn on werror option related with type casting. after adding the code to deal with cplusplus in eina, we will use new eina foreach define Change-Id: I54286aa278684ac7050d835c1ba55dd79c2fcb3d --- src/lib/eina/eina_list.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/lib/eina/eina_list.h b/src/lib/eina/eina_list.h index c2010a5..58d5920 100644 --- a/src/lib/eina/eina_list.h +++ b/src/lib/eina/eina_list.h @@ -1411,8 +1411,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data) * For destructive operations such as this, consider * using EINA_LIST_FOREACH_SAFE(). */ -//TIZEN_ONLY(20171214): fix old-style casting warning in cplusplus -#if !defined(__cplusplus) +//TIZEN_ONLY(20171214): use old EINA_LIST_FOREACH for c++ casting warning +/* #define EINA_LIST_FOREACH(list, l, _data)\ for (l = list, \ _data = eina_list_data_get(l), \ @@ -1423,18 +1423,13 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data) l = eina_list_next(l), \ _data = eina_list_data_get(l), \ l ? (EINA_PREFETCH(((Eina_List *)l)->next), EINA_PREFETCH(_data)) : EINA_PREFETCH(l)) -#else -#define EINA_LIST_FOREACH(list, l, _data)\ +*/ +#define EINA_LIST_FOREACH(list, l, data) \ for (l = list, \ - _data = eina_list_data_get(l), \ - l ? (EINA_PREFETCH((static_cast(l))->next), EINA_PREFETCH(_data)) : EINA_PREFETCH(l); \ - \ + data = eina_list_data_get(l); \ l; \ - \ l = eina_list_next(l), \ - _data = eina_list_data_get(l), \ - l ? (EINA_PREFETCH((static_cast(l))->next), EINA_PREFETCH(_data)) : EINA_PREFETCH(l)) -#endif + data = eina_list_data_get(l)) // /** -- 2.7.4