Merge lp:~alan-griffiths/miral/g++-7 into lp:miral

Proposed by Alan Griffiths
Status: Merged
Approved by: Gerry Boland
Approved revision: 573
Merged at revision: 573
Proposed branch: lp:~alan-griffiths/miral/g++-7
Merge into: lp:miral
Diff against target: 72 lines (+6/-1)
6 files modified
include/miral/active_outputs.h (+1/-0)
include/miral/application_authorizer.h (+1/-0)
include/miral/set_window_management_policy.h (+1/-0)
miral-shell/floating_window_manager.cpp (+1/-0)
miral-shell/tiling_window_manager.cpp (+1/-0)
miral/basic_window_manager.cpp (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/miral/g++-7
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+328906@code.launchpad.net

Commit message

Fix g++-7 FTBFS

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:573
https://mir-jenkins.ubuntu.com/job/miral-ci/63/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-miral/101
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5072
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5061
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5061
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5061
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/105/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/105/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/105/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/105/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/105/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/105
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/105/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/miral-ci/63/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/miral/active_outputs.h'
2--- include/miral/active_outputs.h 2016-12-13 13:07:15 +0000
3+++ include/miral/active_outputs.h 2017-08-11 10:59:43 +0000
4@@ -19,6 +19,7 @@
5 #ifndef MIRAL_ACTIVE_OUTPUTS_H
6 #define MIRAL_ACTIVE_OUTPUTS_H
7
8+#include <functional>
9 #include <memory>
10 #include <vector>
11
12
13=== modified file 'include/miral/application_authorizer.h'
14--- include/miral/application_authorizer.h 2017-02-09 11:39:24 +0000
15+++ include/miral/application_authorizer.h 2017-08-11 10:59:43 +0000
16@@ -22,6 +22,7 @@
17 #include <miral/version.h>
18
19 #include <sys/types.h>
20+#include <functional>
21 #include <memory>
22
23 namespace mir { class Server; }
24
25=== modified file 'include/miral/set_window_management_policy.h'
26--- include/miral/set_window_management_policy.h 2017-03-20 12:28:06 +0000
27+++ include/miral/set_window_management_policy.h 2017-08-11 10:59:43 +0000
28@@ -19,6 +19,7 @@
29 #ifndef MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H
30 #define MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H
31
32+#include <functional>
33 #include <memory>
34
35 namespace mir
36
37=== modified file 'miral-shell/floating_window_manager.cpp'
38--- miral-shell/floating_window_manager.cpp 2017-07-28 13:53:45 +0000
39+++ miral-shell/floating_window_manager.cpp 2017-08-11 10:59:43 +0000
40@@ -185,6 +185,7 @@
41
42 case mir_touch_action_down:
43 is_drag = false;
44+ continue;
45
46 default:
47 continue;
48
49=== modified file 'miral-shell/tiling_window_manager.cpp'
50--- miral-shell/tiling_window_manager.cpp 2017-07-28 13:51:05 +0000
51+++ miral-shell/tiling_window_manager.cpp 2017-08-11 10:59:43 +0000
52@@ -370,6 +370,7 @@
53
54 case mir_touch_action_down:
55 is_drag = false;
56+ continue;
57
58 default:
59 continue;
60
61=== modified file 'miral/basic_window_manager.cpp'
62--- miral/basic_window_manager.cpp 2017-07-28 13:51:05 +0000
63+++ miral/basic_window_manager.cpp 2017-08-11 10:59:43 +0000
64@@ -1036,7 +1036,7 @@
65 if (modifications.output_id().is_set() &&
66 (!window_info.has_output_id() || modifications.output_id().value() != window_info.output_id()))
67 break;
68-
69+ // Falls through.
70 default:
71 if (new_state == window_info.state())
72 return;

Subscribers

People subscribed via source and target branches