Mir

Merge lp:~vanvugt/mir/fix-1199210 into lp:~mir-team/mir/trunk

  1. fix-1199210
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 831
Proposed branch: lp:~vanvugt/mir/fix-1199210
Merge into: lp:~mir-team/mir/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
include/server/mir/input/surface_info.h (+1/-1)
include/server/mir/surfaces/surface_info.h (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1199210
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+173632@code.launchpad.net

Commit message

Work around GCC issue 50043 which is causing build failures on raring.
(LP: #1199210)

The gcc bug is only fixed in 4.8/saucy.

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

PASSED: Continuous integration, rev:828
http://jenkins.qa.ubuntu.com/job/mir-ci/949/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/187
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/187/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/590

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/949/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

sigh

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/server/mir/input/surface_info.h'
2--- include/server/mir/input/surface_info.h 2013-07-08 17:04:31 +0000
3+++ include/server/mir/input/surface_info.h 2013-07-09 02:55:32 +0000
4@@ -49,7 +49,7 @@
5
6 protected:
7 SurfaceInfoController() = default;
8- virtual ~SurfaceInfoController() = default;
9+ virtual ~SurfaceInfoController() noexcept = default;
10 SurfaceInfoController(const SurfaceInfoController&) = delete;
11 SurfaceInfoController& operator=(const SurfaceInfoController& ) = delete;
12 };
13
14=== modified file 'include/server/mir/surfaces/surface_info.h'
15--- include/server/mir/surfaces/surface_info.h 2013-07-08 17:04:31 +0000
16+++ include/server/mir/surfaces/surface_info.h 2013-07-09 02:55:32 +0000
17@@ -50,7 +50,7 @@
18
19 protected:
20 SurfaceInfoController() = default;
21- virtual ~SurfaceInfoController() = default;
22+ virtual ~SurfaceInfoController() noexcept = default;
23 SurfaceInfoController(const SurfaceInfoController&) = delete;
24 SurfaceInfoController& operator=(const SurfaceInfoController& ) = delete;
25 };

Subscribers

People subscribed via source and target branches