Move idlist_t into its own header file

Author: joto

src/dependency-manager.hpp

@@ -10,6 +10,7 @@
  * For a full list of authors see the git log.
  */
 
+#include "idlist.hpp"
 #include "osmtypes.hpp"
 
 #include <osmium/index/id_set.hpp>

src/idlist.hpp

@@ -0,0 +1,34 @@
+#ifndef OSM2PGSQL_IDLIST_HPP
+#define OSM2PGSQL_IDLIST_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+/**
+ * \file
+ *
+ * This file contains the definition of the idlist_t class.
+ */
+
+#include "osmtypes.hpp"
+
+#include <vector>
+
+struct idlist_t : public std::vector<osmid_t>
+{
+    // Get all constructors from std::vector
+    using vector<osmid_t>::vector;
+
+    // Even though we got all constructors from std::vector we need this on
+    // some compilers/libraries for some reason.
+    idlist_t() = default;
+
+};
+
+#endif // OSM2PGSQL_IDLIST_HPP

src/middle-pgsql.cpp

@@ -33,6 +33,7 @@
 #include <nlohmann/json.hpp>
 
 #include "format.hpp"
+#include "idlist.hpp"
 #include "json-writer.hpp"
 #include "logging.hpp"
 #include "middle-pgsql.hpp"

src/osmdata.hpp

@@ -24,6 +24,7 @@
 #include <osmium/osm/box.hpp>
 
 #include "dependency-manager.hpp"
+#include "idlist.hpp"
 #include "osmtypes.hpp"
 #include "pgsql-params.hpp"
 

src/osmtypes.hpp

@@ -238,23 +238,6 @@ class taglist_t
     std::vector<tag_t> m_tags;
 }; // class taglist_t
 
-struct idlist_t : public std::vector<osmid_t>
-{
-    // Get all constructors from std::vector
-    using vector<osmid_t>::vector;
-
-    // Even though we got all constructors from std::vector we need this on
-    // some compilers/libraries for some reason.
-    idlist_t() = default;
-
-    explicit idlist_t(osmium::NodeRefList const &list)
-    {
-        for (auto const &n : list) {
-            push_back(n.ref());
-        }
-    }
-};
-
 using rolelist_t = std::vector<char const *>;
 
 #endif // OSM2PGSQL_OSMTYPES_HPP

src/pgsql-helper.hpp

@@ -10,6 +10,7 @@
  * For a full list of authors see the git log.
  */
 
+#include "idlist.hpp"
 #include "osmtypes.hpp"
 
 #include <string>

tests/common-buffer.hpp

@@ -11,6 +11,7 @@
  */
 
 #include "format.hpp"
+#include "idlist.hpp"
 #include "osmtypes.hpp"
 
 #include <osmium/memory/buffer.hpp>