Mir

Merge lp:~alan-griffiths/mir/be-nice-to-clang into lp:mir

Proposed by Alan Griffiths on 2017-08-24
Status: Merged
Approved by: Chris Halse Rogers on 2017-08-28
Approved revision: 4235
Merged at revision: 4234
Proposed branch: lp:~alan-griffiths/mir/be-nice-to-clang
Merge into: lp:mir
Diff against target: 14 lines (+3/-1)
1 file modified
include/common/mir/input/mir_input_config.h (+3/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/be-nice-to-clang
Reviewer Review Type Date Requested Status
Chris Halse Rogers 2017-08-24 Approve on 2017-08-28
Mir CI Bot continuous-integration Approve on 2017-08-24
Review via email: mp+329527@code.launchpad.net

Commit message

Make public headers play nice with clang

Description of the change

Make public headers play nice with clang

clang erroneously considers struct and class *declarations* to be different and complains if they are not used consistently. We disable this, but downstreams might not and we respect their right to make this choice.

To post a comment you must log in.
4235. By Alan Griffiths on 2017-08-24

Spelling

Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4235
https://mir-jenkins.ubuntu.com/job/mir-ci/3579/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4902/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5124
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5113
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5113
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5113
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4941/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4941/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4941/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4941/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4941/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4941
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4941/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4941
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4941/artifact/output/*zip*/output.zip
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4941/console

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

review: Needs Fixing (continuous-integration)
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4235
https://mir-jenkins.ubuntu.com/job/mir-ci/3581/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4904
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5126
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5115
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5115
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5115
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4943
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4943/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4943
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4943/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4943
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4943/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4943
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4943/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4943
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4943/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4943
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4943/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4943
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4943/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4943
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4943/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Chris Halse Rogers (raof) wrote :

Sure

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/common/mir/input/mir_input_config.h'
2--- include/common/mir/input/mir_input_config.h 2017-07-28 17:00:43 +0000
3+++ include/common/mir/input/mir_input_config.h 2017-08-24 15:18:28 +0000
4@@ -75,7 +75,9 @@
5 std::unique_ptr<Implementation> impl;
6 };
7
8-class MirInputConfig
9+// We use "struct", not "class" for consistency with mirclient/mir_toolkit/client_types.h:395
10+// (To be nice to downstreams that use clang with its pointless warnings about this.)
11+struct MirInputConfig
12 {
13 public:
14 MirInputConfig();

Subscribers

People subscribed via source and target branches