Merge lp:~hikiko/mir/mir.fix-missing-virtual-destructors into lp:~mir-team/mir/trunk

[Eleni Maria Stea]

This branch fixes the bug 1183507: https://bugs.launchpad.net/mir/+bug/1183507
I searched all the classes that have instances inside the directiry src/ and I wrote a virtual destructor in those that had at least one virtual function so that they won't cause memory leaks. I will continue the search into the other directories as well and submit more branches if necessary.

This branch fixes the bug 1183507: https://bugs.launchpad.net/mir/+bug/1183507
I searched all the classes that have instances inside the directiry src/ and I wrote a virtual destructor in those that had at least one virtual function so that they won't cause memory leaks. I will continue the search into the other directories as well and submit more branches if necessary.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:708
http://jenkins.qa.ubuntu.com/job/mir-ci/623/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/750/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/633
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/108/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/336

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

For reference, the canonical form of an abstract base class ("interface") in Mir, is described in https://lists.ubuntu.com/archives/mir-devel/2013-March/000036.html (or see include/server/mir/main_loop.h for a real example). Note the update to use "= default;" for the destructor. Not all classes use this form yet, but we are updating older classes as we come across them in MPs.

23 +mcla::AndroidClientPlatform::~AndroidClientPlatform()
38 + virtual ~AndroidClientPlatform();

Not needed here. The base class destructor should be made virtual.

50 +mcla::AndroidRegistrarGralloc::~AndroidRegistrarGralloc()
78 + virtual ~AndroidRegistrarGralloc();

Not needed. The added virtual base class destructor (AndroidRegistrar) is enough.

65 + virtual ~AndroidRegistrar() = default;

Tab instead of spaces.

103 + virtual ~NullMessageProcessor() = default;

Not needed here. The base class destructor should be made virtual.

115 +mfd::SocketSession::~SocketSession()
129 + virtual ~SocketSession();

Not needed here. The base class destructor should be made virtual.

142 +mga::AndroidPlatform::~AndroidPlatform()
157 + virtual ~AndroidPlatform();

Not needed here. The base class destructor should be made virtual.

170 + virtual ~GBMDisplay();

Not needed here. The base class destructor should be made virtual.

review: Needs Fixing

[Eleni Maria Stea (hikiko)]

I added the virtual both in the base classes and the subclasses for clarity reasons (you don't have to follow the whole hierarchy to see what is virtual) but ok, I'll remove them from the subclasses.

+the tab... :p

actually that comment was going here:
https://bugs.launchpad.net/mir/+bug/1183507/comments/3

[Alan Griffiths (alan-griffiths)]

Shouldn't -Weffc++ warn about any classes with problems? And -Werror stop the compile?

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> Shouldn't -Weffc++ warn about any classes with problems? And -Werror stop the
> compile?

C.f. https://code.launchpad.net/~alan-griffiths/mir/Wno-non-virtual-dtor/+merge/165551

[Eleni Maria Stea (hikiko)]

ok I think it's ok now, could you review it again?

[Alexandros Frantzis (afrantzis)]

100 -mgg::GBMDisplay::~GBMDisplay()
101 -{
102 -}

127 +#include "gbm_display_buffer.h"
139 +#include "src/server/graphics/gbm/gbm_display_buffer.h"

The empty destructor needs to be there so that that unique_ptr to
an incomplete type can work. We should add a comment explaining why
we need it there, rather than working around it and adding false
header dependencies.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

I think you should merge in lp:~alan-griffiths/mir/Wno-non-virtual-dtor/

~~~~

+1 to Alf's comments about ~GBMDisplay()

~~~~

I'm not convinced that the changes to 3rd_party code are needed. Are these classes really used in a way that causes problems? Otherwise "not broke, don't fix" applies.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:740
http://jenkins.qa.ubuntu.com/job/mir-ci/630/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/762/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/644
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/115/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:741
http://jenkins.qa.ubuntu.com/job/mir-ci/638/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/771/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/653
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/123/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/347

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

review: Needs Fixing (continuous-integration)

[Eleni Maria Stea (hikiko)]

ok

[Alan Griffiths (alan-griffiths)]

I think you should merge in lp:~alan-griffiths/mir/Wno-non-virtual-dtor/

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

I don't think you should be changing classes that don't need changing.There are so many of these that reviewing is impractical.

Probably all of those under 3rd_party need reverting and definitely those in 3rd_party/gmock-1.6.0/include/gmock/gmock-actions.h. Look at the first of these:

template <typename T>
class BuiltInDefaultValue {
 public:
  // This function returns true iff type T has a built-in default value.
  static bool Exists() { return false; }
  static T Get() {
    Assert(false, __FILE__, __LINE__,
           "Default action undefined for the function return type.");
    return internal::Invalid<T>();
    // The above statement will never be reached, but is required in
    // order for this function to compile.
  }
};

This doesn't need a virtual destructor - it is not used polymorphically.

If you want to spend time on this I think you should

/1/ start with trunk

/2/ merge in lp:~alan-griffiths/mir/Wno-non-virtual-dtor/

/3/ Fix the *few* classes that it flags up.

review: Needs Fixing

[Eleni Maria Stea (hikiko)]

@Alan: yes I thought jenkins merges automatically all the approved branches but I was wrong, I just merged it manually!

It seems that not specifying any exceptions in gcc means that the destructor is trying to throw all the exceptions (in clang it just throws the exceptions specified in the parent v. destructor which means it allows no exceptions) I added a noexcept to the classes affected.

An idea:
Maybe I could remove the "noexcept" as well as the "default" from the destructors and just use virtual destructors in the classes. Otherwise, in the (probably insane) case that someone wants to throw an exception inside a destructor, we might have a problem. Atm I did it like that because I've seen other noexcept in the code and in the very first correction (@Alexandros) suggests that we make the default destructor of the base class virtual.

@Alexandros, @Alan: any thoughts?

[Robert Ancell (robert-ancell)]

Note, there are still many tab characters in this branch.

[Robert Ancell (robert-ancell)]

+1 on reverting the 3rd_party changes for this branch to make it easier to review and have less side effects. Since we didn't write any of the 3rd_party stuff in the first place it needs more checking to see if it is worth it. Also, changing 3rd_party means it is harder for us to merge in upstream changes to that code in the future so any changes need to be important.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:742
http://jenkins.qa.ubuntu.com/job/mir-ci/646/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/786/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/668/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/131/console

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> +1 on reverting the 3rd_party changes for this branch to make it easier to
> review and have less side effects. Since we didn't write any of the 3rd_party
> stuff in the first place it needs more checking to see if it is worth it.
> Also, changing 3rd_party means it is harder for us to merge in upstream
> changes to that code in the future so any changes need to be important.

It may not be quite that simple - we include 3rd party headers in our code, and unless we disable warnings around those includes (which is ugly) these can cause compiler diagnostics.

Also, Eleni tells me that some memory leaks are fixed. (I've not spotted changes that would explain these yet, but fixing leaks is worthwhile - even in 3rd_party.)

I've had a chat with Eleni about coming up with a simpler set of changes that are easier to review.

[Eleni Maria Stea (hikiko)]

Hello, I made a new branch + fixed the tabs here:
https://code.launchpad.net/~hikiko/mir/mir.fix-virt-destructorS

I haven't remove the changes in the 3rd party yet, because some of them fix memory leaks, but I want to refactor it a bit.

I didn't remove the merge proposal of this branch because if I do so, the comments will be deleted too.

[Eleni Maria Stea (hikiko)]

(the new branch is shorter and maybe I can remove some fixes to make it even shorter)

=== modified file '3rd_party/cucumber-cpp/CTestTestfile.cmake'
--- 3rd_party/cucumber-cpp/CTestTestfile.cmake	2013-01-03 21:26:48 +0000
+++ 3rd_party/cucumber-cpp/CTestTestfile.cmake	2013-05-30 07:52:28 +0000
@@ -1,9 +1,8 @@
 # CMake generated Testfile for 
-# Source directory: /home/augustwest/src/cucumber-cpp
-# Build directory: /home/augustwest/src/cucumber-cpp
+# Source directory: /home/hikiko/staging/gcc/mir.fix-missing-virtual-destructors/3rd_party/cucumber-cpp
+# Build directory: /home/hikiko/staging/gcc/mir.fix-missing-virtual-destructors/3rd_party/cucumber-cpp
 # 
 # This file includes the relevent testing commands required for 
 # testing this directory and lists subdirectories to be tested as well.
 SUBDIRS(src)
 SUBDIRS(tests)
-SUBDIRS(examples)

=== 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-05-30 07:52:28 +0000
@@ -15,11 +15,13 @@
 
 class CallableStep {
 public:
+    virtual ~CallableStep() = default;
     virtual void call() = 0;
 };
 
 class Hook {
 public:
+    virtual ~Hook() = default;
     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-05-30 07:52:28 +0000
@@ -14,6 +14,7 @@
 
 class TagExpression {
 public:
+    virtual ~TagExpression() = default;
     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-05-30 07:52:28 +0000
@@ -100,6 +100,7 @@
 class StepInfo {
 public:
     StepInfo(const std::string &stepMatcher, const std::string source);
+    virtual ~StepInfo() = default;
     SingleStepMatch matches(const std::string &stepDescription);
     virtual InvokeResult invokeStep(const InvokeArgs * pArgs) = 0;
 
@@ -111,6 +112,7 @@
 
 class BasicStep {
 public:
+    virtual ~BasicStep() = default;
     InvokeResult invoke(const InvokeArgs *pArgs);
 
 protected:

=== modified file '3rd_party/cucumber-cpp/src/CTestTestfile.cmake'
--- 3rd_party/cucumber-cpp/src/CTestTestfile.cmake	2013-01-03 21:26:48 +0000
+++ 3rd_party/cucumber-cpp/src/CTestTestfile.cmake	2013-05-30 07:52:28 +0000
@@ -1,6 +1,6 @@
 # CMake generated Testfile for 
-# Source directory: /home/augustwest/src/cucumber-cpp/src
-# Build directory: /home/augustwest/src/cucumber-cpp/src
+# Source directory: /home/hikiko/staging/gcc/mir.fix-missing-virtual-destructors/3rd_party/cucumber-cpp/src
+# Build directory: /home/hikiko/staging/gcc/mir.fix-missing-virtual-destructors/3rd_party/cucumber-cpp/src
 # 
 # This file includes the relevent testing commands required for 
 # testing this directory and lists subdirectories to be tested as well.

=== modified file '3rd_party/cucumber-cpp/src/connectors/wire/WireProtocol.cpp'
--- 3rd_party/cucumber-cpp/src/connectors/wire/WireProtocol.cpp	2013-01-03 21:26:48 +0000
+++ 3rd_party/cucumber-cpp/src/connectors/wire/WireProtocol.cpp	2013-05-30 07:52:28 +0000
@@ -88,6 +88,7 @@
 
 class CommandDecoder {
 public:
+    virtual ~CommandDecoder() = default;
     virtual WireCommand *decode(const mValue & jsonArgs) const = 0;
 };
 

=== modified file '3rd_party/cucumber-cpp/tests/CTestTestfile.cmake'
--- 3rd_party/cucumber-cpp/tests/CTestTestfile.cmake	2013-01-03 21:26:48 +0000
+++ 3rd_party/cucumber-cpp/tests/CTestTestfile.cmake	2013-05-30 07:52:28 +0000
@@ -1,6 +1,6 @@
 # CMake generated Testfile for 
-# Source directory: /home/augustwest/src/cucumber-cpp/tests
-# Build directory: /home/augustwest/src/cucumber-cpp/tests
+# Source directory: /home/hikiko/staging/gcc/mir.fix-missing-virtual-destructors/3rd_party/cucumber-cpp/tests
+# Build directory: /home/hikiko/staging/gcc/mir.fix-missing-virtual-destructors/3rd_party/cucumber-cpp/tests
 # 
 # This file includes the relevent testing commands required for 
 # testing this directory and lists subdirectories to be tested as well.

=== modified file '3rd_party/cucumber-cpp/tests/utils/DriverTestRunner.hpp'
--- 3rd_party/cucumber-cpp/tests/utils/DriverTestRunner.hpp	2013-01-03 21:26:48 +0000
+++ 3rd_party/cucumber-cpp/tests/utils/DriverTestRunner.hpp	2013-05-30 07:52:28 +0000
@@ -68,6 +68,7 @@
     DriverTest() {
         failedTests = 0;
     }
+    virtual ~DriverTest() = default;
 protected:
     void expectTrue(const char *description, bool condition) {
         updateState(description, condition);

=== modified file '3rd_party/gmock-1.6.0/gtest/fused-src/gtest/gtest.h'
--- 3rd_party/gmock-1.6.0/gtest/fused-src/gtest/gtest.h	2012-09-05 06:40:45 +0000
+++ 3rd_party/gmock-1.6.0/gtest/fused-src/gtest/gtest.h	2013-05-30 07:52:28 +0000
@@ -10307,7 +10307,7 @@
 template <class ParamType>
 class TestMetaFactoryBase {
  public:
-  virtual ~TestMetaFactoryBase() {}
+  virtual ~TestMetaFactoryBase() = default;
 
   virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
 };
@@ -10327,6 +10327,7 @@
   typedef typename TestCase::ParamType ParamType;
 
   TestMetaFactory() {}
+  virtual ~TestMetaFactory() = default;
 
   virtual TestFactoryBase* CreateTestFactory(ParamType parameter) {
     return new ParameterizedTestFactory<TestCase>(parameter);

=== modified file '3rd_party/gmock-1.6.0/gtest/include/gtest/internal/gtest-param-util.h'
--- 3rd_party/gmock-1.6.0/gtest/include/gtest/internal/gtest-param-util.h	2012-08-08 08:07:55 +0000
+++ 3rd_party/gmock-1.6.0/gtest/include/gtest/internal/gtest-param-util.h	2013-05-30 07:52:28 +0000
@@ -373,7 +373,7 @@
 template <class ParamType>
 class TestMetaFactoryBase {
  public:
-  virtual ~TestMetaFactoryBase() {}
+  virtual ~TestMetaFactoryBase() = default;
 
   virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0;
 };
@@ -393,6 +393,7 @@
   typedef typename TestCase::ParamType ParamType;
 
   TestMetaFactory() {}
+  virtual ~TestMetaFactory() = default;
 
   virtual TestFactoryBase* CreateTestFactory(ParamType parameter) {
     return new ParameterizedTestFactory<TestCase>(parameter);

=== modified file '3rd_party/gmock-1.6.0/include/gmock/gmock-actions.h'
--- 3rd_party/gmock-1.6.0/include/gmock/gmock-actions.h	2012-08-08 08:07:55 +0000
+++ 3rd_party/gmock-1.6.0/include/gmock/gmock-actions.h	2013-05-30 07:52:28 +0000
@@ -70,6 +70,7 @@
 template <typename T>
 class BuiltInDefaultValue {
  public:
+  virtual ~BuiltInDefaultValue() {}
   // This function returns true iff type T has a built-in default value.
   static bool Exists() { return false; }
   static T Get() {
@@ -86,6 +87,7 @@
 template <typename T>
 class BuiltInDefaultValue<const T> {
  public:
+  virtual ~BuiltInDefaultValue() {}
   static bool Exists() { return BuiltInDefaultValue<T>::Exists(); }
   static T Get() { return BuiltInDefaultValue<T>::Get(); }
 };
@@ -95,6 +97,7 @@
 template <typename T>
 class BuiltInDefaultValue<T*> {
  public:
+  virtual ~BuiltInDefaultValue() {}
   static bool Exists() { return true; }
   static T* Get() { return NULL; }
 };
@@ -105,6 +108,7 @@
   template <> \
   class BuiltInDefaultValue<type> { \
    public: \
+    virtual ~BuiltInDefaultValue() {} \
     static bool Exists() { return true; } \
     static type Get() { return value; } \
   }
@@ -160,6 +164,8 @@
 template <typename T>
 class DefaultValue {
  public:
+  virtual ~DefaultValue() {}
+
   // Sets the default value for type T; requires T to be
   // copy-constructable and have a public destructor.
   static void Set(T x) {
@@ -198,6 +204,8 @@
 template <typename T>
 class DefaultValue<T&> {
  public:
+  virtual ~DefaultValue() {}
+
   // Sets the default value for type T&.
   static void Set(T& x) {  // NOLINT
     address_ = &x;
@@ -233,6 +241,8 @@
 template <>
 class DefaultValue<void> {
  public:
+  virtual ~DefaultValue() {}
+
   static bool Exists() { return true; }
   static void Get() {}
 };
@@ -283,6 +293,7 @@
   // Constructs a null Action.  Needed for storing Action objects in
   // STL containers.
   Action() : impl_(NULL) {}
+  virtual ~Action() {}
 
   // Constructs an Action from its implementation.  A NULL impl is
   // used to represent the "do-default" action.
@@ -350,6 +361,7 @@
 class PolymorphicAction {
  public:
   explicit PolymorphicAction(const Impl& impl) : impl_(impl) {}
+  virtual ~PolymorphicAction() {}
 
   template <typename F>
   operator Action<F>() const {
@@ -364,6 +376,7 @@
     typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
 
     explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
+	virtual ~MonomorphicImpl() {}
 
     virtual Result Perform(const ArgumentTuple& args) {
       return impl_.template Perform<Result>(args);
@@ -410,6 +423,7 @@
   typedef typename internal::Function<F1>::ArgumentTuple ArgumentTuple;
 
   explicit ActionAdaptor(const Action<F2>& from) : impl_(from.impl_) {}
+  virtual ~ActionAdaptor() {}
 
   virtual Result Perform(const ArgumentTuple& args) {
     return impl_->Perform(args);
@@ -452,6 +466,7 @@
   // 'value' is passed by value instead of by const reference in order
   // to allow Return("string literal") to compile.
   explicit ReturnAction(R value) : value_(value) {}
+  virtual ~ReturnAction() = default;
 
   // This template type conversion operator allows Return(x) to be
   // used in ANY function that returns x's type.
@@ -477,6 +492,7 @@
   template <typename F>
   class Impl : public ActionInterface<F> {
    public:
+    virtual ~Impl() {}
     typedef typename Function<F>::Result Result;
     typedef typename Function<F>::ArgumentTuple ArgumentTuple;
 
@@ -709,6 +725,7 @@
   explicit SetArgumentPointeeAction(const Proto& proto) : proto_(new Proto) {
     proto_->CopyFrom(proto);
   }
+  virtual ~SetArgumentPointeeAction() {}
 
   template <typename Result, typename ArgumentTuple>
   void Perform(const ArgumentTuple& args) const {
@@ -734,6 +751,7 @@
   // pointer or a functor).
   explicit InvokeWithoutArgsAction(FunctionImpl function_impl)
       : function_impl_(function_impl) {}
+  virtual ~InvokeWithoutArgsAction() {}
 
   // Allows InvokeWithoutArgs(f) to be used as any action whose type is
   // compatible with f.
@@ -752,6 +770,7 @@
  public:
   InvokeMethodWithoutArgsAction(Class* obj_ptr, MethodPtr method_ptr)
       : obj_ptr_(obj_ptr), method_ptr_(method_ptr) {}
+  virtual ~InvokeMethodWithoutArgsAction() {}
 
   template <typename Result, typename ArgumentTuple>
   Result Perform(const ArgumentTuple&) const {
@@ -770,6 +789,7 @@
 class IgnoreResultAction {
  public:
   explicit IgnoreResultAction(const A& action) : action_(action) {}
+  virtual ~IgnoreResultAction() {}
 
   template <typename F>
   operator Action<F>() const {
@@ -797,6 +817,7 @@
     typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
 
     explicit Impl(const A& action) : action_(action) {}
+	virtual ~Impl() {}
 
     virtual void Perform(const ArgumentTuple& args) {
       // Performs the action and ignores its result.
@@ -831,6 +852,7 @@
  public:
   // Constructs a ReferenceWrapper<T> object from a T&.
   explicit ReferenceWrapper(T& l_value) : pointer_(&l_value) {}  // NOLINT
+  virtual ~ReferenceWrapper() {}
 
   // Allows a ReferenceWrapper<T> object to be implicitly converted to
   // a T&.
@@ -853,6 +875,7 @@
  public:
   DoBothAction(Action1 action1, Action2 action2)
       : action1_(action1), action2_(action2) {}
+  virtual ~DoBothAction() {}
 
   // This template type conversion operator allows DoAll(a1, ..., a_n)
   // to be used in ANY function of compatible type.
@@ -872,6 +895,7 @@
 
     Impl(const Action<VoidResult>& action1, const Action<F>& action2)
         : action1_(action1), action2_(action2) {}
+	virtual ~Impl() {}
 
     virtual Result Perform(const ArgumentTuple& args) {
       action1_.Perform(args);

=== modified file '3rd_party/gmock-1.6.0/include/gmock/gmock-generated-actions.h'
--- 3rd_party/gmock-1.6.0/include/gmock/gmock-generated-actions.h	2012-08-08 08:07:55 +0000
+++ 3rd_party/gmock-1.6.0/include/gmock/gmock-generated-actions.h	2013-05-30 07:52:28 +0000
@@ -597,6 +597,8 @@
   template <typename F>
   class Impl : public ActionInterface<F> {
    public:
+    virtual ~Impl() {}
+
     typedef typename Function<F>::Result Result;
     typedef typename Function<F>::ArgumentTuple ArgumentTuple;
 

=== modified file '3rd_party/gmock-1.6.0/include/gmock/gmock-matchers.h'
--- 3rd_party/gmock-1.6.0/include/gmock/gmock-matchers.h	2012-08-10 12:33:42 +0000
+++ 3rd_party/gmock-1.6.0/include/gmock/gmock-matchers.h	2013-05-30 07:52:28 +0000
@@ -336,6 +336,7 @@
   class MonomorphicImpl : public MatcherInterface<T> {
    public:
     explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
+	virtual ~MonomorphicImpl() {}
 
     virtual void DescribeTo(::std::ostream* os) const {
       impl_.DescribeTo(os);
@@ -704,6 +705,7 @@
   template <typename Rhs> class name##Matcher { \
    public: \
     explicit name##Matcher(const Rhs& rhs) : rhs_(rhs) {} \
+    virtual ~name##Matcher() {} \
     template <typename Lhs> \
     operator Matcher<Lhs>() const { \
       return MakeMatcher(new Impl<Lhs>(rhs_)); \
@@ -713,6 +715,7 @@
     class Impl : public MatcherInterface<Lhs> { \
      public: \
       explicit Impl(const Rhs& rhs) : rhs_(rhs) {} \
+      virtual ~Impl() {} \
       virtual bool MatchAndExplain(\
           Lhs lhs, MatchResultListener* /* listener */) const { \
         return lhs op rhs_; \
@@ -748,6 +751,8 @@
 // pointer that is NULL.
 class IsNullMatcher {
  public:
+  virtual ~IsNullMatcher() {}
+
   template <typename Pointer>
   bool MatchAndExplain(const Pointer& p,
                        MatchResultListener* /* listener */) const {
@@ -764,6 +769,7 @@
 // pointer that is not NULL.
 class NotNullMatcher {
  public:
+  virtual ~NotNullMatcher() {}
   template <typename Pointer>
   bool MatchAndExplain(const Pointer& p,
                        MatchResultListener* /* listener */) const {
@@ -804,6 +810,7 @@
   // compiler to catch using Ref(const_value) as a matcher for a
   // non-const reference.
   explicit RefMatcher(T& x) : object_(x) {}  // NOLINT
+  virtual ~RefMatcher() {}
 
   template <typename Super>
   operator Matcher<Super&>() const {
@@ -820,6 +827,7 @@
   class Impl : public MatcherInterface<Super&> {
    public:
     explicit Impl(Super& x) : object_(x) {}  // NOLINT
+	virtual ~Impl() {}
 
     // MatchAndExplain() takes a Super& (as opposed to const Super&)
     // in order to match the interface MatcherInterface<Super&>.
@@ -889,6 +897,8 @@
 template <typename StringType>
 class StrEqualityMatcher {
  public:
+  virtual ~StrEqualityMatcher() {}
+
   typedef typename StringType::const_pointer ConstCharPointer;
 
   StrEqualityMatcher(const StringType& str, bool expect_eq,
@@ -948,6 +958,7 @@
   explicit HasSubstrMatcher(const StringType& substring)
       : substring_(substring) {}
 
+  virtual ~HasSubstrMatcher() {}
   // These overloaded methods allow HasSubstr(substring) to be used as a
   // Matcher<T> as long as T can be converted to string.  Returns true
   // iff s contains substring_ as a substring.
@@ -989,6 +1000,8 @@
   explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {
   }
 
+  virtual ~StartsWithMatcher() {}
+
   // These overloaded methods allow StartsWith(prefix) to be used as a
   // Matcher<T> as long as T can be converted to string.  Returns true
   // iff s starts with prefix_.
@@ -1028,6 +1041,7 @@
   typedef typename StringType::const_pointer ConstCharPointer;
 
   explicit EndsWithMatcher(const StringType& suffix) : suffix_(suffix) {}
+  virtual ~EndsWithMatcher() {}
 
   // These overloaded methods allow EndsWith(suffix) to be used as a
   // Matcher<T> as long as T can be converted to string.  Returns true
@@ -1067,6 +1081,8 @@
   MatchesRegexMatcher(const RE* regex, bool full_match)
       : regex_(regex), full_match_(full_match) {}
 
+  virtual ~MatchesRegexMatcher() {}
+
   // These overloaded methods allow MatchesRegex(regex) to be used as
   // a Matcher<T> as long as T can be converted to string.  Returns
   // true iff s matches regular expression regex.  When full_match_ is
@@ -1127,6 +1143,7 @@
     template <typename Tuple> \
     class Impl : public MatcherInterface<Tuple> { \
      public: \
+      virtual ~Impl() {} \
       virtual bool MatchAndExplain( \
           Tuple args, \
           MatchResultListener* /* listener */) const { \
@@ -1164,6 +1181,7 @@
  public:
   explicit NotMatcherImpl(const Matcher<T>& matcher)
       : matcher_(matcher) {}
+  virtual ~NotMatcherImpl() {}
 
   virtual bool MatchAndExplain(T x, MatchResultListener* listener) const {
     return !matcher_.MatchAndExplain(x, listener);
@@ -1213,6 +1231,8 @@
   BothOfMatcherImpl(const Matcher<T>& matcher1, const Matcher<T>& matcher2)
       : matcher1_(matcher1), matcher2_(matcher2) {}
 
+  virtual ~BothOfMatcherImpl() {}
+
   virtual void DescribeTo(::std::ostream* os) const {
     *os << "(";
     matcher1_.DescribeTo(os);
@@ -1273,6 +1293,7 @@
  public:
   BothOfMatcher(Matcher1 matcher1, Matcher2 matcher2)
       : matcher1_(matcher1), matcher2_(matcher2) {}
+  virtual ~BothOfMatcher() {}
 
   // This template type conversion operator allows a
   // BothOfMatcher<Matcher1, Matcher2> object to match any type that
@@ -1299,6 +1320,7 @@
  public:
   EitherOfMatcherImpl(const Matcher<T>& matcher1, const Matcher<T>& matcher2)
       : matcher1_(matcher1), matcher2_(matcher2) {}
+  virtual ~EitherOfMatcherImpl() {}
 
   virtual void DescribeTo(::std::ostream* os) const {
     *os << "(";
@@ -1517,6 +1539,7 @@
   // equality comparisons between NANs will always return false.
   FloatingEqMatcher(FloatType rhs, bool nan_eq_nan) :
     rhs_(rhs), nan_eq_nan_(nan_eq_nan) {}
+  virtual ~FloatingEqMatcher() {}
 
   // Implements floating point equality matcher as a Matcher<T>.
   template <typename T>
@@ -1609,6 +1632,7 @@
 class PointeeMatcher {
  public:
   explicit PointeeMatcher(const InnerMatcher& matcher) : matcher_(matcher) {}
+  virtual ~PointeeMatcher() {}
 
   // This type conversion operator template allows Pointee(m) to be
   // used as a matcher for any pointer type whose pointee type is
@@ -1628,6 +1652,8 @@
   template <typename Pointer>
   class Impl : public MatcherInterface<Pointer> {
    public:
+    virtual ~Impl() {}
+
     typedef typename PointeeOf<GTEST_REMOVE_CONST_(  // NOLINT
         GTEST_REMOVE_REFERENCE_(Pointer))>::type Pointee;
 
@@ -1824,6 +1850,7 @@
       : callable_(callable), matcher_(matcher) {
     CallableTraits<Callable>::CheckIsValid(callable_);
   }
+  virtual ~ResultOfMatcher() {}
 
   template <typename T>
   operator Matcher<T>() const {
@@ -1838,6 +1865,7 @@
    public:
     Impl(CallableStorageType callable, const Matcher<ResultType>& matcher)
         : callable_(callable), matcher_(matcher) {}
+	virtual ~Impl() {}
 
     virtual void DescribeTo(::std::ostream* os) const {
       *os << "is mapped by the given callable to a value that ";
@@ -1902,6 +1930,8 @@
         GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>();
   }
 
+  virtual ~ContainerEqMatcher() {}
+
   void DescribeTo(::std::ostream* os) const {
     *os << "equals ";
     UniversalPrint(rhs_, os);
@@ -1990,6 +2020,7 @@
     (void)testing::StaticAssertTypeEq<RhsContainer,
         GTEST_REMOVE_REFERENCE_AND_CONST_(RhsContainer)>();
   }
+  virtual ~PointwiseMatcher() {}
 
   template <typename LhsContainer>
   operator Matcher<LhsContainer>() const {
@@ -2014,6 +2045,7 @@
         // mono_tuple_matcher_ holds a monomorphic version of the tuple matcher.
         : mono_tuple_matcher_(SafeMatcherCast<InnerMatcherArg>(tuple_matcher)),
           rhs_(rhs) {}
+	virtual ~Impl() {}
 
     virtual void DescribeTo(::std::ostream* os) const {
       *os << "contains " << rhs_.size()
@@ -2094,6 +2126,7 @@
   explicit QuantifierMatcherImpl(InnerMatcher inner_matcher)
       : inner_matcher_(
            testing::SafeMatcherCast<const Element&>(inner_matcher)) {}
+  virtual ~QuantifierMatcherImpl() {}
 
   // Checks whether:
   // * All elements in the container match, if all_elements_should_match.
@@ -2132,6 +2165,7 @@
   template <typename InnerMatcher>
   explicit ContainsMatcherImpl(InnerMatcher inner_matcher)
       : QuantifierMatcherImpl<Container>(inner_matcher) {}
+  virtual ~ContainsMatcherImpl() {}
 
   // Describes what this matcher does.
   virtual void DescribeTo(::std::ostream* os) const {
@@ -2161,6 +2195,7 @@
   template <typename InnerMatcher>
   explicit EachMatcherImpl(InnerMatcher inner_matcher)
       : QuantifierMatcherImpl<Container>(inner_matcher) {}
+  virtual ~EachMatcherImpl() {}
 
   // Describes what this matcher does.
   virtual void DescribeTo(::std::ostream* os) const {
@@ -2187,6 +2222,7 @@
 class ContainsMatcher {
  public:
   explicit ContainsMatcher(M m) : inner_matcher_(m) {}
+  virtual ~ContainsMatcher() {}
 
   template <typename Container>
   operator Matcher<Container>() const {
@@ -2204,6 +2240,7 @@
 class EachMatcher {
  public:
   explicit EachMatcher(M m) : inner_matcher_(m) {}
+  virtual ~EachMatcher() {}
 
   template <typename Container>
   operator Matcher<Container>() const {
@@ -2231,6 +2268,7 @@
       : inner_matcher_(
           testing::SafeMatcherCast<const KeyType&>(inner_matcher)) {
   }
+  virtual ~KeyMatcherImpl() {}
 
   // Returns true iff 'key_value.first' (the key) matches the inner matcher.
   virtual bool MatchAndExplain(PairType key_value,
@@ -2268,6 +2306,7 @@
 class KeyMatcher {
  public:
   explicit KeyMatcher(M m) : matcher_for_key_(m) {}
+  virtual ~KeyMatcher() {}
 
   template <typename PairType>
   operator Matcher<PairType>() const {
@@ -2296,6 +2335,7 @@
         second_matcher_(
             testing::SafeMatcherCast<const SecondType&>(second_matcher)) {
   }
+  virtual ~PairMatcherImpl() {}
 
   // Describes what this matcher does.
   virtual void DescribeTo(::std::ostream* os) const {
@@ -2373,6 +2413,7 @@
  public:
   PairMatcher(FirstMatcher first_matcher, SecondMatcher second_matcher)
       : first_matcher_(first_matcher), second_matcher_(second_matcher) {}
+  virtual ~PairMatcher() {}
 
   template <typename PairType>
   operator Matcher<PairType> () const {
@@ -2409,6 +2450,8 @@
     }
   }
 
+  virtual ~ElementsAreMatcherImpl() {}
+
   // Describes what this matcher does.
   virtual void DescribeTo(::std::ostream* os) const {
     if (count() == 0) {
@@ -2526,6 +2569,7 @@
  public:
   ElementsAreArrayMatcher(const T* first, size_t count) :
       first_(first), count_(count) {}
+  virtual ~ElementsAreArrayMatcher() {}
 
   template <typename Container>
   operator Matcher<Container>() const {

=== modified file 'include/server/mir/compositor/buffer_allocation_strategy.h'
--- include/server/mir/compositor/buffer_allocation_strategy.h	2013-04-24 05:22:20 +0000
+++ include/server/mir/compositor/buffer_allocation_strategy.h	2013-05-30 07:52:28 +0000
@@ -36,13 +36,12 @@
 class BufferAllocationStrategy
 {
 public:
-
     virtual std::unique_ptr<BufferSwapper> create_swapper(
         BufferProperties& actual_buffer_properties,
         BufferProperties const& requested_buffer_properties) = 0;
 
 protected:
-    ~BufferAllocationStrategy() {}
+    virtual ~BufferAllocationStrategy() = default;
     BufferAllocationStrategy() {}
 
     BufferAllocationStrategy(const BufferAllocationStrategy&);

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-05-28 17:15:21 +0000
+++ include/server/mir/default_server_configuration.h	2013-05-30 07:52:28 +0000
@@ -101,6 +101,7 @@
 {
 public:
     DefaultServerConfiguration(int argc, char const* argv[]);
+	virtual ~DefaultServerConfiguration() noexcept {}
 
     /** @name DisplayServer dependencies
      * dependencies of DisplayServer on the rest of the Mir

=== modified file 'include/server/mir/frontend/session_mediator_report.h'
--- include/server/mir/frontend/session_mediator_report.h	2013-05-17 15:56:34 +0000
+++ include/server/mir/frontend/session_mediator_report.h	2013-05-30 07:52:28 +0000
@@ -30,6 +30,8 @@
 class SessionMediatorReport
 {
 public:
+    virtual ~SessionMediatorReport() = default;
+
     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-04-30 23:12:18 +0000
+++ include/server/mir/graphics/display.h	2013-05-30 07:52:28 +0000
@@ -59,7 +59,7 @@
 
 protected:
     Display() = default;
-    ~Display() = default;
+    virtual ~Display() noexcept {}
 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-05-30 07:52:28 +0000
@@ -46,7 +46,7 @@
 
 protected:
     DisplayReport() = default;
-    ~DisplayReport() = default;
+    virtual ~DisplayReport() = default;
     DisplayReport(const DisplayReport&) = delete;
     DisplayReport& operator=(const DisplayReport&) = delete;
 };

=== modified file 'include/server/mir/graphics/platform.h'
--- include/server/mir/graphics/platform.h	2013-05-17 18:18:20 +0000
+++ include/server/mir/graphics/platform.h	2013-05-30 07:52:28 +0000
@@ -54,6 +54,8 @@
     Platform(const Platform& p) = delete;
     Platform& operator=(const Platform& p) = delete;
 
+    virtual ~Platform() = default;
+
     virtual std::shared_ptr<compositor::GraphicBufferAllocator> create_buffer_allocator(
         std::shared_ptr<BufferInitializer> const& buffer_initializer) = 0;
     virtual std::shared_ptr<Display> create_display() = 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-05-30 07:52:28 +0000
@@ -34,7 +34,7 @@
 
 protected:
     ViewableArea() = default;
-    ~ViewableArea() = default;
+    virtual ~ViewableArea() = default;
 private:
     ViewableArea(ViewableArea const&) = delete;
     ViewableArea& operator=(ViewableArea const&) = delete;

=== modified file 'include/server/mir/logging/display_report.h'
--- include/server/mir/logging/display_report.h	2013-05-10 18:16:51 +0000
+++ include/server/mir/logging/display_report.h	2013-05-30 07:52:28 +0000
@@ -37,7 +37,7 @@
     static const char* component();
 
     DisplayReport(const std::shared_ptr<Logger>& logger);
-    virtual ~DisplayReport();
+	virtual ~DisplayReport() noexcept;
 
     virtual void report_successful_setup_of_native_resources();
     virtual void report_successful_egl_make_current_on_construction();

=== 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-05-30 07:52:28 +0000
@@ -39,7 +39,7 @@
 
 protected:
     Option() = default;
-    ~Option() = default;
+    virtual ~Option() = default;
     Option(Option const&) = delete;
     Option& operator=(Option const&) = delete;
 };

=== modified file 'include/server/mir/options/program_option.h'
--- include/server/mir/options/program_option.h	2013-04-24 05:22:20 +0000
+++ include/server/mir/options/program_option.h	2013-05-30 07:52:28 +0000
@@ -33,6 +33,7 @@
 {
 public:
     ProgramOption();
+	virtual ~ProgramOption() noexcept;
 
     void parse_arguments(
         boost::program_options::options_description const& description,

=== 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-05-30 07:52:28 +0000
@@ -60,7 +60,7 @@
 
 protected:
     ServerConfiguration() = default;
-    virtual ~ServerConfiguration() {}
+    virtual ~ServerConfiguration() = default;
 
     ServerConfiguration(ServerConfiguration const&) = delete;
     ServerConfiguration& operator=(ServerConfiguration const&) = delete;

=== modified file 'include/server/mir/surfaces/buffer_bundle.h'
--- include/server/mir/surfaces/buffer_bundle.h	2013-04-24 05:22:20 +0000
+++ include/server/mir/surfaces/buffer_bundle.h	2013-05-30 07:52:28 +0000
@@ -40,6 +40,8 @@
 class BufferBundle
 {
 public:
+    ~BufferBundle() = default;
+
     virtual std::shared_ptr<compositor::Buffer> secure_client_buffer() = 0;
     virtual std::shared_ptr<surfaces::GraphicRegion> lock_back_buffer() = 0;
     virtual geometry::PixelFormat get_bundle_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-05-30 07:52:28 +0000
@@ -30,6 +30,7 @@
 class ICSAllocInterface
 {
 public:
+    virtual ~ICSAllocInterface() = default;
     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_display_report.h'
--- include/test/mir_test_doubles/mock_display_report.h	2013-05-10 18:16:51 +0000
+++ include/test/mir_test_doubles/mock_display_report.h	2013-05-30 07:52:28 +0000
@@ -33,6 +33,8 @@
 class MockDisplayReport : public graphics::DisplayReport
 {
 public:
+    virtual ~MockDisplayReport() noexcept {}
+
     MOCK_METHOD0(report_successful_setup_of_native_resources, void());
     MOCK_METHOD0(report_successful_egl_make_current_on_construction, void());
     MOCK_METHOD0(report_successful_egl_buffer_swap_on_construction, void());

=== modified file 'include/test/mir_test_doubles/mock_viewable_area.h'
--- include/test/mir_test_doubles/mock_viewable_area.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_doubles/mock_viewable_area.h	2013-05-30 07:52:28 +0000
@@ -33,6 +33,7 @@
 struct MockViewableArea : public graphics::ViewableArea
 {
 public:
+    virtual ~MockViewableArea() noexcept {}
     MOCK_CONST_METHOD0(view_area, 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-05-30 07:52:28 +0000
@@ -40,6 +40,7 @@
 
 struct TestingClientConfiguration
 {
+    virtual ~TestingClientConfiguration() = default;
     // Code to run in client process
     virtual void exec() = 0;
 };

=== modified file 'include/test/mir_test_framework/testing_server_configuration.h'
--- include/test/mir_test_framework/testing_server_configuration.h	2013-05-02 00:11:18 +0000
+++ include/test/mir_test_framework/testing_server_configuration.h	2013-05-30 07:52:28 +0000
@@ -35,6 +35,7 @@
 {
 public:
     TestingServerConfiguration();
+	virtual ~TestingServerConfiguration() noexcept {}
 
     // Code to run in server process
     virtual void exec();

=== modified file 'src/client/android/android_client_buffer.cpp'
--- src/client/android/android_client_buffer.cpp	2013-05-03 22:53:42 +0000
+++ src/client/android/android_client_buffer.cpp	2013-05-30 07:52:28 +0000
@@ -41,6 +41,10 @@
     pack_native_window_buffer();
 }
 
+mcla::AndroidClientBuffer::~AndroidClientBuffer()
+{
+}
+
 static void incRef(android_native_base_t*)
 {
 }

=== 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-05-30 07:52:28 +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-05-03 18:39:57 +0000
+++ src/client/client_platform.h	2013-05-30 07:52:28 +0000
@@ -38,6 +38,8 @@
     ClientPlatform(const ClientPlatform& p) = delete;
     ClientPlatform& operator=(const ClientPlatform& p) = delete;
 
+    virtual ~ClientPlatform() = default;
+
     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/frontend/message_processor.h'
--- src/server/frontend/message_processor.h	2013-04-24 05:22:20 +0000
+++ src/server/frontend/message_processor.h	2013-05-30 07:52:28 +0000
@@ -37,7 +37,7 @@
     virtual void send_fds(std::vector<int32_t> const& fd) = 0;
 protected:
     MessageSender() = default;
-    ~MessageSender() = default;
+    virtual ~MessageSender() = default;
     MessageSender(MessageSender const&) = delete;
     MessageSender& operator=(MessageSender 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-05-30 07:52:28 +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/frontend/socket_session.h'
--- src/server/frontend/socket_session.h	2013-04-24 05:22:20 +0000
+++ src/server/frontend/socket_session.h	2013-05-30 07:52:28 +0000
@@ -43,6 +43,8 @@
         connected_sessions(connected_sessions),
         processor(std::make_shared<NullMessageProcessor>()) {}
 
+	virtual ~SocketSession() noexcept {}
+
     int id() const { return id_; }
 
     void read_next_message();

=== modified file 'src/server/graphics/gbm/gbm_display.cpp'
--- src/server/graphics/gbm/gbm_display.cpp	2013-05-13 09:23:04 +0000
+++ src/server/graphics/gbm/gbm_display.cpp	2013-05-30 07:52:28 +0000
@@ -64,7 +64,8 @@
     shared_egl.make_current();
 }
 
-mgg::GBMDisplay::~GBMDisplay()
+//do not remove this empty destructor (unique_ptr)
+mgg::GBMDisplay::~GBMDisplay() noexcept
 {
 }
 

=== modified file 'src/server/graphics/gbm/gbm_display.h'
--- src/server/graphics/gbm/gbm_display.h	2013-05-03 22:08:24 +0000
+++ src/server/graphics/gbm/gbm_display.h	2013-05-30 07:52:28 +0000
@@ -50,7 +50,7 @@
 public:
     GBMDisplay(std::shared_ptr<GBMPlatform> const& platform,
                std::shared_ptr<DisplayReport> const& listener);
-    ~GBMDisplay();
+	~GBMDisplay() noexcept;
 
     geometry::Rectangle view_area() const;
     void for_each_display_buffer(std::function<void(DisplayBuffer&)> const& f);

=== modified file 'src/server/graphics/gbm/gbm_platform.cpp'
--- src/server/graphics/gbm/gbm_platform.cpp	2013-05-23 13:01:05 +0000
+++ src/server/graphics/gbm/gbm_platform.cpp	2013-05-30 07:52:28 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "gbm_platform.h"
-
 #include "gbm_buffer_allocator.h"
 #include "gbm_display.h"
 #include "internal_client.h"
@@ -88,7 +87,7 @@
     internal_display_clients_present = false;
 }
 
-mgg::GBMPlatform::~GBMPlatform()
+mgg::GBMPlatform::~GBMPlatform() noexcept
 {
     internal_native_display.reset();
     internal_display_clients_present = false;

=== modified file 'src/server/graphics/gbm/gbm_platform.h'
--- src/server/graphics/gbm/gbm_platform.h	2013-05-20 17:09:41 +0000
+++ src/server/graphics/gbm/gbm_platform.h	2013-05-30 07:52:28 +0000
@@ -39,7 +39,7 @@
 public:
     explicit GBMPlatform(std::shared_ptr<DisplayReport> const& reporter,
                          std::shared_ptr<VirtualTerminal> const& vt);
-    ~GBMPlatform();
+    ~GBMPlatform() noexcept;
 
     /* From Platform */
     std::shared_ptr<compositor::GraphicBufferAllocator> create_buffer_allocator(

=== modified file 'src/server/logging/display_report.cpp'
--- src/server/logging/display_report.cpp	2013-05-10 18:26:22 +0000
+++ src/server/logging/display_report.cpp	2013-05-30 07:52:28 +0000
@@ -28,7 +28,7 @@
 {
 }
 
-ml::DisplayReport::~DisplayReport()
+ml::DisplayReport::~DisplayReport() noexcept
 {
 }
 

=== modified file 'src/server/options/program_option.cpp'
--- src/server/options/program_option.cpp	2013-04-30 23:28:00 +0000
+++ src/server/options/program_option.cpp	2013-05-30 07:52:28 +0000
@@ -30,6 +30,10 @@
 {
 }
 
+mo::ProgramOption::~ProgramOption() noexcept
+{
+}
+
 void mo::ProgramOption::parse_arguments(
     po::options_description const& desc,
     int argc,

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2013-05-28 17:15:21 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2013-05-30 07:52:28 +0000
@@ -64,6 +64,8 @@
     {
 
     }
+
+	virtual ~FocusNotifyingDispatcherController() noexcept {}
     
     void focus_changed(std::shared_ptr<mi::SurfaceTarget> const& surface) override
     {
@@ -85,6 +87,8 @@
     {
     }
 
+	virtual ~FakeInputServerConfiguration() noexcept {}
+
     virtual void inject_input()
     {
     }

=== 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-05-30 07:52:28 +0000
@@ -32,6 +32,8 @@
 class SynchronizerController
 {
 public:
+        virtual ~SynchronizerController() = default;
+
         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() = default;
     virtual bool child_enter_wait() = 0;
     virtual bool child_check_wait_request() = 0;
 };
@@ -56,9 +59,7 @@
         {
         };
 
-        ~Synchronizer ()
-        {
-        };
+        virtual ~Synchronizer () noexcept {}
 
         void ensure_child_is_waiting()
         {

=== modified file 'tests/integration-tests/frontend/test_application_mediator_report.cpp'
--- tests/integration-tests/frontend/test_application_mediator_report.cpp	2013-04-24 05:22:20 +0000
+++ tests/integration-tests/frontend/test_application_mediator_report.cpp	2013-05-30 07:52:28 +0000
@@ -50,6 +50,7 @@
         EXPECT_CALL(*this, session_disconnect_called(testing::_)).
             Times(testing::AtLeast(0));
     }
+	virtual ~MockApplicationMediatorReport() noexcept {}
 
     MOCK_METHOD1(session_connect_called, void (std::string const&));
     MOCK_METHOD1(session_create_surface_called, void (std::string const&));
@@ -67,6 +68,8 @@
 {
     struct Server : TestingServerConfiguration
     {
+        virtual ~Server() noexcept {}
+
         std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
@@ -83,6 +86,7 @@
 
     struct Client: TestingClientConfiguration
     {
+        virtual ~Client() noexcept {}
         void exec()
         {
             mt::TestProtobufClient client(mtf::test_socket_file(), rpc_timeout_ms);
@@ -108,6 +112,7 @@
 {
     struct Server : TestingServerConfiguration
     {
+        virtual ~Server() noexcept {}
         std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
@@ -124,6 +129,7 @@
 
     struct Client: TestingClientConfiguration
     {
+        virtual ~Client() noexcept {}
         void exec()
         {
             mt::TestProtobufClient client(mtf::test_socket_file(), rpc_timeout_ms);
@@ -159,6 +165,7 @@
 {
     struct Server : TestingServerConfiguration
     {
+		virtual ~Server() noexcept {}
         std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
@@ -175,6 +182,7 @@
 
     struct Client: TestingClientConfiguration
     {
+		virtual ~Client() noexcept {}
         void exec()
         {
             mt::TestProtobufClient client(mtf::test_socket_file(), rpc_timeout_ms);
@@ -216,6 +224,7 @@
 {
     struct Server : TestingServerConfiguration
     {
+        virtual ~Server() noexcept {}
         std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
@@ -232,6 +241,7 @@
 
     struct Client: TestingClientConfiguration
     {
+        virtual ~Client() noexcept {}
         void exec()
         {
             mt::TestProtobufClient client(mtf::test_socket_file(), rpc_timeout_ms);
@@ -282,6 +292,7 @@
 {
     struct Server : TestingServerConfiguration
     {
+		virtual ~Server() noexcept {}
         std::shared_ptr<mf::SessionMediatorReport>
         the_application_mediator_report()
         {
@@ -298,6 +309,7 @@
 
     struct Client: TestingClientConfiguration
     {
+        virtual ~Client() noexcept {}
         void exec()
         {
             mt::TestProtobufClient client(mtf::test_socket_file(), rpc_timeout_ms);

=== modified file 'tests/integration-tests/test_display_server_main_loop_events.cpp'
--- tests/integration-tests/test_display_server_main_loop_events.cpp	2013-05-01 21:55:49 +0000
+++ tests/integration-tests/test_display_server_main_loop_events.cpp	2013-05-30 07:52:28 +0000
@@ -66,6 +66,8 @@
     {
     }
 
+	virtual ~MockDisplay() noexcept {}
+
     mir::geometry::Rectangle view_area() const
     {
         return display->view_area();
@@ -107,6 +109,8 @@
 class ServerConfig : public mtf::TestingServerConfiguration
 {
 public:
+	virtual ~ServerConfig() noexcept {}
+
     std::shared_ptr<mi::InputManager> the_input_manager() override
     {
         if (!mock_input_manager)

=== modified file 'tests/integration-tests/test_surface_first_frame_sync.cpp'
--- tests/integration-tests/test_surface_first_frame_sync.cpp	2013-05-21 15:11:41 +0000
+++ tests/integration-tests/test_surface_first_frame_sync.cpp	2013-05-30 07:52:28 +0000
@@ -57,6 +57,8 @@
     {
     }
 
+	virtual ~SynchronousCompositor() {}
+
     void start()
     {
         renderables->set_change_callback([this]()
@@ -87,6 +89,8 @@
     {
     }
 
+	virtual ~StubRenderer() noexcept {}
+
     void clear() {}
 
     void render(std::function<void(std::shared_ptr<void> const&)>, mg::Renderable&)
@@ -103,6 +107,8 @@
 class StubDisplayBuffer : public mg::DisplayBuffer
 {
 public:
+    virtual ~StubDisplayBuffer() {}
+
     geom::Rectangle view_area() const
     {
         return geom::Rectangle{geom::Point(),
@@ -118,6 +124,8 @@
 class StubDisplay : public mg::Display
 {
 public:
+    virtual ~StubDisplay() noexcept {}
+
     geom::Rectangle view_area() const
     {
         return display_buffer.view_area();
@@ -180,7 +188,7 @@
             }
         }
 
-        ~ServerConfig()
+        virtual ~ServerConfig() noexcept
         {
             if (rendering_ops_pipe[0] >= 0)
                 close(rendering_ops_pipe[0]);

=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
--- tests/integration-tests/test_surfaceloop.cpp	2013-05-24 15:44:11 +0000
+++ tests/integration-tests/test_surfaceloop.cpp	2013-05-30 07:52:28 +0000
@@ -67,6 +67,8 @@
             .WillByDefault(testing::Invoke(this, &MockBufferAllocationStrategy::on_create_swapper));
     }
 
+	virtual ~MockBufferAllocationStrategy() noexcept {}
+
     MOCK_METHOD2(
         create_swapper,
         std::unique_ptr<mc::BufferSwapper>(mc::BufferProperties&, mc::BufferProperties const&));
@@ -93,6 +95,8 @@
             .WillByDefault(testing::Invoke(this, &MockGraphicBufferAllocator::on_create_swapper));
     }
 
+	virtual ~MockGraphicBufferAllocator() noexcept {}
+
     MOCK_METHOD1(
         alloc_buffer,
         std::shared_ptr<mc::Buffer> (mc::BufferProperties const&));
@@ -121,6 +125,8 @@
 class StubDisplay : public mg::Display
 {
 public:
+	virtual ~StubDisplay() noexcept {}
+
     geom::Rectangle view_area() const
     {
         return default_view_area;

=== 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-05-30 07:52:28 +0000
@@ -33,6 +33,8 @@
 class ICSRegistrarInterface
 {
 public:
+    virtual ~ICSRegistrarInterface() = default;
+
     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/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2013-05-29 12:04:04 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2013-05-30 07:52:28 +0000
@@ -41,6 +41,8 @@
 
 struct MockRpcChannel : public mir::client::rpc::MirBasicRpcChannel
 {
+    virtual ~MockRpcChannel() noexcept {}
+
     void CallMethod(const google::protobuf::MethodDescriptor* method,
                     google::protobuf::RpcController*,
                     const google::protobuf::Message* parameters,
@@ -75,6 +77,8 @@
             .WillByDefault(Return(native_display));
     }
 
+	virtual ~MockClientPlatform() noexcept {}
+
     MOCK_CONST_METHOD0(platform_type, MirPlatformType()); 
     MOCK_METHOD0(create_buffer_factory, std::shared_ptr<mcl::ClientBufferFactory>());
     MOCK_METHOD1(create_egl_native_window, std::shared_ptr<EGLNativeWindowType>(mcl::ClientSurface*));

=== modified file 'tests/unit-tests/compositor/test_buffer_manager.cpp'
--- tests/unit-tests/compositor/test_buffer_manager.cpp	2013-01-23 01:03:20 +0000
+++ tests/unit-tests/compositor/test_buffer_manager.cpp	2013-05-30 07:52:28 +0000
@@ -37,6 +37,8 @@
 
 struct MockBufferAllocationStrategy : public mc::BufferAllocationStrategy
 {
+	virtual ~MockBufferAllocationStrategy() noexcept {}
+
     MOCK_METHOD2(
         create_swapper,
         std::unique_ptr<mc::BufferSwapper>(mc::BufferProperties&, mc::BufferProperties const&));

=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2013-05-24 15:44:11 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2013-05-30 07:52:28 +0000
@@ -119,6 +119,8 @@
             .WillByDefault(Return(std::make_shared<mg::PlatformIPCPackage>()));
     }
 
+    virtual ~MockPlatform() noexcept {}
+
     MOCK_METHOD1(create_buffer_allocator, std::shared_ptr<mc::GraphicBufferAllocator>(std::shared_ptr<mg::BufferInitializer> const&));
     MOCK_METHOD0(create_display, std::shared_ptr<mg::Display>());
     MOCK_METHOD0(get_ipc_package, std::shared_ptr<mg::PlatformIPCPackage>());

=== 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-05-30 07:52:28 +0000
@@ -31,6 +31,7 @@
 class ANativeWindowInterface
 {
 public:
+    virtual ~ANativeWindowInterface() = default;
     virtual int query_interface(const ANativeWindow* win , int code, int* value) const = 0;
 };
 

=== modified file 'tests/unit-tests/shell/test_consuming_placement_strategy.cpp'
--- tests/unit-tests/shell/test_consuming_placement_strategy.cpp	2013-05-21 17:16:43 +0000
+++ tests/unit-tests/shell/test_consuming_placement_strategy.cpp	2013-05-30 07:52:28 +0000
@@ -36,6 +36,8 @@
 
 struct ConsumingPlacementStrategySetup : public testing::Test
 {
+    virtual ~ConsumingPlacementStrategySetup() noexcept {}
+
     void SetUp()
     {
         using namespace ::testing;

=== 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-05-30 07:52:28 +0000
@@ -26,11 +26,13 @@
 {
     struct Interface
     {
+        virtual ~Interface() = default;
         virtual std::unique_ptr<int> function() const = 0;
     };
 
     struct MockImplementation : Interface
     {
+		virtual ~MockImplementation() noexcept {}
         MOCK_CONST_METHOD0(function, std::unique_ptr<int>());
     };