<p></p>
<p><b>@joto</b> commented on this pull request.</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/osm2pgsql/pull/1176#discussion_r428524545">src/osmdata.cpp</a>:</p>
<pre style='color:#555'>> for (auto const &clone : m_clones) {
- for (output_vec_t::const_iterator
- original_output = m_outputs.begin(),
- clone_output = clone.begin();
- original_output != m_outputs.end() &&
- clone_output != clone.end();
- ++original_output, ++clone_output) {
- //merge the expire tree from this threads copy of output back
- original_output->get()->merge_expire_trees(clone_output->get());
+ auto it = clone.begin();
+ for (auto const &output : m_outputs) {
+ assert(it != clone.end());
+ if (*it) {
+ output->merge_expire_trees(it->get());
+ }
+ ++it;
</pre>
<p>Will be in a separate PR.</p>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/osm2pgsql/pull/1176#discussion_r428524545">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AA6353RVVMDTLMWXLE2MVVDRSTSWVANCNFSM4NFW5W5A">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AA6353WWB5NO6IP77WLQEODRSTSWVA5CNFSM4NFW5W5KYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGODDFVE5Q.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/osm2pgsql/pull/1176#discussion_r428524545",
"url": "https://github.com/openstreetmap/osm2pgsql/pull/1176#discussion_r428524545",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>