QtMir

Merge lp:~aacid/qtmir/compile_with_clang into lp:qtmir

  1. compile_with_clang
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 528
Merged at revision: 542
Proposed branch: lp:~aacid/qtmir/compile_with_clang
Merge into: lp:qtmir
Prerequisite: lp:~aacid/qtmir/clazy_run
Diff against target: 78 lines (+13/-8)
4 files modified
tests/framework/fake_surface.h (+5/-5)
tests/framework/mock_main_loop.cpp (+1/-1)
tests/framework/mock_main_loop.h (+6/-1)
tests/mirserver/WindowManager/stub_session.cpp (+1/-1)
To merge this branch: bzr merge lp:~aacid/qtmir/compile_with_clang
Reviewer Review Type Date Requested Status
Unity8 CI Bot (community) continuous-integration Needs Fixing
Gerry Boland (community) Approve
Review via email: mp+302300@code.launchpad.net

Commit message

Compile with clang

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM. You using clang with any command line options in particular, or does it warn about these issues by default?

Revision history for this message
Albert Astals Cid (aacid) wrote :

by default

Using clang++ 3.8 in yakkety

Revision history for this message
Gerry Boland (gerboland) :
review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:528
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/329/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2499/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2527
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2408
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2408
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2408
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2401
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2401/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2401/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2401/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2401
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2401/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2401
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2401/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2401
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2401/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2401
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2401/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2401
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2401/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2401
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2401/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/329/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/framework/fake_surface.h'
2--- tests/framework/fake_surface.h 2016-05-24 20:13:10 +0000
3+++ tests/framework/fake_surface.h 2016-08-08 15:59:27 +0000
4@@ -73,7 +73,7 @@
5 void resize(geometry::Size const&) override {}
6 void set_transformation(glm::mat4 const&) override {}
7 void set_alpha(float) override {}
8- void set_orientation(MirOrientation) {}
9+ void set_orientation(MirOrientation) override {}
10
11 void add_observer(std::shared_ptr<scene::SurfaceObserver> const&) override {}
12 void remove_observer(std::weak_ptr<scene::SurfaceObserver> const&) override {}
13@@ -81,8 +81,8 @@
14 void set_reception_mode(input::InputReceptionMode mode) override { input_mode = mode; }
15 void consume(MirEvent const*) override {}
16
17- void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) {}
18- std::shared_ptr<graphics::CursorImage> cursor_image() const { return {}; }
19+ void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& /* image */) override {}
20+ std::shared_ptr<graphics::CursorImage> cursor_image() const override { return {}; }
21
22 void request_client_surface_close() override {}
23
24@@ -97,8 +97,8 @@
25 void set_keymap(MirInputDeviceId, std::string const&, std::string const&, std::string const&, std::string const&) override
26 {}
27
28- void set_cursor_stream(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&) {}
29- void rename(std::string const&) {}
30+ void set_cursor_stream(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&) override {}
31+ void rename(std::string const&) override {}
32 std::shared_ptr<frontend::BufferStream> primary_buffer_stream() const override { return nullptr; }
33 };
34
35
36=== modified file 'tests/framework/mock_main_loop.cpp'
37--- tests/framework/mock_main_loop.cpp 2015-11-11 10:43:36 +0000
38+++ tests/framework/mock_main_loop.cpp 2016-08-08 15:59:27 +0000
39@@ -20,7 +20,7 @@
40 {
41 }
42
43-MockMainLoop::~MockMainLoop()
44+MockMainLoop::~MockMainLoop() noexcept
45 {
46 }
47
48
49=== modified file 'tests/framework/mock_main_loop.h'
50--- tests/framework/mock_main_loop.h 2015-11-11 10:43:36 +0000
51+++ tests/framework/mock_main_loop.h 2016-08-08 15:59:27 +0000
52@@ -44,7 +44,12 @@
53 MOCK_METHOD1(resume_processing_for,void (void const*));
54
55 MOCK_METHOD1(create_alarm, std::unique_ptr<mir::time::Alarm>(std::function<void()> const& callback));
56- MOCK_METHOD1(create_alarm, std::unique_ptr<mir::time::Alarm>(std::shared_ptr<mir::LockableCallback> const& callback));
57+ MOCK_METHOD1(create_alarm, std::unique_ptr<mir::time::Alarm>(mir::LockableCallback* callback));
58+
59+ std::unique_ptr<mir::time::Alarm> create_alarm(std::unique_ptr<mir::LockableCallback> callback)
60+ {
61+ return create_alarm(callback.get());
62+ }
63 };
64
65 #endif // MOCKMAINLOOP_H
66
67=== modified file 'tests/mirserver/WindowManager/stub_session.cpp'
68--- tests/mirserver/WindowManager/stub_session.cpp 2016-04-21 16:21:22 +0000
69+++ tests/mirserver/WindowManager/stub_session.cpp 2016-08-08 15:59:27 +0000
70@@ -33,7 +33,7 @@
71
72 pid_t StubSession::process_id() const
73 {
74- return {0};
75+ return 0;
76 }
77
78 void StubSession::take_snapshot(

Subscribers

People subscribed via source and target branches