Skip to content

Commit b6fed6b

Browse files
jotojoto
committed
Avoid bugprone-implicit-widening-of-multiplication-result warning
(from clang-tidy)
1 parent 8cad37c commit b6fed6b

14 files changed

Lines changed: 59 additions & 51 deletions

‎benchmarks/osmium_benchmark_static_vs_dynamic_index.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ int main(int argc, char* argv[]) {
5151

5252
const auto& map_factory = osmium::index::MapFactory<osmium::unsigned_object_id_type, osmium::Location>::instance();
5353

54-
const auto buffer_size = buffer.committed() / (1024 * 1024); // buffer size in MBytes
54+
const auto buffer_size = buffer.committed() / (1024UL * 1024UL); // buffer size in MBytes
5555
const int runs = std::max(10, static_cast<int>(5000ULL / buffer_size));
5656

5757
std::cout << "input: filename=" << input_filename << " buffer_size=" << buffer_size << "MBytes\n";

‎include/osmium/io/detail/o5m_input_format.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ namespace osmium {
9898

9999
// The following settings are from the o5m description:
100100

101-
enum {
101+
enum : uint64_t {
102102
// The maximum number of entries in this table.
103-
number_of_entries = 15000U,
103+
number_of_entries = 15000UL,
104104

105105
// The size of one entry in the table.
106-
entry_size = 256U
106+
entry_size = 256UL
107107
};
108108

109109
// The maximum length of a string in the table including

‎include/osmium/io/detail/pbf.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ namespace osmium {
6565
const int max_blob_header_size = 64 * 1024; // 64 kB
6666

6767
// the maximum size of an uncompressed blob in bytes
68-
const uint64_t max_uncompressed_blob_size = 32 * 1024 * 1024; // 32 MB
68+
const uint64_t max_uncompressed_blob_size = 32UL * 1024UL * 1024UL; // 32 MB
6969

7070
// resolution for longitude/latitude used for conversion
7171
// between representation as double and as int
72-
const int64_t lonlat_resolution = 1000 * 1000 * 1000;
72+
const int64_t lonlat_resolution = 1000L * 1000L * 1000L;
7373

7474
const int64_t resolution_convert = lonlat_resolution / osmium::detail::coordinate_precision;
7575

‎include/osmium/io/reader.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ namespace osmium {
540540
*/
541541
template <typename... TArgs>
542542
osmium::memory::Buffer read_file(TArgs&&... args) {
543-
osmium::memory::Buffer buffer{1024 * 1024, osmium::memory::Buffer::auto_grow::yes};
543+
osmium::memory::Buffer buffer{1024UL * 1024UL, osmium::memory::Buffer::auto_grow::yes};
544544

545545
Reader reader{std::forward<TArgs>(args)...};
546546
while (auto read_buffer = reader.read()) {

‎include/osmium/storage/item_stash.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,16 +181,16 @@ namespace osmium {
181181
// buffer grow (*3). The checks (*1) and (*2) make sure there is
182182
// minimum and maximum for the number of removed objects.
183183
bool should_gc() const noexcept {
184-
if (m_count_removed < 10 * 1000) { // *1
184+
if (m_count_removed < 10UL * 1000UL) { // *1
185185
return false;
186186
}
187-
if (m_count_removed > 5 * 1000 * 1000) { // *2
187+
if (m_count_removed > 5UL * 1000UL * 1000UL) { // *2
188188
return true;
189189
}
190-
if (m_count_removed * 5 < m_count_items) { // *3
190+
if (m_count_removed * 5UL < m_count_items) { // *3
191191
return false;
192192
}
193-
return m_buffer.capacity() - m_buffer.committed() < 10 * 1024; // *4
193+
return m_buffer.capacity() - m_buffer.committed() < 10UL * 1024UL; // *4
194194
}
195195

196196
public:

‎test/t/builder/test_attr.cpp‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515

1616
using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
1717

18+
constexpr const std::size_t test_buffer_size = 1024UL * 10UL;
19+
1820
TEST_CASE("create node using builders: add node with only id") {
19-
osmium::memory::Buffer buffer{1024 * 10};
21+
osmium::memory::Buffer buffer{test_buffer_size};
2022

2123
const auto pos = osmium::builder::add_node(buffer, _id(22));
2224

@@ -33,7 +35,7 @@ TEST_CASE("create node using builders: add node with only id") {
3335
}
3436

3537
TEST_CASE("create node using builders: add node with complete info but no tags") {
36-
osmium::memory::Buffer buffer{1024 * 10};
38+
osmium::memory::Buffer buffer{test_buffer_size};
3739

3840
const osmium::Location loc{3.14, 1.59};
3941
const auto pos = osmium::builder::add_node(buffer,
@@ -60,7 +62,7 @@ TEST_CASE("create node using builders: add node with complete info but no tags")
6062
}
6163

6264
TEST_CASE("create node using builders: visible/deleted flag") {
63-
osmium::memory::Buffer buffer{1024 * 10};
65+
osmium::memory::Buffer buffer{test_buffer_size};
6466

6567
osmium::builder::add_node(buffer, _id(1), _deleted());
6668
osmium::builder::add_node(buffer, _id(2), _deleted(true));
@@ -80,7 +82,7 @@ TEST_CASE("create node using builders: visible/deleted flag") {
8082
}
8183

8284
TEST_CASE("create node using builders: order of attributes doesn't matter") {
83-
osmium::memory::Buffer buffer{1024 * 10};
85+
osmium::memory::Buffer buffer{test_buffer_size};
8486

8587
const osmium::Location loc{3.14, 1.59};
8688
const auto pos = osmium::builder::add_node(buffer,
@@ -106,7 +108,7 @@ TEST_CASE("create node using builders: order of attributes doesn't matter") {
106108
}
107109

108110
TEST_CASE("create node with tags using builders: add tags using _tag") {
109-
osmium::memory::Buffer buffer{1024 * 10};
111+
osmium::memory::Buffer buffer{test_buffer_size};
110112

111113
std::pair<const char*, const char*> t1 = {"name", "Node Inn"};
112114
std::pair<std::string, std::string> t2 = {"phone", "+1-123-555-4567"};
@@ -142,7 +144,7 @@ TEST_CASE("create node with tags using builders: add tags using _tag") {
142144
}
143145

144146
TEST_CASE("create node with tags using builders: add tags using _tag with equal sign in single cstring") {
145-
osmium::memory::Buffer buffer{1024 * 10};
147+
osmium::memory::Buffer buffer{test_buffer_size};
146148

147149
const auto pos = osmium::builder::add_node(buffer,
148150
_id(2),
@@ -175,7 +177,7 @@ TEST_CASE("create node with tags using builders: add tags using _tag with equal
175177
}
176178

177179
TEST_CASE("create node with tags using builders: add tags using _tags from initializer list") {
178-
osmium::memory::Buffer buffer{1024 * 10};
180+
osmium::memory::Buffer buffer{test_buffer_size};
179181

180182
const auto pos = osmium::builder::add_node(buffer,
181183
_id(3),
@@ -196,7 +198,7 @@ TEST_CASE("create node with tags using builders: add tags using _tags from initi
196198
}
197199

198200
TEST_CASE("create node with tags using builders: add tags using _tags from TagList") {
199-
osmium::memory::Buffer buffer{1024 * 10};
201+
osmium::memory::Buffer buffer{test_buffer_size};
200202

201203
const auto pos1 = osmium::builder::add_node(buffer,
202204
_id(3),
@@ -226,7 +228,7 @@ TEST_CASE("create node with tags using builders: add tags using _tags from TagLi
226228
}
227229

228230
TEST_CASE("create node with tags using builders: add tags using mixed tag sources") {
229-
osmium::memory::Buffer buffer{1024 * 10};
231+
osmium::memory::Buffer buffer{test_buffer_size};
230232

231233
const std::vector<pair_of_cstrings> tags = {
232234
{"t5", "t5"},
@@ -264,7 +266,7 @@ TEST_CASE("create node with tags using builders: add tags using mixed tag source
264266
}
265267

266268
TEST_CASE("create node with tags using builders: add tags using _t with string") {
267-
osmium::memory::Buffer buffer{1024 * 10};
269+
osmium::memory::Buffer buffer{test_buffer_size};
268270

269271
const auto pos = osmium::builder::add_node(buffer,
270272
_id(5),
@@ -294,7 +296,7 @@ TEST_CASE("create node with tags using builders: add tags using _t with string")
294296
}
295297

296298
TEST_CASE("create way using builders") {
297-
osmium::memory::Buffer buffer{1024 * 10};
299+
osmium::memory::Buffer buffer{test_buffer_size};
298300

299301
SECTION("add way without nodes") {
300302
const auto pos = osmium::builder::add_way(buffer,
@@ -327,15 +329,15 @@ TEST_CASE("create way with nodes") {
327329
{ 8, osmium::Location{8.8, 0.8} }
328330
};
329331

330-
osmium::memory::Buffer wbuffer{1024 * 10};
332+
osmium::memory::Buffer wbuffer{test_buffer_size};
331333
osmium::builder::add_way(wbuffer,
332334
_id(1),
333335
_nodes({1, 2, 4, 8})
334336
);
335337

336338
const osmium::NodeRefList& nodes = wbuffer.get<osmium::Way>(0).nodes();
337339

338-
osmium::memory::Buffer buffer{1024 * 10};
340+
osmium::memory::Buffer buffer{test_buffer_size};
339341

340342
SECTION("add nodes using an OSM object id or NodeRef") {
341343
osmium::builder::add_way(buffer,
@@ -445,7 +447,7 @@ TEST_CASE("create way with nodes") {
445447
}
446448

447449
TEST_CASE("create relation using builders: create relation") {
448-
osmium::memory::Buffer buffer{1024 * 10};
450+
osmium::memory::Buffer buffer{test_buffer_size};
449451

450452
osmium::builder::attr::member_type m{osmium::item_type::way, 113, "inner"};
451453

@@ -495,7 +497,7 @@ TEST_CASE("create relation using builders: create relation") {
495497
}
496498

497499
TEST_CASE("create relation using builders: create relation member from existing relation member") {
498-
osmium::memory::Buffer buffer{1024 * 10};
500+
osmium::memory::Buffer buffer{test_buffer_size};
499501

500502
osmium::builder::add_relation(buffer,
501503
_id(123),
@@ -532,7 +534,7 @@ TEST_CASE("create relation using builders: create relation member from existing
532534
}
533535

534536
TEST_CASE("create relation using builders: create relation with members from initializer list") {
535-
osmium::memory::Buffer buffer{1024 * 10};
537+
osmium::memory::Buffer buffer{test_buffer_size};
536538

537539
const auto pos = osmium::builder::add_relation(buffer,
538540
_id(123),
@@ -561,7 +563,7 @@ TEST_CASE("create relation using builders: create relation with members from ini
561563
}
562564

563565
TEST_CASE("create relation using builders: create relation with members from iterators and some tags") {
564-
osmium::memory::Buffer buffer{1024 * 10};
566+
osmium::memory::Buffer buffer{test_buffer_size};
565567

566568
const std::vector<member_type> members = {
567569
{osmium::item_type::node, 123},
@@ -605,7 +607,7 @@ TEST_CASE("create relation using builders: create relation with members from ite
605607
}
606608

607609
TEST_CASE("create area using builders") {
608-
osmium::memory::Buffer buffer{1024 * 10};
610+
osmium::memory::Buffer buffer{test_buffer_size};
609611

610612
SECTION("add area without rings") {
611613
const auto pos = osmium::builder::add_area(buffer,

‎test/t/builder/test_object_builder.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66

77
#include <string>
88

9+
constexpr const std::size_t test_buffer_size = 1024UL * 10UL;
10+
911
TEST_CASE("create objects using builder") {
10-
osmium::memory::Buffer buffer{1024 * 10};
12+
osmium::memory::Buffer buffer{test_buffer_size};
1113
std::string user;
1214

1315
SECTION("complete node with tags") {
@@ -366,7 +368,7 @@ TEST_CASE("create objects using builder") {
366368
}
367369

368370
TEST_CASE("no call to set_user on node") {
369-
osmium::memory::Buffer buffer{1024 * 10};
371+
osmium::memory::Buffer buffer{test_buffer_size};
370372

371373
{
372374
osmium::builder::NodeBuilder builder{buffer};
@@ -378,7 +380,7 @@ TEST_CASE("no call to set_user on node") {
378380
}
379381

380382
TEST_CASE("set_user with length on node") {
381-
osmium::memory::Buffer buffer{1024 * 10};
383+
osmium::memory::Buffer buffer{test_buffer_size};
382384
std::string user = "userx";
383385

384386
{
@@ -392,7 +394,7 @@ TEST_CASE("set_user with length on node") {
392394
}
393395

394396
TEST_CASE("no call to set_user on way") {
395-
osmium::memory::Buffer buffer{1024 * 10};
397+
osmium::memory::Buffer buffer{test_buffer_size};
396398

397399
{
398400
osmium::builder::WayBuilder builder{buffer};
@@ -404,7 +406,7 @@ TEST_CASE("no call to set_user on way") {
404406
}
405407

406408
TEST_CASE("set_user with length on way") {
407-
osmium::memory::Buffer buffer{1024 * 10};
409+
osmium::memory::Buffer buffer{test_buffer_size};
408410
std::string user = "userx";
409411

410412
{
@@ -418,7 +420,7 @@ TEST_CASE("set_user with length on way") {
418420
}
419421

420422
TEST_CASE("no call to set_user on changeset") {
421-
osmium::memory::Buffer buffer{1024 * 10};
423+
osmium::memory::Buffer buffer{test_buffer_size};
422424

423425
{
424426
osmium::builder::ChangesetBuilder builder{buffer};
@@ -430,7 +432,7 @@ TEST_CASE("no call to set_user on changeset") {
430432
}
431433

432434
TEST_CASE("set_user with length on changeset") {
433-
osmium::memory::Buffer buffer{1024 * 10};
435+
osmium::memory::Buffer buffer{test_buffer_size};
434436
std::string user = "userx";
435437

436438
{
@@ -444,7 +446,7 @@ TEST_CASE("set_user with length on changeset") {
444446
}
445447

446448
TEST_CASE("clear_user should clear the user field but nothing else") {
447-
osmium::memory::Buffer buffer{1024 * 10};
449+
osmium::memory::Buffer buffer{test_buffer_size};
448450
std::string user = "user";
449451

450452
{

‎test/t/handler/test_dynamic_handler.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ struct Handler2 : public osmium::handler::Handler {
7070

7171
osmium::memory::Buffer fill_buffer() {
7272
using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
73-
osmium::memory::Buffer buffer{1024 * 1024, osmium::memory::Buffer::auto_grow::yes};
73+
osmium::memory::Buffer buffer{1024UL * 1024UL, osmium::memory::Buffer::auto_grow::yes};
7474

7575
osmium::builder::add_node(buffer, _id(1));
7676
osmium::builder::add_way(buffer, _id(2));

‎test/t/osm/test_changeset.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010

1111
using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
1212

13+
constexpr const std::size_t test_buffer_size = 1024UL * 10UL;
14+
1315
TEST_CASE("Build changeset") {
14-
osmium::memory::Buffer buffer{10 * 1000};
16+
osmium::memory::Buffer buffer{test_buffer_size};
1517

1618
osmium::builder::add_changeset(buffer,
1719
_cid(42),
@@ -90,7 +92,7 @@ TEST_CASE("Build changeset") {
9092
}
9193

9294
TEST_CASE("Create changeset without helper") {
93-
osmium::memory::Buffer buffer{10 * 1000};
95+
osmium::memory::Buffer buffer{test_buffer_size};
9496
{
9597
osmium::builder::ChangesetBuilder builder{buffer};
9698

@@ -145,7 +147,7 @@ TEST_CASE("Create changeset without helper") {
145147
}
146148

147149
TEST_CASE("Change changeset") {
148-
osmium::memory::Buffer buffer{10 * 1000};
150+
osmium::memory::Buffer buffer{test_buffer_size};
149151

150152
osmium::builder::add_changeset(buffer,
151153
_cid(42),

‎test/t/osm/test_metadata.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ TEST_CASE("Metadata options: fail") {
9696
}
9797

9898
TEST_CASE("Metdata options: constructor using OSMObject") {
99-
osmium::memory::Buffer buffer{10 * 1000};
99+
osmium::memory::Buffer buffer{10UL * 1024UL};
100100
using namespace osmium::builder::attr; // NOLINT(google-build-using-namespace)
101101

102102
SECTION("only version") {

0 commit comments

Comments
 (0)