From ee2779d9e1060f8527589169fb2f0dbf6f0f8815 Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Mon, 11 Aug 2014 18:41:40 +0100 Subject: [PATCH] Implemented the Handle assignment operators properly [Problem] Some unsafe handle assignments are allowed by the compiler e.g. Actor notAnImageActor = Actor::New(); ImageActor notSafeToUse = notAnImageActor; [Cause] using BaseHandle::operator= is unsafe [Solution] Implemented the Handle assignment operators properly Change-Id: If4cd798d2cb394ac4dbac96b1c17598a2aae8ee6 --- .../src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h | 1 - automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h | 1 - 2 files changed, 2 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h index 1537e05..3876b2f 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h @@ -51,7 +51,6 @@ public: // Creation & Destruction static StyleMonitor Get(); ~StyleMonitor(); static StyleMonitor DownCast( BaseHandle handle ); - using BaseHandle::operator=; public: // Style Information std::string GetDefaultFontFamily() const; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h index 8f23022..c479fb8 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h @@ -47,7 +47,6 @@ public: Timer& operator=( const Timer& timer ); ~Timer(); static Timer DownCast( BaseHandle handle ); - using BaseHandle::operator=; void Start(); void Stop(); void SetInterval( unsigned int milliSec ); -- 2.7.4