projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[dali_1.0.18] Merger branch 'tizen'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-timer.h
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
(file)
--- 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 );