Merge lp:~bregma/unity-system-compositor/fix-gcc-4.8 into lp:unity-system-compositor

Proposed by Stephen M. Webb
Status: Merged
Approved by: Robert Ancell
Approved revision: 27
Merged at revision: 26
Proposed branch: lp:~bregma/unity-system-compositor/fix-gcc-4.8
Merge into: lp:unity-system-compositor
Diff against target: 43 lines (+5/-0)
4 files modified
.bzr-builddeb/default.conf (+2/-0)
src/dm_connection.cpp (+1/-0)
src/main.cpp (+1/-0)
src/system_compositor.cpp (+1/-0)
To merge this branch: bzr merge lp:~bregma/unity-system-compositor/fix-gcc-4.8
Reviewer Review Type Date Requested Status
Robert Ancell Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+168571@code.launchpad.net

Commit message

Fix FTBFS using GCC 4.8.

Description of the change

Fix FTBFS using GCC 4.8

Required headers need to be included for standard library declarations.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2013-06-11 01:10:33 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'src/dm_connection.cpp'
10--- src/dm_connection.cpp 2013-04-26 04:31:15 +0000
11+++ src/dm_connection.cpp 2013-06-11 01:10:33 +0000
12@@ -19,6 +19,7 @@
13 #include "dm_connection.h"
14
15 #include <boost/signals2.hpp>
16+#include <iostream>
17
18 namespace ba = boost::asio;
19 namespace bs = boost::system;
20
21=== modified file 'src/main.cpp'
22--- src/main.cpp 2013-05-09 14:07:20 +0000
23+++ src/main.cpp 2013-06-11 01:10:33 +0000
24@@ -18,6 +18,7 @@
25
26 #include "system_compositor.h"
27 #include <mir/report_exception.h>
28+#include <iostream>
29
30 int main(int argc, char const* argv[])
31 try
32
33=== modified file 'src/system_compositor.cpp'
34--- src/system_compositor.cpp 2013-05-09 16:45:45 +0000
35+++ src/system_compositor.cpp 2013-06-11 01:10:33 +0000
36@@ -23,6 +23,7 @@
37 #include <mir/shell/session_container.h>
38 #include <mir/shell/focus_setter.h>
39
40+#include <iostream>
41 #include <thread>
42
43 namespace msh = mir::shell;

Subscribers

People subscribed via source and target branches