Skip to content

Commit fd531a0

Browse files
authored
Merge pull request #2182 from joto/fold-dependency-manager-into-osmdata
Fold dependency manager into osmdata
2 parents af60004 + d4a7b37 commit fd531a0

File tree

9 files changed

+218
-460
lines changed

9 files changed

+218
-460
lines changed

src/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ target_sources(osm2pgsql_lib PRIVATE
1010
command-line-parser.cpp
1111
db-copy.cpp
1212
debug-output.cpp
13-
dependency-manager.cpp
1413
expire-tiles.cpp
1514
expire-output.cpp
1615
geom.cpp

src/dependency-manager.cpp

Lines changed: 0 additions & 87 deletions
This file was deleted.

src/dependency-manager.hpp

Lines changed: 0 additions & 167 deletions
This file was deleted.

src/osm2pgsql.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99

1010
#include "command-line-parser.hpp"
11-
#include "dependency-manager.hpp"
1211
#include "input.hpp"
1312
#include "logging.hpp"
1413
#include "middle.hpp"
@@ -60,12 +59,7 @@ static file_info run(options_t const &options)
6059

6160
middle->set_requirements(output->get_requirements());
6261

63-
auto dependency_manager =
64-
std::make_unique<full_dependency_manager_t>(middle);
65-
66-
osmdata_t osmdata{std::move(dependency_manager), middle, output, options};
67-
68-
osmdata.start();
62+
osmdata_t osmdata{middle, output, options};
6963

7064
// Processing: In this phase the input file(s) are read and parsed,
7165
// populating some of the tables.

0 commit comments

Comments
 (0)