Commit cda608f4a827d15b9be91b270b060b7319977ebc
1 parent
d095b044
include map- and set-wrappers directly internally as they're not part of dali-core.h anymore
Change-Id: I9cc165944307a1e62df6aa34d28c13831fa4de6d
Showing
3 changed files
with
9 additions
and
5 deletions
demo/dali-table-view.h
examples/blocks/blocks-example.cpp
| @@ -17,8 +17,8 @@ | @@ -17,8 +17,8 @@ | ||
| 17 | 17 | ||
| 18 | #include <sstream> | 18 | #include <sstream> |
| 19 | #include <iostream> | 19 | #include <iostream> |
| 20 | -#include <vector> | ||
| 21 | #include <string> | 20 | #include <string> |
| 21 | +#include <map> | ||
| 22 | #include <algorithm> | 22 | #include <algorithm> |
| 23 | 23 | ||
| 24 | #include <boost/any.hpp> | 24 | #include <boost/any.hpp> |
examples/image/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
| @@ -40,13 +40,15 @@ | @@ -40,13 +40,15 @@ | ||
| 40 | * | 40 | * |
| 41 | * @see CreateImage CreateImageActor | 41 | * @see CreateImage CreateImageActor |
| 42 | */ | 42 | */ |
| 43 | -// INTERNAL INCLUDES | ||
| 44 | -#include "grid-flags.h" | ||
| 45 | -#include "../../shared/view.h" | ||
| 46 | -#include <dali-toolkit/dali-toolkit.h> | ||
| 47 | 43 | ||
| 48 | // EXTERNAL INCLUDES | 44 | // EXTERNAL INCLUDES |
| 49 | #include <algorithm> | 45 | #include <algorithm> |
| 46 | +#include <map> | ||
| 47 | +#include <dali-toolkit/dali-toolkit.h> | ||
| 48 | + | ||
| 49 | +// INTERNAL INCLUDES | ||
| 50 | +#include "grid-flags.h" | ||
| 51 | +#include "../../shared/view.h" | ||
| 50 | 52 | ||
| 51 | using namespace Dali; | 53 | using namespace Dali; |
| 52 | using namespace Dali::Toolkit; | 54 | using namespace Dali::Toolkit; |