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

Proposed by Andrea Azzarone on 2017-08-04
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2017-08-08
Approved revision: 558
Merged at revision: 558
Proposed branch: lp:~azzar1/indicator-sound/fix-build-issue-g++7
Merge into: lp:indicator-sound
Diff against target: 42 lines (+5/-2)
2 files modified
src/gmenuharness/MatchUtils.cpp (+4/-2)
tests/notifications-test.cc (+1/-0)
To merge this branch: bzr merge lp:~azzar1/indicator-sound/fix-build-issue-g++7
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2017-08-04 Approve on 2017-08-08
unity-api-1-bot continuous-integration Needs Fixing on 2017-08-04
Review via email: mp+328568@code.launchpad.net

Commit message

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

Description of the change

Fix build issue with g++7

To post a comment you must log in.
unity-api-1-bot (unity-api-1-bot) wrote :

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)
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gmenuharness/MatchUtils.cpp'
2--- src/gmenuharness/MatchUtils.cpp 2015-12-23 13:35:46 +0000
3+++ src/gmenuharness/MatchUtils.cpp 2017-08-04 11:53:04 +0000
4@@ -18,6 +18,8 @@
5
6 #include <unity/gmenuharness/MatchUtils.h>
7
8+#include <functional>
9+
10 #include <unity/util/ResourcePtr.h>
11
12 using namespace std;
13@@ -33,7 +35,7 @@
14 shared_ptr<GMainLoop> loop(g_main_loop_new(nullptr, false), &g_main_loop_unref);
15
16 /* Our two exit criteria */
17- util::ResourcePtr<gulong, function<void(gulong)>> signal(
18+ util::ResourcePtr<gulong, std::function<void(gulong)>> signal(
19 g_signal_connect_swapped(obj, signalName.c_str(),
20 G_CALLBACK(g_main_loop_quit), loop.get()),
21 [obj](gulong s)
22@@ -41,7 +43,7 @@
23 g_signal_handler_disconnect(obj, s);
24 });
25
26- util::ResourcePtr<guint, function<void(guint)>> timer(g_timeout_add(timeout,
27+ util::ResourcePtr<guint, std::function<void(guint)>> timer(g_timeout_add(timeout,
28 [](gpointer user_data) -> gboolean
29 {
30 g_main_loop_quit((GMainLoop *)user_data);
31
32=== modified file 'tests/notifications-test.cc'
33--- tests/notifications-test.cc 2016-03-01 09:41:41 +0000
34+++ tests/notifications-test.cc 2017-08-04 11:53:04 +0000
35@@ -19,6 +19,7 @@
36 */
37
38 #include <algorithm>
39+#include <functional>
40 #include <memory>
41
42 #include <gtest/gtest.h>

Subscribers

People subscribed via source and target branches