Remove now unused merge_pending_relations() function in outputs

Author: joto

src/osmdata.cpp

@@ -297,19 +297,9 @@ struct pending_threaded_processor : public middle_t::pending_processor
         ids_queued = 0;
         ids_done = 0;
 
-        //collect all the new rels that became pending from each
-        //output in each thread back to their respective main outputs
         for (auto const &clone : clones) {
-            //for each clone/original output
-            for (output_vec_t::const_iterator original_output = outs.begin(),
-                                              clone_output = clone.begin();
-                 original_output != outs.end() && clone_output != clone.end();
-                 ++original_output, ++clone_output) {
-                //done copying ways for now
-                clone_output->get()->commit();
-                //merge the pending from this threads copy of output back
-                original_output->get()->merge_pending_relations(
-                    clone_output->get());
+            for (auto const &clone_output : clone) {
+                clone_output.get()->commit();
             }
         }
     }

src/output-flex.cpp

@@ -1403,10 +1403,6 @@ void output_flex_t::stage2_proc()
     }
 }
 
-void output_flex_t::merge_pending_relations(output_t *)
-{
-}
-
 void output_flex_t::merge_expire_trees(output_t *other)
 {
     auto *opgsql = dynamic_cast<output_flex_t *>(other);

src/output-flex.hpp

@@ -79,7 +79,6 @@ class output_flex_t : public output_t
     void way_delete(osmid_t id) override;
     void relation_delete(osmid_t id) override;
 
-    void merge_pending_relations(output_t *other) override;
     void merge_expire_trees(output_t *other) override;
 
     int app_define_table();

src/output-multi.cpp

@@ -330,10 +330,6 @@ void output_multi_t::delete_from_output(osmid_t id)
     }
 }
 
-void output_multi_t::merge_pending_relations(output_t *)
-{
-}
-
 void output_multi_t::merge_expire_trees(output_t *other)
 {
     auto *const omulti = dynamic_cast<output_multi_t *>(other);

src/output-multi.hpp

@@ -64,7 +64,6 @@ class output_multi_t : public output_t
     void way_delete(osmid_t id) override;
     void relation_delete(osmid_t id) override;
 
-    void merge_pending_relations(output_t *other) override;
     void merge_expire_trees(output_t *other) override;
 
 protected:

src/output-pgsql.cpp

@@ -425,10 +425,6 @@ output_pgsql_t::output_pgsql_t(
 
 output_pgsql_t::~output_pgsql_t() = default;
 
-void output_pgsql_t::merge_pending_relations(output_t *)
-{
-}
-
 void output_pgsql_t::merge_expire_trees(output_t *other)
 {
     auto *const opgsql = dynamic_cast<output_pgsql_t *>(other);

src/output-pgsql.hpp

@@ -64,7 +64,6 @@ class output_pgsql_t : public output_t
     void way_delete(osmid_t id) override;
     void relation_delete(osmid_t id) override;
 
-    void merge_pending_relations(output_t *other) override;
     void merge_expire_trees(output_t *other) override;
 
 protected:

src/output.cpp

@@ -199,6 +199,4 @@ output_t::~output_t() = default;
 
 options_t const *output_t::get_options() const { return &m_options; }
 
-void output_t::merge_pending_relations(output_t *) {}
-
 void output_t::merge_expire_trees(output_t *) {}

src/output.hpp

@@ -75,7 +75,6 @@ class output_t
 
     const options_t *get_options() const;
 
-    virtual void merge_pending_relations(output_t *other);
     virtual void merge_expire_trees(output_t *other);
 
 protected: