Merge lp:~vanvugt/mir/fix-1196415 into lp:~mir-team/mir/trunk

[Daniel van Vugt]

Fix mismatched destructor exception specifiers causing build failure in
gcc 4.7. Also fix struct/class mismatches that some compilers will treat as
an error. (LP: #1196415)

[Daniel van Vugt (vanvugt)]

This supporting gcc-4.7 is indeed getting irritating for me now. Maybe I'll put gcc 4.8 on the raring machine...

[Alexandros Frantzis (afrantzis)]

+ msh::Surface::~Surface() noexcept

~Surface() can actually throw an exception: ~Surface() -> ... -> SurfaceStack::destroy_surface() -> InputRegistrar::input_surface_closed() -> exception, but this is not a problem with this MP.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:794
http://jenkins.qa.ubuntu.com/job/mir-ci/865/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/103/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/519

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/865/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/389/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/988
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/43/console

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

looks good!

review: Approve

[Kevin DuBois (kdub)]

i've seen that bug with the Input acceptance tests before... I'll file a bug about it (investigated it a bit friday actually) and retrigger landing

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'include/server/mir/shell/surface.h'
--- include/server/mir/shell/surface.h	2013-06-28 16:03:05 +0000
+++ include/server/mir/shell/surface.h	2013-07-01 07:05:36 +0000
@@ -55,7 +55,7 @@
         frontend::SurfaceId id,
         std::shared_ptr<events::EventSink> const& sink);
 
-    ~Surface();
+    ~Surface() noexcept;
 
     virtual void hide();
     virtual void show();

=== modified file 'include/test/mir_test_doubles/mock_surface.h'
--- include/test/mir_test_doubles/mock_surface.h	2013-06-25 05:42:49 +0000
+++ include/test/mir_test_doubles/mock_surface.h	2013-07-01 07:05:36 +0000
@@ -41,6 +41,8 @@
     {
     }
 
+    ~MockSurface() noexcept {}
+
     MOCK_METHOD0(hide, void());
     MOCK_METHOD0(show, void());
     MOCK_METHOD0(visible, bool());

=== modified file 'src/server/shell/surface.cpp'
--- src/server/shell/surface.cpp	2013-06-25 19:28:56 +0000
+++ src/server/shell/surface.cpp	2013-07-01 07:05:36 +0000
@@ -60,7 +60,7 @@
 {
 }
 
-msh::Surface::~Surface()
+msh::Surface::~Surface() noexcept
 {
     if (surface.lock())
     {

=== modified file 'tests/unit-tests/shell/test_application_session.cpp'
--- tests/unit-tests/shell/test_application_session.cpp	2013-06-25 13:19:15 +0000
+++ tests/unit-tests/shell/test_application_session.cpp	2013-07-01 07:05:36 +0000
@@ -163,8 +163,11 @@
 {
     using namespace ::testing;
 
-    struct MockSnapshotStrategy : public msh::SnapshotStrategy
+    class MockSnapshotStrategy : public msh::SnapshotStrategy
     {
+    public:
+        ~MockSnapshotStrategy() noexcept {}
+
         MOCK_METHOD2(take_snapshot_of,
                     void(std::shared_ptr<msh::SurfaceBufferAccess> const&,
                          msh::SnapshotCallback const&));

=== modified file 'tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp'
--- tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp	2013-06-25 13:19:14 +0000
+++ tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp	2013-07-01 07:05:36 +0000
@@ -37,8 +37,11 @@
 namespace mtd = mir::test::doubles;
 namespace geom = mir::geometry;
 
-struct StubSurfaceBufferAccess : public msh::SurfaceBufferAccess
+class StubSurfaceBufferAccess : public msh::SurfaceBufferAccess
 {
+public:
+    ~StubSurfaceBufferAccess() noexcept {}
+
     void with_most_recent_buffer_do(
         std::function<void(mc::Buffer&)> const& exec)
     {
@@ -48,8 +51,11 @@
     mtd::StubBuffer buffer;
 };
 
-struct MockPixelBuffer : public msh::PixelBuffer
+class MockPixelBuffer : public msh::PixelBuffer
 {
+public:
+    ~MockPixelBuffer() noexcept {}
+
     MOCK_METHOD1(fill_from, void(mc::Buffer& buffer));
     MOCK_METHOD0(as_argb_8888, void const*());
     MOCK_CONST_METHOD0(size, geom::Size());