Make osmid_t a real class

Author: joto

src/idlist.hpp

@@ -18,17 +18,55 @@
 
 #include "osmtypes.hpp"
 
+#include <cassert>
 #include <vector>
 
-struct idlist_t : public std::vector<osmid_t>
+class idlist_t
 {
-    // Get all constructors from std::vector
-    using vector<osmid_t>::vector;
+public:
+    using value_type = osmid_t;
 
-    // Even though we got all constructors from std::vector we need this on
-    // some compilers/libraries for some reason.
     idlist_t() = default;
 
-};
+    idlist_t(std::initializer_list<osmid_t> ids) : m_list(ids) {}
+
+    bool empty() const noexcept { return m_list.empty(); }
+
+    std::size_t size() const noexcept { return m_list.size(); }
+
+    auto begin() const noexcept { return m_list.begin(); }
+
+    auto end() const noexcept { return m_list.end(); }
+
+    osmid_t operator[](std::size_t n) const noexcept { return m_list[n]; }
+
+    void clear() { m_list.clear(); }
+
+    void push_back(osmid_t id) { m_list.push_back(id); }
+
+    void reserve(std::size_t size) { m_list.reserve(size); }
+
+    osmid_t pop_id()
+    {
+        assert(!m_list.empty());
+        auto const id = m_list.back();
+        m_list.pop_back();
+        return id;
+    }
+
+    friend bool operator==(idlist_t const &lhs, idlist_t const &rhs) noexcept
+    {
+        return lhs.m_list == rhs.m_list;
+    }
+
+    friend bool operator!=(idlist_t const &lhs, idlist_t const &rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+private:
+    std::vector<osmid_t> m_list;
+
+}; // class idlist_t
 
 #endif // OSM2PGSQL_IDLIST_HPP

src/osmdata.cpp

@@ -244,8 +244,7 @@ class multithreaded_processor
 
         std::lock_guard<std::mutex> const lock{*mutex};
         if (!queue->empty()) {
-            id = queue->back();
-            queue->pop_back();
+            id = queue->pop_id();
         }
 
         return id;

tests/test-middle.cpp

@@ -1118,7 +1118,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
 
         REQUIRE(dependency_manager.has_pending());
         idlist_t const way_ids = dependency_manager.get_pending_way_ids();
-        REQUIRE_THAT(way_ids, Catch::Equals<osmid_t>({20}));
+        REQUIRE(way_ids == idlist_t{20});
 
         check_way(mid, way20);
         check_way_nodes(mid, way20.id(), {&node10a, &node11});
@@ -1153,7 +1153,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
 
             REQUIRE(dependency_manager.has_pending());
             idlist_t const way_ids = dependency_manager.get_pending_way_ids();
-            REQUIRE_THAT(way_ids, Catch::Equals<osmid_t>({20, 22}));
+            REQUIRE(way_ids == idlist_t{20, 22});
 
             check_way(mid, way20);
             check_way_nodes(mid, way20.id(), {&node10a, &node11});
@@ -1265,7 +1265,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
         REQUIRE(dependency_manager.has_pending());
         idlist_t const rel_ids = dependency_manager.get_pending_relation_ids();
 
-        REQUIRE_THAT(rel_ids, Catch::Equals<osmid_t>({30}));
+        REQUIRE(rel_ids == idlist_t{30});
         check_relation(mid, rel30);
     }
 
@@ -1286,9 +1286,9 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
 
         REQUIRE(dependency_manager.has_pending());
         idlist_t const way_ids = dependency_manager.get_pending_way_ids();
-        REQUIRE_THAT(way_ids, Catch::Equals<osmid_t>({20}));
+        REQUIRE(way_ids == idlist_t{20});
         idlist_t const rel_ids = dependency_manager.get_pending_relation_ids();
-        REQUIRE_THAT(rel_ids, Catch::Equals<osmid_t>({31}));
+        REQUIRE(rel_ids == idlist_t{31});
         check_relation(mid, rel31);
     }
 }