Skip to content

Commit ce5f012

Browse files
jotojoto
committed
Various small fixes for problems found by clang-tidy
Biggest problem here are the warnings for access of objects after std::move() in the SECTIONs in the tests. Those are not valid, because for each test only one section is ever run, but it was easiest to silence the warning this way.
1 parent a910b86 commit ce5f012

File tree

4 files changed

+97
-36
lines changed

4 files changed

+97
-36
lines changed

‎src/output-flex.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ int output_flex_t::app_define_table()
681681
setup_indexes(&new_table);
682682

683683
void *ptr = lua_newuserdata(lua_state(), sizeof(std::size_t));
684-
std::size_t *num = new (ptr) std::size_t{};
684+
auto *num = new (ptr) std::size_t{};
685685
*num = m_tables->size() - 1;
686686
luaL_getmetatable(lua_state(), osm2pgsql_table_name);
687687
lua_setmetatable(lua_state(), -2);

‎tests/test-expire-from-geometry.cpp‎

Lines changed: 93 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,22 @@ TEST_CASE("expire linestring away from tile boundary", "[NoDB]")
103103
{
104104
expire_tiles et{zoom, 20000, defproj};
105105

106-
geom::linestring_t line{{5000.0, 4000.0}, {5100.0, 4200.0}};
107-
108-
SECTION("line") { et.from_geometry(line); }
106+
SECTION("line")
107+
{
108+
geom::linestring_t line{{5000.0, 4000.0}, {5100.0, 4200.0}};
109+
et.from_geometry(line);
110+
}
109111

110112
SECTION("geom")
111113
{
114+
geom::linestring_t line{{5000.0, 4000.0}, {5100.0, 4200.0}};
112115
geom::geometry_t geom{std::move(line)};
113116
et.from_geometry(geom);
114117
}
115118

116119
SECTION("geom with check")
117120
{
121+
geom::linestring_t line{{5000.0, 4000.0}, {5100.0, 4200.0}};
118122
geom::geometry_t geom{std::move(line)};
119123
geom.set_srid(3857);
120124
et.from_geometry_if_3857(geom);
@@ -129,18 +133,22 @@ TEST_CASE("expire linestring crossing tile boundary", "[NoDB]")
129133
{
130134
expire_tiles et{zoom, 20000, defproj};
131135

132-
geom::linestring_t line{{5000.0, 5000.0}, {5000.0, 15000.0}};
133-
134-
SECTION("line") { et.from_geometry(line); }
136+
SECTION("line")
137+
{
138+
geom::linestring_t line{{5000.0, 5000.0}, {5000.0, 15000.0}};
139+
et.from_geometry(line);
140+
}
135141

136142
SECTION("geom")
137143
{
144+
geom::linestring_t line{{5000.0, 5000.0}, {5000.0, 15000.0}};
138145
geom::geometry_t geom{std::move(line)};
139146
et.from_geometry(geom);
140147
}
141148

142149
SECTION("geom with check")
143150
{
151+
geom::linestring_t line{{5000.0, 5000.0}, {5000.0, 15000.0}};
144152
geom::geometry_t geom{std::move(line)};
145153
geom.set_srid(3857);
146154
et.from_geometry_if_3857(geom);
@@ -156,22 +164,34 @@ TEST_CASE("expire small polygon", "[NoDB]")
156164
{
157165
expire_tiles et{zoom, 20000, defproj};
158166

159-
geom::polygon_t poly{{{5000.0, 5000.0},
160-
{5100.0, 5000.0},
161-
{5100.0, 5100.0},
162-
{5000.0, 5100.0},
163-
{5000.0, 5000.0}}};
164-
165-
SECTION("polygon") { et.from_geometry(poly); }
167+
SECTION("polygon")
168+
{
169+
geom::polygon_t poly{{{5000.0, 5000.0},
170+
{5100.0, 5000.0},
171+
{5100.0, 5100.0},
172+
{5000.0, 5100.0},
173+
{5000.0, 5000.0}}};
174+
et.from_geometry(poly);
175+
}
166176

167177
SECTION("geom")
168178
{
179+
geom::polygon_t poly{{{5000.0, 5000.0},
180+
{5100.0, 5000.0},
181+
{5100.0, 5100.0},
182+
{5000.0, 5100.0},
183+
{5000.0, 5000.0}}};
169184
geom::geometry_t geom{std::move(poly)};
170185
et.from_geometry(geom);
171186
}
172187

173188
SECTION("geom with check")
174189
{
190+
geom::polygon_t poly{{{5000.0, 5000.0},
191+
{5100.0, 5000.0},
192+
{5100.0, 5100.0},
193+
{5000.0, 5100.0},
194+
{5000.0, 5000.0}}};
175195
geom::geometry_t geom{std::move(poly)};
176196
geom.set_srid(3857);
177197
et.from_geometry_if_3857(geom);
@@ -186,22 +206,34 @@ TEST_CASE("expire large polygon as bbox", "[NoDB]")
186206
{
187207
expire_tiles et{zoom, 40000, defproj};
188208

189-
geom::polygon_t poly{{{5000.0, 5000.0},
190-
{25000.0, 5000.0},
191-
{25000.0, 25000.0},
192-
{5000.0, 25000.0},
193-
{5000.0, 5000.0}}};
194-
195-
SECTION("polygon") { et.from_geometry(poly); }
209+
SECTION("polygon")
210+
{
211+
geom::polygon_t poly{{{5000.0, 5000.0},
212+
{25000.0, 5000.0},
213+
{25000.0, 25000.0},
214+
{5000.0, 25000.0},
215+
{5000.0, 5000.0}}};
216+
et.from_geometry(poly);
217+
}
196218

197219
SECTION("geom")
198220
{
221+
geom::polygon_t poly{{{5000.0, 5000.0},
222+
{25000.0, 5000.0},
223+
{25000.0, 25000.0},
224+
{5000.0, 25000.0},
225+
{5000.0, 5000.0}}};
199226
geom::geometry_t geom{std::move(poly)};
200227
et.from_geometry(geom);
201228
}
202229

203230
SECTION("geom with check")
204231
{
232+
geom::polygon_t poly{{{5000.0, 5000.0},
233+
{25000.0, 5000.0},
234+
{25000.0, 25000.0},
235+
{5000.0, 25000.0},
236+
{5000.0, 5000.0}}};
205237
geom::geometry_t geom{std::move(poly)};
206238
geom.set_srid(3857);
207239
et.from_geometry_if_3857(geom);
@@ -226,24 +258,44 @@ TEST_CASE("expire large polygon as boundary", "[NoDB]")
226258
{
227259
expire_tiles et{zoom, 10000, defproj};
228260

229-
geom::polygon_t poly{{{5000.0, 5000.0},
230-
{25000.0, 5000.0},
231-
{25000.0, 25000.0},
232-
{5000.0, 25000.0},
233-
{5000.0, 5000.0}}};
234-
235-
SECTION("polygon") { et.from_geometry(poly); }
261+
SECTION("polygon")
262+
{
263+
geom::polygon_t poly{{{5000.0, 5000.0},
264+
{25000.0, 5000.0},
265+
{25000.0, 25000.0},
266+
{5000.0, 25000.0},
267+
{5000.0, 5000.0}}};
268+
et.from_geometry(poly);
269+
}
236270

237-
SECTION("polygon boundary") { et.from_polygon_boundary(poly); }
271+
SECTION("polygon boundary")
272+
{
273+
geom::polygon_t poly{{{5000.0, 5000.0},
274+
{25000.0, 5000.0},
275+
{25000.0, 25000.0},
276+
{5000.0, 25000.0},
277+
{5000.0, 5000.0}}};
278+
et.from_polygon_boundary(poly);
279+
}
238280

239281
SECTION("geom")
240282
{
283+
geom::polygon_t poly{{{5000.0, 5000.0},
284+
{25000.0, 5000.0},
285+
{25000.0, 25000.0},
286+
{5000.0, 25000.0},
287+
{5000.0, 5000.0}}};
241288
geom::geometry_t geom{std::move(poly)};
242289
et.from_geometry(geom);
243290
}
244291

245292
SECTION("geom with check")
246293
{
294+
geom::polygon_t poly{{{5000.0, 5000.0},
295+
{25000.0, 5000.0},
296+
{25000.0, 25000.0},
297+
{5000.0, 25000.0},
298+
{5000.0, 5000.0}}};
247299
geom::geometry_t geom{std::move(poly)};
248300
geom.set_srid(3857);
249301
et.from_geometry_if_3857(geom);
@@ -269,20 +321,29 @@ TEST_CASE("expire multipoint geometry", "[NoDB]")
269321

270322
geom::point_t p1{0.0, 0.0};
271323
geom::point_t p2{15000.0, 15000.0};
272-
geom::multipoint_t mpt;
273-
mpt.add_geometry(std::move(p1));
274-
mpt.add_geometry(std::move(p2));
275324

276-
SECTION("multipoint") { et.from_geometry(mpt); }
325+
SECTION("multipoint")
326+
{
327+
geom::multipoint_t mpt;
328+
mpt.add_geometry(std::move(p1));
329+
mpt.add_geometry(std::move(p2));
330+
et.from_geometry(mpt);
331+
}
277332

278333
SECTION("geom")
279334
{
335+
geom::multipoint_t mpt;
336+
mpt.add_geometry(std::move(p1));
337+
mpt.add_geometry(std::move(p2));
280338
geom::geometry_t geom{std::move(mpt)};
281339
et.from_geometry(geom);
282340
}
283341

284342
SECTION("geom with check")
285343
{
344+
geom::multipoint_t mpt;
345+
mpt.add_geometry(std::move(p1));
346+
mpt.add_geometry(std::move(p2));
286347
geom::geometry_t geom{std::move(mpt)};
287348
geom.set_srid(3857);
288349
et.from_geometry_if_3857(geom);

‎tests/test-flex-indexes.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class test_framework
3434

3535
lua_State *lua_state() const noexcept { return m_lua_state.get(); }
3636

37-
bool run_lua(char const *code)
37+
bool run_lua(char const *code) const
3838
{
3939
return luaL_dostring(lua_state(), code) == 0;
4040
}
@@ -168,7 +168,7 @@ TEST_CASE("check index with expression and where clause", "[NoDB]")
168168
REQUIRE(table.indexes().size() == 1);
169169
auto const &idx = table.indexes()[0];
170170
REQUIRE(idx.method() == "btree");
171-
REQUIRE(idx.columns() == "");
171+
REQUIRE(idx.columns().empty());
172172
REQUIRE_FALSE(idx.is_unique());
173173
REQUIRE(idx.tablespace().empty());
174174
REQUIRE(idx.expression() == "lower(col)");

‎tests/test-parse-osmium.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ struct counting_output_t : public output_null_t
123123
void relation_delete(osmid_t) override { ++relation.deleted; }
124124

125125
type_stats_t node, way, relation;
126-
long long sum_ids = 0;
126+
uint64_t sum_ids = 0;
127127
std::size_t sum_nds = 0;
128128
std::size_t sum_members = 0;
129129
};

0 commit comments

Comments
 (0)