cppcoreguidelines-pro-type-member
This commit is contained in:
parent
68f91822ed
commit
e5bbe57f01
@ -8,7 +8,6 @@
|
|||||||
#include "../common.h"
|
#include "../common.h"
|
||||||
#include "../details/os.h"
|
#include "../details/os.h"
|
||||||
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
@ -21,8 +20,7 @@ struct log_msg
|
|||||||
log_msg() = default;
|
log_msg() = default;
|
||||||
log_msg(const std::string *loggers_name, level::level_enum lvl) :
|
log_msg(const std::string *loggers_name, level::level_enum lvl) :
|
||||||
logger_name(loggers_name),
|
logger_name(loggers_name),
|
||||||
level(lvl),
|
level(lvl)
|
||||||
msg_id(0)
|
|
||||||
{
|
{
|
||||||
#ifndef SPDLOG_NO_DATETIME
|
#ifndef SPDLOG_NO_DATETIME
|
||||||
time = os::now();
|
time = os::now();
|
||||||
@ -38,13 +36,13 @@ struct log_msg
|
|||||||
log_msg(log_msg&& other) = delete;
|
log_msg(log_msg&& other) = delete;
|
||||||
|
|
||||||
|
|
||||||
const std::string *logger_name;
|
const std::string *logger_name{ nullptr };
|
||||||
level::level_enum level;
|
level::level_enum level;
|
||||||
log_clock::time_point time;
|
log_clock::time_point time;
|
||||||
size_t thread_id;
|
size_t thread_id;
|
||||||
fmt::MemoryWriter raw;
|
fmt::MemoryWriter raw;
|
||||||
fmt::MemoryWriter formatted;
|
fmt::MemoryWriter formatted;
|
||||||
size_t msg_id;
|
size_t msg_id{ 0 };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -81,10 +81,10 @@ inline std::tm localtime(const std::time_t &time_tt)
|
|||||||
{
|
{
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
std::tm tm;
|
std::tm tm{};
|
||||||
localtime_s(&tm, &time_tt);
|
localtime_s(&tm, &time_tt);
|
||||||
#else
|
#else
|
||||||
std::tm tm;
|
std::tm tm{};
|
||||||
localtime_r(&time_tt, &tm);
|
localtime_r(&time_tt, &tm);
|
||||||
#endif
|
#endif
|
||||||
return tm;
|
return tm;
|
||||||
@ -96,15 +96,14 @@ inline std::tm localtime()
|
|||||||
return localtime(now_t);
|
return localtime(now_t);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline std::tm gmtime(const std::time_t &time_tt)
|
inline std::tm gmtime(const std::time_t &time_tt)
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
std::tm tm;
|
std::tm tm{};
|
||||||
gmtime_s(&tm, &time_tt);
|
gmtime_s(&tm, &time_tt);
|
||||||
#else
|
#else
|
||||||
std::tm tm;
|
std::tm tm{};
|
||||||
gmtime_r(&time_tt, &tm);
|
gmtime_r(&time_tt, &tm);
|
||||||
#endif
|
#endif
|
||||||
return tm;
|
return tm;
|
||||||
@ -220,7 +219,7 @@ inline bool file_exists(const filename_t& filename)
|
|||||||
#endif
|
#endif
|
||||||
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
|
||||||
}
|
}
|
||||||
@ -250,11 +249,11 @@ inline size_t filesize(FILE *f)
|
|||||||
int fd = fileno(f);
|
int fd = fileno(f);
|
||||||
//64 bits(but not in osx or cygwin, where fstat64 is deprecated)
|
//64 bits(but not in osx or cygwin, where fstat64 is deprecated)
|
||||||
#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
|
#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
|
||||||
struct stat64 st;
|
struct stat64 st{};
|
||||||
if (fstat64(fd, &st) == 0)
|
if (fstat64(fd, &st) == 0)
|
||||||
return static_cast<size_t>(st.st_size);
|
return static_cast<size_t>(st.st_size);
|
||||||
#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);
|
||||||
#endif
|
#endif
|
||||||
|
@ -213,7 +213,7 @@ private:
|
|||||||
size_t _async_q_size = 0;
|
size_t _async_q_size = 0;
|
||||||
async_overflow_policy _overflow_policy = async_overflow_policy::block_retry;
|
async_overflow_policy _overflow_policy = async_overflow_policy::block_retry;
|
||||||
std::function<void()> _worker_warmup_cb = nullptr;
|
std::function<void()> _worker_warmup_cb = nullptr;
|
||||||
std::chrono::milliseconds _flush_interval_ms;
|
std::chrono::milliseconds _flush_interval_ms{ 0 };
|
||||||
std::function<void()> _worker_teardown_cb = nullptr;
|
std::function<void()> _worker_teardown_cb = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user