MirAL

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

  1. g++-7
  2. Merge into trunk
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
=== modified file 'include/miral/active_outputs.h'
--- include/miral/active_outputs.h 2016-12-13 13:07:15 +0000
+++ include/miral/active_outputs.h 2017-08-11 10:59:43 +0000
@@ -19,6 +19,7 @@
19#ifndef MIRAL_ACTIVE_OUTPUTS_H19#ifndef MIRAL_ACTIVE_OUTPUTS_H
20#define MIRAL_ACTIVE_OUTPUTS_H20#define MIRAL_ACTIVE_OUTPUTS_H
2121
22#include <functional>
22#include <memory>23#include <memory>
23#include <vector>24#include <vector>
2425
2526
=== modified file 'include/miral/application_authorizer.h'
--- include/miral/application_authorizer.h 2017-02-09 11:39:24 +0000
+++ include/miral/application_authorizer.h 2017-08-11 10:59:43 +0000
@@ -22,6 +22,7 @@
22#include <miral/version.h>22#include <miral/version.h>
2323
24#include <sys/types.h>24#include <sys/types.h>
25#include <functional>
25#include <memory>26#include <memory>
2627
27namespace mir { class Server; }28namespace mir { class Server; }
2829
=== modified file 'include/miral/set_window_management_policy.h'
--- include/miral/set_window_management_policy.h 2017-03-20 12:28:06 +0000
+++ include/miral/set_window_management_policy.h 2017-08-11 10:59:43 +0000
@@ -19,6 +19,7 @@
19#ifndef MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H19#ifndef MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H
20#define MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H20#define MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H
2121
22#include <functional>
22#include <memory>23#include <memory>
2324
24namespace mir25namespace mir
2526
=== modified file 'miral-shell/floating_window_manager.cpp'
--- miral-shell/floating_window_manager.cpp 2017-07-28 13:53:45 +0000
+++ miral-shell/floating_window_manager.cpp 2017-08-11 10:59:43 +0000
@@ -185,6 +185,7 @@
185185
186 case mir_touch_action_down:186 case mir_touch_action_down:
187 is_drag = false;187 is_drag = false;
188 continue;
188189
189 default:190 default:
190 continue;191 continue;
191192
=== modified file 'miral-shell/tiling_window_manager.cpp'
--- miral-shell/tiling_window_manager.cpp 2017-07-28 13:51:05 +0000
+++ miral-shell/tiling_window_manager.cpp 2017-08-11 10:59:43 +0000
@@ -370,6 +370,7 @@
370370
371 case mir_touch_action_down:371 case mir_touch_action_down:
372 is_drag = false;372 is_drag = false;
373 continue;
373374
374 default:375 default:
375 continue;376 continue;
376377
=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp 2017-07-28 13:51:05 +0000
+++ miral/basic_window_manager.cpp 2017-08-11 10:59:43 +0000
@@ -1036,7 +1036,7 @@
1036 if (modifications.output_id().is_set() &&1036 if (modifications.output_id().is_set() &&
1037 (!window_info.has_output_id() || modifications.output_id().value() != window_info.output_id()))1037 (!window_info.has_output_id() || modifications.output_id().value() != window_info.output_id()))
1038 break;1038 break;
10391039 // Falls through.
1040 default:1040 default:
1041 if (new_state == window_info.state())1041 if (new_state == window_info.state())
1042 return;1042 return;

Subscribers

People subscribed via source and target branches