Mir

Merge lp:~robert-ancell/mir/missing-import into lp:~mir-team/mir/trunk

  1. missing-import
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Thomi Richards
Approved revision: no longer in the source branch.
Merged at revision: 944
Proposed branch: lp:~robert-ancell/mir/missing-import
Merge into: lp:~mir-team/mir/trunk
Diff against target: 12 lines (+2/-0)
1 file modified
examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp (+2/-0)
To merge this branch: bzr merge lp:~robert-ancell/mir/missing-import
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Thomi Richards (community) Approve
Review via email: mp+179092@code.launchpad.net

Commit message

Add missing iostream import. This was accidentally removed in revision 939. Local builds and CI builds both seem to have treated this as a warning; debian package builds as an error. Fixes packaging builds.

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:944
http://jenkins.qa.ubuntu.com/job/mir-ci/1252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/490
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/490/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1252/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 'examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp'
2--- examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp 2013-08-07 08:11:14 +0000
3+++ examples/demo-inprocess-surface-client/demo_inprocess_surface_client.cpp 2013-08-08 04:02:07 +0000
4@@ -23,6 +23,8 @@
5
6 #include "mir/report_exception.h"
7
8+#include <iostream>
9+
10 namespace me = mir::examples;
11
12 ///\page demo_inprocess_egl demo_inprocess_egl.cpp: A simple use of egl in process

Subscribers

People subscribed via source and target branches