Merge lp:~hikiko/mir/mir.dest-tmp into lp:~mir-team/mir/trunk

[Eleni Maria Stea]

Clean-up of these two branches:
https://code.launchpad.net/~hikiko/mir/mir.fix-virt-destructorS
https://code.launchpad.net/~hikiko/mir/mir.fix-missing-virtual-destructors

for the bug:
https://bugs.launchpad.net/mir/+bug/1183507

Clean-up of these two branches:
https://code.launchpad.net/~hikiko/mir/mir.fix-virt-destructorS
https://code.launchpad.net/~hikiko/mir/mir.fix-missing-virtual-destructors

for the bug:
https://bugs.launchpad.net/mir/+bug/1183507

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:736
http://jenkins.qa.ubuntu.com/job/mir-ci/714/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/884/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/766
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/199
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/403

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

139 - ~Display() = default;
140 + virtual ~Display() {}

296 + virtual ~MirBasicRpcChannel();

309 + virtual ~MirSocketRpcChannel();

335 + virtual ~ReadLock(){}

344 + virtual ~WriteLock(){}

414 + virtual ~SynchronizerController() {}

Missing "TODO make noexcept" (unless it can be done already).

~~~~

321 - virtual ~BufferSwapperMaster() noexcept {}
322 + virtual ~BufferSwapperMaster() {}

Looks like a backward step

~~~~

435 + virtual ~Interface() {}
...
442 + virtual ~MockImplementation() {}

As you're changing both classes you can put the "default" and "noexcept" in there.

review: Needs Fixing

[Kevin DuBois (kdub)]

390 +//do not remove this empty destructor (unique_ptr)
seems self-evident to anyone who would try to remove the destructor :)

[Eleni Maria Stea (hikiko)]

@Kevin, I just added the comment because of this: https://code.launchpad.net/~hikiko/mir/mir.fix-missing-virtual-destructors/+merge/165464/comments/367371 but I will remove it! :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:737
http://jenkins.qa.ubuntu.com/job/mir-ci/723/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/900/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/782/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/208/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/412

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:741
http://jenkins.qa.ubuntu.com/job/mir-ci/725/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/902
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/210
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/210/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/414

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

97 - ~BufferStreamSurfaces();
98 + virtual ~BufferStreamSurfaces();

Not needed - this is not a base class

263 - ~AgingBuffer() noexcept {};
264 + virtual ~AgingBuffer() noexcept {}

Not needed - this is not a base class

276 - ~AndroidClientBuffer() noexcept;
277 + virtual ~AndroidClientBuffer() noexcept;

Not needed - this is not a base class

315 - ~MirBasicRpcChannel();
316 + virtual ~MirBasicRpcChannel();

Not needed - this is not a base class

328 - ~MirSocketRpcChannel();
329 + virtual ~MirSocketRpcChannel();

Not needed - this is not a base class

341 - virtual ~BufferBundle() noexcept {}
342 + virtual ~BufferBundle() {}

Looks like a backward step

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Correction: These _are_ base classes so need "virtual"...
MirBasicRpcChannel
AgingBuffer

But yeah, other non-base classes should not be changed...
BufferStreamSurfaces
AndroidClientBuffer
MirSocketRpcChannel

review: Needs Fixing

[Eleni Maria Stea (hikiko)]

@Daniel: I only added "virtual" to the accessible virtual destructors (based on the gcc errors): BufferStreamSurfaces, AndroidClientBuffer and MirSocketRpcChannel were accessible when I cross-compiled the branch.

@Alan: I am checking out if these changes were necessary and why.

[Eleni Maria Stea (hikiko)]

@Alan, @Daniel thanks, I fixed the:
BufferStreamSurfaces, AgingBuffer, AndroidClientBuffer, MirBasicRpcChannel, MirSocketRpcChannel

The noexcept was removed from BasicBundle to solve the looser specifier error we get because of that: https://code.launchpad.net/~hikiko/mir/mir.fix-virt-destructorS/+merge/167705/comments/372088 in gcc

Specifically:
[...]
In file included from /home/eleni/staging/destructors/mir.dest-tmp/src/server/compositor/switching_bundle.cpp:22:0:
/home/eleni/staging/destructors/mir.dest-tmp/src/server/compositor/switching_bundle.h:37:7: error: looser throw specifier for ‘virtual mir::compositor::SwitchingBundle::~SwitchingBundle()’
In file included from /home/eleni/staging/destructors/mir.dest-tmp/src/server/compositor/switching_bundle.h:23:0,
                 from /home/eleni/staging/destructors/mir.dest-tmp/src/server/compositor/switching_bundle.cpp:22:
/home/eleni/staging/destructors/mir.dest-tmp/src/server/compositor/buffer_bundle.h:35:13: error: overriding ‘virtual mir::compositor::BufferBundle::~BufferBundle() noexcept (true)’
[...]

If I put the noexcept back I'll have to add virtual noexcept destructors to all the classes that inherit from it and the diff will be even bigger - if that's not a problem I can make the change (but it was already discussed and the suggestion was to remove the noexcept/default from base classes)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:746
http://jenkins.qa.ubuntu.com/job/mir-ci/732/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/911
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/217
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/419

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> The noexcept was removed from BasicBundle to solve the looser specifier error
> we get because of that: https://code.launchpad.net/~hikiko/mir/mir.fix-virt-
> destructorS/+merge/167705/comments/372088 in gcc
...
> If I put the noexcept back I'll have to add virtual noexcept destructors to
> all the classes that inherit from it and the diff will be even bigger - if
> that's not a problem I can make the change (but it was already discussed and
> the suggestion was to remove the noexcept/default from base classes)

On trunk the code is already compiling with noexcept (and without changes to other classes).

[Alan Griffiths (alan-griffiths)]

> > The noexcept was removed from BasicBundle to solve the looser specifier
> error
> > we get because of that: https://code.launchpad.net/~hikiko/mir/mir.fix-virt-
> > destructorS/+merge/167705/comments/372088 in gcc
> ...
> > If I put the noexcept back I'll have to add virtual noexcept destructors to
> > all the classes that inherit from it and the diff will be even bigger - if
> > that's not a problem I can make the change (but it was already discussed and
> > the suggestion was to remove the noexcept/default from base classes)
>
> On trunk the code is already compiling with noexcept (and without changes to
> other classes).

The change that causes these errors is:

314 + virtual ~ReadLock(){}
..
323 + virtual ~WriteLock(){}

If you use = default on the above lines you don't need to change BufferBundle

review: Needs Fixing

[Eleni Maria Stea (hikiko)]

fixed

[Alan Griffiths (alan-griffiths)]

413 + virtual ~ANativeWindowInterface() {}
...
421 + virtual ~MockANativeWindow() {}

As you're already changing both classes you should put the "default" and "noexcept" in there now.

~~~~

434 + virtual ~Interface() {}
...
441 + virtual ~MockImplementation() {}

As you're already changing both classes you should put the "default" and "noexcept" in there now.

~~~~

135 + virtual ~Display() {}
212 + virtual ~BufferStream() {}
225 + virtual ~ICSAllocInterface() {}

Missing "TODO make noexcept"

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:747
http://jenkins.qa.ubuntu.com/job/mir-ci/733/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/218
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/218/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/420

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

1. Not base classes, should not be virtual:
+ virtual ~SingleStepMatch() {}
+ virtual ~MockAndroidRegistrar() noexcept {}
+ virtual ~MockANativeWindow() {}
+ virtual ~MockImplementation() {}

2. This change is pointless, because -Wall already includes -Wnon-virtual-dtor, according to the docs...
68 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wextra -fPIC")
69 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")

3. Is this a mistake?
81 -protected:

4. Pointless whitespace changes:
96 -
344 -
368 -

5. Pointless comment:
356 +//do not remove this empty destructor (unique_ptr)
Because you can't accidentally remove the empty virtual destructor without getting a linker error.

review: Needs Fixing

[Alexandros Frantzis (afrantzis)]

> 5. Pointless comment:
> 356 +//do not remove this empty destructor (unique_ptr)

The situation is that we need to have a destructor defined in the source file, instead of in the header (including the compiler generated one), for unique_ptr to an incomplete type to work. The comment could have more details about what is going on, to avoid the "pointless comment" concerns.

I am ok with not having any comment, although that could mean that in the future someone may be tempted to clean this up, only to find that they have wasted their time in vain.

[Daniel van Vugt (vanvugt)]

Well, even with my dated C++ expertise I know that empty virtual destructors are useful things, and need to be kept, even empty.

I would hope that knowledge comes with the territory.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:748
http://jenkins.qa.ubuntu.com/job/mir-ci/746/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/930
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/231
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/431

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

review: Approve (continuous-integration)

[Eleni Maria Stea (hikiko)]

fixed :)

[Alan Griffiths (alan-griffiths)]

Not fixed :(

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> Not fixed :(

Too terse?

106 - virtual ~BufferSwapper() = default;
107 + virtual ~BufferSwapper() {/* TODO: make nothrow */}

See above comments about BufferBundle (the previous name of BufferSwapper)

210 + virtual ~BufferStream() {}

Missing "TODO make noexcept" - also part of the BufferXXX renames

413 + virtual ~ANativeWindowInterface() {}
421 + ~MockANativeWindow() {}
434 + virtual ~Interface() {}
441 + ~MockImplementation() {}

See above comments about these

[Daniel van Vugt (vanvugt)]

See previous comments.

Also, empty non-virtual destructors have no value:
421 + ~MockANativeWindow() {}
422 +

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:749
http://jenkins.qa.ubuntu.com/job/mir-ci/756/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/944
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/826
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/241
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/440

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:750
http://jenkins.qa.ubuntu.com/job/mir-ci/758/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/828
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/243
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/442

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

39 + ~SingleStepMatch() {}

Why?

421 + virtual ~Interface() {/* TODO: make nothrow */}

can be "= default"

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:751
http://jenkins.qa.ubuntu.com/job/mir-ci/763/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/958/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/841/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/446

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:757
http://jenkins.qa.ubuntu.com/job/mir-ci/766/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/4/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[Daniel van Vugt (vanvugt)]

1. I think we went off topic when noexcept was added to:
+ virtual ~MockAndroidRegistrar() {}
+ virtual ~MockANativeWindow() {}
+ virtual ~MockImplementation() {}
That really should be a separate proposal as this one was meant to be just about fixing virtual destructors... ?

2. This change is still unnecessary as it's already included in -Wall:
60 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wextra -fPIC")
61 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
Making the global CMAKE_CXX_FLAGS unnecessarily more complex is something to avoid.

3. Various blank lines have been added and removed. And in some cases they're the only change made to a file, so should be undone.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Oh, I was wrong about -Wnon-virtual-dtor because I was looking at the wrong man-page. Please ignore my point #2 above.

[Eleni Maria Stea (hikiko)]

@Daniel: thanks

> 1. I think we went off topic when noexcept was added to:
> + virtual ~MockAndroidRegistrar() {}
> + virtual ~MockANativeWindow() {}
> + virtual ~MockImplementation() {}
> That really should be a separate proposal as this one was meant to be just
> about fixing virtual destructors... ?

If you don't add the noexcept and you use = default in the parent you get a compile error in gcc because of these:
http://stackoverflow.com/questions/11497252/default-destructor-nothrow
https://code.launchpad.net/~hikiko/mir/mir.fix-virt-destructorS/+merge/167705/comments/372088
https://code.launchpad.net/~hikiko/mir/mir.fix-missing-virtual-destructors/+merge/165464/comments/368890

>
> 2. This change is still unnecessary as it's already included in -Wall:
> 60 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall
> -fno-strict-aliasing -pedantic -Wextra -fPIC")
> 61 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall
> -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
> Making the global CMAKE_CXX_FLAGS unnecessarily more complex is something to
> avoid.
>
ok, you corrected yourself (https://code.launchpad.net/~hikiko/mir/mir.dest-tmp/+merge/168934/comments/379703)

> 3. Various blank lines have been added and removed. And in some cases they're
> the only change made to a file, so should be undone.

I just leave a new line after the constructors-destructors "block" of lines when there are other functions that follow... The only empty line introduced in an empty file is 144 and is there after merge to trunk/resolve (sorry!). But anyway I'll remove all the empty lines...

[Daniel van Vugt (vanvugt)]

OK, I've used enough of your time. Approved.

review: Approve

[Eleni Maria Stea (hikiko)]

I removed the empty lines :)

=== modified file '3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/HookRegistrar.hpp'
--- 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/HookRegistrar.hpp	2013-01-03 21:26:48 +0000
+++ 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/HookRegistrar.hpp	2013-06-19 10:10:36 +0000
@@ -15,11 +15,14 @@
 
 class CallableStep {
 public:
+    virtual ~CallableStep() {}
     virtual void call() = 0;
 };
 
 class Hook {
 public:
+    virtual ~Hook() {}
+
     void setTags(const std::string &csvTagNotation);
     virtual void invokeHook(Scenario *scenario);
     virtual void skipHook();

=== modified file '3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/Tag.hpp'
--- 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/Tag.hpp	2013-01-03 21:26:48 +0000
+++ 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/hook/Tag.hpp	2013-06-19 10:10:36 +0000
@@ -14,6 +14,7 @@
 
 class TagExpression {
 public:
+    virtual ~TagExpression() {}
     typedef std::vector<std::string> tag_list;
 
     virtual bool matches(const tag_list &tags) = 0;

=== modified file '3rd_party/cucumber-cpp/include/cucumber-cpp/internal/step/StepManager.hpp'
--- 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/step/StepManager.hpp	2013-01-03 21:26:48 +0000
+++ 3rd_party/cucumber-cpp/include/cucumber-cpp/internal/step/StepManager.hpp	2013-06-19 10:10:36 +0000
@@ -100,6 +100,8 @@
 class StepInfo {
 public:
     StepInfo(const std::string &stepMatcher, const std::string source);
+    virtual ~StepInfo() {}
+
     SingleStepMatch matches(const std::string &stepDescription);
     virtual InvokeResult invokeStep(const InvokeArgs * pArgs) = 0;
 
@@ -111,6 +113,7 @@
 
 class BasicStep {
 public:
+    virtual ~BasicStep() {}
     InvokeResult invoke(const InvokeArgs *pArgs);
 
 protected:

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-18 14:04:37 +0000
+++ CMakeLists.txt	2013-06-19 10:10:36 +0000
@@ -42,7 +42,7 @@
 include (cmake/PrePush.cmake)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Werror -Wall -pedantic -Wextra -fPIC")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wextra -fPIC")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
 
 #####################################################################

=== modified file 'include/server/mir/compositor/buffer_allocation_strategy.h'
--- include/server/mir/compositor/buffer_allocation_strategy.h	2013-06-11 14:27:33 +0000
+++ include/server/mir/compositor/buffer_allocation_strategy.h	2013-06-19 10:10:36 +0000
@@ -52,7 +52,7 @@
 
 protected:
     BufferAllocationStrategy() {}
-    ~BufferAllocationStrategy() = default;
+    virtual ~BufferAllocationStrategy() { /* TODO: make nothrow */ }
 
     BufferAllocationStrategy(const BufferAllocationStrategy&);
     BufferAllocationStrategy& operator=(const BufferAllocationStrategy& );

=== modified file 'include/server/mir/compositor/buffer_stream_surfaces.h'
--- include/server/mir/compositor/buffer_stream_surfaces.h	2013-06-13 10:40:42 +0000
+++ include/server/mir/compositor/buffer_stream_surfaces.h	2013-06-19 10:10:36 +0000
@@ -37,7 +37,6 @@
 {
 public:
     BufferStreamSurfaces(std::shared_ptr<BufferBundle> const& swapper);
-
     ~BufferStreamSurfaces();
 
     std::shared_ptr<Buffer> secure_client_buffer();

=== modified file 'include/server/mir/frontend/session_mediator_report.h'
--- include/server/mir/frontend/session_mediator_report.h	2013-05-30 03:50:54 +0000
+++ include/server/mir/frontend/session_mediator_report.h	2013-06-19 10:10:36 +0000
@@ -30,6 +30,8 @@
 class SessionMediatorReport
 {
 public:
+    virtual ~SessionMediatorReport() { /* TODO: make nothrow */ }
+
     virtual void session_connect_called(std::string const& app_name) = 0;
 
     virtual void session_create_surface_called(std::string const& app_name) = 0;

=== modified file 'include/server/mir/graphics/display.h'
--- include/server/mir/graphics/display.h	2013-06-17 09:51:42 +0000
+++ include/server/mir/graphics/display.h	2013-06-19 10:10:36 +0000
@@ -100,7 +100,7 @@
 
 protected:
     Display() = default;
-    ~Display() = default;
+    virtual ~Display() {/* TODO: make nothrow */}
 private:
     Display(Display const&) = delete;
     Display& operator=(Display const&) = delete;

=== modified file 'include/server/mir/graphics/display_report.h'
--- include/server/mir/graphics/display_report.h	2013-05-10 18:16:51 +0000
+++ include/server/mir/graphics/display_report.h	2013-06-19 10:10:36 +0000
@@ -46,7 +46,7 @@
 
 protected:
     DisplayReport() = default;
-    ~DisplayReport() = default;
+    virtual ~DisplayReport() { /* TODO: make nothrow */ }
     DisplayReport(const DisplayReport&) = delete;
     DisplayReport& operator=(const DisplayReport&) = delete;
 };

=== modified file 'include/server/mir/graphics/platform.h'
--- include/server/mir/graphics/platform.h	2013-06-17 09:51:42 +0000
+++ include/server/mir/graphics/platform.h	2013-06-19 10:10:36 +0000
@@ -63,11 +63,14 @@
     Platform(const Platform& p) = delete;
     Platform& operator=(const Platform& p) = delete;
 
+    virtual ~Platform() { /* TODO: make nothrow */ }
+
     /**
      * Creates the buffer allocator subsystem.
      *
      * \param [in] buffer_initializer the object responsible for initializing the buffers
      */
+
     virtual std::shared_ptr<compositor::GraphicBufferAllocator> create_buffer_allocator(
         std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
 

=== modified file 'include/server/mir/graphics/viewable_area.h'
--- include/server/mir/graphics/viewable_area.h	2013-04-24 05:22:20 +0000
+++ include/server/mir/graphics/viewable_area.h	2013-06-19 10:10:36 +0000
@@ -34,7 +34,7 @@
 
 protected:
     ViewableArea() = default;
-    ~ViewableArea() = default;
+    virtual ~ViewableArea() { /* TODO: make nothrow */ }
 private:
     ViewableArea(ViewableArea const&) = delete;
     ViewableArea& operator=(ViewableArea const&) = delete;

=== modified file 'include/server/mir/options/option.h'
--- include/server/mir/options/option.h	2013-04-24 05:22:20 +0000
+++ include/server/mir/options/option.h	2013-06-19 10:10:36 +0000
@@ -39,7 +39,7 @@
 
 protected:
     Option() = default;
-    ~Option() = default;
+    virtual ~Option() { /* TODO: make nothrow */ }
     Option(Option const&) = delete;
     Option& operator=(Option const&) = delete;
 };

=== modified file 'include/server/mir/server_configuration.h'
--- include/server/mir/server_configuration.h	2013-04-25 09:48:54 +0000
+++ include/server/mir/server_configuration.h	2013-06-19 10:10:36 +0000
@@ -60,7 +60,7 @@
 
 protected:
     ServerConfiguration() = default;
-    virtual ~ServerConfiguration() {}
+    virtual ~ServerConfiguration() { /* TODO: make nothrow */ }
 
     ServerConfiguration(ServerConfiguration const&) = delete;
     ServerConfiguration& operator=(ServerConfiguration const&) = delete;

=== modified file 'include/server/mir/surfaces/buffer_stream.h'
--- include/server/mir/surfaces/buffer_stream.h	2013-06-13 10:40:42 +0000
+++ include/server/mir/surfaces/buffer_stream.h	2013-06-19 10:10:36 +0000
@@ -40,6 +40,8 @@
 class BufferStream
 {
 public:
+    virtual ~BufferStream() {/* TODO: make nothrow */}
+
     virtual std::shared_ptr<compositor::Buffer> secure_client_buffer() = 0;
     virtual std::shared_ptr<surfaces::GraphicRegion> lock_back_buffer() = 0;
     virtual geometry::PixelFormat get_stream_pixel_format() = 0;

=== modified file 'include/test/mir_test_doubles/mock_android_alloc_device.h'
--- include/test/mir_test_doubles/mock_android_alloc_device.h	2013-05-01 17:35:49 +0000
+++ include/test/mir_test_doubles/mock_android_alloc_device.h	2013-06-19 10:10:36 +0000
@@ -30,6 +30,7 @@
 class ICSAllocInterface
 {
 public:
+    virtual ~ICSAllocInterface() {/* TODO: make nothrow */}
     virtual int alloc_interface(alloc_device_t* dev, int w, int h,
                                 int format, int usage, buffer_handle_t* handle, int* stride) = 0;
     virtual int free_interface(alloc_device_t* dev, buffer_handle_t handle) = 0;

=== modified file 'include/test/mir_test_doubles/mock_android_registrar.h'
--- include/test/mir_test_doubles/mock_android_registrar.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_doubles/mock_android_registrar.h	2013-06-19 10:10:36 +0000
@@ -35,6 +35,7 @@
 {
 struct MockAndroidRegistrar : public client::android::AndroidRegistrar
 {
+    ~MockAndroidRegistrar() noexcept {}
     MOCK_METHOD1(register_buffer,   void(const native_handle_t*));
     MOCK_METHOD1(unregister_buffer, void(const native_handle_t*));
     MOCK_METHOD2(secure_for_cpu, std::shared_ptr<char>(std::shared_ptr<const native_handle_t>, geometry::Rectangle));

=== modified file 'include/test/mir_test_framework/testing_process_manager.h'
--- include/test/mir_test_framework/testing_process_manager.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_framework/testing_process_manager.h	2013-06-19 10:10:36 +0000
@@ -40,6 +40,7 @@
 
 struct TestingClientConfiguration
 {
+    virtual ~TestingClientConfiguration() = default;
     // Code to run in client process
     virtual void exec() = 0;
 };

=== modified file 'src/client/aging_buffer.h'
--- src/client/aging_buffer.h	2013-05-03 18:39:57 +0000
+++ src/client/aging_buffer.h	2013-06-19 10:10:36 +0000
@@ -30,7 +30,7 @@
 {
 public:
     AgingBuffer();
-    ~AgingBuffer() noexcept {};
+    ~AgingBuffer() noexcept {}
 
     virtual uint32_t age() const;
     virtual void increment_age();

=== modified file 'src/client/android/android_registrar.h'
--- src/client/android/android_registrar.h	2013-04-24 05:22:20 +0000
+++ src/client/android/android_registrar.h	2013-06-19 10:10:36 +0000
@@ -35,6 +35,8 @@
 class AndroidRegistrar
 {
 public:
+    virtual ~AndroidRegistrar() = default;
+
     virtual void register_buffer(const native_handle_t *handle) = 0;
     virtual void unregister_buffer(const native_handle_t *handle) = 0;
     virtual std::shared_ptr<char> secure_for_cpu(std::shared_ptr<const native_handle_t> handle, const geometry::Rectangle) = 0;

=== modified file 'src/client/client_platform.h'
--- src/client/client_platform.h	2013-06-17 09:51:42 +0000
+++ src/client/client_platform.h	2013-06-19 10:10:36 +0000
@@ -42,6 +42,8 @@
     ClientPlatform(const ClientPlatform& p) = delete;
     ClientPlatform& operator=(const ClientPlatform& p) = delete;
 
+    virtual ~ClientPlatform() { /* TODO: make nothrow */ }
+
     virtual MirPlatformType platform_type() const = 0; 
     virtual std::shared_ptr<ClientBufferFactory> create_buffer_factory() = 0;
     virtual std::shared_ptr<EGLNativeWindowType> create_egl_native_window(ClientSurface *surface) = 0;

=== modified file 'src/server/compositor/rw_lock.h'
--- src/server/compositor/rw_lock.h	2013-06-07 15:23:27 +0000
+++ src/server/compositor/rw_lock.h	2013-06-19 10:10:36 +0000
@@ -33,6 +33,8 @@
 public:
     void lock() { read_lock(); }
     void unlock() { read_unlock(); }
+
+    virtual ~ReadLock() = default;
 protected:
     ReadLock()
     {
@@ -50,6 +52,8 @@
 public:
     void lock() { write_lock(); }
     void unlock() { write_unlock(); }
+
+    virtual ~WriteLock() = default;
 protected:
     WriteLock()
     {

=== modified file 'src/server/frontend/message_processor.h'
--- src/server/frontend/message_processor.h	2013-04-24 05:22:20 +0000
+++ src/server/frontend/message_processor.h	2013-06-19 10:10:36 +0000
@@ -37,7 +37,7 @@
     virtual void send_fds(std::vector<int32_t> const& fd) = 0;
 protected:
     MessageSender() = default;
-    ~MessageSender() = default;
+    virtual ~MessageSender() { /* TODO: make nothrow */ }
     MessageSender(MessageSender const&) = delete;
     MessageSender& operator=(MessageSender const&) = delete;
 };
@@ -47,7 +47,7 @@
     virtual bool process_message(std::istream& msg) = 0;
 protected:
     MessageProcessor() = default;
-    ~MessageProcessor() = default;
+    virtual ~MessageProcessor() = default;
     MessageProcessor(MessageProcessor const&) = delete;
     MessageProcessor& operator=(MessageProcessor const&) = delete;
 };

=== modified file 'src/server/frontend/socket_session.cpp'
--- src/server/frontend/socket_session.cpp	2013-04-24 05:22:20 +0000
+++ src/server/frontend/socket_session.cpp	2013-06-19 10:10:36 +0000
@@ -27,7 +27,6 @@
 
 namespace mfd = mir::frontend::detail;
 
-
 void mfd::SocketSession::send(std::string const& body)
 {
     const size_t size = body.size();

=== modified file 'src/server/graphics/gbm/gbm_display.cpp'
--- src/server/graphics/gbm/gbm_display.cpp	2013-06-12 10:27:50 +0000
+++ src/server/graphics/gbm/gbm_display.cpp	2013-06-19 10:10:36 +0000
@@ -87,6 +87,9 @@
     shared_egl.make_current();
 }
 
+// please don't remove this empty destructor, it's here for the
+// unique ptr!! if you accidentally remove it you will get a not
+// so relevant linker error about some missing headers
 mgg::GBMDisplay::~GBMDisplay()
 {
 }

=== modified file 'src/server/graphics/gbm/gbm_platform.cpp'
--- src/server/graphics/gbm/gbm_platform.cpp	2013-05-30 03:50:54 +0000
+++ src/server/graphics/gbm/gbm_platform.cpp	2013-06-19 10:10:36 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "gbm_platform.h"
-
 #include "gbm_buffer_allocator.h"
 #include "gbm_display.h"
 #include "internal_client.h"

=== modified file 'tests/integration-tests/compositor/multithread_harness.h'
--- tests/integration-tests/compositor/multithread_harness.h	2013-01-11 23:47:40 +0000
+++ tests/integration-tests/compositor/multithread_harness.h	2013-06-19 10:10:36 +0000
@@ -32,6 +32,8 @@
 class SynchronizerController
 {
 public:
+    virtual ~SynchronizerController() {}
+
         virtual void ensure_child_is_waiting() = 0;
         virtual void activate_waiting_child() = 0;
         virtual void kill_thread() = 0;
@@ -41,6 +43,7 @@
 class SynchronizerSpawned
 {
 public:
+    virtual ~SynchronizerSpawned() {}
     virtual bool child_enter_wait() = 0;
     virtual bool child_check_wait_request() = 0;
 };

=== modified file 'tests/unit-tests/client/android/test_client_android_registrar.cpp'
--- tests/unit-tests/client/android/test_client_android_registrar.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/client/android/test_client_android_registrar.cpp	2013-06-19 10:10:36 +0000
@@ -33,6 +33,7 @@
 class ICSRegistrarInterface
 {
 public:
+    virtual ~ICSRegistrarInterface() {}
     virtual int registerBuffer_interface(struct gralloc_module_t const* module, buffer_handle_t handle) const = 0;
     virtual int unregisterBuffer_interface(struct gralloc_module_t const* module, buffer_handle_t handle) const = 0;
     virtual int lock_interface(struct gralloc_module_t const* module, buffer_handle_t handle,

=== modified file 'tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp'
--- tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp	2013-05-20 15:55:48 +0000
+++ tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp	2013-06-19 10:10:36 +0000
@@ -31,6 +31,7 @@
 class ANativeWindowInterface
 {
 public:
+    virtual ~ANativeWindowInterface() = default;
     virtual int query_interface(const ANativeWindow* win , int code, int* value) const = 0;
 };
 
@@ -51,6 +52,8 @@
                            Return(0)));
     }
 
+    ~MockANativeWindow() noexcept {}
+
     static int hook_query(const ANativeWindow* anw, int code, int *ret)
     {
         const MockANativeWindow* mocker = static_cast<const MockANativeWindow*>(anw);

=== modified file 'tests/unit-tests/test_gmock_fixes.cpp'
--- tests/unit-tests/test_gmock_fixes.cpp	2012-07-12 14:11:36 +0000
+++ tests/unit-tests/test_gmock_fixes.cpp	2013-06-19 10:10:36 +0000
@@ -26,12 +26,14 @@
 {
     struct Interface
     {
+        virtual ~Interface() = default;
         virtual std::unique_ptr<int> function() const = 0;
     };
 
     struct MockImplementation : Interface
     {
         MOCK_CONST_METHOD0(function, std::unique_ptr<int>());
+        ~MockImplementation() noexcept {}
     };
 
     MockImplementation mi;