From 36605faaea4ce6fe307a4421159982b5402ba0da Mon Sep 17 00:00:00 2001
From: Nick Holland <nick.holland@partner.samsung.com>
Date: Mon, 13 Apr 2015 10:40:59 +0100
Subject: [PATCH] Remove last reference to boost in dali-core

Removed boost::function declared in property-notifcation-declarations.h
which was being included by handle.h, which is include by
most of DALi. The boost function.hpp header was pulling in a
total of 179 other boost header files.

Some files using strcmp, memcpy and memmove no longer compiled after the
removal, so they now include <cstring> which has the API for those functions.

On an i7 with make -j8 dali-core now compiles 20% faster

Change-Id: Ic03c1efaa3f234b3777a4828b6c5e8e28bf1ff75
---
 .../src/dali/dali-test-suite-utils/test-gl-abstraction.h           | 1 +
 dali/integration-api/debug.cpp                                     | 6 +++---
 dali/internal/event/actors/actor-impl.cpp                          | 1 +
 dali/internal/event/actors/camera-actor-impl.cpp                   | 1 +
 dali/internal/event/actors/image-actor-impl.cpp                    | 3 +++
 dali/internal/event/actors/layer-impl.cpp                          | 3 +++
 dali/internal/event/animation/animation-impl.cpp                   | 3 +++
 dali/internal/event/animation/path-constraint-impl.cpp             | 3 +++
 dali/internal/event/animation/path-impl.cpp                        | 5 +++++
 dali/internal/event/common/object-registry-impl.cpp                | 1 +
 dali/internal/event/common/stage-impl.cpp                          | 1 +
 dali/internal/event/common/type-registry-impl.cpp                  | 4 ----
 dali/internal/event/events/long-press-gesture-detector-impl.cpp    | 3 +++
 dali/internal/event/events/pan-gesture-detector-impl.cpp           | 3 +++
 dali/internal/event/events/pinch-gesture-detector-impl.cpp         | 3 +++
 dali/internal/event/events/tap-gesture-detector-impl.cpp           | 3 +++
 dali/internal/event/images/atlas-impl.cpp                          | 5 +++--
 dali/internal/event/images/encoded-buffer-image-impl.cpp           | 5 +++--
 dali/internal/event/images/image-impl.cpp                          | 3 +++
 dali/internal/event/images/nine-patch-image-impl.cpp               | 3 +++
 dali/internal/event/images/resource-image-impl.cpp                 | 3 +++
 dali/internal/event/modeling/animatable-mesh-impl.cpp              | 3 +++
 dali/internal/event/render-tasks/render-task-impl.cpp              | 3 +++
 dali/internal/render/shaders/uniform-meta.h                        | 1 +
 dali/public-api/common/dali-vector.cpp                             | 3 +--
 dali/public-api/math/matrix.cpp                                    | 4 ++--
 dali/public-api/math/matrix3.cpp                                   | 2 +-
 dali/public-api/object/property-notification-declarations.h        | 7 -------
 28 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h
index 67170e3..eb8baf7 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h
@@ -23,6 +23,7 @@
 #include <string>
 #include <map>
 #include <cstdio>
+#include <cstring> // for strcmp
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
diff --git a/dali/integration-api/debug.cpp b/dali/integration-api/debug.cpp
index b229b3f..8d4d60f 100644
--- a/dali/integration-api/debug.cpp
+++ b/dali/integration-api/debug.cpp
@@ -19,9 +19,9 @@
 #include <dali/integration-api/debug.h>
 
 // EXTERNAL INCLUDES
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdarg>
+#include <cstring>
 #include <cstdlib>
 #include <sstream>
 #include <iomanip>
diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index acfe0d7..ff21ca6 100644
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -22,6 +22,7 @@
 #include <cmath>
 #include <algorithm>
 #include <cfloat>
+#include <cstring> // for strcmp
 
 // INTERNAL INCLUDES
 
diff --git a/dali/internal/event/actors/camera-actor-impl.cpp b/dali/internal/event/actors/camera-actor-impl.cpp
index b65b016..8201a17 100644
--- a/dali/internal/event/actors/camera-actor-impl.cpp
+++ b/dali/internal/event/actors/camera-actor-impl.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <cmath>
+#include <cstring> // for strcmp
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/stage.h>
diff --git a/dali/internal/event/actors/image-actor-impl.cpp b/dali/internal/event/actors/image-actor-impl.cpp
index 55212d5..d55d0c6 100644
--- a/dali/internal/event/actors/image-actor-impl.cpp
+++ b/dali/internal/event/actors/image-actor-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/actors/image-actor-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/scripting/scripting.h>
diff --git a/dali/internal/event/actors/layer-impl.cpp b/dali/internal/event/actors/layer-impl.cpp
index 9b64444..e986a57 100644
--- a/dali/internal/event/actors/layer-impl.cpp
+++ b/dali/internal/event/actors/layer-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/actors/layer-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/type-registry.h>
diff --git a/dali/internal/event/animation/animation-impl.cpp b/dali/internal/event/animation/animation-impl.cpp
index 73e2ba0..d5c26b7 100644
--- a/dali/internal/event/animation/animation-impl.cpp
+++ b/dali/internal/event/animation/animation-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/animation/animation-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/animation/alpha-functions.h>
diff --git a/dali/internal/event/animation/path-constraint-impl.cpp b/dali/internal/event/animation/path-constraint-impl.cpp
index d9e8e2e..cb4c9df 100644
--- a/dali/internal/event/animation/path-constraint-impl.cpp
+++ b/dali/internal/event/animation/path-constraint-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/animation/path-constraint-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/internal/event/common/property-helper.h>
 #include <dali/public-api/animation/constraint.h>
diff --git a/dali/internal/event/animation/path-impl.cpp b/dali/internal/event/animation/path-impl.cpp
index 44d422b..4ca4c8e 100644
--- a/dali/internal/event/animation/path-impl.cpp
+++ b/dali/internal/event/animation/path-impl.cpp
@@ -17,6 +17,11 @@
 
 // CLASS HEADER
 #include <dali/internal/event/animation/path-impl.h>
+
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
+// INTERNAL INCLUDES
 #include <dali/internal/event/common/property-helper.h>
 
 namespace Dali
diff --git a/dali/internal/event/common/object-registry-impl.cpp b/dali/internal/event/common/object-registry-impl.cpp
index edd5232..c97c94a 100644
--- a/dali/internal/event/common/object-registry-impl.cpp
+++ b/dali/internal/event/common/object-registry-impl.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <algorithm>
+#include <cstring> // for strcmp
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/common/thread-local-storage.h>
diff --git a/dali/internal/event/common/stage-impl.cpp b/dali/internal/event/common/stage-impl.cpp
index 775c319..feb8ac8 100644
--- a/dali/internal/event/common/stage-impl.cpp
+++ b/dali/internal/event/common/stage-impl.cpp
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <algorithm>
 #include <cmath>
+#include <cstring> // for strcmp
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/system-overlay.h>
diff --git a/dali/internal/event/common/type-registry-impl.cpp b/dali/internal/event/common/type-registry-impl.cpp
index 23e6cc3..be5ef41 100644
--- a/dali/internal/event/common/type-registry-impl.cpp
+++ b/dali/internal/event/common/type-registry-impl.cpp
@@ -18,10 +18,6 @@
 // CLASS HEADER
 #include <dali/internal/event/common/type-registry-impl.h>
 
-// EXTERNAL INCLUDES
-#include <string.h>
-#include <sstream>
-
 // INTERNAL INCLUDES
 #include <dali/internal/event/common/thread-local-storage.h>
 #include <dali/public-api/object/type-registry.h>
diff --git a/dali/internal/event/events/long-press-gesture-detector-impl.cpp b/dali/internal/event/events/long-press-gesture-detector-impl.cpp
index edc5850..69ce40b 100644
--- a/dali/internal/event/events/long-press-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/long-press-gesture-detector-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include "long-press-gesture-detector-impl.h"
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/events/long-press-gesture.h>
 #include <dali/public-api/object/type-registry.h>
diff --git a/dali/internal/event/events/pan-gesture-detector-impl.cpp b/dali/internal/event/events/pan-gesture-detector-impl.cpp
index 487da4e..bf1e38c 100644
--- a/dali/internal/event/events/pan-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/pan-gesture-detector-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/events/pan-gesture-detector-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/public-api/object/type-registry.h>
diff --git a/dali/internal/event/events/pinch-gesture-detector-impl.cpp b/dali/internal/event/events/pinch-gesture-detector-impl.cpp
index 370c1e8..43c971e 100644
--- a/dali/internal/event/events/pinch-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/pinch-gesture-detector-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/events/pinch-gesture-detector-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/events/pinch-gesture.h>
 #include <dali/public-api/object/type-registry.h>
diff --git a/dali/internal/event/events/tap-gesture-detector-impl.cpp b/dali/internal/event/events/tap-gesture-detector-impl.cpp
index d796e8d..b7c76b0 100644
--- a/dali/internal/event/events/tap-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/tap-gesture-detector-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/events/tap-gesture-detector-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/events/tap-gesture.h>
 #include <dali/public-api/object/type-registry.h>
diff --git a/dali/internal/event/images/atlas-impl.cpp b/dali/internal/event/images/atlas-impl.cpp
index d9acf50..5da8baf 100644
--- a/dali/internal/event/images/atlas-impl.cpp
+++ b/dali/internal/event/images/atlas-impl.cpp
@@ -18,16 +18,17 @@
 // CLASS HEADER
 #include <dali/internal/event/images/atlas-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for memset()
+
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
 #include <dali/internal/event/common/thread-local-storage.h>
-
 #include <dali/internal/event/images/image-factory.h>
 #include <dali/internal/event/resources/resource-client.h>
 #include <dali/integration-api/bitmap.h>
 #include <dali/integration-api/platform-abstraction.h>
 
-#include <string.h> // for memset()
 
 namespace Dali
 {
diff --git a/dali/internal/event/images/encoded-buffer-image-impl.cpp b/dali/internal/event/images/encoded-buffer-image-impl.cpp
index 50039a8..51ad81b 100644
--- a/dali/internal/event/images/encoded-buffer-image-impl.cpp
+++ b/dali/internal/event/images/encoded-buffer-image-impl.cpp
@@ -18,14 +18,15 @@
 // CLASS HEADER
 #include <dali/internal/event/images/encoded-buffer-image-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for memcpy
+
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
 #include <dali/internal/event/common/thread-local-storage.h>
 #include <dali/internal/event/resources/resource-client.h>
 #include <dali/integration-api/platform-abstraction.h>
 
-#include <string.h>
-
 namespace Dali
 {
 namespace Internal
diff --git a/dali/internal/event/images/image-impl.cpp b/dali/internal/event/images/image-impl.cpp
index 9a9ccb9..8734ca4 100644
--- a/dali/internal/event/images/image-impl.cpp
+++ b/dali/internal/event/images/image-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/images/image-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/type-registry.h>
diff --git a/dali/internal/event/images/nine-patch-image-impl.cpp b/dali/internal/event/images/nine-patch-image-impl.cpp
index 0f13a5e..d6f66ff 100644
--- a/dali/internal/event/images/nine-patch-image-impl.cpp
+++ b/dali/internal/event/images/nine-patch-image-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/images/nine-patch-image-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for memcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
 #include <dali/integration-api/bitmap.h>
diff --git a/dali/internal/event/images/resource-image-impl.cpp b/dali/internal/event/images/resource-image-impl.cpp
index 4724cbc..d00a537 100644
--- a/dali/internal/event/images/resource-image-impl.cpp
+++ b/dali/internal/event/images/resource-image-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/images/resource-image-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/type-registry.h>
diff --git a/dali/internal/event/modeling/animatable-mesh-impl.cpp b/dali/internal/event/modeling/animatable-mesh-impl.cpp
index ca97703..2073d51 100644
--- a/dali/internal/event/modeling/animatable-mesh-impl.cpp
+++ b/dali/internal/event/modeling/animatable-mesh-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/modeling/animatable-mesh-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/internal/event/common/property-helper.h>
 #include <dali/internal/event/common/stage-impl.h>
diff --git a/dali/internal/event/render-tasks/render-task-impl.cpp b/dali/internal/event/render-tasks/render-task-impl.cpp
index eea053c..8edb7b3 100644
--- a/dali/internal/event/render-tasks/render-task-impl.cpp
+++ b/dali/internal/event/render-tasks/render-task-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/internal/event/render-tasks/render-task-impl.h>
 
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/type-registry.h>
diff --git a/dali/internal/render/shaders/uniform-meta.h b/dali/internal/render/shaders/uniform-meta.h
index ec2501d..8cb92b7 100644
--- a/dali/internal/render/shaders/uniform-meta.h
+++ b/dali/internal/render/shaders/uniform-meta.h
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <string>
+#include <cstring> // for memcpy & memset
 
 // INTERNAL INCLUDES
 #include <dali/public-api/math/compile-time-math.h>
diff --git a/dali/public-api/common/dali-vector.cpp b/dali/public-api/common/dali-vector.cpp
index 643c89f..34c541e 100644
--- a/dali/public-api/common/dali-vector.cpp
+++ b/dali/public-api/common/dali-vector.cpp
@@ -19,8 +19,7 @@
 #include <dali/public-api/common/dali-vector.h>
 
 // EXTERNAL INCLUDES
-#include <stdlib.h>
-#include <memory.h>
+#include <cstring> // for memcpy & memmove
 
 namespace Dali
 {
diff --git a/dali/public-api/math/matrix.cpp b/dali/public-api/math/matrix.cpp
index e71405d..a893da2 100644
--- a/dali/public-api/math/matrix.cpp
+++ b/dali/public-api/math/matrix.cpp
@@ -19,8 +19,8 @@
 #include <dali/public-api/math/matrix.h>
 
 // EXTERNAL INCLUDES
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring> // for memcpy
 #include <ostream>
 
 // INTERNAL INCLUDES
diff --git a/dali/public-api/math/matrix3.cpp b/dali/public-api/math/matrix3.cpp
index d2b7bd2..a526f65 100644
--- a/dali/public-api/math/matrix3.cpp
+++ b/dali/public-api/math/matrix3.cpp
@@ -19,7 +19,7 @@
 #include <dali/public-api/math/matrix3.h>
 
 // EXTERNAL INCLUDES
-#include <string.h>
+#include <cstring> // for memcpy
 #include <ostream>
 
 // INTERNAL INCLUDES
diff --git a/dali/public-api/object/property-notification-declarations.h b/dali/public-api/object/property-notification-declarations.h
index f068c90..faeae67 100644
--- a/dali/public-api/object/property-notification-declarations.h
+++ b/dali/public-api/object/property-notification-declarations.h
@@ -18,8 +18,6 @@
  *
  */
 
-// EXTERNAL INCLUDES
-#include <boost/function.hpp>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
@@ -35,11 +33,6 @@ class PropertyNotification;
  */
 typedef Signal< void (PropertyNotification& source) > PropertyNotifySignalType;
 
-/**
- * @brief Function signature for Dali::PropertyNotification::NotifySignal() signal callbacks.
- */
-typedef boost::function<void (PropertyNotification& source)> PropertyNotifyCallbackType;
-
 } // namespace Dali
 
 #endif // __DALI_PROPERTY_NOTIFICATION_DECLARATIONS_H__
-- 
2.7.4