diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h index e96d1d38..d6af8048 100644 --- a/include/spdlog/details/os-inl.h +++ b/include/spdlog/details/os-inl.h @@ -178,7 +178,7 @@ SPDLOG_INLINE bool file_exists(const filename_t &filename) SPDLOG_NOEXCEPT return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY)); #else // common linux/unix all have the stat system call struct stat buffer; - return (stat(filename.c_str(), &buffer) == 0); + return (::stat(filename.c_str(), &buffer) == 0); #endif } @@ -218,7 +218,7 @@ SPDLOG_INLINE size_t filesize(FILE *f) #else // unix 32 bits or cygwin struct stat st; - if (fstat(fd, &st) == 0) + if (::fstat(fd, &st) == 0) { return static_cast(st.st_size); } diff --git a/include/spdlog/details/pattern_formatter-inl.h b/include/spdlog/details/pattern_formatter-inl.h index a6951e47..6c5e1c0d 100644 --- a/include/spdlog/details/pattern_formatter-inl.h +++ b/include/spdlog/details/pattern_formatter-inl.h @@ -304,7 +304,7 @@ class Y_formatter final : public flag_formatter { public: explicit Y_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override { @@ -367,7 +367,7 @@ class I_formatter final : public flag_formatter { public: explicit I_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override { @@ -382,7 +382,7 @@ class M_formatter final : public flag_formatter { public: explicit M_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override { @@ -397,7 +397,7 @@ class S_formatter final : public flag_formatter { public: explicit S_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override { @@ -412,7 +412,7 @@ class e_formatter final : public flag_formatter { public: explicit e_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -435,7 +435,7 @@ class f_formatter final : public flag_formatter { public: explicit f_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -458,7 +458,7 @@ class F_formatter final : public flag_formatter { public: explicit F_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -481,7 +481,7 @@ class E_formatter final : public flag_formatter { public: explicit E_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -498,7 +498,7 @@ class p_formatter final : public flag_formatter { public: explicit p_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override { @@ -513,7 +513,7 @@ class r_formatter final : public flag_formatter { public: explicit r_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override { @@ -535,7 +535,7 @@ class R_formatter final : public flag_formatter { public: explicit R_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override { @@ -553,7 +553,7 @@ class T_formatter final : public flag_formatter { public: explicit T_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override { @@ -573,7 +573,7 @@ class z_formatter final : public flag_formatter { public: explicit z_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} const std::chrono::seconds cache_refresh = std::chrono::seconds(5); @@ -632,7 +632,7 @@ class t_formatter final : public flag_formatter { public: explicit t_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -654,7 +654,7 @@ class pid_formatter final : public flag_formatter { public: explicit pid_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &, const std::tm &, fmt::memory_buffer &dest) override { @@ -676,7 +676,7 @@ class v_formatter final : public flag_formatter { public: explicit v_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -760,7 +760,7 @@ class source_location_formatter final : public flag_formatter { public: explicit source_location_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -789,7 +789,7 @@ class source_filename_formatter final : public flag_formatter { public: explicit source_filename_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -806,7 +806,7 @@ class source_linenum_formatter final : public flag_formatter { public: explicit source_linenum_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -831,7 +831,7 @@ class source_funcname_formatter final : public flag_formatter { public: explicit source_funcname_formatter(padding_info padinfo) - : flag_formatter(padinfo){}; + : flag_formatter(padinfo){} void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override { @@ -1169,7 +1169,7 @@ SPDLOG_INLINE details::padding_info pattern_formatter::handle_padspec_(std::stri const size_t max_width = 128; if (it == end) { - return padding_info{}; + return padding_info{} } padding_info::pad_side side;