Skip to content

Commit b73247d

Browse files
committed
Rename member variable output_pgsql_t::rels_buffer to m_rels_buffer
To bring it in line with the rest of the code.
1 parent 0e479f5 commit b73247d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/output-pgsql.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ void output_pgsql_t::pending_relation(osmid_t id)
103103
// Note that we cannot use the global buffer here because
104104
// we cannot keep a reference to the relation and an autogrow buffer
105105
// might be relocated when more data is added.
106-
rels_buffer.clear();
107-
if (m_mid->relation_get(id, &rels_buffer)) {
106+
m_rels_buffer.clear();
107+
if (m_mid->relation_get(id, &m_rels_buffer)) {
108108
pgsql_delete_relation_from_output(id);
109109

110-
auto const &rel = rels_buffer.get<osmium::Relation>(0);
110+
auto const &rel = m_rels_buffer.get<osmium::Relation>(0);
111111
pgsql_process_relation(rel);
112112
}
113113
}
@@ -386,7 +386,7 @@ output_pgsql_t::output_pgsql_t(
386386
: output_t(mid, o), m_builder(o.projection),
387387
m_expire(o.expire_tiles_zoom, o.expire_tiles_max_bbox, o.projection),
388388
m_buffer(32768, osmium::memory::Buffer::auto_grow::yes),
389-
rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
389+
m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
390390
{
391391
log_debug("Using projection SRS {} ({})", o.projection->target_srs(),
392392
o.projection->target_desc());
@@ -446,7 +446,7 @@ output_pgsql_t::output_pgsql_t(
446446
m_expire(m_options.expire_tiles_zoom, m_options.expire_tiles_max_bbox,
447447
m_options.projection),
448448
m_buffer(1024, osmium::memory::Buffer::auto_grow::yes),
449-
rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
449+
m_rels_buffer(1024, osmium::memory::Buffer::auto_grow::yes)
450450
{
451451
for (size_t i = 0; i < t_MAX; ++i) {
452452
//copy constructor will just connect to the already there table

src/output-pgsql.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class output_pgsql_t : public output_t
9090
expire_tiles m_expire;
9191

9292
osmium::memory::Buffer m_buffer;
93-
osmium::memory::Buffer rels_buffer;
93+
osmium::memory::Buffer m_rels_buffer;
9494
};
9595

9696
#endif // OSM2PGSQL_OUTPUT_PGSQL_HPP

0 commit comments

Comments
 (0)