Unity

Merge unity:include-fixes into unity:master

  1. Git
  2. lp:unity
  3. include-fixes
  4. Merge into master
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 5ba0a962255faf88285191d60a0265edafc23eb1
Merged at revision: cb7ae65f8e26320661b2b156462fda0fba09af77
Proposed branch: unity:include-fixes
Merge into: unity:master
Diff against target: 87 lines (+13/-2)
6 files modified
UnityCore/GLibDBusServer.cpp (+2/-0)
debian/changelog (+6/-1)
launcher/DevicesSettingsImp.cpp (+1/-0)
launcher/FavoriteStoreGSettings.cpp (+2/-0)
launcher/FavoriteStorePrivate.h (+1/-1)
unity-shared/IconLoader.h (+1/-0)
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+358294@code.launchpad.net

Commit message

Add missing includes for build w/o pch

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/UnityCore/GLibDBusServer.cpp b/UnityCore/GLibDBusServer.cpp
2index 49b70d7..8fcfdf9 100644
3--- a/UnityCore/GLibDBusServer.cpp
4+++ b/UnityCore/GLibDBusServer.cpp
5@@ -17,7 +17,9 @@
6 * Authored by: Marco Trevisan (Treviño) <marco.trevisan@canonical.com>
7 */
8
9+#include <algorithm>
10 #include <unordered_map>
11+
12 #include <NuxCore/Logger.h>
13
14 #include "GLibDBusServer.h"
15diff --git a/debian/changelog b/debian/changelog
16index 720b5aa..bfc0f2f 100644
17--- a/debian/changelog
18+++ b/debian/changelog
19@@ -1,8 +1,13 @@
20 unity (7.5.0+18.10.20180926.2-0ubuntu2) UNRELEASED; urgency=medium
21
22+ [ Marco Trevisan (Treviño) ]
23 * debian/gbp.conf: add default settings to use gbp-buildpackage
24+ * debian: use native source format
25+
26+ [ Aleksey Tulinov ]
27+ * Add missing includes for build w/o pch
28
29- -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 26 Sep 2018 23:47:35 +0200
30+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Sun, 04 Nov 2018 20:26:08 -0600
31
32 unity (7.5.0+18.10.20180926.2-0ubuntu1) cosmic; urgency=medium
33
34diff --git a/launcher/DevicesSettingsImp.cpp b/launcher/DevicesSettingsImp.cpp
35index 08eddb9..25f40a6 100644
36--- a/launcher/DevicesSettingsImp.cpp
37+++ b/launcher/DevicesSettingsImp.cpp
38@@ -17,6 +17,7 @@
39 * Authored by: Andrea Azzarone <andrea.azzarone@canonical.com>
40 */
41
42+#include <algorithm>
43 #include <list>
44
45 #include <gio/gio.h>
46diff --git a/launcher/FavoriteStoreGSettings.cpp b/launcher/FavoriteStoreGSettings.cpp
47index 415a04b..493e823 100644
48--- a/launcher/FavoriteStoreGSettings.cpp
49+++ b/launcher/FavoriteStoreGSettings.cpp
50@@ -18,6 +18,8 @@
51 * Marco Trevisan <marco.trevisan@canonical.com>
52 */
53
54+#include <algorithm>
55+
56 #include <NuxCore/Logger.h>
57 #include <UnityCore/DesktopUtilities.h>
58
59diff --git a/launcher/FavoriteStorePrivate.h b/launcher/FavoriteStorePrivate.h
60index 3edad23..ebd3cfe 100644
61--- a/launcher/FavoriteStorePrivate.h
62+++ b/launcher/FavoriteStorePrivate.h
63@@ -22,6 +22,7 @@
64
65 #include <list>
66 #include <string>
67+#include <vector>
68
69 namespace unity
70 {
71@@ -47,4 +48,3 @@ bool IsDesktopFilePath(std::string const& path);
72 } // namespace unity
73
74 #endif
75-
76diff --git a/unity-shared/IconLoader.h b/unity-shared/IconLoader.h
77index fb4587e..595def4 100644
78--- a/unity-shared/IconLoader.h
79+++ b/unity-shared/IconLoader.h
80@@ -22,6 +22,7 @@
81
82 #include <boost/utility.hpp>
83
84+#include <functional>
85 #include <memory>
86 #include <gtk/gtk.h>
87 #include <UnityCore/ActionHandle.h>

Subscribers

People subscribed via source and target branches

to all changes: