Unity

Merge lp:~unity-team/unity/gcc-5 into lp:unity

  1. gcc-5
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3986
Proposed branch: lp:~unity-team/unity/gcc-5
Merge into: lp:unity
Diff against target: 11 lines (+1/-0)
1 file modified
unity-shared/DebugDBusInterface.cpp (+1/-0)
To merge this branch: bzr merge lp:~unity-team/unity/gcc-5
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Eleni Maria Stea (community) Approve
Review via email: mp+266708@code.launchpad.net

Commit message

unity-shared/DebugDBusInterface.cpp: include <iostream> to fix a FTBFS

Description of the change

Include <iostream> in unity-shared/DebugDBusInterface.cpp otherwise it fails to build using GCC 5 on arm64 (because the code is in fact invalid but just happens to work elsewhere).

To post a comment you must log in.
Revision history for this message
Eleni Maria Stea (hikiko) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3984
http://jenkins.qa.ubuntu.com/job/unity-ci/1278/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/54

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1278/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-shared/DebugDBusInterface.cpp'
2--- unity-shared/DebugDBusInterface.cpp 2014-07-21 12:50:49 +0000
3+++ unity-shared/DebugDBusInterface.cpp 2015-08-03 12:08:40 +0000
4@@ -20,6 +20,7 @@
5 */
6
7 #include <fstream>
8+#include <iostream>
9 #include <sstream>
10 #include <boost/algorithm/string.hpp>
11 #include <NuxCore/Logger.h>