Remove unnecessary progress_display_t::update() function

Author: joto

src/osm2pgsql.cpp

@@ -117,11 +117,9 @@ int main(int argc, char *argv[])
 
         // Processing: In this phase the input file(s) are read and parsed,
         // populating some of the tables.
-        progress_display_t progress;
-
         util::timer_t timer_parse;
 
-        progress.update(osmdata.process_files(files, options.bbox));
+        auto const progress = osmdata.process_files(files, options.bbox);
 
         progress.print_status(std::time(nullptr));
         fmt::print(stderr, "  parse time: {}\n",

src/progress-display.cpp

@@ -2,13 +2,6 @@
 #include "logging.hpp"
 #include "progress-display.hpp"
 
-void progress_display_t::update(progress_display_t const &other) noexcept
-{
-    m_node += other.m_node;
-    m_way += other.m_way;
-    m_rel += other.m_rel;
-}
-
 void progress_display_t::print_summary() const
 {
     std::time_t const now = std::time(nullptr);

src/progress-display.hpp

@@ -35,28 +35,13 @@ class progress_display_t
             }
             return ++count;
         }
-
-        Counter &operator+=(Counter const &rhs) noexcept
-        {
-            count += rhs.count;
-            if (rhs.max > max) {
-                max = rhs.max;
-            }
-            if (start == 0) {
-                start = rhs.start;
-            }
-
-            return *this;
-        }
     };
 
 public:
     progress_display_t() noexcept : m_last_print_time(std::time(nullptr)) {}
 
-    void update(progress_display_t const &other) noexcept;
     void print_summary() const;
     void print_status(std::time_t now) const;
-    void possibly_print_status();
 
     void add_node(osmid_t id)
     {
@@ -80,6 +65,8 @@ class progress_display_t
     }
 
 private:
+    void possibly_print_status();
+
     static double count_per_second(osmid_t count, uint64_t elapsed) noexcept
     {
         if (count == 0) {