Unity

Merge lp:~tatokis/unity/gcc-72-errors into lp:unity

  1. gcc-72-errors
  2. Merge into trunk
Proposed by Tasos Sahanidis
Status: Needs review
Proposed branch: lp:~tatokis/unity/gcc-72-errors
Merge into: lp:unity
Diff against target: 23 lines (+2/-0)
2 files modified
UnityCore/GLibSource.h (+1/-0)
unity-shared/IconLoader.h (+1/-0)
To merge this branch: bzr merge lp:~tatokis/unity/gcc-72-errors
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+340561@code.launchpad.net

Description of the change

Fixes `error: ‘function’ in namespace ‘std’ does not name a template type` when attempting to compile Unity with gcc/g++ 7.2.

To post a comment you must log in.

Unmerged revisions

4270. By Tasos Sahanidis <email address hidden>

Fix gcc 7.2 build errors

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/GLibSource.h'
2--- UnityCore/GLibSource.h 2015-02-03 09:46:48 +0000
3+++ UnityCore/GLibSource.h 2018-03-03 12:59:35 +0000
4@@ -25,6 +25,7 @@
5 #include <glib.h>
6 #include <memory>
7 #include <unordered_map>
8+#include <functional>
9
10 namespace unity
11 {
12
13=== modified file 'unity-shared/IconLoader.h'
14--- unity-shared/IconLoader.h 2016-03-31 04:11:24 +0000
15+++ unity-shared/IconLoader.h 2018-03-03 12:59:35 +0000
16@@ -23,6 +23,7 @@
17 #include <boost/utility.hpp>
18
19 #include <memory>
20+#include <functional>
21 #include <gtk/gtk.h>
22 #include <UnityCore/ActionHandle.h>
23 #include <UnityCore/GLibWrapper.h>