From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Wed, 13 Aug 2014 15:36:57 +0000 (-0700)
Subject: Merge "DALi Version 1.0.4" into tizen
X-Git-Tag: dali_1.0.5~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=d642543706ebe3146e476c8ac8f84898ea9d05e4;hp=63fe0e4e41c883ea6552a07271251e288a26ed76

Merge "DALi Version 1.0.4" into tizen
---

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 );