diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2017-08-04 15:31:09 +0200 |
|---|---|---|
| committer | Andrea Azzarone <azzaronea@gmail.com> | 2017-08-04 15:31:09 +0200 |
| commit | f2371a427b5ccf92d001ce4ffc6545266d4c02a2 (patch) | |
| tree | d2a90e59b9021a0bdc2f9d27651a7ccff9aafa48 | |
| parent | 9380098be614afa22cacd8162be076035de7609f (diff) | |
Fix build issues with gcc7/g++7
(bzr r4253.1.1)
| -rw-r--r-- | UnityCore/GLibDBusProxy.h | 1 | ||||
| -rw-r--r-- | UnityCore/GLibDBusServer.h | 1 | ||||
| -rw-r--r-- | UnityCore/GLibSignal.h | 1 | ||||
| -rw-r--r-- | tests/test_application_launcher_icon.cpp | 2 |
4 files changed, 5 insertions, 0 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/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); |