Merge lp:~azzar1/indicator-sound/fix-build-issue-g++7 into lp:indicator-sound

[Andrea Azzarone]

Include <functional> to fix a build issues with g++7.

Fix build issue with g++7

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:558
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/26/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1935/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1942
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1722/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1722
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1722/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1722/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-sound-ci/26/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'src/gmenuharness/MatchUtils.cpp'
--- src/gmenuharness/MatchUtils.cpp	2015-12-23 13:35:46 +0000
+++ src/gmenuharness/MatchUtils.cpp	2017-08-04 11:53:04 +0000
@@ -18,6 +18,8 @@
 
 #include <unity/gmenuharness/MatchUtils.h>
 
+#include <functional>
+
 #include <unity/util/ResourcePtr.h>
 
 using namespace std;
@@ -33,7 +35,7 @@
     shared_ptr<GMainLoop> loop(g_main_loop_new(nullptr, false), &g_main_loop_unref);
 
     /* Our two exit criteria */
-    util::ResourcePtr<gulong, function<void(gulong)>> signal(
+    util::ResourcePtr<gulong, std::function<void(gulong)>> signal(
             g_signal_connect_swapped(obj, signalName.c_str(),
                                      G_CALLBACK(g_main_loop_quit), loop.get()),
             [obj](gulong s)
@@ -41,7 +43,7 @@
                 g_signal_handler_disconnect(obj, s);
             });
 
-    util::ResourcePtr<guint, function<void(guint)>> timer(g_timeout_add(timeout,
+    util::ResourcePtr<guint, std::function<void(guint)>> timer(g_timeout_add(timeout,
             [](gpointer user_data) -> gboolean
             {
                 g_main_loop_quit((GMainLoop *)user_data);

=== modified file 'tests/notifications-test.cc'
--- tests/notifications-test.cc	2016-03-01 09:41:41 +0000
+++ tests/notifications-test.cc	2017-08-04 11:53:04 +0000
@@ -19,6 +19,7 @@
  */
 
 #include <algorithm>
+#include <functional>
 #include <memory>
 
 #include <gtest/gtest.h>