Add _t suffix to class logger

Author: joto

src/gen/osm2pgsql-gen.cpp

@@ -224,7 +224,7 @@ void run_tile_gen(std::atomic_flag *error_flag,
                   std::mutex *mut, unsigned int n)
 {
     try {
-        logger::init_thread(n);
+        logger_t::init_thread(n);
 
         log_debug("Started generalizer thread for '{}'.",
                   master_generalizer->strategy());

src/logging.cpp

@@ -16,15 +16,16 @@ namespace {
 thread_local unsigned int this_thread_num = 0;
 
 /// Global logger singleton
-logger the_logger{};
+logger_t the_logger{};
 
 } // anonymous namespace
 
 /// Access the global logger singleton
-logger &get_logger() noexcept { return the_logger; }
+logger_t &get_logger() noexcept { return the_logger; }
 
-void logger::generate_common_prefix(std::string *str, fmt::text_style const &ts,
-                                    char const *prefix) const
+void logger_t::generate_common_prefix(std::string *str,
+                                      fmt::text_style const &ts,
+                                      char const *prefix) const
 {
     *str += fmt::format("{:%Y-%m-%d %H:%M:%S}  ",
                         fmt::localtime(std::time(nullptr)));
@@ -38,7 +39,7 @@ void logger::generate_common_prefix(std::string *str, fmt::text_style const &ts,
     }
 }
 
-void logger::init_thread(unsigned int num)
+void logger_t::init_thread(unsigned int num)
 {
     // Store thread number in thread local variable
     this_thread_num = num;

src/logging.hpp

@@ -34,7 +34,7 @@ enum class log_level : uint8_t
  * This class contains the logging state and code. It is intended as a
  * singleton class. Its use is mostly wrapped in the log_*() free functions.
  */
-class logger
+class logger_t
 {
 public:
     template <typename... TArgs>
@@ -107,9 +107,9 @@ class logger
     bool m_use_color = osmium::util::isatty(2);
 #endif
 
-}; // class logger
+}; // class logger_t
 
-logger &get_logger() noexcept;
+logger_t &get_logger() noexcept;
 
 template <typename... TArgs>
 void log_debug(fmt::format_string<TArgs...> format_str, TArgs &&...args)

src/thread-pool.cpp

@@ -50,7 +50,7 @@ void thread_pool_t::shutdown_all_workers()
 
 void thread_pool_t::worker_thread(unsigned int thread_num)
 {
-    logger::init_thread(thread_num + 1);
+    logger_t::init_thread(thread_num + 1);
 
     while (true) {
         osmium::thread::function_wrapper task;