Fix compile errors on MS-Windows. 91/226191/8
authorVictor Cebollada <v.cebollada@samsung.com>
Thu, 27 Feb 2020 10:16:31 +0000 (10:16 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Wed, 11 Mar 2020 16:09:48 +0000 (16:09 +0000)
Change-Id: Iae21d02ccce247de3d8d60f84322d3f4c4e20c54
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
examples/contact-cards/contact-card.h
examples/point-mesh/point-mesh-example.cpp
examples/refraction-effect/refraction-effect-example.cpp
examples/simple-text-renderer/simple-text-renderer-example.cpp
examples/web-view/web-view-example.cpp

index c922e58..cee4000 100644 (file)
@@ -26,7 +26,7 @@
 #include <dali/public-api/object/ref-object.h>
 #include <dali-toolkit/public-api/controls/control.h>
 
-class ContactCardLayoutInfo;
+struct ContactCardLayoutInfo;
 
 /**
  * @brief Creates and sets up animations for a contact card
index 7d9fe0b..0313f86 100644 (file)
@@ -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;
index b825388..bd2a0d3 100644 (file)
@@ -23,6 +23,7 @@
 
 #include <sstream>
 #include <limits>
+#include <cctype>
 
 // 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<unsigned int> indices;
+        indices.Resize(numOfInt);
         unsigned int i=0;
         while( iss >> indices[i++] && i < numOfInt);
         unsigned int step = (i+1) / 3;
index 676a3e1..4180c2b 100644 (file)
@@ -24,7 +24,7 @@
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/text/text-utils-devel.h>
-#include <devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
 
 using namespace std;
 using namespace Dali;
index f3936ab..eb9af25 100644 (file)
@@ -18,7 +18,6 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include "dali-toolkit/devel-api/controls/web-view/web-view.h"
 #include <dali/integration-api/debug.h>
-#include <unistd.h>
 
 using namespace Dali;