From 84d3c90b93afd52a7ba3d659d144b996a36fa82b Mon Sep 17 00:00:00 2001 From: gabime Date: Wed, 28 Feb 2018 00:11:50 +0200 Subject: [PATCH] Fixed g++ 4.9 warnings after the clang-tidy fixes --- include/spdlog/async_logger.h | 6 +++--- include/spdlog/details/async_logger_impl.h | 14 +++++++------- include/spdlog/details/logger_impl.h | 12 ++++++------ include/spdlog/details/os.h | 14 +++++++------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/spdlog/async_logger.h b/include/spdlog/async_logger.h index 7ddcca25..be577a3b 100644 --- a/include/spdlog/async_logger.h +++ b/include/spdlog/async_logger.h @@ -35,7 +35,7 @@ class async_logger SPDLOG_FINAL : public logger { public: template - async_logger(const std::string& name, + async_logger(const std::string& logger_name, const It& begin, const It& end, size_t queue_size, @@ -44,7 +44,7 @@ public: const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(), const std::function& worker_teardown_cb = nullptr); - async_logger(const std::string& name, + async_logger(const std::string& logger_name, sinks_init_list sinks, size_t queue_size, const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, @@ -52,7 +52,7 @@ public: const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(), const std::function& worker_teardown_cb = nullptr); - async_logger(const std::string& name, + async_logger(const std::string& logger_name, sink_ptr single_sink, size_t queue_size, const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, diff --git a/include/spdlog/details/async_logger_impl.h b/include/spdlog/details/async_logger_impl.h index 9f2b2283..72bd4f98 100644 --- a/include/spdlog/details/async_logger_impl.h +++ b/include/spdlog/details/async_logger_impl.h @@ -17,7 +17,7 @@ #include template -inline spdlog::async_logger::async_logger(const std::string& name, +inline spdlog::async_logger::async_logger(const std::string& logger_name, const It& begin, const It& end, size_t queue_size, @@ -25,28 +25,28 @@ inline spdlog::async_logger::async_logger(const std::string& name, const std::function& worker_warmup_cb, const std::chrono::milliseconds& flush_interval_ms, const std::function& worker_teardown_cb) : - logger(name, begin, end), + logger(logger_name, begin, end), _async_log_helper(new details::async_log_helper(_formatter, _sinks, queue_size, _err_handler, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb)) { } -inline spdlog::async_logger::async_logger(const std::string& name, - sinks_init_list sinks, +inline spdlog::async_logger::async_logger(const std::string& logger_name, + sinks_init_list sinks_list, size_t queue_size, const async_overflow_policy overflow_policy, const std::function& worker_warmup_cb, const std::chrono::milliseconds& flush_interval_ms, const std::function& worker_teardown_cb) : - async_logger(name, sinks.begin(), sinks.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {} + async_logger(logger_name, sinks_list.begin(), sinks_list.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {} -inline spdlog::async_logger::async_logger(const std::string& name, +inline spdlog::async_logger::async_logger(const std::string& logger_name, sink_ptr single_sink, size_t queue_size, const async_overflow_policy overflow_policy, const std::function& worker_warmup_cb, const std::chrono::milliseconds& flush_interval_ms, const std::function& worker_teardown_cb) : - async_logger(name, + async_logger(logger_name, { std::move(single_sink) }, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {} diff --git a/include/spdlog/details/logger_impl.h b/include/spdlog/details/logger_impl.h index 0ff1773b..11cbc7e4 100644 --- a/include/spdlog/details/logger_impl.h +++ b/include/spdlog/details/logger_impl.h @@ -14,8 +14,8 @@ // create logger with given name, sinks and the default pattern formatter // all other ctors will call this one template -inline spdlog::logger::logger(std::string name, const It& begin, const It& end): - _name(std::move(name)), +inline spdlog::logger::logger(std::string logger_name, const It& begin, const It& end): + _name(std::move(logger_name)), _sinks(begin, end), _formatter(std::make_shared("%+")), _level(level::info), @@ -30,14 +30,14 @@ inline spdlog::logger::logger(std::string name, const It& begin, const It& end): } // ctor with sinks as init list -inline spdlog::logger::logger(const std::string& name, sinks_init_list sinks): - logger(name, sinks.begin(), sinks.end()) +inline spdlog::logger::logger(const std::string& logger_name, sinks_init_list sinks_list): + logger(logger_name, sinks_list.begin(), sinks_list.end()) {} // ctor with single sink -inline spdlog::logger::logger(const std::string& name, spdlog::sink_ptr single_sink): - logger(name, +inline spdlog::logger::logger(const std::string& logger_name, spdlog::sink_ptr single_sink): + logger(logger_name, { std::move(single_sink) }) diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h index dc9ef5b3..4de7b9f8 100644 --- a/include/spdlog/details/os.h +++ b/include/spdlog/details/os.h @@ -81,10 +81,10 @@ inline std::tm localtime(const std::time_t &time_tt) { #ifdef _WIN32 - std::tm tm {}; + std::tm tm; localtime_s(&tm, &time_tt); #else - std::tm tm {}; + std::tm tm; localtime_r(&time_tt, &tm); #endif return tm; @@ -100,10 +100,10 @@ inline std::tm gmtime(const std::time_t &time_tt) { #ifdef _WIN32 - std::tm tm {}; + std::tm tm; gmtime_s(&tm, &time_tt); #else - std::tm tm {}; + std::tm tm; gmtime_r(&time_tt, &tm); #endif return tm; @@ -219,7 +219,7 @@ inline bool file_exists(const filename_t& filename) #endif return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY)); #else //common linux/unix all have the stat system call - struct stat buffer {}; + struct stat buffer; return (stat(filename.c_str(), &buffer) == 0); #endif } @@ -249,11 +249,11 @@ inline size_t filesize(FILE *f) int fd = fileno(f); //64 bits(but not in osx or cygwin, where fstat64 is deprecated) #if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__) - struct stat64 st {}; + struct stat64 st ; if (fstat64(fd, &st) == 0) return static_cast(st.st_size); #else // unix 32 bits or cygwin - struct stat st {}; + struct stat st; if (fstat(fd, &st) == 0) return static_cast(st.st_size); #endif