From: Victor Cebollada Date: Thu, 27 Feb 2020 10:16:31 +0000 (+0000) Subject: Fix compile errors on MS-Windows. X-Git-Tag: dali_1.5.5~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=6221e2f122b0b19cdac88e1a0e8acfa47b417a29 Fix compile errors on MS-Windows. Change-Id: Iae21d02ccce247de3d8d60f84322d3f4c4e20c54 Signed-off-by: Victor Cebollada --- diff --git a/examples/contact-cards/contact-card.h b/examples/contact-cards/contact-card.h index c922e58..cee4000 100644 --- a/examples/contact-cards/contact-card.h +++ b/examples/contact-cards/contact-card.h @@ -26,7 +26,7 @@ #include #include -class ContactCardLayoutInfo; +struct ContactCardLayoutInfo; /** * @brief Creates and sets up animations for a contact card diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp index 7d9fe0b..0313f86 100644 --- a/examples/point-mesh/point-mesh-example.cpp +++ b/examples/point-mesh/point-mesh-example.cpp @@ -82,7 +82,7 @@ Geometry CreateGeometry() // Create vertices struct Vertex { Vector2 position; float hue; }; - unsigned int numSides = 20; + const unsigned int numSides = 20; Vertex polyhedraVertexData[numSides]; float angle=0; float sectorAngle = 2.0f * Math::PI / (float) numSides; diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp index b825388..bd2a0d3 100644 --- a/examples/refraction-effect/refraction-effect-example.cpp +++ b/examples/refraction-effect/refraction-effect-example.cpp @@ -23,6 +23,7 @@ #include #include +#include // INTERNAL INCLUDES #include "shared/view.h" @@ -517,7 +518,8 @@ private: } std::istringstream iss(line.substr(2), std::istringstream::in); - unsigned int indices[ numOfInt ]; + Dali::Vector indices; + indices.Resize(numOfInt); unsigned int i=0; while( iss >> indices[i++] && i < numOfInt); unsigned int step = (i+1) / 3; diff --git a/examples/simple-text-renderer/simple-text-renderer-example.cpp b/examples/simple-text-renderer/simple-text-renderer-example.cpp index 676a3e1..4180c2b 100644 --- a/examples/simple-text-renderer/simple-text-renderer-example.cpp +++ b/examples/simple-text-renderer/simple-text-renderer-example.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include using namespace std; using namespace Dali; diff --git a/examples/web-view/web-view-example.cpp b/examples/web-view/web-view-example.cpp index f3936ab..eb9af25 100644 --- a/examples/web-view/web-view-example.cpp +++ b/examples/web-view/web-view-example.cpp @@ -18,7 +18,6 @@ #include #include "dali-toolkit/devel-api/controls/web-view/web-view.h" #include -#include using namespace Dali;