From bdf696a6076973d7091ba878ea2546d899154ff1 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 29 Jan 2020 10:45:24 +0100 Subject: [PATCH] Revert "eolian: enforce that list<> can only be used with @beta API." This reverts commit 6b110e578d24b2a99c4c1b158433327a0a43ce1a. This breaks bindings compilation. --- src/lib/eolian/Eolian.h | 5 ----- src/lib/eolian/database_validate.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index 7f19ff93e7..db0421634a 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -336,12 +336,7 @@ typedef enum EOLIAN_TYPE_BUILTIN_ARRAY, EOLIAN_TYPE_BUILTIN_FUTURE, EOLIAN_TYPE_BUILTIN_ITERATOR, -#ifdef EFL_BETA_API_SUPPORT EOLIAN_TYPE_BUILTIN_LIST, -#else - // Placeholder when using release API only. Done to prevent offseting the value below. - EOLIAN_TYPE_BUILTIN_BETA_PLACEHOLDER1, -#endif EOLIAN_TYPE_BUILTIN_ANY_VALUE, EOLIAN_TYPE_BUILTIN_ANY_VALUE_REF, diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c index 1e7b072c9d..b1af2185ef 100644 --- a/src/lib/eolian/database_validate.c +++ b/src/lib/eolian/database_validate.c @@ -400,9 +400,9 @@ _validate_type(Validate_State *vals, Eolian_Type *tp, Eina_Bool by_ref, int kwid = eo_lexer_keyword_str_to_id(tp->base.name); if (kwid > KW_void) tp->ownable = EINA_TRUE; - if ((kwid == KW_hash || kwid == KW_list) && vals->stable) + if (kwid == KW_hash && vals->stable) { - _eo_parser_log(&tp->base, "hashes and lists not allowed in stable context"); + _eo_parser_log(&tp->base, "hashes not allowed in stable context"); return EINA_FALSE; } Eolian_Type *itp = tp->base_type;