Remove unnecessary copy of idlist

Author: joto

src/dependency-manager.cpp

@@ -100,17 +100,3 @@ bool full_dependency_manager_t::has_pending() const noexcept
 {
     return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
 }
-
-idlist_t full_dependency_manager_t::get_ids(idlist_t *tracker)
-{
-    tracker->sort_unique();
-
-    idlist_t list;
-    list.reserve(tracker->size());
-
-    std::copy(tracker->cbegin(), tracker->cend(), std::back_inserter(list));
-
-    tracker->clear();
-
-    return list;
-}

src/dependency-manager.hpp

@@ -115,17 +115,23 @@ class full_dependency_manager_t : public dependency_manager_t
 
     idlist_t get_pending_way_ids() override
     {
-        return get_ids(&m_ways_pending_tracker);
+        idlist_t list;
+        using std::swap;
+        swap(list, m_ways_pending_tracker);
+        list.sort_unique();
+        return list;
     }
 
     idlist_t get_pending_relation_ids() override
     {
-        return get_ids(&m_rels_pending_tracker);
+        idlist_t list;
+        using std::swap;
+        swap(list, m_rels_pending_tracker);
+        list.sort_unique();
+        return list;
     }
 
 private:
-    static idlist_t get_ids(idlist_t *tracker);
-
     std::shared_ptr<middle_t> m_object_store;
 
     /**

src/idlist.cpp

@@ -20,7 +20,7 @@ void idlist_t::sort_unique()
     m_list.erase(last, m_list.end());
 }
 
-void idlist_t::merge_sorted(const idlist_t &other)
+void idlist_t::merge_sorted(idlist_t const &other)
 {
     std::vector<osmid_t> new_list;
 

src/idlist.hpp

@@ -75,7 +75,7 @@ class idlist_t
 
     void sort_unique();
 
-    void merge_sorted(const idlist_t &other);
+    void merge_sorted(idlist_t const &other);
 
 private:
     std::vector<osmid_t> m_list;