Merge lp:~unity-api-team/unity-scopes-shell/gcc-5 into lp:unity-scopes-shell

Proposed by Pete Woods on 2015-07-29
Status: Approved
Approved by: dobey on 2015-07-30
Approved revision: 239
Proposed branch: lp:~unity-api-team/unity-scopes-shell/gcc-5
Merge into: lp:unity-scopes-shell
Diff against target: 350 lines (+32/-32)
16 files modified
src/scope-harness/matcher/category-list-matcher.cpp (+1/-1)
src/scope-harness/matcher/category-matcher.cpp (+3/-3)
src/scope-harness/matcher/child-department-matcher.cpp (+2/-2)
src/scope-harness/matcher/match-result.cpp (+2/-2)
src/scope-harness/matcher/preview-column-matcher.cpp (+2/-2)
src/scope-harness/matcher/preview-matcher.cpp (+2/-2)
src/scope-harness/matcher/preview-widget-matcher.cpp (+3/-3)
src/scope-harness/matcher/result-matcher.cpp (+1/-1)
src/scope-harness/matcher/scope-uri.cpp (+2/-2)
src/scope-harness/preview/preview-widget-list.cpp (+2/-2)
src/scope-harness/preview/preview-widget.cpp (+2/-2)
src/scope-harness/registry/custom-registry.cpp (+2/-2)
src/scope-harness/results/category.cpp (+2/-2)
src/scope-harness/results/child-department.cpp (+2/-2)
src/scope-harness/results/department.cpp (+2/-2)
src/scope-harness/results/result.cpp (+2/-2)
To merge this branch: bzr merge lp:~unity-api-team/unity-scopes-shell/gcc-5
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Needs Information on 2016-01-11
dobey (community) 2015-07-29 Approve on 2015-07-30
Matthias Klose Approve on 2015-07-29
PS Jenkins bot (community) continuous-integration Approve on 2015-07-29
Review via email: mp+266227@code.launchpad.net

Commit message

Fix GCC 5 issues

Description of the change

Fix GCC 5 issues

To post a comment you must log in.
Matthias Klose (doko) wrote :

package builds again, but hangs in the tests (likely needs a rebuilt location-service)

review: Approve
dobey (dobey) :
review: Approve
Marcus Tomlinson (marcustomlinson) wrote :

Hey Pete, considering this MP is still floating around, I assume that it was not actually required. Can we delete this?

review: Needs Information

Unmerged revisions

239. By Pete Woods on 2015-07-29

Change move -> std::move to remove ambiguity

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/scope-harness/matcher/category-list-matcher.cpp'
2--- src/scope-harness/matcher/category-list-matcher.cpp 2015-03-10 11:23:01 +0000
3+++ src/scope-harness/matcher/category-list-matcher.cpp 2015-07-29 13:31:53 +0000
4@@ -118,7 +118,7 @@
5
6 CategoryListMatcher& CategoryListMatcher::category(CategoryMatcher&& categoryMatcher)
7 {
8- p->m_categories.emplace_back(move(categoryMatcher));
9+ p->m_categories.emplace_back(std::move(categoryMatcher));
10 return *this;
11 }
12
13
14=== modified file 'src/scope-harness/matcher/category-matcher.cpp'
15--- src/scope-harness/matcher/category-matcher.cpp 2015-03-10 11:23:01 +0000
16+++ src/scope-harness/matcher/category-matcher.cpp 2015-07-29 13:31:53 +0000
17@@ -180,7 +180,7 @@
18
19 CategoryMatcher::CategoryMatcher(CategoryMatcher&& other)
20 {
21- *this = move(other);
22+ *this = std::move(other);
23 }
24
25 CategoryMatcher& CategoryMatcher::operator=(const CategoryMatcher& other)
26@@ -199,7 +199,7 @@
27
28 CategoryMatcher& CategoryMatcher::operator=(CategoryMatcher&& other)
29 {
30- p = move(other.p);
31+ p = std::move(other.p);
32 return *this;
33 }
34
35@@ -253,7 +253,7 @@
36
37 CategoryMatcher& CategoryMatcher::result(ResultMatcher&& resultMatcher)
38 {
39- p->m_results.emplace_back(move(resultMatcher));
40+ p->m_results.emplace_back(std::move(resultMatcher));
41 return *this;
42 }
43
44
45=== modified file 'src/scope-harness/matcher/child-department-matcher.cpp'
46--- src/scope-harness/matcher/child-department-matcher.cpp 2015-03-10 11:23:01 +0000
47+++ src/scope-harness/matcher/child-department-matcher.cpp 2015-07-29 13:31:53 +0000
48@@ -88,7 +88,7 @@
49
50 ChildDepartmentMatcher::ChildDepartmentMatcher(ChildDepartmentMatcher&& other)
51 {
52- *this = move(other);
53+ *this = std::move(other);
54 }
55
56 ChildDepartmentMatcher& ChildDepartmentMatcher::operator=(const ChildDepartmentMatcher& other)
57@@ -102,7 +102,7 @@
58
59 ChildDepartmentMatcher& ChildDepartmentMatcher::operator=(ChildDepartmentMatcher&& other)
60 {
61- p = move(other.p);
62+ p = std::move(other.p);
63 return *this;
64 }
65
66
67=== modified file 'src/scope-harness/matcher/match-result.cpp'
68--- src/scope-harness/matcher/match-result.cpp 2015-03-10 11:23:01 +0000
69+++ src/scope-harness/matcher/match-result.cpp 2015-07-29 13:31:53 +0000
70@@ -43,7 +43,7 @@
71
72 MatchResult::MatchResult(MatchResult&& other)
73 {
74- *this = move(other);
75+ *this = std::move(other);
76 }
77
78 MatchResult::MatchResult(const MatchResult& other) :
79@@ -61,7 +61,7 @@
80
81 MatchResult& MatchResult::operator=(MatchResult&& other)
82 {
83- p = move(other.p);
84+ p = std::move(other.p);
85 return *this;
86 }
87
88
89=== modified file 'src/scope-harness/matcher/preview-column-matcher.cpp'
90--- src/scope-harness/matcher/preview-column-matcher.cpp 2015-03-10 11:23:01 +0000
91+++ src/scope-harness/matcher/preview-column-matcher.cpp 2015-07-29 13:31:53 +0000
92@@ -52,7 +52,7 @@
93
94 PreviewColumnMatcher::PreviewColumnMatcher(PreviewColumnMatcher&& other)
95 {
96- *this = move(other);
97+ *this = std::move(other);
98 }
99
100 PreviewColumnMatcher& PreviewColumnMatcher::operator=(const PreviewColumnMatcher& other)
101@@ -63,7 +63,7 @@
102
103 PreviewColumnMatcher& PreviewColumnMatcher::operator=(PreviewColumnMatcher&& other)
104 {
105- p = move(other.p);
106+ p = std::move(other.p);
107 return *this;
108 }
109
110
111=== modified file 'src/scope-harness/matcher/preview-matcher.cpp'
112--- src/scope-harness/matcher/preview-matcher.cpp 2015-03-10 11:23:01 +0000
113+++ src/scope-harness/matcher/preview-matcher.cpp 2015-07-29 13:31:53 +0000
114@@ -50,7 +50,7 @@
115
116 PreviewMatcher::PreviewMatcher(PreviewMatcher&& other)
117 {
118- *this = move(other);
119+ *this = std::move(other);
120 }
121
122 PreviewMatcher& PreviewMatcher::operator=(const PreviewMatcher& other)
123@@ -61,7 +61,7 @@
124
125 PreviewMatcher& PreviewMatcher::operator=(PreviewMatcher&& other)
126 {
127- p = move(other.p);
128+ p = std::move(other.p);
129 return *this;
130 }
131
132
133=== modified file 'src/scope-harness/matcher/preview-widget-matcher.cpp'
134--- src/scope-harness/matcher/preview-widget-matcher.cpp 2015-03-10 11:23:01 +0000
135+++ src/scope-harness/matcher/preview-widget-matcher.cpp 2015-07-29 13:31:53 +0000
136@@ -92,7 +92,7 @@
137
138 PreviewWidgetMatcher::PreviewWidgetMatcher(PreviewWidgetMatcher&& other)
139 {
140- *this = move(other);
141+ *this = std::move(other);
142 }
143
144 PreviewWidgetMatcher& PreviewWidgetMatcher::operator=(const PreviewWidgetMatcher& other)
145@@ -105,7 +105,7 @@
146
147 PreviewWidgetMatcher& PreviewWidgetMatcher::operator=(PreviewWidgetMatcher&& other)
148 {
149- p = move(other.p);
150+ p = std::move(other.p);
151 return *this;
152 }
153
154@@ -127,7 +127,7 @@
155
156 PreviewWidgetMatcher& PreviewWidgetMatcher::data(sc::Variant&& data)
157 {
158- p->m_data = move(data);
159+ p->m_data = std::move(data);
160 return *this;
161 }
162
163
164=== modified file 'src/scope-harness/matcher/result-matcher.cpp'
165--- src/scope-harness/matcher/result-matcher.cpp 2015-03-10 11:23:01 +0000
166+++ src/scope-harness/matcher/result-matcher.cpp 2015-07-29 13:31:53 +0000
167@@ -186,7 +186,7 @@
168
169 ResultMatcher& ResultMatcher::operator=(ResultMatcher&& other)
170 {
171- p = move(other.p);
172+ p = std::move(other.p);
173 return *this;
174 }
175
176
177=== modified file 'src/scope-harness/matcher/scope-uri.cpp'
178--- src/scope-harness/matcher/scope-uri.cpp 2015-03-10 11:23:01 +0000
179+++ src/scope-harness/matcher/scope-uri.cpp 2015-07-29 13:31:53 +0000
180@@ -81,7 +81,7 @@
181
182 ScopeUri::ScopeUri(ScopeUri&& other)
183 {
184- *this = move(other);
185+ *this = std::move(other);
186 }
187
188 ScopeUri& ScopeUri::operator=(const ScopeUri& other)
189@@ -94,7 +94,7 @@
190
191 ScopeUri& ScopeUri::operator=(ScopeUri&& other)
192 {
193- p = move(other.p);
194+ p = std::move(other.p);
195 return *this;
196 }
197
198
199=== modified file 'src/scope-harness/preview/preview-widget-list.cpp'
200--- src/scope-harness/preview/preview-widget-list.cpp 2015-03-10 11:23:01 +0000
201+++ src/scope-harness/preview/preview-widget-list.cpp 2015-07-29 13:31:53 +0000
202@@ -48,7 +48,7 @@
203
204 PreviewWidgetList::PreviewWidgetList(PreviewWidgetList&& other)
205 {
206- *this = move(other);
207+ *this = std::move(other);
208 }
209
210 PreviewWidgetList::~PreviewWidgetList()
211@@ -63,7 +63,7 @@
212
213 PreviewWidgetList& PreviewWidgetList::operator=(PreviewWidgetList&& other)
214 {
215- p = move(other.p);
216+ p = std::move(other.p);
217 return *this;
218 }
219
220
221=== modified file 'src/scope-harness/preview/preview-widget.cpp'
222--- src/scope-harness/preview/preview-widget.cpp 2015-04-27 11:28:36 +0000
223+++ src/scope-harness/preview/preview-widget.cpp 2015-07-29 13:31:53 +0000
224@@ -81,7 +81,7 @@
225
226 PreviewWidget::PreviewWidget(PreviewWidget&& other)
227 {
228- *this = move(other);
229+ *this = std::move(other);
230 }
231
232 PreviewWidget& PreviewWidget::operator=(const PreviewWidget& other)
233@@ -97,7 +97,7 @@
234
235 PreviewWidget& PreviewWidget::operator=(PreviewWidget&& other)
236 {
237- p = move(other.p);
238+ p = std::move(other.p);
239 return *this;
240 }
241
242
243=== modified file 'src/scope-harness/registry/custom-registry.cpp'
244--- src/scope-harness/registry/custom-registry.cpp 2015-03-10 11:23:01 +0000
245+++ src/scope-harness/registry/custom-registry.cpp 2015-07-29 13:31:53 +0000
246@@ -91,7 +91,7 @@
247
248 CustomRegistry::Parameters::Parameters(Parameters&& other)
249 {
250- p = move(other.p);
251+ p = std::move(other.p);
252 }
253
254 CustomRegistry::Parameters& CustomRegistry::Parameters::operator=(const Parameters& other)
255@@ -106,7 +106,7 @@
256
257 CustomRegistry::Parameters& CustomRegistry::Parameters::operator=(Parameters&& other)
258 {
259- p = move(other.p);
260+ p = std::move(other.p);
261 return *this;
262 }
263
264
265=== modified file 'src/scope-harness/results/category.cpp'
266--- src/scope-harness/results/category.cpp 2015-03-10 11:23:01 +0000
267+++ src/scope-harness/results/category.cpp 2015-07-29 13:31:53 +0000
268@@ -58,7 +58,7 @@
269 Category::Category(Category&& other) :
270 p(new _Priv)
271 {
272- *this = move(other);
273+ *this = std::move(other);
274 }
275
276 Category::Category(const Category& other) :
277@@ -77,7 +77,7 @@
278
279 Category& Category::operator=(Category&& other)
280 {
281- p = move(other.p);
282+ p = std::move(other.p);
283 return *this;
284 }
285
286
287=== modified file 'src/scope-harness/results/child-department.cpp'
288--- src/scope-harness/results/child-department.cpp 2015-03-10 11:23:01 +0000
289+++ src/scope-harness/results/child-department.cpp 2015-07-29 13:31:53 +0000
290@@ -62,7 +62,7 @@
291
292 ChildDepartment::ChildDepartment(ChildDepartment&& other)
293 {
294- *this = move(other);
295+ *this = std::move(other);
296 }
297
298 ChildDepartment& ChildDepartment::operator=(const ChildDepartment& other)
299@@ -74,7 +74,7 @@
300
301 ChildDepartment& ChildDepartment::operator=(ChildDepartment&& other)
302 {
303- p = move(other.p);
304+ p = std::move(other.p);
305 return *this;
306 }
307
308
309=== modified file 'src/scope-harness/results/department.cpp'
310--- src/scope-harness/results/department.cpp 2015-03-10 11:23:01 +0000
311+++ src/scope-harness/results/department.cpp 2015-07-29 13:31:53 +0000
312@@ -70,7 +70,7 @@
313
314 Department::Department(Department&& other)
315 {
316- *this = move(other);
317+ *this = std::move(other);
318 }
319
320 Department& Department::operator=(const Department& other)
321@@ -82,7 +82,7 @@
322
323 Department& Department::operator=(Department&& other)
324 {
325- p = move(other.p);
326+ p = std::move(other.p);
327 return *this;
328 }
329
330
331=== modified file 'src/scope-harness/results/result.cpp'
332--- src/scope-harness/results/result.cpp 2015-03-10 11:23:01 +0000
333+++ src/scope-harness/results/result.cpp 2015-07-29 13:31:53 +0000
334@@ -237,7 +237,7 @@
335
336 Result::Result(Result&& other)
337 {
338- *this = move(other);
339+ *this = std::move(other);
340 }
341
342 Result::Result(const Result& other) :
343@@ -264,7 +264,7 @@
344
345 Result& Result::operator=(Result&& other)
346 {
347- p = move(other.p);
348+ p = std::move(other.p);
349 return *this;
350 }
351

Subscribers

People subscribed via source and target branches

to all changes: