Skip to content

Commit 2f805a0

Browse files
committed
Remove unused m_simulate_ways_deleted member in middle_ram_t
1 parent 70f2208 commit 2f805a0

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

src/middle-ram.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ void middle_ram_t::release_ways() { m_ways.clear(); }
7070

7171
bool middle_ram_t::way_get(osmid_t id, osmium::memory::Buffer &buffer) const
7272
{
73-
if (m_simulate_ways_deleted) {
74-
return false;
75-
}
76-
7773
auto const *ele = m_ways.get(id);
7874

7975
if (!ele) {
@@ -140,7 +136,7 @@ void middle_ram_t::commit() {}
140136
middle_ram_t::middle_ram_t(options_t const *options)
141137
: m_ways(), m_rels(),
142138
m_cache(new node_ram_cache{options->alloc_chunkwise, options->cache}),
143-
m_extra_attributes(options->extra_attributes), m_simulate_ways_deleted(false)
139+
m_extra_attributes(options->extra_attributes)
144140
{}
145141

146142
middle_ram_t::~middle_ram_t()

src/middle-ram.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,6 @@ struct middle_ram_t : public middle_t, public middle_query_t
159159

160160
std::unique_ptr<node_ram_cache> m_cache;
161161
bool m_extra_attributes;
162-
163-
/* the previous behaviour of iterate_ways was to delete all ways as they
164-
* were being iterated. this doesn't work now that the output handles its
165-
* own "done" status and output-specific "pending" status. however, the
166-
* tests depend on the behaviour that ways will be unavailable once
167-
* iterate_ways is complete, so this flag emulates that. */
168-
bool m_simulate_ways_deleted;
169162
};
170163

171164
#endif // OSM2PGSQL_MIDDLE_RAM_HPP

0 commit comments

Comments
 (0)