Mir

Merge lp:~alan-griffiths/mir/InputDeviceInfo-is-a-struct into lp:mir

Proposed by Alan Griffiths
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 4135
Proposed branch: lp:~alan-griffiths/mir/InputDeviceInfo-is-a-struct
Merge into: lp:mir
Diff against target: 11 lines (+1/-1)
1 file modified
include/test/mir_test_framework/stub_server_platform_factory.h (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/InputDeviceInfo-is-a-struct
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+321729@code.launchpad.net

Commit message

Use struct consistently for InputDeviceInfo in public headers.

Description of the change

Use struct consistently for InputDeviceInfo in public headers.

include/platform/mir/input/input_device_info.h uses "struct"
include/test/mir_test_framework/stub_server_platform_factory.h used "class"

We know that struct and class are interchangeable but clang doesn't and downstreams use it. So let's be polite and not cause them problems.

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

PASSED: Continuous integration, rev:4135
https://mir-jenkins.ubuntu.com/job/mir-ci/3291/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4447
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4561
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4551
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4551
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4551
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4551
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4479
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4479/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4479
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4479/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4479
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4479/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4479
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4479/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4479
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4479/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4479
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4479/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

lgtm, didnt know clang treated them differently. Though I agree, should make it correct for downstream.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/test/mir_test_framework/stub_server_platform_factory.h'
2--- include/test/mir_test_framework/stub_server_platform_factory.h 2016-08-23 03:56:40 +0000
3+++ include/test/mir_test_framework/stub_server_platform_factory.h 2017-04-03 15:50:07 +0000
4@@ -31,7 +31,7 @@
5 {
6 namespace input
7 {
8-class InputDeviceInfo;
9+struct InputDeviceInfo;
10 }
11 }
12

Subscribers

People subscribed via source and target branches