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
=== modified file 'UnityCore/GLibSource.h'
--- UnityCore/GLibSource.h 2015-02-03 09:46:48 +0000
+++ UnityCore/GLibSource.h 2018-03-03 12:59:35 +0000
@@ -25,6 +25,7 @@
25#include <glib.h>25#include <glib.h>
26#include <memory>26#include <memory>
27#include <unordered_map>27#include <unordered_map>
28#include <functional>
2829
29namespace unity30namespace unity
30{31{
3132
=== modified file 'unity-shared/IconLoader.h'
--- unity-shared/IconLoader.h 2016-03-31 04:11:24 +0000
+++ unity-shared/IconLoader.h 2018-03-03 12:59:35 +0000
@@ -23,6 +23,7 @@
23#include <boost/utility.hpp>23#include <boost/utility.hpp>
2424
25#include <memory>25#include <memory>
26#include <functional>
26#include <gtk/gtk.h>27#include <gtk/gtk.h>
27#include <UnityCore/ActionHandle.h>28#include <UnityCore/ActionHandle.h>
28#include <UnityCore/GLibWrapper.h>29#include <UnityCore/GLibWrapper.h>