Mir

Merge lp:~vanvugt/mir/fix-clang-20160803 into lp:mir

Proposed by Daniel van Vugt on 2016-08-03
Status: Merged
Approved by: Alan Griffiths on 2016-08-03
Approved revision: 3623
Merged at revision: 3625
Proposed branch: lp:~vanvugt/mir/fix-clang-20160803
Merge into: lp:mir
Diff against target: 103 lines (+5/-16)
7 files modified
src/client/buffer_factory.cpp (+1/-1)
src/client/rpc/mir_protobuf_rpc_channel.cpp (+0/-5)
src/platforms/eglstream-kms/client/client_platform.cpp (+1/-2)
src/platforms/eglstream-kms/client/client_platform.h (+1/-4)
src/platforms/eglstream-kms/server/platform.cpp (+1/-2)
src/platforms/eglstream-kms/server/platform.h (+0/-1)
tests/unit-tests/client/test_no_tls_future.cpp (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-clang-20160803
Reviewer Review Type Date Requested Status
Alan Griffiths 2016-08-03 Approve on 2016-08-03
Mir CI Bot continuous-integration Approve on 2016-08-03
Review via email: mp+301869@code.launchpad.net

Commit message

Fix lots of clang warnings/errors that cause build failure.

Description of the change

Apparently clang in CI has been stuck on vivid till now, so we never checked lp:mir against newer versions of clang in xenial/yakkety.

And the reason for clang++ not working for so long has recently been resolved: bug 1510042

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

PASSED: Continuous integration, rev:3623
https://mir-jenkins.ubuntu.com/job/mir-ci/1389/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1676
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1729
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1720
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1720
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1720
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1692
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1692/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/1692
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1692/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1692
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1692/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/1692
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1692/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/1692
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1692/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/1692
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1692/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/buffer_factory.cpp'
2--- src/client/buffer_factory.cpp 2016-06-24 18:19:58 +0000
3+++ src/client/buffer_factory.cpp 2016-08-03 06:51:52 +0000
4@@ -86,7 +86,7 @@
5 }
6
7 allocation_requests.erase(request_it);
8- return std::move(b);
9+ return b;
10 }
11
12 void mcl::BufferFactory::cancel_requests_with_context(void* cancelled_context)
13
14=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
15--- src/client/rpc/mir_protobuf_rpc_channel.cpp 2016-06-24 17:52:00 +0000
16+++ src/client/rpc/mir_protobuf_rpc_channel.cpp 2016-08-03 06:51:52 +0000
17@@ -52,11 +52,6 @@
18 namespace md = mir::dispatch;
19 namespace mp = mir::protobuf;
20
21-namespace
22-{
23-std::chrono::milliseconds const timeout(200);
24-}
25-
26 mclr::MirProtobufRpcChannel::MirProtobufRpcChannel(
27 std::unique_ptr<mclr::StreamTransport> transport,
28 std::shared_ptr<mcl::SurfaceMap> const& surface_map,
29
30=== modified file 'src/platforms/eglstream-kms/client/client_platform.cpp'
31--- src/platforms/eglstream-kms/client/client_platform.cpp 2016-05-31 01:21:42 +0000
32+++ src/platforms/eglstream-kms/client/client_platform.cpp 2016-08-03 06:51:52 +0000
33@@ -29,8 +29,7 @@
34 namespace mcle=mir::client::eglstream;
35 namespace geom=mir::geometry;
36
37-mcle::ClientPlatform::ClientPlatform(ClientContext* const context)
38- : context{context}
39+mcle::ClientPlatform::ClientPlatform(ClientContext* const)
40 {
41 }
42
43
44=== modified file 'src/platforms/eglstream-kms/client/client_platform.h'
45--- src/platforms/eglstream-kms/client/client_platform.h 2016-05-31 01:21:42 +0000
46+++ src/platforms/eglstream-kms/client/client_platform.h 2016-08-03 06:51:52 +0000
47@@ -30,7 +30,7 @@
48 class ClientPlatform : public client::ClientPlatform
49 {
50 public:
51- ClientPlatform(ClientContext* const context);
52+ ClientPlatform(ClientContext* const);
53
54 MirPlatformType platform_type() const override;
55 void populate(MirPlatformPackage& package) const override;
56@@ -40,9 +40,6 @@
57 std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
58 MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
59 MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
60-
61-private:
62- ClientContext* const context;
63 };
64
65 }
66
67=== modified file 'src/platforms/eglstream-kms/server/platform.cpp'
68--- src/platforms/eglstream-kms/server/platform.cpp 2016-07-20 04:54:07 +0000
69+++ src/platforms/eglstream-kms/server/platform.cpp 2016-08-03 06:51:52 +0000
70@@ -55,8 +55,7 @@
71 EGLDeviceEXT device,
72 std::shared_ptr<EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
73 std::shared_ptr<DisplayReport> const& /*report*/)
74- : device{device},
75- display{EGL_NO_DISPLAY},
76+ : display{EGL_NO_DISPLAY},
77 drm_node{open(drm_node_for_device(device), O_RDWR | O_CLOEXEC)}
78 {
79 using namespace std::literals;
80
81=== modified file 'src/platforms/eglstream-kms/server/platform.h'
82--- src/platforms/eglstream-kms/server/platform.h 2016-07-20 04:54:07 +0000
83+++ src/platforms/eglstream-kms/server/platform.h 2016-08-03 06:51:52 +0000
84@@ -53,7 +53,6 @@
85 UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
86
87 private:
88- EGLDeviceEXT device;
89 EGLDisplay display;
90 mir::Fd const drm_node;
91 };
92
93=== modified file 'tests/unit-tests/client/test_no_tls_future.cpp'
94--- tests/unit-tests/client/test_no_tls_future.cpp 2016-07-27 06:14:20 +0000
95+++ tests/unit-tests/client/test_no_tls_future.cpp 2016-08-03 06:51:52 +0000
96@@ -118,7 +118,7 @@
97
98 EXPECT_FALSE(called);
99
100- promise.set_value(std::move(std::string{expected}));
101+ promise.set_value(std::string{expected});
102 EXPECT_TRUE(called);
103 }
104

Subscribers

People subscribed via source and target branches