Unity

Merge lp:~azzar1/unity/fix-gcc7 into lp:unity

  1. fix-gcc7
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4254
Proposed branch: lp:~azzar1/unity/fix-gcc7
Merge into: lp:unity
Diff against target: 62 lines (+6/-1)
5 files modified
UnityCore/GLibDBusProxy.h (+1/-0)
UnityCore/GLibDBusServer.h (+1/-0)
UnityCore/GLibSignal.h (+1/-0)
debian/control (+1/-1)
tests/test_application_launcher_icon.cpp (+2/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-gcc7
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+328577@code.launchpad.net

Commit message

Fix build issues with gcc-7 and g++-7

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/GLibDBusProxy.h'
2--- UnityCore/GLibDBusProxy.h 2017-01-17 15:24:17 +0000
3+++ UnityCore/GLibDBusProxy.h 2017-09-01 09:49:13 +0000
4@@ -23,6 +23,7 @@
5 #define UNITY_DBUS_PROXY_H
6
7 #include <boost/noncopyable.hpp>
8+#include <functional>
9 #include <gio/gio.h>
10 #include <memory>
11 #include <sigc++/signal.h>
12
13=== modified file 'UnityCore/GLibDBusServer.h'
14--- UnityCore/GLibDBusServer.h 2015-09-25 15:37:00 +0000
15+++ UnityCore/GLibDBusServer.h 2017-09-01 09:49:13 +0000
16@@ -20,6 +20,7 @@
17 #ifndef UNITY_GLIB_DBUS_SERVER_H
18 #define UNITY_GLIB_DBUS_SERVER_H
19
20+#include <functional>
21 #include <gio/gio.h>
22 #include <memory>
23 #include <sigc++/signal.h>
24
25=== modified file 'UnityCore/GLibSignal.h'
26--- UnityCore/GLibSignal.h 2017-07-12 17:45:57 +0000
27+++ UnityCore/GLibSignal.h 2017-09-01 09:49:13 +0000
28@@ -21,6 +21,7 @@
29 #ifndef UNITY_GLIB_SIGNAL_H
30 #define UNITY_GLIB_SIGNAL_H
31
32+#include <functional>
33 #include <limits>
34 #include <string>
35 #include <vector>
36
37=== modified file 'debian/control'
38--- debian/control 2017-07-03 15:31:30 +0000
39+++ debian/control 2017-09-01 09:49:13 +0000
40@@ -3,7 +3,7 @@
41 Priority: optional
42 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
43 Build-Depends: cmake,
44- compiz-dev (>= 1:0.9.13.1+17.10.20170630),
45+ compiz-dev (>= 1:0.9.13.1+17.10.20170829),
46 debhelper (>= 9.0.0~),
47 dbus-test-runner,
48 dbus-x11,
49
50=== modified file 'tests/test_application_launcher_icon.cpp'
51--- tests/test_application_launcher_icon.cpp 2016-11-29 14:43:12 +0000
52+++ tests/test_application_launcher_icon.cpp 2017-09-01 09:49:13 +0000
53@@ -1059,7 +1059,9 @@
54 ON_CALL(*mock_icon, GetRemoteMenus()).WillByDefault(Invoke([&root] { return root; }));
55
56 if (GetParam() != "Quit")
57+ {
58 ASSERT_FALSE(HasMenuItemWithLabel(mock_icon, GetParam()));
59+ }
60
61 item = GetMenuItemWithLabel(mock_icon, "Quit");
62 ASSERT_NE(item, nullptr);