From 8e3db82ed1c5587e83ddf7f4a34a9c57e9ccca4a Mon Sep 17 00:00:00 2001 From: "U. Artie Eoff" Date: Wed, 10 Oct 2012 14:30:06 -0700 Subject: [PATCH] evasobject: remove ambiguous cast operators These compiled fine before... but for some reason they are flagged as ambiguous by the compiler now... this started happending when EO was added as dependency to Evas. Signed-off-by: U. Artie Eoff --- src/efl/evasobject.cpp | 19 ++++++++++--------- src/efl/evasobject.h | 8 ++++++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/efl/evasobject.cpp b/src/efl/evasobject.cpp index dbcfd23..81837d7 100644 --- a/src/efl/evasobject.cpp +++ b/src/efl/evasobject.cpp @@ -18,15 +18,16 @@ EvasObject::~EvasObject() obj_ = NULL; } -EvasObject::operator Evas*() -{ - return evas_object_evas_get(*this); -} - -EvasObject::operator Ecore_Evas*() -{ - return ecore_evas_object_ecore_evas_get(*this); -} +//FIXME: see header +// EvasObject::operator Evas*() +// { +// return evas_object_evas_get(*this); +// } + +// EvasObject::operator Ecore_Evas*() +// { +// return ecore_evas_object_ecore_evas_get(*this); +// } EvasObject::operator Evas_Object*() { diff --git a/src/efl/evasobject.h b/src/efl/evasobject.h index c89b290..88cbf0e 100644 --- a/src/efl/evasobject.h +++ b/src/efl/evasobject.h @@ -19,8 +19,12 @@ public: const int getY(); const Eina_Bool isVisible(); - operator Evas*(); - operator Ecore_Evas*(); + //FIXME: these compiled fine before... but for some reason they are flagged + // as ambiguous by the compiler now... this started happending when + // EO was added as dependency to Evas. +// operator Evas*(); +// operator Ecore_Evas*(); + operator Evas_Object*(); void checkSize(const int width, const int height); -- 2.7.4