mirror of
https://github.com/gabime/spdlog.git
synced 2025-11-16 09:28:56 +08:00
better support for custom eol
This commit is contained in:
@@ -112,29 +112,18 @@ inline bool operator!=(const std::tm& tm1, const std::tm& tm2)
|
||||
return !(tm1 == tm2);
|
||||
}
|
||||
|
||||
// eol at end of each log line
|
||||
#if !defined (SPDLOG_EOL)
|
||||
#ifdef _WIN32
|
||||
inline const char* eol()
|
||||
{
|
||||
return "\r\n";
|
||||
}
|
||||
#define SPDLOG_EOL "\r\n"
|
||||
#else
|
||||
constexpr inline const char* eol()
|
||||
{
|
||||
return "\n";
|
||||
}
|
||||
#define SPDLOG_EOL "\n"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
inline unsigned short eol_size()
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
#else
|
||||
constexpr inline unsigned short eol_size()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
SPDLOG_CONSTEXPR static const char* eol = SPDLOG_EOL;
|
||||
SPDLOG_CONSTEXPR static int eol_size = sizeof(SPDLOG_EOL) - 1;
|
||||
|
||||
|
||||
//fopen_s on non windows for writing
|
||||
inline int fopen_s(FILE** fp, const filename_t& filename, const filename_t& mode)
|
||||
|
||||
@@ -619,11 +619,7 @@ inline void spdlog::pattern_formatter::format(details::log_msg& msg)
|
||||
f->format(msg, tm_time);
|
||||
}
|
||||
//write eol
|
||||
#if defined(SPDLOG_EOL)
|
||||
msg.formatted << SPDLOG_EOL;
|
||||
#else
|
||||
msg.formatted.write(details::os::eol(), details::os::eol_size());
|
||||
#endif
|
||||
msg.formatted.write(details::os::eol, details::os::eol_size);
|
||||
}
|
||||
catch(const fmt::FormatError& e)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user