Skip to content

Commit 391a97c

Browse files
committed
Some smaller cleanups in output code
1 parent e6b24ac commit 391a97c

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

src/output.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,4 @@ output_t::output_t(output_t const *other, std::shared_ptr<middle_query_t> mid)
7676

7777
output_t::~output_t() = default;
7878

79-
void output_t::free_middle_references()
80-
{
81-
m_mid.reset();
82-
}
83-
84-
void output_t::merge_expire_trees(output_t *) {}
79+
void output_t::free_middle_references() { m_mid.reset(); }

src/output.hpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@
1010
* For a full list of authors see the git log.
1111
*/
1212

13-
/* Common output layer interface */
14-
15-
/* Each output layer must provide methods for
16-
* storing:
17-
* - Nodes (Points of interest etc)
18-
* - Way geometries
19-
* Associated tags: name, type etc.
20-
*/
13+
/**
14+
* \file
15+
*
16+
* Common output layer interface.
17+
*/
2118

2219
#include <osmium/index/id_set.hpp>
2320

@@ -93,9 +90,9 @@ class output_t
9390
virtual void way_delete(osmid_t id) = 0;
9491
virtual void relation_delete(osmid_t id) = 0;
9592

96-
virtual void merge_expire_trees(output_t *other);
93+
virtual void merge_expire_trees(output_t * /*other*/) {}
9794

98-
struct output_requirements const &get_requirements() const noexcept
95+
output_requirements const &get_requirements() const noexcept
9996
{
10097
return m_output_requirements;
10198
}

0 commit comments

Comments
 (0)