Merge lp:~vanvugt/mir/fix-error_stream-overrides into lp:mir

[Daniel van Vugt]

error_stream.h: Fix missing overrides

It appears to be clang's policy to ignore missing overrides only until you add one or more overrides. Then it starts caring about the rest and emits a warning/error...

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

FAILED: Continuous integration, rev:3883
https://mir-jenkins.ubuntu.com/job/mir-ci/2401/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3129/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3196
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3188
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3188
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3188
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3158/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3158/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3158/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3158/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3158/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3158/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Hmm the Ubuntu Archive has gone missing. Network failure.

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

FAILED: Continuous integration, rev:3884
https://mir-jenkins.ubuntu.com/job/mir-ci/2403/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3131/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3198
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3190
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3190
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3190
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3160/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3160/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3160/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3160/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3160/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3160/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

[Chris Halse Rogers (raof)]

Yup!

Clang assumes that if you've got *any* override specifiers then you're interested in using (the entirely optional) keyword.

review: Approve

=== modified file 'src/client/error_stream.h'
--- src/client/error_stream.h	2016-12-09 02:54:31 +0000
+++ src/client/error_stream.h	2016-12-16 02:07:43 +0000
@@ -32,27 +32,28 @@
         std::string const& error_msg, MirConnection* conn,
         frontend::BufferStreamId id, std::shared_ptr<MirWaitHandle> const& wh);
 
-    MirSurfaceParameters get_parameters() const;
-    std::shared_ptr<ClientBuffer> get_current_buffer();
-    uint32_t get_current_buffer_id();
-    EGLNativeWindowType egl_native_window();
-    MirWaitHandle* swap_buffers(std::function<void()> const& done);
-    std::shared_ptr<MemoryRegion> secure_for_cpu_write();
-    int swap_interval() const;
-    MirWaitHandle* set_swap_interval(int interval);
-    MirNativeBuffer* get_current_buffer_package();
-    MirPlatformType platform_type();
-    frontend::BufferStreamId rpc_id() const;
+    MirSurfaceParameters get_parameters() const override;
+    std::shared_ptr<ClientBuffer> get_current_buffer() override;
+    uint32_t get_current_buffer_id() override;
+    EGLNativeWindowType egl_native_window() override;
+    MirWaitHandle* swap_buffers(std::function<void()> const& done) override;
+    std::shared_ptr<MemoryRegion> secure_for_cpu_write() override;
+    int swap_interval() const override;
+    MirWaitHandle* set_swap_interval(int interval) override;
+    MirNativeBuffer* get_current_buffer_package() override;
+    MirPlatformType platform_type() override;
+    frontend::BufferStreamId rpc_id() const override;
+    bool valid() const override;
+    void buffer_available(mir::protobuf::Buffer const& buffer) override;
+    void buffer_unavailable() override;
+    void set_size(geometry::Size) override;
+    geometry::Size size() const override;
+    MirWaitHandle* set_scale(float) override;
+    char const* get_error_message() const override;
+    MirConnection* connection() const override;
+    MirRenderSurface* render_surface() const override;
+
     MirWaitHandle* release(mir_buffer_stream_callback callback, void* context);
-    bool valid() const;
-    void buffer_available(mir::protobuf::Buffer const& buffer);
-    void buffer_unavailable();
-    void set_size(geometry::Size);
-    geometry::Size size() const;
-    MirWaitHandle* set_scale(float);
-    char const* get_error_message() const;
-    MirConnection* connection() const;
-    MirRenderSurface* render_surface() const;
 private:
     std::string const error;
     MirConnection* const connection_;