Merge lp:~alan-griffiths/mir/fix-FTBFS-on-artful-clang into lp:mir

[Alan Griffiths]

Workaround for clang crashing on artful

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

FAILED: Continuous integration, rev:4250
https://mir-jenkins.ubuntu.com/job/mir-ci/3658/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5006/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5234
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5222
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5222
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5222
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5045/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5045/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5045/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4251
https://mir-jenkins.ubuntu.com/job/mir-ci/3660/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5009/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5237
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5225
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5225
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5225
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5048/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5048/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5048/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5048/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5048/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5048/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5048/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5048
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5048/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4251
https://mir-jenkins.ubuntu.com/job/mir-ci/3661/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5010/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5238
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5226
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5226
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5226
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5053/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5053/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5053/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5053/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Weird, but ok

review: Approve

=== modified file 'src/miral/set_window_management_policy.cpp'
--- src/miral/set_window_management_policy.cpp	2017-08-21 14:18:55 +0000
+++ src/miral/set_window_management_policy.cpp	2017-09-14 10:35:39 +0000
@@ -32,22 +32,6 @@
 char const* const trace_option = "window-management-trace";
 }
 
-MIRAL_FAKE_OLD_SYMBOL(
-    _ZN5miral24SetWindowManagmentPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE,
-    _ZN5miral25SetWindowManagementPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE)
-
-MIRAL_FAKE_OLD_SYMBOL(
-    _ZNK5miral24SetWindowManagmentPolicyclERN3mir6ServerE,
-    _ZNK5miral25SetWindowManagementPolicyclERN3mir6ServerE)
-
-MIRAL_FAKE_OLD_SYMBOL(
-    _ZN5miral24SetWindowManagmentPolicyD1Ev,
-    _ZN5miral25SetWindowManagementPolicyD1Ev)
-
-MIRAL_FAKE_OLD_SYMBOL(
-    _ZN5miral24SetWindowManagmentPolicyD2Ev,
-    _ZN5miral25SetWindowManagementPolicyD2Ev)
-
 miral::SetWindowManagementPolicy::SetWindowManagementPolicy(WindowManagementPolicyBuilder const& builder) :
     builder{builder}
 {
@@ -89,3 +73,19 @@
                 builder);
         });
 }
+
+MIRAL_FAKE_OLD_SYMBOL(
+    _ZN5miral24SetWindowManagmentPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE,
+    _ZN5miral25SetWindowManagementPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE)
+
+MIRAL_FAKE_OLD_SYMBOL(
+    _ZNK5miral24SetWindowManagmentPolicyclERN3mir6ServerE,
+    _ZNK5miral25SetWindowManagementPolicyclERN3mir6ServerE)
+
+MIRAL_FAKE_OLD_SYMBOL(
+    _ZN5miral24SetWindowManagmentPolicyD1Ev,
+    _ZN5miral25SetWindowManagementPolicyD1Ev)
+
+MIRAL_FAKE_OLD_SYMBOL(
+    _ZN5miral24SetWindowManagmentPolicyD2Ev,
+    _ZN5miral25SetWindowManagementPolicyD2Ev)