projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.0.17] Merge branch 'tizen'
[platform/core/uifw/dali-demo.git]
/
examples
/
blocks
/
blocks-example.cpp
diff --git
a/examples/blocks/blocks-example.cpp
b/examples/blocks/blocks-example.cpp
index
8c8f533
..
18ed966
100644
(file)
--- a/
examples/blocks/blocks-example.cpp
+++ b/
examples/blocks/blocks-example.cpp
@@
-17,8
+17,8
@@
#include <sstream>
#include <iostream>
#include <sstream>
#include <iostream>
-#include <vector>
#include <string>
#include <string>
+#include <map>
#include <algorithm>
#include <boost/any.hpp>
#include <algorithm>
#include <boost/any.hpp>
@@
-27,7
+27,6
@@
#include <dali-toolkit/dali-toolkit.h>
#include "../shared/view.h"
#include <dali-toolkit/dali-toolkit.h>
#include "../shared/view.h"
-using namespace std;
using namespace Dali;
using namespace Dali::Toolkit;
using namespace DemoHelper;
using namespace Dali;
using namespace Dali::Toolkit;
using namespace DemoHelper;
@@
-564,7
+563,7
@@
private:
if(turn)
{
// turn 90 degrees clockwise.
if(turn)
{
// turn 90 degrees clockwise.
- swap(di, dj);
+ s
td::s
wap(di, dj);
di = -di;
if (length<=1)
{
di = -di;
if (length<=1)
{