Merge pull request #1148 from joto/misc-cleanups

Various small code cleanups

Author: lonvia

src/db-copy.cpp

@@ -73,7 +73,7 @@ db_copy_thread_t::db_copy_thread_t(std::string const &conninfo)
 {
     // conninfo is captured by copy here, because we don't know wether the
     // reference will still be valid once we get around to running the thread
-    m_worker = std::thread(thread_t{conninfo, m_shared});
+    m_worker = std::thread{thread_t{conninfo, m_shared}};
 }
 
 db_copy_thread_t::~db_copy_thread_t() { finish(); }

src/domain-matcher.hpp

@@ -4,7 +4,6 @@
 #include <osmium/osm/tag.hpp>
 
 #include <cstring>
-#include <string>
 
 /**
  * Returns the tag specific name, if applicable.
@@ -19,7 +18,7 @@
 class DomainMatcher
 {
 public:
-    explicit DomainMatcher(char const *cls)
+    explicit DomainMatcher(char const *cls) noexcept
     : m_domain(cls), m_len(std::strlen(cls))
     {}
 

src/osmdata.cpp

@@ -1,8 +1,8 @@
 #include <algorithm>
 #include <chrono>
-#include <cstdio>
 #include <functional>
 #include <future>
+#include <memory>
 #include <mutex>
 #include <stdexcept>
 #include <utility>
@@ -209,7 +209,7 @@ struct pending_threaded_processor : public middle_t::pending_processor
 
             fmt::print(stderr, "\rLeft to process: {}...", queue_size);
 
-            std::this_thread::sleep_for(std::chrono::seconds(1));
+            std::this_thread::sleep_for(std::chrono::seconds{1});
         } while (queue_size > 0);
     }
 

src/parse-osmium.cpp

@@ -49,7 +49,7 @@ void parse_stats_t::print_summary() const
                m_rel.count, m_rel.max, rels_time(now));
 }
 
-void parse_stats_t::print_status(time_t now) const
+void parse_stats_t::print_status(std::time_t now) const
 {
     fmt::print(
         stderr,

src/parse-osmium.hpp

@@ -60,7 +60,7 @@ class parse_stats_t
 
     void update(parse_stats_t const &other);
     void print_summary() const;
-    void print_status(time_t now) const;
+    void print_status(std::time_t now) const;
     void possibly_print_status();
 
     void add_node(osmid_t id)