Skip to content

Commit ef8244e

Browse files
jotojoto
committed
Fix some integer conversion issues
1 parent d7c49c3 commit ef8244e

9 files changed

+26
-26
lines changed

Diff for: ‎src/command_fileinfo.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ class JSONOutput : public Output {
348348

349349
if (!input_file.filename().empty()) {
350350
m_writer.String("size");
351-
m_writer.Int64(file_size(input_file));
351+
m_writer.Int64(static_cast<int64_t>(file_size(input_file)));
352352
}
353353

354354
m_writer.EndObject();
@@ -427,13 +427,13 @@ class JSONOutput : public Output {
427427
m_writer.String("count");
428428
m_writer.StartObject();
429429
m_writer.String("changesets");
430-
m_writer.Int64(info_handler.changesets);
430+
m_writer.Int64(static_cast<int64_t>(info_handler.changesets));
431431
m_writer.String("nodes");
432-
m_writer.Int64(info_handler.nodes);
432+
m_writer.Int64(static_cast<int64_t>(info_handler.nodes));
433433
m_writer.String("ways");
434-
m_writer.Int64(info_handler.ways);
434+
m_writer.Int64(static_cast<int64_t>(info_handler.ways));
435435
m_writer.String("relations");
436-
m_writer.Int64(info_handler.relations);
436+
m_writer.Int64(static_cast<int64_t>(info_handler.relations));
437437
m_writer.EndObject();
438438

439439
m_writer.String("minid");
@@ -463,11 +463,11 @@ class JSONOutput : public Output {
463463
m_writer.String("buffers");
464464
m_writer.StartObject();
465465
m_writer.String("count");
466-
m_writer.Int64(get_largest(info_handler.buffers_count));
466+
m_writer.Int64(get_largest(static_cast<int64_t>(info_handler.buffers_count)));
467467
m_writer.String("size");
468-
m_writer.Int64(get_largest(info_handler.buffers_size));
468+
m_writer.Int64(get_largest(static_cast<int64_t>(info_handler.buffers_size)));
469469
m_writer.String("capacity");
470-
m_writer.Int64(get_largest(info_handler.buffers_capacity));
470+
m_writer.Int64(get_largest(static_cast<int64_t>(info_handler.buffers_capacity)));
471471
m_writer.EndObject();
472472

473473
m_writer.String("metadata");

Diff for: ‎src/command_getid.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,17 @@ void CommandGetId::show_arguments() {
182182
if (m_verbose_ids) {
183183
m_vout << " looking for these ids:\n";
184184
m_vout << " nodes:";
185-
for (const osmium::object_id_type id : m_ids(osmium::item_type::node)) {
185+
for (const auto id : m_ids(osmium::item_type::node)) {
186186
m_vout << " " << id;
187187
}
188188
m_vout << "\n";
189189
m_vout << " ways:";
190-
for (const osmium::object_id_type id : m_ids(osmium::item_type::way)) {
190+
for (const auto id : m_ids(osmium::item_type::way)) {
191191
m_vout << " " << id;
192192
}
193193
m_vout << "\n";
194194
m_vout << " relations:";
195-
for (const osmium::object_id_type id : m_ids(osmium::item_type::relation)) {
195+
for (const auto id : m_ids(osmium::item_type::relation)) {
196196
m_vout << " " << id;
197197
}
198198
m_vout << "\n";
@@ -230,7 +230,7 @@ static void print_missing_ids(const char* type, const osmium::index::IdSetDense<
230230
std::cerr << '\n';
231231
}
232232

233-
void CommandGetId::mark_rel_ids(const osmium::index::RelationsMapIndex& rel_in_rel, osmium::object_id_type parent_id) {
233+
void CommandGetId::mark_rel_ids(const osmium::index::RelationsMapIndex& rel_in_rel, osmium::unsigned_object_id_type parent_id) {
234234
rel_in_rel.for_each(parent_id, [&](osmium::unsigned_object_id_type member_id) {
235235
if (m_ids(osmium::item_type::relation).check_and_set(member_id)) {
236236
mark_rel_ids(rel_in_rel, member_id);
@@ -265,7 +265,7 @@ bool CommandGetId::find_relations_in_relations() {
265265
}
266266

267267
const auto rel_in_rel = stash.build_parent_to_member_index();
268-
for (const osmium::unsigned_object_id_type id : m_ids(osmium::item_type::relation)) {
268+
for (const auto id : m_ids(osmium::item_type::relation)) {
269269
mark_rel_ids(rel_in_rel, id);
270270
}
271271

Diff for: ‎src/command_getid.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class CommandGetId : public CommandWithSingleOSMInput, public with_osm_output {
5555

5656
void find_referenced_objects();
5757

58-
void mark_rel_ids(const osmium::index::RelationsMapIndex& rel_in_rel, osmium::object_id_type parent_id);
58+
void mark_rel_ids(const osmium::index::RelationsMapIndex& rel_in_rel, osmium::unsigned_object_id_type parent_id);
5959
bool find_relations_in_relations();
6060
void find_nodes_and_ways_in_relations();
6161
void find_nodes_in_ways();

Diff for: ‎src/command_getparents.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -153,17 +153,17 @@ void CommandGetParents::show_arguments() {
153153
if (m_verbose_ids) {
154154
m_vout << " looking for these ids:\n";
155155
m_vout << " nodes:";
156-
for (const osmium::object_id_type id : m_ids(osmium::item_type::node)) {
156+
for (const auto id : m_ids(osmium::item_type::node)) {
157157
m_vout << " " << id;
158158
}
159159
m_vout << "\n";
160160
m_vout << " ways:";
161-
for (const osmium::object_id_type id : m_ids(osmium::item_type::way)) {
161+
for (const auto id : m_ids(osmium::item_type::way)) {
162162
m_vout << " " << id;
163163
}
164164
m_vout << "\n";
165165
m_vout << " relations:";
166-
for (const osmium::object_id_type id : m_ids(osmium::item_type::relation)) {
166+
for (const auto id : m_ids(osmium::item_type::relation)) {
167167
m_vout << " " << id;
168168
}
169169
m_vout << "\n";

Diff for: ‎src/command_query_locations_index.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ bool CommandQueryLocationsIndex::setup(const std::vector<std::string>& arguments
101101
}
102102
const auto id = vm["node-id"].as<std::string>();
103103
const auto r = osmium::string_to_object_id(id.c_str(), osmium::osm_entity_bits::node, osmium::item_type::node);
104-
m_id = static_cast<osmium::unsigned_object_id_type>(r.second);
104+
m_id = r.second;
105105
} else if (!m_dump) {
106106
throw argument_error{"Missing node ID on command line."};
107107
}

Diff for: ‎src/command_renumber.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ osmium::object_id_type id_map::operator()(osmium::object_id_type id) {
7474
// New ID is larger than all existing IDs. Add it to end and return.
7575
if (m_ids.empty() || osmium::id_order{}(m_ids.back(), id)) {
7676
m_ids.push_back(id);
77-
return add_offset_to_id(m_ids.size());
77+
return add_offset_to_id(static_cast<osmium::object_id_type>(m_ids.size()));
7878
}
7979

8080
const auto element = std::lower_bound(m_ids.cbegin(), m_ids.cend(), id, osmium::id_order{});
8181
// Old ID not found in m_ids, add to m_extra_ids.
8282
if (element == m_ids.cend() || *element != id) {
8383
m_ids.push_back(m_ids.back());
84-
m_extra_ids[id] = m_ids.size();
85-
return add_offset_to_id(m_ids.size());
84+
m_extra_ids[id] = static_cast<osmium::object_id_type>(m_ids.size());
85+
return add_offset_to_id(static_cast<osmium::object_id_type>(m_ids.size()));
8686
}
8787

8888
// Old ID found in m_ids, return.
@@ -128,7 +128,7 @@ void id_map::read(int fd, std::size_t file_size) {
128128
last_id = id;
129129
} else {
130130
m_ids.push_back(last_id);
131-
m_extra_ids[id] = m_ids.size();
131+
m_extra_ids[id] = static_cast<osmium::object_id_type>(m_ids.size());
132132
}
133133
}
134134
}

Diff for: ‎src/command_tags_filter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ bool CommandTagsFilter::matches_object(const osmium::OSMObject& object) const no
239239
return false;
240240
}
241241

242-
void CommandTagsFilter::mark_rel_ids(const osmium::index::RelationsMapIndex& rel_in_rel, osmium::object_id_type parent_id) {
242+
void CommandTagsFilter::mark_rel_ids(const osmium::index::RelationsMapIndex& rel_in_rel, osmium::unsigned_object_id_type parent_id) {
243243
rel_in_rel.for_each(parent_id, [&](osmium::unsigned_object_id_type member_id) {
244244
if (m_referenced_ids(osmium::item_type::relation).check_and_set(member_id)) {
245245
mark_rel_ids(rel_in_rel, member_id);
@@ -275,7 +275,7 @@ bool CommandTagsFilter::find_relations_in_relations() {
275275
}
276276

277277
const auto rel_in_rel = stash.build_parent_to_member_index();
278-
for (const osmium::unsigned_object_id_type id : m_matching_ids(osmium::item_type::relation)) {
278+
for (const auto id : m_matching_ids(osmium::item_type::relation)) {
279279
mark_rel_ids(rel_in_rel, id);
280280
}
281281

Diff for: ‎src/command_tags_filter.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class CommandTagsFilter : public CommandWithSingleOSMInput, public with_osm_outp
6464
bool matches_relation(const osmium::Relation& relation) const noexcept;
6565
bool matches_object(const osmium::OSMObject& object) const noexcept;
6666

67-
void mark_rel_ids(const osmium::index::RelationsMapIndex& rel_in_rel, osmium::object_id_type parent_id);
67+
void mark_rel_ids(const osmium::index::RelationsMapIndex& rel_in_rel, osmium::unsigned_object_id_type parent_id);
6868
bool find_relations_in_relations();
6969
void find_nodes_and_ways_in_relations();
7070
void find_nodes_in_ways();

Diff for: ‎src/export/export_format_json.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void ExportFormatJSON::start_feature(const std::string& prefix, osmium::object_i
8888

8989
if (options().unique_id == unique_id_type::counter) {
9090
m_writer.Key("id");
91-
m_writer.Int64(m_count + 1);
91+
m_writer.Int64(static_cast<int64_t>(m_count + 1));
9292
} else if (options().unique_id == unique_id_type::type_id) {
9393
m_writer.Key("id");
9494
m_writer.String(prefix + std::to_string(id));

0 commit comments

Comments
 (0)