Merge pull request #1408 from joto/better-counter-type

Use better type for counter (std::size_t instead of osmid_t)

Author: lonvia

src/progress-display.cpp

@@ -12,7 +12,7 @@
 #include "progress-display.hpp"
 #include "util.hpp"
 
-static double count_per_second(osmid_t count, uint64_t elapsed) noexcept
+static double count_per_second(std::size_t count, uint64_t elapsed) noexcept
 {
     if (count == 0) {
         return 0.0;
@@ -25,7 +25,7 @@ static double count_per_second(osmid_t count, uint64_t elapsed) noexcept
     return static_cast<double>(count) / elapsed;
 }
 
-static std::string cps_display(osmid_t count, uint64_t elapsed)
+static std::string cps_display(std::size_t count, uint64_t elapsed)
 {
     double const cps = count_per_second(count, elapsed);
 

src/progress-display.hpp

@@ -23,9 +23,6 @@
 
 #include <osmium/handler.hpp>
 
-#include "format.hpp"
-#include "osmtypes.hpp"
-
 /**
  * The progress_display_t class is used to display how far the processing of
  * the input data has progressed.
@@ -37,7 +34,7 @@ class progress_display_t : public osmium::handler::Handler
         std::size_t count = 0;
         std::time_t start = 0;
 
-        osmid_t count_k() const noexcept { return count / 1000; }
+        std::size_t count_k() const noexcept { return count / 1000; }
     };
 
 public: