Fix compile errors after removing boost function include from dali-core

Change-Id: Ie62e653b1b37d71326365fd9992955a3ce622fe5

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
index b094fdec5b62c86a4d189e9aa5a16bb92be2bff8..36cb94b4f547d76e003781606553827300be9626 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
@@ -19,8 +19,10 @@
  */
 
 // EXTERNAL INCLUDES
+#include <cstdio>  // fprintf
 #include <sstream>
 #include <string>
+#include <cstring> // for strcpy, strncpy
 #include <map>
 
 // INTERNAL INCLUDES

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 44878b6f8b2dd167e77232b8e3cb18ea0dec857b..4765f441db8e1f658c421455587bc04cb23d8f60 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -19,6 +19,7 @@
 #include "button-impl.h"
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>

diff --git a/dali-toolkit/internal/controls/cluster/cluster-impl.cpp b/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
index d4daf3c6000e7809940ce7a3f45fd32ac01a7ae8..d43d63a42ae3197f69ed5046810f0c4a981f4156 100644 (file)
--- a/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
+++ b/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <algorithm>
+#include <cstring> // for strcmp
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp b/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
index 84eb4e4e2be19549130fec66b4a4f756344a104e..26956dc3bce1161e7c1a8d0d97d6684452def966 100644 (file)
--- a/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
+++ b/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
@@ -19,6 +19,7 @@
 #include "navigation-control-impl.h"
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/object/type-registry.h>

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index 42981a34ca33c8cce9f18d48ad02077b76840100..42fac718e38bd27a9956bef36f3bfbb62c71380d 100755 (executable)
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/controls/popup/popup-impl.h>
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/adaptor-framework/key.h>
 #include <dali/public-api/adaptor-framework/physical-keyboard.h>
 #include <dali/public-api/animation/constraints.h>

diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
index d57f2a483e3df43df58169f39bba97f7a7b4ab1a..0d7b8333b8fa0f5dbffeb96fbfef40ebdb30c6ff 100755 (executable)
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h>
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/object/type-registry.h>

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index 9ad835ff42b6cd17e25c0ee5cfd1f210d8993fc9..a3f222e156d953c60bb6a33e7e377f4cefc9d879 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h>
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <algorithm>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/constraints.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
index 613b0e8e8b4104b98f98e5fa822b5f0e843ff301..a7899819db59ac4805dd86f4da1449c15ed22b2b 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h>
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/object/property-index-ranges.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index 09582cf57461727cd607a036cb641be53cdaf415..496d20fea5ff8295817e90acdfa8bfe239998ce8 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/events/mouse-wheel-event.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
index 3db2f3e852d8028f9bd14e0be4a6305e06eb89fc..5f7cf720c164917f6f5383146133eb6fea6881c4 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
@@ -16,6 +16,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
 

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp
index 7ab8438ff341d2813a6e67f8c542f42404eee781..4c1b2fa331da9cf58cd28a26f03333feb4d8e5db 100755 (executable)
--- a/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -19,7 +19,9 @@
 #include <dali-toolkit/internal/controls/slider/slider-impl.h>
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <sstream>
+#include <limits>
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>

diff --git a/dali-toolkit/internal/controls/view/view-impl.cpp b/dali-toolkit/internal/controls/view/view-impl.cpp
index 24229f39b714e4bfcb968e70657745f34bf68ea8..3b2ff0bfc10861918bbc3056676f8ae04639d7dd 100644 (file)
--- a/dali-toolkit/internal/controls/view/view-impl.cpp
+++ b/dali-toolkit/internal/controls/view/view-impl.cpp
@@ -19,6 +19,7 @@
 #include "view-impl.h"
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/type-registry.h>

diff --git a/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
index 5a3a6112a2f4c599eed7a5a48013955ce0c5a6cb..1dee2b25407598fbabe2b17710f908c5412765c8 100644 (file)
--- a/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
@@ -19,6 +19,7 @@
 #include "focus-manager-impl.h"
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/adaptor-framework/accessibility-manager.h>
 #include <dali/public-api/adaptor-framework/sound-player.h>

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 038f99c8586d048607aee92ecda6849ccba2becf..8e02311c80858917a5d47d5054eeb71eb8b64d88 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -19,6 +19,7 @@
 #include "keyboard-focus-manager-impl.h"
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/adaptor-framework/accessibility-manager.h>
 #include <dali/public-api/adaptor-framework/singleton-service.h>

diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index 5d7d4be85b8f287594540afc26efe0e8893b1c42..9fee4284ca58626072f3742c9e75591d41757712 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@ -19,6 +19,7 @@
 #include "keyinput-focus-manager-impl.h"
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/common/stage.h>
 

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
index 1a58f8ded117f5cbc37f9fa75600db7f059bab78..888322aea71577fa228a966c0263f7e7ed092d2f 100644 (file)
--- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
+++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
@@ -19,6 +19,7 @@
 #include "cube-transition-effect-impl.h"
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/object/type-registry.h>

diff --git a/dali-toolkit/public-api/controls/cluster/cluster-style.cpp b/dali-toolkit/public-api/controls/cluster/cluster-style.cpp
index 6ef28a6c10584049d20e910199ffabb20488f41c..0e2d988d3e36d60a7f6bd5c4bd5c0d3adcd7faf4 100644 (file)
--- a/dali-toolkit/public-api/controls/cluster/cluster-style.cpp
+++ b/dali-toolkit/public-api/controls/cluster/cluster-style.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
 
+// EXTERNAL INCLUDES
+#include <limits>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/cluster/cluster-style-impl.h>
 

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index f8eded1fdae2db81f6e82058a7700046668a3692..16b4e6738493aaa88c80ffa9845f6755444aedc8 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -19,6 +19,8 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+#include <limits>
 #include <stack>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/actors/mesh-actor.h>

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
index d41a7046aec5ebda8d4d6c7cce06472e1aeff865..ee9ca7d829e07f172d3bb763aa70b61897d3f9fa 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <boost/function.hpp>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/common/vector-wrapper.h>
 

diff --git a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp
index 45d0fbf9ef57c0543f6635f19146e1be8bc7ee14..cc315c014006186dd1ecc853a966fb3e982490a5 100644 (file)
--- a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp
+++ b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp
@@ -20,6 +20,7 @@
 #include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 
 // INTERNAL INCLUDES
 

diff --git a/plugins/dali-script-v8/src/animation/animation-api.cpp b/plugins/dali-script-v8/src/animation/animation-api.cpp
index 3fba14a23eaa1598ecb9c95319c1cbccff1aeb5b..1a11440d719bccf1b84a41789355003ed483ccac 100644 (file)
--- a/plugins/dali-script-v8/src/animation/animation-api.cpp
+++ b/plugins/dali-script-v8/src/animation/animation-api.cpp
@@ -19,12 +19,15 @@
 #include "animation-api.h"
 #include "path-wrapper.h"
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+#include <dali/integration-api/debug.h>
+
+
 // INTERNAL INCLUDES
 #include <v8-utils.h>
-#include <dali/integration-api/debug.h>
 #include <animation/animation-wrapper.h>
 #include <object/property-value-wrapper.h>
-#include <dali/public-api/common/map-wrapper.h>
 
 namespace Dali
 {
@@ -43,7 +46,6 @@ struct AlphaFuncStruct
 };
 /**
  * Contains a list of alpha functions that can be used.
- * We use a stl map as lookup to map a string name to the function
  */
 const AlphaFuncStruct AlphaFunctionTable[]=
 {

diff --git a/plugins/dali-script-v8/src/signals/signal-manager.cpp b/plugins/dali-script-v8/src/signals/signal-manager.cpp
index 55d4a0e7389a4a2bc879b8151d5ed545ff23a533..d8359e21fd94327de323d783252db01fff23a139 100644 (file)
--- a/plugins/dali-script-v8/src/signals/signal-manager.cpp
+++ b/plugins/dali-script-v8/src/signals/signal-manager.cpp
@@ -18,6 +18,19 @@
 // CLASS HEADER
 #include "signal-manager.h"
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+#include <dali/public-api/images/resource-image.h>
+#include <dali/public-api/object/any.h>
+#include <dali/public-api/events/pan-gesture-detector.h>
+#include <dali/public-api/object/any.h>
+#include <dali/public-api/images/image.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/events/hover-event.h>
+#include <dali/public-api/events/mouse-wheel-event.h>
+#include <dali/public-api/events/key-event.h>
+#include <dali/public-api/events/pan-gesture.h>
+
 // INTERNAL INCLUDES
 #include <v8-utils.h>
 #include <object/handle-wrapper.h>
@@ -29,16 +42,6 @@
 #include <events/pan-gesture-detector-wrapper.h>
 #include <toolkit/focus-manager/keyboard-focus-manager-wrapper.h>
 #include <signals/dali-any-javascript-converter.h>
-#include <dali/public-api/images/resource-image.h>
-#include <dali/public-api/object/any.h>
-#include <dali/public-api/events/pan-gesture-detector.h>
-#include <dali/public-api/object/any.h>
-#include <dali/public-api/images/image.h>
-#include <dali/public-api/events/touch-event.h>
-#include <dali/public-api/events/hover-event.h>
-#include <dali/public-api/events/mouse-wheel-event.h>
-#include <dali/public-api/events/key-event.h>
-#include <dali/public-api/events/pan-gesture.h>