From 131be5ba0d9cdd1c23cfd0eb2d9628c8e1930410 Mon Sep 17 00:00:00 2001
From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Fri, 10 Apr 2015 17:15:16 +0100
Subject: [PATCH] Only include forward declaring iostream header in public API

Change-Id: I10e1abe3f89277073db9566dc4e7ee5ad7af1628
---
 dali/public-api/math/matrix.cpp           |  2 +-
 dali/public-api/math/matrix.h             |  2 +-
 dali/public-api/math/matrix3.cpp          |  2 +-
 dali/public-api/math/quaternion.cpp       |  6 +++---
 dali/public-api/math/quaternion.h         |  3 +++
 dali/public-api/math/rect.h               | 29 ++---------------------------
 dali/public-api/math/vector2.cpp          |  1 +
 dali/public-api/math/vector2.h            |  2 +-
 dali/public-api/math/vector3.cpp          |  2 +-
 dali/public-api/math/vector3.h            |  2 +-
 dali/public-api/math/vector4.cpp          |  2 +-
 dali/public-api/math/vector4.h            |  2 +-
 dali/public-api/object/property-value.cpp |  3 +++
 dali/public-api/object/property-value.h   |  2 +-
 14 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/dali/public-api/math/matrix.cpp b/dali/public-api/math/matrix.cpp
index 7ffb393..e71405d 100644
--- a/dali/public-api/math/matrix.cpp
+++ b/dali/public-api/math/matrix.cpp
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <math.h>
 #include <string.h>
-#include <iostream>
+#include <ostream>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
diff --git a/dali/public-api/math/matrix.h b/dali/public-api/math/matrix.h
index d483684..da84212 100644
--- a/dali/public-api/math/matrix.h
+++ b/dali/public-api/math/matrix.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <ostream>
+#include <iosfwd>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
diff --git a/dali/public-api/math/matrix3.cpp b/dali/public-api/math/matrix3.cpp
index fe9ec59..d2b7bd2 100644
--- a/dali/public-api/math/matrix3.cpp
+++ b/dali/public-api/math/matrix3.cpp
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <string.h>
-#include <iostream>
+#include <ostream>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/math/math-utils.h>
diff --git a/dali/public-api/math/quaternion.cpp b/dali/public-api/math/quaternion.cpp
index 05140df..5442444 100644
--- a/dali/public-api/math/quaternion.cpp
+++ b/dali/public-api/math/quaternion.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/public-api/math/quaternion.h>
 
+// EXTERNAL INCLUDES
+#include <ostream>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/constants.h>
 #include <dali/public-api/math/degree.h>
@@ -26,9 +29,6 @@
 #include <dali/public-api/math/math-utils.h>
 #include <dali/internal/render/common/performance-monitor.h>
 
-// EXTERNAL INCLUDES
-#include <iostream>
-
 namespace Dali
 {
 using Internal::PerformanceMonitor;
diff --git a/dali/public-api/math/quaternion.h b/dali/public-api/math/quaternion.h
index 2a4ac8c..fa81e4c 100644
--- a/dali/public-api/math/quaternion.h
+++ b/dali/public-api/math/quaternion.h
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <iosfwd>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/constants.h>
diff --git a/dali/public-api/math/rect.h b/dali/public-api/math/rect.h
index e51fd88..27a438c 100644
--- a/dali/public-api/math/rect.h
+++ b/dali/public-api/math/rect.h
@@ -291,37 +291,12 @@ inline bool Rect<float>::IsEmpty() const
  * @param [in] rectangle the rectangle to output
  * @return The output stream operator.
  */
-inline std::ostream& operator<< (std::ostream& stream, const Rect<int>& rectangle)
-{
-  return stream << "[" << rectangle.x << ", " << rectangle.y << ", " << rectangle.width << ", " << rectangle.height << "]";
-}
-
-/**
- * @brief Convert the value of the rectangle into a string and insert in to an output stream.
- *
- * @param [in] stream The output stream operator.
- * @param [in] rectangle the rectangle to output
- * @return The output stream operator.
- */
-inline std::ostream& operator<< (std::ostream& stream, const Rect<unsigned int>& rectangle)
-{
-  return stream << "[" << rectangle.x << ", " << rectangle.y << ", " << rectangle.width << ", " << rectangle.height << "]";
-}
-
-/**
- * @brief Convert the value of the rectangle into a string and insert in to an output stream.
- *
- * @param [in] stream The output stream operator.
- * @param [in] rectangle the rectangle to output
- * @return The output stream operator.
- */
-inline std::ostream& operator<< (std::ostream& stream, const Rect<float>& rectangle)
+template< typename T >
+inline std::ostream& operator<< (std::ostream& stream, const Rect<T>& rectangle)
 {
   return stream << "[" << rectangle.x << ", " << rectangle.y << ", " << rectangle.width << ", " << rectangle.height << "]";
 }
 
-
-
 } // namespace Dali
 
 #endif // __DALI_RECT_H__
diff --git a/dali/public-api/math/vector2.cpp b/dali/public-api/math/vector2.cpp
index 52500ef..93ed590 100644
--- a/dali/public-api/math/vector2.cpp
+++ b/dali/public-api/math/vector2.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <math.h>
+#include <ostream>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
diff --git a/dali/public-api/math/vector2.h b/dali/public-api/math/vector2.h
index 7e4c552..dd1e7ab 100644
--- a/dali/public-api/math/vector2.h
+++ b/dali/public-api/math/vector2.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <ostream>
+#include <iosfwd>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
diff --git a/dali/public-api/math/vector3.cpp b/dali/public-api/math/vector3.cpp
index dc2ef6f..0812c9c 100644
--- a/dali/public-api/math/vector3.cpp
+++ b/dali/public-api/math/vector3.cpp
@@ -21,7 +21,7 @@
 
 // EXTERNAL INCLUDES
 #include <math.h>
-#include <iostream>
+#include <ostream>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
diff --git a/dali/public-api/math/vector3.h b/dali/public-api/math/vector3.h
index 7531f2a..22d18bb 100644
--- a/dali/public-api/math/vector3.h
+++ b/dali/public-api/math/vector3.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <ostream>
+#include <iosfwd>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
diff --git a/dali/public-api/math/vector4.cpp b/dali/public-api/math/vector4.cpp
index d801902..c41f141 100644
--- a/dali/public-api/math/vector4.cpp
+++ b/dali/public-api/math/vector4.cpp
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <math.h>
-#include <iostream>
+#include <ostream>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
diff --git a/dali/public-api/math/vector4.h b/dali/public-api/math/vector4.h
index 132e7d1..6cfc206 100644
--- a/dali/public-api/math/vector4.h
+++ b/dali/public-api/math/vector4.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <ostream>
+#include <iosfwd>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
diff --git a/dali/public-api/object/property-value.cpp b/dali/public-api/object/property-value.cpp
index 4e429f2..8bffbc3 100644
--- a/dali/public-api/object/property-value.cpp
+++ b/dali/public-api/object/property-value.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/public-api/object/property-value.h>
 
+// EXTERNAL INCLUDES
+#include <ostream>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/object/any.h>
 #include <dali/public-api/math/angle-axis.h>
diff --git a/dali/public-api/object/property-value.h b/dali/public-api/object/property-value.h
index f45fa49..0d54462 100644
--- a/dali/public-api/object/property-value.h
+++ b/dali/public-api/object/property-value.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <ostream>
+#include <iosfwd>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/property.h>
-- 
2.7.4