From c172c72be916e1b94359abfd7143dc5e447f120a Mon Sep 17 00:00:00 2001 From: Florin Iucha Date: Wed, 27 Nov 2019 19:17:27 -0500 Subject: [PATCH] Fix compiler warnings --- include/spdlog/details/log_msg-inl.h | 8 ++++---- include/spdlog/details/os-inl.h | 2 +- include/spdlog/details/pattern_formatter-inl.h | 2 +- include/spdlog/details/thread_pool-inl.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/spdlog/details/log_msg-inl.h b/include/spdlog/details/log_msg-inl.h index 1e4eaaff..3b50fd42 100644 --- a/include/spdlog/details/log_msg-inl.h +++ b/include/spdlog/details/log_msg-inl.h @@ -12,8 +12,8 @@ namespace spdlog { namespace details { -SPDLOG_INLINE log_msg::log_msg(spdlog::source_loc loc, string_view_t logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg) - : logger_name(logger_name) +SPDLOG_INLINE log_msg::log_msg(spdlog::source_loc loc, string_view_t a_logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg) + : logger_name(a_logger_name) , level(lvl) , time(os::now()) #ifndef SPDLOG_NO_THREAD_ID @@ -23,8 +23,8 @@ SPDLOG_INLINE log_msg::log_msg(spdlog::source_loc loc, string_view_t logger_name , payload(msg) {} -SPDLOG_INLINE log_msg::log_msg(string_view_t logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg) - : log_msg(source_loc{}, logger_name, lvl, msg) +SPDLOG_INLINE log_msg::log_msg(string_view_t a_logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg) + : log_msg(source_loc{}, a_logger_name, lvl, msg) {} } // namespace details diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h index 84b99969..1a63b0f8 100644 --- a/include/spdlog/details/os-inl.h +++ b/include/spdlog/details/os-inl.h @@ -462,7 +462,7 @@ SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target) #endif // (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32) // return true on success -SPDLOG_INLINE bool mkdir_(const filename_t &path) +static SPDLOG_INLINE bool mkdir_(const filename_t &path) { #ifdef _WIN32 #ifdef SPDLOG_WCHAR_FILENAMES diff --git a/include/spdlog/details/pattern_formatter-inl.h b/include/spdlog/details/pattern_formatter-inl.h index 83d0283b..f4e406a5 100644 --- a/include/spdlog/details/pattern_formatter-inl.h +++ b/include/spdlog/details/pattern_formatter-inl.h @@ -77,7 +77,7 @@ private: { // count = std::min(count, spaces_.size()); // assert(count <= spaces_.size()); - fmt_helper::append_string_view(string_view_t(spaces_.data(), count), dest_); + fmt_helper::append_string_view(string_view_t(spaces_.data(), static_cast(count)), dest_); } const padding_info &padinfo_; diff --git a/include/spdlog/details/thread_pool-inl.h b/include/spdlog/details/thread_pool-inl.h index 910eb2a0..29a6363f 100644 --- a/include/spdlog/details/thread_pool-inl.h +++ b/include/spdlog/details/thread_pool-inl.h @@ -81,7 +81,7 @@ void SPDLOG_INLINE thread_pool::post_async_msg_(async_msg &&new_msg, async_overf void SPDLOG_INLINE thread_pool::worker_loop_() { - while (process_next_msg_()) {}; + while (process_next_msg_()) {} } // process next message in the queue