Merge lp:~alan-griffiths/mir/fix-1247820 into lp:mir

[Alan Griffiths]

geometry: remove implementation of streaming operators from headers
(LP: #1247820)

geometry: remove implementation of streaming operators from headers

These headers are used a lot - pulling in <ostream> is unnecessary when <iosfwd> will do just fine.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1208
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/360/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/89
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/89
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/89/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/360/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2013-09-23 13:37:44 +0000
+++ examples/CMakeLists.txt	2013-11-08 13:06:22 +0000
@@ -114,6 +114,7 @@
 target_link_libraries(mir_demo_standalone_render_surfaces
     mirserver
     mirshell
+    mirsharedgeometry
     ${Boost_LIBRARIES}
 )
 

=== modified file 'include/shared/mir/geometry/displacement.h'
--- include/shared/mir/geometry/displacement.h	2013-08-28 03:41:48 +0000
+++ include/shared/mir/geometry/displacement.h	2013-11-08 13:06:22 +0000
@@ -22,7 +22,7 @@
 #include "dimensions.h"
 #include "point.h"
 
-#include <ostream>
+#include <iosfwd>
 
 namespace mir
 {
@@ -57,11 +57,7 @@
     return lhs.dx != rhs.dx || lhs.dy != rhs.dy;
 }
 
-inline std::ostream& operator<<(std::ostream& out, Displacement const& value)
-{
-    out << '(' << value.dx << ", " << value.dy << ')';
-    return out;
-}
+std::ostream& operator<<(std::ostream& out, Displacement const& value);
 
 inline Displacement operator+(Displacement const& lhs, Displacement const& rhs)
 {

=== modified file 'include/shared/mir/geometry/point.h'
--- include/shared/mir/geometry/point.h	2013-08-28 03:41:48 +0000
+++ include/shared/mir/geometry/point.h	2013-11-08 13:06:22 +0000
@@ -20,7 +20,7 @@
 #define MIR_GEOMETRY_POINT_H_
 
 #include "dimensions.h"
-#include <ostream>
+#include <iosfwd>
 
 namespace mir
 {
@@ -50,12 +50,7 @@
     return lhs.x != rhs.x || lhs.y != rhs.y;
 }
 
-inline std::ostream& operator<<(std::ostream& out, Point const& value)
-{
-    out << '(' << value.x << ", " << value.y << ')';
-    return out;
-}
-
+std::ostream& operator<<(std::ostream& out, Point const& value);
 }
 }
 

=== modified file 'include/shared/mir/geometry/rectangle.h'
--- include/shared/mir/geometry/rectangle.h	2013-10-15 08:53:10 +0000
+++ include/shared/mir/geometry/rectangle.h	2013-11-08 13:06:22 +0000
@@ -23,7 +23,7 @@
 #include "point.h"
 #include "size.h"
 
-#include <ostream>
+#include <iosfwd>
 
 namespace mir
 {
@@ -65,12 +65,7 @@
     return lhs.top_left != rhs.top_left || lhs.size != rhs.size;
 }
 
-inline std::ostream& operator<<(std::ostream& out, Rectangle const& value)
-{
-    out << '(' << value.top_left << ", " << value.size << ')';
-    return out;
-}
-
+std::ostream& operator<<(std::ostream& out, Rectangle const& value);
 }
 }
 

=== modified file 'include/shared/mir/geometry/size.h'
--- include/shared/mir/geometry/size.h	2013-08-28 03:41:48 +0000
+++ include/shared/mir/geometry/size.h	2013-11-08 13:06:22 +0000
@@ -20,7 +20,7 @@
 #define MIR_GEOMETRY_SIZE_H_
 
 #include "dimensions.h"
-#include <ostream>
+#include <iosfwd>
 
 namespace mir
 {
@@ -50,12 +50,7 @@
     return lhs.width != rhs.width || lhs.height != rhs.height;
 }
 
-inline std::ostream& operator<<(std::ostream& out, Size const& value)
-{
-    out << '(' << value.width << ", " << value.height << ')';
-    return out;
-}
-
+std::ostream& operator<<(std::ostream& out, Size const& value);
 }
 }
 

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2013-11-05 03:39:55 +0000
+++ src/server/CMakeLists.txt	2013-11-08 13:06:22 +0000
@@ -49,6 +49,7 @@
   mirplatform
   mirinput
   mirsharedinput
+  mirsharedgeometry
   mirsharedlogging
   mirsurfaces
   mirtime

=== modified file 'src/shared/geometry/CMakeLists.txt'
--- src/shared/geometry/CMakeLists.txt	2013-08-28 03:41:48 +0000
+++ src/shared/geometry/CMakeLists.txt	2013-11-08 13:06:22 +0000
@@ -19,5 +19,6 @@
 
   rectangle.cpp
   rectangles.cpp
+  ostream.cpp
 )
 

=== added file 'src/shared/geometry/ostream.cpp'
--- src/shared/geometry/ostream.cpp	1970-01-01 00:00:00 +0000
+++ src/shared/geometry/ostream.cpp	2013-11-08 13:06:22 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#include "mir/geometry/displacement.h"
+#include "mir/geometry/point.h"
+#include "mir/geometry/size.h"
+#include "mir/geometry/rectangle.h"
+#include "mir/geometry/rectangles.h"
+
+#include <ostream>
+
+namespace geom = mir::geometry;
+
+std::ostream& geom::operator<<(std::ostream& out, Displacement const& value)
+{
+    out << '(' << value.dx << ", " << value.dy << ')';
+    return out;
+}
+
+std::ostream& geom::operator<<(std::ostream& out, Point const& value)
+{
+    out << '(' << value.x << ", " << value.y << ')';
+    return out;
+}
+
+std::ostream& geom::operator<<(std::ostream& out, Size const& value)
+{
+    out << '(' << value.width << ", " << value.height << ')';
+    return out;
+}
+
+std::ostream& geom::operator<<(std::ostream& out, Rectangle const& value)
+{
+    out << '(' << value.top_left << ", " << value.size << ')';
+    return out;
+}
+
+std::ostream& geom::operator<<(std::ostream& out, Rectangles const& value)
+{
+    out << '[';
+    for (auto const& rect : value)
+        out << rect << ", ";
+    out << ']';
+    return out;
+}

=== modified file 'src/shared/geometry/rectangles.cpp'
--- src/shared/geometry/rectangles.cpp	2013-08-28 03:41:48 +0000
+++ src/shared/geometry/rectangles.cpp	2013-11-08 13:06:22 +0000
@@ -187,12 +187,3 @@
 {
     return !(*this == rects);
 }
-
-std::ostream& geom::operator<<(std::ostream& out, Rectangles const& value)
-{
-    out << '[';
-    for (auto const& rect : value)
-        out << rect << ", ";
-    out << ']';
-    return out;
-}