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

[Daniel van Vugt]

MockDisplayConfigurationPolicy: Work around gcc-4.7 bugs causing build
failure on raring. (LP: #1200064)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:839
http://jenkins.qa.ubuntu.com/job/mir-ci/979/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/217
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/616

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'tests/integration-tests/test_display_server_main_loop_events.cpp'
--- tests/integration-tests/test_display_server_main_loop_events.cpp	2013-07-10 08:50:53 +0000
+++ tests/integration-tests/test_display_server_main_loop_events.cpp	2013-07-11 03:37:27 +0000
@@ -132,6 +132,7 @@
 class MockDisplayConfigurationPolicy : public mg::DisplayConfigurationPolicy
 {
 public:
+    ~MockDisplayConfigurationPolicy() noexcept {}
     MOCK_METHOD1(apply_to, void(mg::DisplayConfiguration&));
 };