gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge v1.x

Browse Source
This commit is contained in:
gabime
2019-05-24 12:44:51 +03:00
parent 7a3a560c44
commit 884c23a9c9
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/spdlog/details/os-inl.h
View File

@@ -178,7 +178,7 @@ SPDLOG_INLINE bool file_exists(const filename_t &filename) SPDLOG_NOEXCEPT
return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY)); return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
#else // common linux/unix all have the stat system call #else // common linux/unix all have the stat system call
struct stat buffer; struct stat buffer;
return (stat(filename.c_str(), &buffer) == 0); return (::stat(filename.c_str(), &buffer) == 0);
#endif #endif
} }
@@ -218,7 +218,7 @@ SPDLOG_INLINE size_t filesize(FILE *f)
#else // unix 32 bits or cygwin #else // unix 32 bits or cygwin
struct stat st; struct stat st;
if (fstat(fd, &st) == 0) if (::fstat(fd, &st) == 0)
{ {
return static_cast<size_t>(st.st_size); return static_cast<size_t>(st.st_size);
} }

42
include/spdlog/details/pattern_formatter-inl.h
View File

@@ -304,7 +304,7 @@ class Y_formatter final : public flag_formatter
{ {
public: public:
explicit Y_formatter(padding_info padinfo) 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 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: public:
explicit I_formatter(padding_info padinfo) 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 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: public:
explicit M_formatter(padding_info padinfo) 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 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: public:
explicit S_formatter(padding_info padinfo) 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 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: public:
explicit e_formatter(padding_info padinfo) 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 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: public:
explicit f_formatter(padding_info padinfo) 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 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: public:
explicit F_formatter(padding_info padinfo) 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 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: public:
explicit E_formatter(padding_info padinfo) 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 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: public:
explicit p_formatter(padding_info padinfo) 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 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: public:
explicit r_formatter(padding_info padinfo) 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 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: public:
explicit R_formatter(padding_info padinfo) 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 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: public:
explicit T_formatter(padding_info padinfo) 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 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: public:
explicit z_formatter(padding_info padinfo) explicit z_formatter(padding_info padinfo)
: flag_formatter(padinfo){}; : flag_formatter(padinfo){}
const std::chrono::seconds cache_refresh = std::chrono::seconds(5); const std::chrono::seconds cache_refresh = std::chrono::seconds(5);
@@ -632,7 +632,7 @@ class t_formatter final : public flag_formatter
{ {
public: public:
explicit t_formatter(padding_info padinfo) 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 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: public:
explicit pid_formatter(padding_info padinfo) 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 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: public:
explicit v_formatter(padding_info padinfo) 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 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: public:
explicit source_location_formatter(padding_info padinfo) 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 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: public:
explicit source_filename_formatter(padding_info padinfo) 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 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: public:
explicit source_linenum_formatter(padding_info padinfo) 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 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: public:
explicit source_funcname_formatter(padding_info padinfo) 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 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; const size_t max_width = 128;
if (it == end) if (it == end)
{ {
return padding_info{}; return padding_info{}
} }
padding_info::pad_side side; padding_info::pad_side side;