From 4aa4d0477ff2212aa51afb1b7aa5a65f4b01d065 Mon Sep 17 00:00:00 2001
From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Thu, 1 May 2014 10:45:03 +0100
Subject: [PATCH 1/1] Fix code to not include std set directly

[Issue#] N/A
[Problem] set exports its allocator causing extra symbols in symbol table
[Cause] including set directly
[Solution] include set-wrapper instead

Signed-off-by: David Steele <david.steele@partner.samsung.com>
Change-Id: Ic2590137403d7d4d6d39971960098ffda9b5a9b2
---
 .../dali-test-suite-utils/test-platform-abstraction.h             | 2 +-
 .../src/dali/dali-test-suite-utils/test-platform-abstraction.h    | 2 +-
 dali/internal/event/animation/active-constraint-impl.h            | 2 +-
 dali/internal/event/animation/animation-playlist.h                | 6 ++----
 dali/internal/event/common/object-registry-impl.h                 | 6 ++----
 dali/internal/event/common/property-notification-manager.h        | 4 +---
 .../event/text/glyph-status/debug/glyph-status-container-debug.h  | 5 +----
 dali/internal/event/text/glyph-status/glyph-status-container.h    | 6 +-----
 dali/internal/event/text/resource/glyph-resource-manager.h        | 6 +-----
 dali/internal/render/gl-resources/context.h                       | 8 +++-----
 dali/internal/update/common/property-owner.h                      | 2 +-
 dali/internal/update/manager/update-manager.cpp                   | 4 +---
 dali/internal/update/resources/resource-manager.cpp               | 2 +-
 dali/internal/update/touch/history.h                              | 2 +-
 14 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/automated-tests/src/dali-unmanaged/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali-unmanaged/dali-test-suite-utils/test-platform-abstraction.h
index c23fec8..087a62c 100644
--- a/automated-tests/src/dali-unmanaged/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali-unmanaged/dali-test-suite-utils/test-platform-abstraction.h
@@ -18,11 +18,11 @@
 //
 
 // EXTERNAL INCLUDES
-#include <set>
 #include <stdint.h>
 #include <cstring>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/integration-api/platform-abstraction.h>
 
 #include <dali/integration-api/glyph-set.h>
diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
index 5051fce..6d56e4e 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
@@ -18,11 +18,11 @@
 //
 
 // EXTERNAL INCLUDES
-#include <set>
 #include <stdint.h>
 #include <cstring>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/integration-api/platform-abstraction.h>
 
 #include <dali/integration-api/glyph-set.h>
diff --git a/dali/internal/event/animation/active-constraint-impl.h b/dali/internal/event/animation/active-constraint-impl.h
index 843f860..0378dee 100644
--- a/dali/internal/event/animation/active-constraint-impl.h
+++ b/dali/internal/event/animation/active-constraint-impl.h
@@ -18,10 +18,10 @@
 //
 
 // EXTERNAL INCLUDES
-#include <set>
 #include <boost/function.hpp>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/internal/common/event-to-update.h>
 #include <dali/internal/common/message.h>
 #include <dali/internal/event/common/proxy-object.h>
diff --git a/dali/internal/event/animation/animation-playlist.h b/dali/internal/event/animation/animation-playlist.h
index 569bcb0..56cdeba 100644
--- a/dali/internal/event/animation/animation-playlist.h
+++ b/dali/internal/event/animation/animation-playlist.h
@@ -17,13 +17,11 @@
 // limitations under the License.
 //
 
-// EXTERNAL INCLUDES
-#include <set>
-
 // INTERNAL INCLUDES
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/internal/common/message.h>
 #include <dali/internal/event/animation/animation-finished-notifier.h>
-#include <dali/public-api/animation/animation.h>
 
 namespace Dali
 {
diff --git a/dali/internal/event/common/object-registry-impl.h b/dali/internal/event/common/object-registry-impl.h
index fa64966..e57e75b 100644
--- a/dali/internal/event/common/object-registry-impl.h
+++ b/dali/internal/event/common/object-registry-impl.h
@@ -17,12 +17,10 @@
 // limitations under the License.
 //
 
-// EXTERNAL INCLUDES
+// INTERNAL INCLUDES
 #ifdef DEBUG_ENABLED
-#include <set>
+#include <dali/public-api/common/set-wrapper.h>
 #endif
-
-// INTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/object-registry.h>
 #include <dali/public-api/object/base-object.h>
diff --git a/dali/internal/event/common/property-notification-manager.h b/dali/internal/event/common/property-notification-manager.h
index 63e2693..96cc53f 100644
--- a/dali/internal/event/common/property-notification-manager.h
+++ b/dali/internal/event/common/property-notification-manager.h
@@ -17,10 +17,8 @@
 // limitations under the License.
 //
 
-// EXTERNAL INCLUDES
-#include <set>
-
 // INTERNAL INCLUDES
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/internal/common/message.h>
 #include <dali/internal/event/common/property-notifier.h>
 
diff --git a/dali/internal/event/text/glyph-status/debug/glyph-status-container-debug.h b/dali/internal/event/text/glyph-status/debug/glyph-status-container-debug.h
index 011b1d5..c25d389 100644
--- a/dali/internal/event/text/glyph-status/debug/glyph-status-container-debug.h
+++ b/dali/internal/event/text/glyph-status/debug/glyph-status-container-debug.h
@@ -23,12 +23,9 @@
 #ifdef DEBUG_GLYPH_STATUS_CONTAINER
 
 // INTERNAL INCLUDES
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/internal/event/text/glyph-status/glyph-status.h>
 
-// EXTERNAL INCLUDES
-#include <set>
-
-
 namespace Dali
 {
 
diff --git a/dali/internal/event/text/glyph-status/glyph-status-container.h b/dali/internal/event/text/glyph-status/glyph-status-container.h
index e0a3874..53ab536 100644
--- a/dali/internal/event/text/glyph-status/glyph-status-container.h
+++ b/dali/internal/event/text/glyph-status/glyph-status-container.h
@@ -18,14 +18,10 @@
 //
 
 // INTERNAL INCLUDES
-
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/internal/event/text/glyph-status/glyph-status.h>
 #include <dali/internal/common/text-array.h>
 
-// EXTERNAL INCLUDES
-#include <set>
-
-
 namespace Dali
 {
 
diff --git a/dali/internal/event/text/resource/glyph-resource-manager.h b/dali/internal/event/text/resource/glyph-resource-manager.h
index 916b3f1..e82d992 100644
--- a/dali/internal/event/text/resource/glyph-resource-manager.h
+++ b/dali/internal/event/text/resource/glyph-resource-manager.h
@@ -17,10 +17,9 @@
 // limitations under the License.
 //
 
-
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/map-wrapper.h>
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/internal/event/text/glyph-status/glyph-status.h>
 #include <dali/internal/event/text/resource/glyph-resource-observer.h>
 #include <dali/internal/event/text/resource/glyph-resource-request.h>
@@ -31,9 +30,6 @@
 #include <dali/internal/event/resources/resource-ticket.h>
 #include <dali/integration-api/resource-cache.h>
 
-// EXTERNAL INCLUDES
-#include <set>
-
 namespace Dali
 {
 
diff --git a/dali/internal/render/gl-resources/context.h b/dali/internal/render/gl-resources/context.h
index c66ddcf..a151c8c 100644
--- a/dali/internal/render/gl-resources/context.h
+++ b/dali/internal/render/gl-resources/context.h
@@ -17,11 +17,9 @@
 // limitations under the License.
 //
 
-// EXTERNAL INCLUDES
-#include <set>
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/map-wrapper.h>
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/actors/renderable-actor.h>
 #include <dali/integration-api/debug.h>
@@ -387,8 +385,8 @@ public:
    */
   void BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
   {
-      LOG_GL( "BlitFramebuffer %d %d %d %d %d %d %d %d %x %d\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter );
-      CHECK_GL( *this, mGlAbstraction.BlitFramebuffer( srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter ) );
+    LOG_GL( "BlitFramebuffer %d %d %d %d %d %d %d %d %x %d\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter );
+    CHECK_GL( *this, mGlAbstraction.BlitFramebuffer( srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter ) );
   }
 
   /**
diff --git a/dali/internal/update/common/property-owner.h b/dali/internal/update/common/property-owner.h
index b3dfa12..fb056ad 100644
--- a/dali/internal/update/common/property-owner.h
+++ b/dali/internal/update/common/property-owner.h
@@ -18,10 +18,10 @@
 //
 
 // EXTERNAL INCLUDES
-#include <set>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/internal/common/message.h>
 #include <dali/internal/common/owner-container.h>
 #include <dali/internal/update/common/property-base.h>
diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp
index fe75dda..d1fd5a4 100644
--- a/dali/internal/update/manager/update-manager.cpp
+++ b/dali/internal/update/manager/update-manager.cpp
@@ -17,11 +17,9 @@
 // CLASS HEADER
 #include <dali/internal/update/manager/update-manager.h>
 
-// EXTERNAL INCLUDES
-#include <set>
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/stage.h>
+#include <dali/public-api/common/set-wrapper.h>
 
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/render-controller.h>
diff --git a/dali/internal/update/resources/resource-manager.cpp b/dali/internal/update/resources/resource-manager.cpp
index 52ce1b7..d935e18 100644
--- a/dali/internal/update/resources/resource-manager.cpp
+++ b/dali/internal/update/resources/resource-manager.cpp
@@ -19,11 +19,11 @@
 
 // EXTERNAL INCLUDES
 #include <stdio.h>
-#include <set>
 #include <typeinfo>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/map-wrapper.h>
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/images/image-attributes.h>
 
diff --git a/dali/internal/update/touch/history.h b/dali/internal/update/touch/history.h
index 4efbf20..3539a47 100644
--- a/dali/internal/update/touch/history.h
+++ b/dali/internal/update/touch/history.h
@@ -18,10 +18,10 @@
 //
 
 // EXTERNAL INCLUDES
-#include <set>
 #include <limits>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/math/vector2.h>
 
-- 
2.7.4