1
=== modified file 'src/miral/set_window_management_policy.cpp'
2
--- src/miral/set_window_management_policy.cpp	2017-08-21 14:18:55 +0000
3
+++ src/miral/set_window_management_policy.cpp	2017-09-14 10:35:39 +0000
4
@@ -32,22 +32,6 @@
5
32
char const* const trace_option = "window-management-trace";
32
char const* const trace_option = "window-management-trace";
6
33
}
33
}
7
34
34
8
35
MIRAL_FAKE_OLD_SYMBOL(
9
36
    _ZN5miral24SetWindowManagmentPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE,
10
37
    _ZN5miral25SetWindowManagementPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE)
11
38
12
39
MIRAL_FAKE_OLD_SYMBOL(
13
40
    _ZNK5miral24SetWindowManagmentPolicyclERN3mir6ServerE,
14
41
    _ZNK5miral25SetWindowManagementPolicyclERN3mir6ServerE)
15
42
16
43
MIRAL_FAKE_OLD_SYMBOL(
17
44
    _ZN5miral24SetWindowManagmentPolicyD1Ev,
18
45
    _ZN5miral25SetWindowManagementPolicyD1Ev)
19
46
20
47
MIRAL_FAKE_OLD_SYMBOL(
21
48
    _ZN5miral24SetWindowManagmentPolicyD2Ev,
22
49
    _ZN5miral25SetWindowManagementPolicyD2Ev)
23
50
24
51
miral::SetWindowManagementPolicy::SetWindowManagementPolicy(WindowManagementPolicyBuilder const& builder) :
35
miral::SetWindowManagementPolicy::SetWindowManagementPolicy(WindowManagementPolicyBuilder const& builder) :
25
52
    builder{builder}
36
    builder{builder}
26
53
{
37
{
27
@@ -89,3 +73,19 @@
28
89
                builder);
73
                builder);
29
90
        });
74
        });
30
91
}
75
}
31
76
32
77
MIRAL_FAKE_OLD_SYMBOL(
33
78
    _ZN5miral24SetWindowManagmentPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE,
34
79
    _ZN5miral25SetWindowManagementPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE)
35
80
36
81
MIRAL_FAKE_OLD_SYMBOL(
37
82
    _ZNK5miral24SetWindowManagmentPolicyclERN3mir6ServerE,
38
83
    _ZNK5miral25SetWindowManagementPolicyclERN3mir6ServerE)
39
84
40
85
MIRAL_FAKE_OLD_SYMBOL(
41
86
    _ZN5miral24SetWindowManagmentPolicyD1Ev,
42
87
    _ZN5miral25SetWindowManagementPolicyD1Ev)
43
88
44
89
MIRAL_FAKE_OLD_SYMBOL(
45
90
    _ZN5miral24SetWindowManagmentPolicyD2Ev,
46
91
    _ZN5miral25SetWindowManagementPolicyD2Ev)
Status:	Merged
Approved by:	Alan Griffiths on 2017-09-15
Approved revision:	no longer in the source branch.
Merged at revision:	4252
Proposed branch:	lp:~alan-griffiths/mir/fix-FTBFS-on-artful-clang
Merge into:	lp:mir
Diff against target:	46 lines (+16/-16) 1 file modified src/miral/set_window_management_policy.cpp (+16/-16)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/fix-FTBFS-on-artful-clang
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2017-09-14	Approve on 2017-09-15
Mir CI Bot	continuous-integration		Needs Fixing on 2017-09-14
Review via email: mp+330735@code.launchpad.net