Commit 42313084d7036b3549adac54b17ab93650650e86
1 parent
78dc052d
Fix compile errors on MS-Windows.
Change-Id: Iae21d02ccce247de3d8d60f84322d3f4c4e20c54 Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Showing
5 changed files
with
6 additions
and
5 deletions
examples/contact-cards/contact-card.h
| @@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
| 26 | #include <dali/public-api/object/ref-object.h> | 26 | #include <dali/public-api/object/ref-object.h> |
| 27 | #include <dali-toolkit/public-api/controls/control.h> | 27 | #include <dali-toolkit/public-api/controls/control.h> |
| 28 | 28 | ||
| 29 | -class ContactCardLayoutInfo; | 29 | +struct ContactCardLayoutInfo; |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * @brief Creates and sets up animations for a contact card | 32 | * @brief Creates and sets up animations for a contact card |
examples/point-mesh/point-mesh-example.cpp
| @@ -82,7 +82,7 @@ Geometry CreateGeometry() | @@ -82,7 +82,7 @@ Geometry CreateGeometry() | ||
| 82 | // Create vertices | 82 | // Create vertices |
| 83 | struct Vertex { Vector2 position; float hue; }; | 83 | struct Vertex { Vector2 position; float hue; }; |
| 84 | 84 | ||
| 85 | - unsigned int numSides = 20; | 85 | + const unsigned int numSides = 20; |
| 86 | Vertex polyhedraVertexData[numSides]; | 86 | Vertex polyhedraVertexData[numSides]; |
| 87 | float angle=0; | 87 | float angle=0; |
| 88 | float sectorAngle = 2.0f * Math::PI / (float) numSides; | 88 | float sectorAngle = 2.0f * Math::PI / (float) numSides; |
examples/refraction-effect/refraction-effect-example.cpp
| @@ -23,6 +23,7 @@ | @@ -23,6 +23,7 @@ | ||
| 23 | 23 | ||
| 24 | #include <sstream> | 24 | #include <sstream> |
| 25 | #include <limits> | 25 | #include <limits> |
| 26 | +#include <cctype> | ||
| 26 | 27 | ||
| 27 | // INTERNAL INCLUDES | 28 | // INTERNAL INCLUDES |
| 28 | #include "shared/view.h" | 29 | #include "shared/view.h" |
| @@ -517,7 +518,8 @@ private: | @@ -517,7 +518,8 @@ private: | ||
| 517 | } | 518 | } |
| 518 | 519 | ||
| 519 | std::istringstream iss(line.substr(2), std::istringstream::in); | 520 | std::istringstream iss(line.substr(2), std::istringstream::in); |
| 520 | - unsigned int indices[ numOfInt ]; | 521 | + Dali::Vector<unsigned int> indices; |
| 522 | + indices.Resize(numOfInt); | ||
| 521 | unsigned int i=0; | 523 | unsigned int i=0; |
| 522 | while( iss >> indices[i++] && i < numOfInt); | 524 | while( iss >> indices[i++] && i < numOfInt); |
| 523 | unsigned int step = (i+1) / 3; | 525 | unsigned int step = (i+1) / 3; |
examples/simple-text-renderer/simple-text-renderer-example.cpp
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | #include <dali/devel-api/adaptor-framework/pixel-buffer.h> | 24 | #include <dali/devel-api/adaptor-framework/pixel-buffer.h> |
| 25 | #include <dali-toolkit/dali-toolkit.h> | 25 | #include <dali-toolkit/dali-toolkit.h> |
| 26 | #include <dali-toolkit/devel-api/text/text-utils-devel.h> | 26 | #include <dali-toolkit/devel-api/text/text-utils-devel.h> |
| 27 | -#include <devel-api/adaptor-framework/image-loading.h> | 27 | +#include <dali/devel-api/adaptor-framework/image-loading.h> |
| 28 | 28 | ||
| 29 | using namespace std; | 29 | using namespace std; |
| 30 | using namespace Dali; | 30 | using namespace Dali; |
examples/web-view/web-view-example.cpp
| @@ -18,7 +18,6 @@ | @@ -18,7 +18,6 @@ | ||
| 18 | #include <dali-toolkit/dali-toolkit.h> | 18 | #include <dali-toolkit/dali-toolkit.h> |
| 19 | #include "dali-toolkit/devel-api/controls/web-view/web-view.h" | 19 | #include "dali-toolkit/devel-api/controls/web-view/web-view.h" |
| 20 | #include <dali/integration-api/debug.h> | 20 | #include <dali/integration-api/debug.h> |
| 21 | -#include <unistd.h> | ||
| 22 | 21 | ||
| 23 | using namespace Dali; | 22 | using namespace Dali; |
| 24 | 23 |