Merge unity:gcc-72-errors into unity:master

Proposed by Marco Trevisan (Treviño) on 2018-09-26
Status: Needs review
Proposed branch: unity:gcc-72-errors
Merge into: unity:master
Diff against target: 24 lines (+2/-0)
2 files modified
UnityCore/GLibSource.h (+1/-0)
unity-shared/IconLoader.h (+1/-0)
Reviewer Review Type Date Requested Status
Unity Team 2018-09-26 Pending
Review via email: mp+355734@code.launchpad.net

Commit message

Fix gcc 7.2 build errors

To post a comment you must log in.

Unmerged commits

5b1ff14... by Tasos Sahanidis <email address hidden> on 2018-03-03

Fix gcc 7.2 build errors

(bzr r4270)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/UnityCore/GLibSource.h b/UnityCore/GLibSource.h
2index 061fa2b..6994dc3 100644
3--- a/UnityCore/GLibSource.h
4+++ b/UnityCore/GLibSource.h
5@@ -25,6 +25,7 @@
6 #include <glib.h>
7 #include <memory>
8 #include <unordered_map>
9+#include <functional>
10
11 namespace unity
12 {
13diff --git a/unity-shared/IconLoader.h b/unity-shared/IconLoader.h
14index fb4587e..81041a6 100644
15--- a/unity-shared/IconLoader.h
16+++ b/unity-shared/IconLoader.h
17@@ -23,6 +23,7 @@
18 #include <boost/utility.hpp>
19
20 #include <memory>
21+#include <functional>
22 #include <gtk/gtk.h>
23 #include <UnityCore/ActionHandle.h>
24 #include <UnityCore/GLibWrapper.h>

Subscribers

People subscribed via source and target branches

to all changes: