diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2017-09-25 16:03:12 +0000 |
|---|---|---|
| committer | Bileto Bot <ci-train-bot@canonical.com> | 2017-09-25 16:03:12 +0000 |
| commit | 48c8ba20c3900f1455a0304099e7bad0ac7c2d17 (patch) | |
| tree | ba5f65eb7cd434505a0d9fe5f11e22c9e4f2438a | |
| parent | 9380098be614afa22cacd8162be076035de7609f (diff) | |
| parent | 5dde9a2211dadac7c7ebd79aad564f97f2d4e88d (diff) | |
Fix build issues with gcc-7 and g++-7
Approved by: Marco Trevisan (Treviño) (bzr r4254)
| -rw-r--r-- | UnityCore/GLibDBusProxy.h | 1 | ||||
| -rw-r--r-- | UnityCore/GLibDBusServer.h | 1 | ||||
| -rw-r--r-- | UnityCore/GLibSignal.h | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | tests/test_application_launcher_icon.cpp | 2 |
5 files changed, 6 insertions, 1 deletions
diff --git a/UnityCore/GLibDBusProxy.h b/UnityCore/GLibDBusProxy.h index f0eb777f3..f75c1b2de 100644 --- a/UnityCore/GLibDBusProxy.h +++ b/UnityCore/GLibDBusProxy.h @@ -23,6 +23,7 @@ #define UNITY_DBUS_PROXY_H #include <boost/noncopyable.hpp> +#include <functional> #include <gio/gio.h> #include <memory> #include <sigc++/signal.h> diff --git a/UnityCore/GLibDBusServer.h b/UnityCore/GLibDBusServer.h index b064c4360..a0a77ecb6 100644 --- a/UnityCore/GLibDBusServer.h +++ b/UnityCore/GLibDBusServer.h @@ -20,6 +20,7 @@ #ifndef UNITY_GLIB_DBUS_SERVER_H #define UNITY_GLIB_DBUS_SERVER_H +#include <functional> #include <gio/gio.h> #include <memory> #include <sigc++/signal.h> diff --git a/UnityCore/GLibSignal.h b/UnityCore/GLibSignal.h index 6dc536111..98d696e21 100644 --- a/UnityCore/GLibSignal.h +++ b/UnityCore/GLibSignal.h @@ -21,6 +21,7 @@ #ifndef UNITY_GLIB_SIGNAL_H #define UNITY_GLIB_SIGNAL_H +#include <functional> #include <limits> #include <string> #include <vector> diff --git a/debian/control b/debian/control index 6a0dd0a8b..acca6839e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Build-Depends: cmake, - compiz-dev (>= 1:0.9.13.1+17.10.20170630), + compiz-dev (>= 1:0.9.13.1+17.10.20170829), debhelper (>= 9.0.0~), dbus-test-runner, dbus-x11, diff --git a/tests/test_application_launcher_icon.cpp b/tests/test_application_launcher_icon.cpp index 6c1a77c7b..2d3c4e3de 100644 --- a/tests/test_application_launcher_icon.cpp +++ b/tests/test_application_launcher_icon.cpp @@ -1059,7 +1059,9 @@ TEST_P(/*TestApplicationLauncherIcon*/QuitLabel, QuicklistMenuItemRemoteOverride ON_CALL(*mock_icon, GetRemoteMenus()).WillByDefault(Invoke([&root] { return root; })); if (GetParam() != "Quit") + { ASSERT_FALSE(HasMenuItemWithLabel(mock_icon, GetParam())); + } item = GetMenuItemWithLabel(mock_icon, "Quit"); ASSERT_NE(item, nullptr); |