Merge lp:~vanvugt/mir/make-older-clang-happy into lp:mir

[Daniel van Vugt]

Minor fixes to restore support for legacy clang (3.8) on xenial.

They were reasonable complaints, so worth fixing.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4159
https://mir-jenkins.ubuntu.com/job/mir-ci/3386/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4584
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4712
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4701
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4701
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4616
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4616/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/4616
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4616/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4616
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4616/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/4616
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4616/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/4616
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4616/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

that should not cause a warning..

review: Abstain

[Daniel van Vugt (vanvugt)]

No they shouldn't, but compilers are often imperfect. So it's a choice between what builds and what doesn't :)

[Andreas Pokorny (andreas-pokorny)]

review: Approve

=== modified file 'src/platforms/mesa/client/client_platform.cpp'
--- src/platforms/mesa/client/client_platform.cpp	2017-04-13 07:00:27 +0000
+++ src/platforms/mesa/client/client_platform.cpp	2017-05-01 09:59:05 +0000
@@ -151,12 +151,7 @@
         available_callback, available_context);
 }
 
-MirBuffer* allocate_buffer_gbm_sync(
-    MirConnection* connection,
-    uint32_t width, uint32_t height,
-    uint32_t gbm_pixel_format,
-    uint32_t gbm_bo_flags)
-try
+namespace
 {
     struct BufferSync
     {
@@ -177,11 +172,25 @@
         std::mutex mutex;
         std::condition_variable cv;
         MirBuffer* buffer = nullptr;
-    } sync;
-
+    };
+
+    void allocate_buffer_gbm_sync_cb(MirBuffer* b, void* context)
+    {
+        reinterpret_cast<BufferSync*>(context)->set_buffer(b);
+    }
+}
+
+MirBuffer* allocate_buffer_gbm_sync(
+    MirConnection* connection,
+    uint32_t width, uint32_t height,
+    uint32_t gbm_pixel_format,
+    uint32_t gbm_bo_flags)
+try
+{
+    BufferSync sync;
     allocate_buffer_gbm(
         connection, width, height, gbm_pixel_format, gbm_bo_flags,
-        [](auto* b, auto* context){ reinterpret_cast<BufferSync*>(context)->set_buffer(b); }, &sync);
+        &allocate_buffer_gbm_sync_cb, &sync);
     return sync.wait_for_buffer();
 }
 catch (...)

=== modified file 'src/platforms/mesa/server/kms/display.cpp'
--- src/platforms/mesa/server/kms/display.cpp	2017-04-06 05:30:53 +0000
+++ src/platforms/mesa/server/kms/display.cpp	2017-05-01 09:59:05 +0000
@@ -557,8 +557,8 @@
                     bounding_rect.size.height.as_uint32_t()};
 
                 auto const physical_size = transformation * logical_size;
-                uint32_t width = abs(physical_size.x);
-                uint32_t height = abs(physical_size.y);
+                uint32_t width = abs(int(physical_size.x));
+                uint32_t height = abs(int(physical_size.y));
 
                 for (auto const& group : kms_output_groups)
                 {

=== modified file 'tests/unit-tests/platforms/nested/test_host_buffer.cpp'
--- tests/unit-tests/platforms/nested/test_host_buffer.cpp	2017-04-13 07:00:27 +0000
+++ tests/unit-tests/platforms/nested/test_host_buffer.cpp	2017-05-01 09:59:05 +0000
@@ -36,6 +36,9 @@
 namespace mcl = mir::client;
 namespace mtd = mir::test::doubles;
 
+namespace
+{
+
 std::unique_ptr<mir::Fd> fd = nullptr;
 int get_fence(MirBuffer*)
 {
@@ -44,6 +47,10 @@
     return -1;
 }
 
+void null_connected_callback(MirConnection*, void*)
+{
+}
+
 struct TestConnectionConfiguration : mir::client::DefaultConnectionConfiguration
 {
 public:
@@ -110,6 +117,8 @@
     }
 };
 
+}
+
 struct HostBuffer : Test
 {
     HostBuffer()
@@ -133,7 +142,7 @@
     fd = std::make_unique<mir::Fd>( fileno(tmpfile()) );
 
     MirConnection connection{*config};
-    connection.connect("", [](auto*, auto*){}, nullptr)->wait_for_all();
+    connection.connect("", &null_connected_callback, nullptr)->wait_for_all();
     mgn::HostBuffer buffer(&connection, mir::geometry::Size{1,1}, mir_pixel_format_abgr_8888);
     {
         auto fence = buffer.fence();