From bd2a9015c354073a4bd378d5c5362397f2aee6e4 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 15 Mar 2016 14:03:00 +0000 Subject: [PATCH] Eo: eo_add(), change current object's name (api). It was temporarily eoid, change it to eo_self which is more descriptive. In this process I also made it a macro to prepare for the proposed changes on the ML for the fallback implementation for compilers that don't support the compound statements returning values gcc extension. --- src/lib/eo/Eo.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 4ac541f..13d8283 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -597,11 +597,13 @@ EAPI Eo *eo_super(const Eo *obj, const Eo_Class *cur_klass); */ EAPI const Eo_Class *eo_class_get(const Eo *obj); +#define eo_self __eo_self + #define _eo_add_common(klass, parent, is_ref, ...) \ ({ \ - Eo * const eoid = _eo_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref); \ + Eo * const __eo_self = _eo_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref); \ __VA_ARGS__; \ - (Eo *) _eo_add_end(eoid); \ + (Eo *) _eo_add_end(eo_self); \ }) /** -- 2.7.4