From 84916e8ab39d7e8ef54eace3f502ee920df763a0 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Fri, 19 Dec 2014 17:50:43 +0900 Subject: [PATCH] Removal of Ecore_Wl_Display from ecore-wl-render-surface.cpp:SetDisplay - Ecore_Wl_Display was removed from Ecore_Wayland.h Change-Id: Id84820d80e7f0219558cded70ed9505ac02470a4 --- adaptors/wayland/ecore-wl-render-surface.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/adaptors/wayland/ecore-wl-render-surface.cpp b/adaptors/wayland/ecore-wl-render-surface.cpp index 158323e..e164ab2 100644 --- a/adaptors/wayland/ecore-wl-render-surface.cpp +++ b/adaptors/wayland/ecore-wl-render-surface.cpp @@ -210,22 +210,13 @@ void RenderSurface::SetDisplay( Any display ) if ( display.Empty() == false ) { // check we have a valid type - DALI_ASSERT_ALWAYS( ( ( display.GetType() == typeid (Ecore_Wl_Display *)) || - ( display.GetType() == typeid (WlDisplay *) ) ) + DALI_ASSERT_ALWAYS( ( display.GetType() == typeid (WlDisplay *) ) && "Display type is invalid" ); mOwnDisplay = false; - // display may point to EcoreXDisplay so may need to cast - if( display.GetType() == typeid (Ecore_Wl_Display*) ) - { - mMainDisplay = static_cast< WlDisplay* >( ecore_wl_display_get() ); - } - else - { - mMainDisplay = AnyCast< WlDisplay* >( display ); - } + mMainDisplay = AnyCast< WlDisplay* >( display ); } } -- 2.7.4