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
=== modified file 'src/client/buffer_factory.cpp'
--- src/client/buffer_factory.cpp 2016-06-24 18:19:58 +0000
+++ src/client/buffer_factory.cpp 2016-08-03 06:51:52 +0000
@@ -86,7 +86,7 @@
86 }86 }
8787
88 allocation_requests.erase(request_it);88 allocation_requests.erase(request_it);
89 return std::move(b);89 return b;
90}90}
9191
92void mcl::BufferFactory::cancel_requests_with_context(void* cancelled_context)92void mcl::BufferFactory::cancel_requests_with_context(void* cancelled_context)
9393
=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
--- src/client/rpc/mir_protobuf_rpc_channel.cpp 2016-06-24 17:52:00 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp 2016-08-03 06:51:52 +0000
@@ -52,11 +52,6 @@
52namespace md = mir::dispatch;52namespace md = mir::dispatch;
53namespace mp = mir::protobuf;53namespace mp = mir::protobuf;
5454
55namespace
56{
57std::chrono::milliseconds const timeout(200);
58}
59
60mclr::MirProtobufRpcChannel::MirProtobufRpcChannel(55mclr::MirProtobufRpcChannel::MirProtobufRpcChannel(
61 std::unique_ptr<mclr::StreamTransport> transport,56 std::unique_ptr<mclr::StreamTransport> transport,
62 std::shared_ptr<mcl::SurfaceMap> const& surface_map,57 std::shared_ptr<mcl::SurfaceMap> const& surface_map,
6358
=== modified file 'src/platforms/eglstream-kms/client/client_platform.cpp'
--- src/platforms/eglstream-kms/client/client_platform.cpp 2016-05-31 01:21:42 +0000
+++ src/platforms/eglstream-kms/client/client_platform.cpp 2016-08-03 06:51:52 +0000
@@ -29,8 +29,7 @@
29namespace mcle=mir::client::eglstream;29namespace mcle=mir::client::eglstream;
30namespace geom=mir::geometry;30namespace geom=mir::geometry;
3131
32mcle::ClientPlatform::ClientPlatform(ClientContext* const context)32mcle::ClientPlatform::ClientPlatform(ClientContext* const)
33 : context{context}
34{33{
35}34}
3635
3736
=== modified file 'src/platforms/eglstream-kms/client/client_platform.h'
--- src/platforms/eglstream-kms/client/client_platform.h 2016-05-31 01:21:42 +0000
+++ src/platforms/eglstream-kms/client/client_platform.h 2016-08-03 06:51:52 +0000
@@ -30,7 +30,7 @@
30class ClientPlatform : public client::ClientPlatform30class ClientPlatform : public client::ClientPlatform
31{31{
32public:32public:
33 ClientPlatform(ClientContext* const context);33 ClientPlatform(ClientContext* const);
3434
35 MirPlatformType platform_type() const override;35 MirPlatformType platform_type() const override;
36 void populate(MirPlatformPackage& package) const override;36 void populate(MirPlatformPackage& package) const override;
@@ -40,9 +40,6 @@
40 std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;40 std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
41 MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;41 MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
42 MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;42 MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
43
44private:
45 ClientContext* const context;
46};43};
4744
48}45}
4946
=== modified file 'src/platforms/eglstream-kms/server/platform.cpp'
--- src/platforms/eglstream-kms/server/platform.cpp 2016-07-20 04:54:07 +0000
+++ src/platforms/eglstream-kms/server/platform.cpp 2016-08-03 06:51:52 +0000
@@ -55,8 +55,7 @@
55 EGLDeviceEXT device,55 EGLDeviceEXT device,
56 std::shared_ptr<EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,56 std::shared_ptr<EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
57 std::shared_ptr<DisplayReport> const& /*report*/)57 std::shared_ptr<DisplayReport> const& /*report*/)
58 : device{device},58 : display{EGL_NO_DISPLAY},
59 display{EGL_NO_DISPLAY},
60 drm_node{open(drm_node_for_device(device), O_RDWR | O_CLOEXEC)}59 drm_node{open(drm_node_for_device(device), O_RDWR | O_CLOEXEC)}
61{60{
62 using namespace std::literals;61 using namespace std::literals;
6362
=== modified file 'src/platforms/eglstream-kms/server/platform.h'
--- src/platforms/eglstream-kms/server/platform.h 2016-07-20 04:54:07 +0000
+++ src/platforms/eglstream-kms/server/platform.h 2016-08-03 06:51:52 +0000
@@ -53,7 +53,6 @@
53 UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;53 UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
5454
55private:55private:
56 EGLDeviceEXT device;
57 EGLDisplay display;56 EGLDisplay display;
58 mir::Fd const drm_node;57 mir::Fd const drm_node;
59};58};
6059
=== modified file 'tests/unit-tests/client/test_no_tls_future.cpp'
--- tests/unit-tests/client/test_no_tls_future.cpp 2016-07-27 06:14:20 +0000
+++ tests/unit-tests/client/test_no_tls_future.cpp 2016-08-03 06:51:52 +0000
@@ -118,7 +118,7 @@
118118
119 EXPECT_FALSE(called);119 EXPECT_FALSE(called);
120120
121 promise.set_value(std::move(std::string{expected}));121 promise.set_value(std::string{expected});
122 EXPECT_TRUE(called);122 EXPECT_TRUE(called);
123}123}
124124

Subscribers

People subscribed via source and target branches