Skip to content

Commit 22037d4

Browse files
committed
Change function parameter from int to bool
We are not using it for anything else anyway.
1 parent e0e6b3d commit 22037d4

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

src/osmdata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ struct pending_threaded_processor : public middle_t::pending_processor
171171
using output_vec_t = std::vector<std::shared_ptr<output_t>>;
172172

173173
static void do_jobs(output_vec_t const &outputs, pending_queue_t &queue,
174-
size_t &ids_done, std::mutex &mutex, int append,
174+
size_t &ids_done, std::mutex &mutex, bool append,
175175
bool ways)
176176
{
177177
while (true) {

src/output-flex.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ void output_flex_t::call_process_function(int index,
10071007
}
10081008
}
10091009

1010-
void output_flex_t::pending_way(osmid_t id, int exists)
1010+
void output_flex_t::pending_way(osmid_t id, bool exists)
10111011
{
10121012
if (!m_has_process_way) {
10131013
return;
@@ -1031,7 +1031,7 @@ void output_flex_t::pending_way(osmid_t id, int exists)
10311031
m_buffer.clear();
10321032
}
10331033

1034-
void output_flex_t::pending_relation(osmid_t id, int exists)
1034+
void output_flex_t::pending_relation(osmid_t id, bool exists)
10351035
{
10361036
if (!m_has_process_relation) {
10371037
return;

src/output-flex.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ class output_flex_t : public output_t
6161

6262
void stage2_proc() override;
6363

64-
void pending_way(osmid_t id, int exists) override;
65-
void pending_relation(osmid_t id, int exists) override;
64+
void pending_way(osmid_t id, bool exists) override;
65+
void pending_relation(osmid_t id, bool exists) override;
6666

6767
void node_add(osmium::Node const &node) override;
6868
void way_add(osmium::Way *way) override;

src/output-gazetteer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class output_gazetteer_t : public output_t
4848

4949
bool need_forward_dependencies() const noexcept override { return false; }
5050

51-
void pending_way(osmid_t, int) override {}
52-
void pending_relation(osmid_t, int) override {}
51+
void pending_way(osmid_t, bool) override {}
52+
void pending_relation(osmid_t, bool) override {}
5353

5454
void node_add(osmium::Node const &node) override;
5555
void way_add(osmium::Way *way) override;

src/output-multi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void output_multi_t::start()
6565
m_options.tblsmain_data);
6666
}
6767

68-
void output_multi_t::pending_way(osmid_t id, int exists)
68+
void output_multi_t::pending_way(osmid_t id, bool exists)
6969
{
7070
// Try to fetch the way from the DB
7171
buffer.clear();
@@ -75,7 +75,7 @@ void output_multi_t::pending_way(osmid_t id, int exists)
7575
}
7676
}
7777

78-
void output_multi_t::pending_relation(osmid_t id, int exists)
78+
void output_multi_t::pending_relation(osmid_t id, bool exists)
7979
{
8080
// Try to fetch the relation from the DB
8181
buffer.clear();

src/output-multi.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class output_multi_t : public output_t
4646
void stop(osmium::thread::Pool *pool) override;
4747
void commit() override;
4848

49-
void pending_way(osmid_t id, int exists) override;
50-
void pending_relation(osmid_t id, int exists) override;
49+
void pending_way(osmid_t id, bool exists) override;
50+
void pending_relation(osmid_t id, bool exists) override;
5151

5252
void node_add(osmium::Node const &node) override;
5353
void way_add(osmium::Way *way) override;

src/output-null.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class output_null_t : public output_t
2424

2525
bool need_forward_dependencies() const noexcept override { return false; }
2626

27-
void pending_way(osmid_t /*id*/, int /*exists*/) override {}
28-
void pending_relation(osmid_t /*id*/, int /*exists*/) override {}
27+
void pending_way(osmid_t /*id*/, bool /*exists*/) override {}
28+
void pending_relation(osmid_t /*id*/, bool /*exists*/) override {}
2929

3030
void node_add(osmium::Node const & /*node*/) override {}
3131
void way_add(osmium::Way * /*way*/) override {}

src/output-pgsql.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
6666
}
6767
}
6868

69-
void output_pgsql_t::pending_way(osmid_t id, int exists)
69+
void output_pgsql_t::pending_way(osmid_t id, bool exists)
7070
{
7171
// Try to fetch the way from the DB
7272
buffer.clear();
@@ -90,7 +90,7 @@ void output_pgsql_t::pending_way(osmid_t id, int exists)
9090
}
9191
}
9292

93-
void output_pgsql_t::pending_relation(osmid_t id, int exists)
93+
void output_pgsql_t::pending_relation(osmid_t id, bool exists)
9494
{
9595
// Try to fetch the relation from the DB
9696
// Note that we cannot use the global buffer here because

src/output-pgsql.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class output_pgsql_t : public output_t
4646
void stop(osmium::thread::Pool *pool) override;
4747
void commit() override;
4848

49-
void pending_way(osmid_t id, int exists) override;
50-
void pending_relation(osmid_t id, int exists) override;
49+
void pending_way(osmid_t id, bool exists) override;
50+
void pending_relation(osmid_t id, bool exists) override;
5151

5252
void node_add(osmium::Node const &node) override;
5353
void way_add(osmium::Way *way) override;

src/output.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ class output_t
5555

5656
virtual bool need_forward_dependencies() const noexcept { return true; }
5757

58-
virtual void pending_way(osmid_t id, int exists) = 0;
59-
virtual void pending_relation(osmid_t id, int exists) = 0;
58+
virtual void pending_way(osmid_t id, bool exists) = 0;
59+
virtual void pending_relation(osmid_t id, bool exists) = 0;
6060

6161
virtual void node_add(osmium::Node const &node) = 0;
6262
virtual void way_add(osmium::Way *way) = 0;

0 commit comments

Comments
 (0)