Thumbnailer

Merge lp:~michihenning/thumbnailer/gcc-5-fixes into lp:thumbnailer/devel

  1. gcc-5-fixes
  2. Merge into devel
Proposed by Michi Henning on 2015-07-22
Status: Merged
Approved by: James Henstridge on 2015-07-22
Approved revision: 242
Merged at revision: 242
Proposed branch: lp:~michihenning/thumbnailer/gcc-5-fixes
Merge into: lp:thumbnailer/devel
Diff against target: 372 lines (+80/-80)
3 files modified
tests/core/internal/persistent_string_cache_impl/persistent_string_cache_impl_test.cpp (+3/-3)
tests/core/persistent_cache/persistent_cache_test.cpp (+72/-72)
tests/core/persistent_string_cache/persistent_string_cache_test.cpp (+5/-5)
To merge this branch: bzr merge lp:~michihenning/thumbnailer/gcc-5-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-07-22
James Henstridge 2015-07-22 Approve on 2015-07-22
Review via email: mp+265472@code.launchpad.net

Commit Message

Fixes for the transition to gcc 5. A few tests no longer compiled with boost 1.58. The changes work with both gcc-4.9/boost-1.55 and gcc-5.0/boost-58.

Description of the Change

Fixes for the transition to gcc 5. A few tests no longer compiled with boost 1.58. The changes work with both gcc-4.9/boost-1.55 and gcc-5.0/boost-58.

To post a comment you must log in.
James Henstridge (jamesh) wrote :

Looks good.

review: Approve
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/core/internal/persistent_string_cache_impl/persistent_string_cache_impl_test.cpp'
2--- tests/core/internal/persistent_string_cache_impl/persistent_string_cache_impl_test.cpp 2015-06-23 02:49:14 +0000
3+++ tests/core/internal/persistent_string_cache_impl/persistent_string_cache_impl_test.cpp 2015-07-22 03:05:04 +0000
4@@ -464,7 +464,7 @@
5 EXPECT_EQ(0, s.hits());
6
7 throw_std_exception_called = false;
8- EXPECT_TRUE(c->get_or_put("1", throw_std_exception));
9+ EXPECT_TRUE(bool(c->get_or_put("1", throw_std_exception)));
10 EXPECT_FALSE(throw_std_exception_called); // Entry exists, loader must not have run.
11
12 s = c->stats();
13@@ -516,7 +516,7 @@
14 load_entry_called = false;
15 auto v = c->get_or_put("1", load_entry);
16 EXPECT_TRUE(load_entry_called);
17- EXPECT_TRUE(v);
18+ EXPECT_TRUE(bool(v));
19 EXPECT_EQ("load_entry", *v);
20 EXPECT_EQ(0, s.hits());
21 EXPECT_EQ(1, s.misses());
22@@ -527,7 +527,7 @@
23 load_with_metadata_called = false;
24 auto data = c->get_or_put_data("1", load_with_metadata);
25 EXPECT_TRUE(load_with_metadata_called);
26- EXPECT_TRUE(data);
27+ EXPECT_TRUE(bool(data));
28 EXPECT_EQ("value", data->value);
29 EXPECT_EQ("metadata", data->metadata);
30 EXPECT_EQ(0, s.hits());
31
32=== modified file 'tests/core/persistent_cache/persistent_cache_test.cpp'
33--- tests/core/persistent_cache/persistent_cache_test.cpp 2015-06-19 08:11:48 +0000
34+++ tests/core/persistent_cache/persistent_cache_test.cpp 2015-07-22 03:05:04 +0000
35@@ -196,13 +196,13 @@
36
37 EXPECT_TRUE(c->put(1, 2.0));
38 data = c->take_data(1);
39- EXPECT_TRUE(data);
40+ EXPECT_TRUE(bool(data));
41 EXPECT_EQ(2.0, data->value);
42 EXPECT_EQ('\0', data->metadata);
43
44 EXPECT_TRUE(c->put(2, 3, '4'));
45 data = c->take_data(2);
46- EXPECT_TRUE(data);
47+ EXPECT_TRUE(bool(data));
48 EXPECT_EQ(3, data->value);
49 EXPECT_EQ('4', data->metadata);
50
51@@ -286,13 +286,13 @@
52 };
53
54 loader_called = false;
55- EXPECT_TRUE(c->get_or_put(3, loader));
56-
57- loader_called = false;
58- EXPECT_TRUE(c->get_or_put_data(4, loader));
59-
60- loader_called = false;
61- EXPECT_FALSE(c->get_or_put_data(99, loader));
62+ EXPECT_TRUE(bool(c->get_or_put(3, loader)));
63+
64+ loader_called = false;
65+ EXPECT_TRUE(bool(c->get_or_put_data(4, loader)));
66+
67+ loader_called = false;
68+ EXPECT_FALSE(bool(c->get_or_put_data(99, loader)));
69 }
70 }
71
72@@ -362,13 +362,13 @@
73
74 EXPECT_TRUE(c->put("1", 2.0));
75 data = c->take_data("1");
76- EXPECT_TRUE(data);
77+ EXPECT_TRUE(bool(data));
78 EXPECT_EQ(2.0, data->value);
79 EXPECT_EQ('\0', data->metadata);
80
81 EXPECT_TRUE(c->put("2", 3, '4'));
82 data = c->take_data("2");
83- EXPECT_TRUE(data);
84+ EXPECT_TRUE(bool(data));
85 EXPECT_EQ(3, data->value);
86 EXPECT_EQ('4', data->metadata);
87
88@@ -434,13 +434,13 @@
89 };
90
91 loader_called = false;
92- EXPECT_TRUE(c->get_or_put("3", loader));
93-
94- loader_called = false;
95- EXPECT_TRUE(c->get_or_put_data("4", loader));
96-
97- loader_called = false;
98- EXPECT_FALSE(c->get_or_put_data("99", loader));
99+ EXPECT_TRUE(bool(c->get_or_put("3", loader)));
100+
101+ loader_called = false;
102+ EXPECT_TRUE(bool(c->get_or_put_data("4", loader)));
103+
104+ loader_called = false;
105+ EXPECT_FALSE(bool(c->get_or_put_data("99", loader)));
106 }
107 }
108
109@@ -507,13 +507,13 @@
110
111 EXPECT_TRUE(c->put(1, "2.0"));
112 data = c->take_data(1);
113- EXPECT_TRUE(data);
114+ EXPECT_TRUE(bool(data));
115 EXPECT_EQ("2.0", data->value);
116 EXPECT_EQ('\0', data->metadata);
117
118 EXPECT_TRUE(c->put(2, string("3"), '4'));
119 data = c->take_data(2);
120- EXPECT_TRUE(data);
121+ EXPECT_TRUE(bool(data));
122 EXPECT_EQ("3", data->value);
123 EXPECT_EQ('4', data->metadata);
124
125@@ -579,13 +579,13 @@
126 };
127
128 loader_called = false;
129- EXPECT_TRUE(c->get_or_put(3, loader));
130-
131- loader_called = false;
132- EXPECT_TRUE(c->get_or_put_data(4, loader));
133-
134- loader_called = false;
135- EXPECT_FALSE(c->get_or_put_data(99, loader));
136+ EXPECT_TRUE(bool(c->get_or_put(3, loader)));
137+
138+ loader_called = false;
139+ EXPECT_TRUE(bool(c->get_or_put_data(4, loader)));
140+
141+ loader_called = false;
142+ EXPECT_FALSE(bool(c->get_or_put_data(99, loader)));
143
144 // Extra put() overloads
145 c->invalidate();
146@@ -666,13 +666,13 @@
147
148 EXPECT_TRUE(c->put(1, 2.0));
149 data = c->take_data(1);
150- EXPECT_TRUE(data);
151+ EXPECT_TRUE(bool(data));
152 EXPECT_EQ(2.0, data->value);
153 EXPECT_EQ("\0", data->metadata);
154
155 EXPECT_TRUE(c->put(2, 3, "4"));
156 data = c->take_data(2);
157- EXPECT_TRUE(data);
158+ EXPECT_TRUE(bool(data));
159 EXPECT_EQ(3, data->value);
160 EXPECT_EQ("4", data->metadata);
161
162@@ -737,13 +737,13 @@
163 };
164
165 loader_called = false;
166- EXPECT_TRUE(c->get_or_put(3, loader));
167-
168- loader_called = false;
169- EXPECT_TRUE(c->get_or_put_data(4, loader));
170-
171- loader_called = false;
172- EXPECT_FALSE(c->get_or_put_data(99, loader));
173+ EXPECT_TRUE(bool(c->get_or_put(3, loader)));
174+
175+ loader_called = false;
176+ EXPECT_TRUE(bool(c->get_or_put_data(4, loader)));
177+
178+ loader_called = false;
179+ EXPECT_FALSE(bool(c->get_or_put_data(99, loader)));
180
181 // Extra put() overload
182 c->invalidate();
183@@ -825,13 +825,13 @@
184
185 EXPECT_TRUE(c->put("1", "2.0"));
186 data = c->take_data("1");
187- EXPECT_TRUE(data);
188+ EXPECT_TRUE(bool(data));
189 EXPECT_EQ("2.0", data->value);
190 EXPECT_EQ('\0', data->metadata);
191
192 EXPECT_TRUE(c->put("2", string("3"), '4'));
193 data = c->take_data("2");
194- EXPECT_TRUE(data);
195+ EXPECT_TRUE(bool(data));
196 EXPECT_EQ("3", data->value);
197 EXPECT_EQ('4', data->metadata);
198
199@@ -897,13 +897,13 @@
200 };
201
202 loader_called = false;
203- EXPECT_TRUE(c->get_or_put("3", loader));
204-
205- loader_called = false;
206- EXPECT_TRUE(c->get_or_put_data("4", loader));
207-
208- loader_called = false;
209- EXPECT_FALSE(c->get_or_put_data("99", loader));
210+ EXPECT_TRUE(bool(c->get_or_put("3", loader)));
211+
212+ loader_called = false;
213+ EXPECT_TRUE(bool(c->get_or_put_data("4", loader)));
214+
215+ loader_called = false;
216+ EXPECT_FALSE(bool(c->get_or_put_data("99", loader)));
217
218 // Extra put() overloads
219 c->invalidate();
220@@ -984,13 +984,13 @@
221
222 EXPECT_TRUE(c->put("1", 2.0));
223 data = c->take_data("1");
224- EXPECT_TRUE(data);
225+ EXPECT_TRUE(bool(data));
226 EXPECT_EQ(2.0, data->value);
227 EXPECT_EQ("", data->metadata);
228
229 EXPECT_TRUE(c->put("2", 3, "4"));
230 data = c->take_data("2");
231- EXPECT_TRUE(data);
232+ EXPECT_TRUE(bool(data));
233 EXPECT_EQ(3, data->value);
234 EXPECT_EQ("4", data->metadata);
235
236@@ -1056,13 +1056,13 @@
237 };
238
239 loader_called = false;
240- EXPECT_TRUE(c->get_or_put("3", loader));
241-
242- loader_called = false;
243- EXPECT_TRUE(c->get_or_put_data("4", loader));
244-
245- loader_called = false;
246- EXPECT_FALSE(c->get_or_put_data("99", loader));
247+ EXPECT_TRUE(bool(c->get_or_put("3", loader)));
248+
249+ loader_called = false;
250+ EXPECT_TRUE(bool(c->get_or_put_data("4", loader)));
251+
252+ loader_called = false;
253+ EXPECT_FALSE(bool(c->get_or_put_data("99", loader)));
254
255 // Extra put() overload
256 c->invalidate();
257@@ -1143,13 +1143,13 @@
258
259 EXPECT_TRUE(c->put(1, "2.0"));
260 data = c->take_data(1);
261- EXPECT_TRUE(data);
262+ EXPECT_TRUE(bool(data));
263 EXPECT_EQ("2.0", data->value);
264 EXPECT_EQ("\0", data->metadata);
265
266 EXPECT_TRUE(c->put(2, string("3"), "4"));
267 data = c->take_data(2);
268- EXPECT_TRUE(data);
269+ EXPECT_TRUE(bool(data));
270 EXPECT_EQ("3", data->value);
271 EXPECT_EQ("4", data->metadata);
272
273@@ -1215,13 +1215,13 @@
274 };
275
276 loader_called = false;
277- EXPECT_TRUE(c->get_or_put(3, loader));
278-
279- loader_called = false;
280- EXPECT_TRUE(c->get_or_put_data(4, loader));
281-
282- loader_called = false;
283- EXPECT_FALSE(c->get_or_put_data(99, loader));
284+ EXPECT_TRUE(bool(c->get_or_put(3, loader)));
285+
286+ loader_called = false;
287+ EXPECT_TRUE(bool(c->get_or_put_data(4, loader)));
288+
289+ loader_called = false;
290+ EXPECT_FALSE(bool(c->get_or_put_data(99, loader)));
291
292 // Extra put() overloads
293 c->invalidate();
294@@ -1309,13 +1309,13 @@
295
296 EXPECT_TRUE(c->put("1", "2.0"));
297 data = c->take_data("1");
298- EXPECT_TRUE(data);
299+ EXPECT_TRUE(bool(data));
300 EXPECT_EQ("2.0", data->value);
301 EXPECT_EQ("", data->metadata);
302
303 EXPECT_TRUE(c->put("2", string("3"), "4"));
304 data = c->take_data("2");
305- EXPECT_TRUE(data);
306+ EXPECT_TRUE(bool(data));
307 EXPECT_EQ("3", data->value);
308 EXPECT_EQ("4", data->metadata);
309
310@@ -1381,13 +1381,13 @@
311 };
312
313 loader_called = false;
314- EXPECT_TRUE(c->get_or_put("3", loader));
315-
316- loader_called = false;
317- EXPECT_TRUE(c->get_or_put_data("4", loader));
318-
319- loader_called = false;
320- EXPECT_FALSE(c->get_or_put_data("99", loader));
321+ EXPECT_TRUE(bool(c->get_or_put("3", loader)));
322+
323+ loader_called = false;
324+ EXPECT_TRUE(bool(c->get_or_put_data("4", loader)));
325+
326+ loader_called = false;
327+ EXPECT_FALSE(bool(c->get_or_put_data("99", loader)));
328
329 // Extra put() overloads
330 c->invalidate();
331
332=== modified file 'tests/core/persistent_string_cache/persistent_string_cache_test.cpp'
333--- tests/core/persistent_string_cache/persistent_string_cache_test.cpp 2015-06-19 08:11:48 +0000
334+++ tests/core/persistent_string_cache/persistent_string_cache_test.cpp 2015-07-22 03:05:04 +0000
335@@ -92,7 +92,7 @@
336 EXPECT_TRUE(c->put_metadata("x", "z"));
337 EXPECT_TRUE(c->put_metadata("x", "z", 1));
338 data = c->take_data("x");
339- EXPECT_TRUE(data);
340+ EXPECT_TRUE(bool(data));
341 EXPECT_EQ("y", data->value);
342 EXPECT_EQ("z", data->metadata);
343 PersistentStringCache::Data data2;
344@@ -178,7 +178,7 @@
345 auto now = chrono::system_clock::now();
346 c->put("x", "y");
347 EXPECT_FALSE(c->get("y"));
348- EXPECT_TRUE(c->get("x"));
349+ EXPECT_TRUE(bool(c->get("x")));
350
351 s = c->stats();
352 EXPECT_EQ(test_db, s.cache_path()); // Must not have changed.
353@@ -210,8 +210,8 @@
354
355 // Two more hits.
356 now = chrono::system_clock::now();
357- EXPECT_TRUE(c->get("x"));
358- EXPECT_TRUE(c->get("x"));
359+ EXPECT_TRUE(bool(c->get("x")));
360+ EXPECT_TRUE(bool(c->get("x")));
361
362 s = c->stats();
363 EXPECT_EQ(3, s.hits());
364@@ -260,7 +260,7 @@
365
366 // One more hit
367 now = chrono::system_clock::now();
368- EXPECT_TRUE(c->get("x"));
369+ EXPECT_TRUE(bool(c->get("x")));
370
371 s = c->stats();
372 EXPECT_EQ(4, s.hits());

Subscribers

People subscribed via source and target branches

to all changes: