Merge "Addition of build flag "-Wl,-Bsymbolic-functions" for launching performance...

diff --git a/dali-toolkit/internal/controls/popup/popup-style-impl.h b/dali-toolkit/internal/controls/popup/popup-style-impl.h
index 22a1831..34d051a 100644 (file)
--- a/dali-toolkit/internal/controls/popup/popup-style-impl.h
+++ b/dali-toolkit/internal/controls/popup/popup-style-impl.h
@@ -25,6 +25,8 @@
 #include <dali/public-api/math/vector4.h>
 #include <dali/public-api/object/ref-object.h>
 
+#include <string>
+
 namespace Dali
 {
 

diff --git a/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp b/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
index 713c681..9f3fe92 100644 (file)
--- a/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
+++ b/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
@@ -21,6 +21,9 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/text-view/text-view-processor-types.h>
 
+// EXTERNAL INCLUDES
+#include <iostream>
+
 namespace Dali
 {