Move the middle factory function into its own cpp file

Author: joto

src/CMakeLists.txt

@@ -8,6 +8,7 @@ set(osm2pgsql_lib_SOURCES
   geometry-processor.cpp
   input.cpp
   logging.cpp
+  middle.cpp
   middle-pgsql.cpp
   middle-ram.cpp
   node-persistent-cache.cpp

src/middle.cpp

@@ -0,0 +1,15 @@
+
+#include "middle-pgsql.hpp"
+#include "middle-ram.hpp"
+#include "middle.hpp"
+#include "options.hpp"
+
+std::shared_ptr<middle_t> create_middle(options_t const &options)
+{
+    if (options.slim) {
+        return std::make_shared<middle_pgsql_t>(&options);
+    }
+
+    return std::make_shared<middle_ram_t>(&options);
+}
+

src/middle.hpp

@@ -8,6 +8,8 @@
 #include "osmtypes.hpp"
 #include "thread-pool.hpp"
 
+class options_t;
+
 /**
  * Interface for returning information about raw OSM input data from a cache.
  */
@@ -104,4 +106,7 @@ struct middle_t
 
 inline middle_t::~middle_t() = default;
 
+/// Factory function: Instantiate the middle based on the command line options.
+std::shared_ptr<middle_t> create_middle(options_t const &options);
+
 #endif // OSM2PGSQL_MIDDLE_HPP

src/osm2pgsql.cpp

@@ -27,8 +27,7 @@
 #include "format.hpp"
 #include "input.hpp"
 #include "logging.hpp"
-#include "middle-pgsql.hpp"
-#include "middle-ram.hpp"
+#include "middle.hpp"
 #include "options.hpp"
 #include "osmdata.hpp"
 #include "output.hpp"
@@ -39,15 +38,6 @@
 #include <exception>
 #include <memory>
 
-static std::shared_ptr<middle_t> create_middle(options_t const &options)
-{
-    if (options.slim) {
-        return std::make_shared<middle_pgsql_t>(&options);
-    }
-
-    return std::make_shared<middle_ram_t>(&options);
-}
-
 int main(int argc, char *argv[])
 {
     try {