Fix compiler error when SPDLOG_WCHAR_TO_UTF8_SUPPORT and SPDLOG_FMT_PRINTF are used together

pull/656/head
k1988 8 years ago
parent 06e2ea8855
commit 35975333d7

@ -58,7 +58,7 @@ inline void spdlog::logger::set_pattern(const std::string& pattern, pattern_time
}
template <typename... Args>
inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Args&... args)
inline void spdlog::logger::log(level::level_enum lvl, const char* fmtStr, const Args&... args)
{
if (!should_log(lvl)) return;
@ -67,9 +67,9 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Ar
details::log_msg log_msg(&_name, lvl);
#if defined(SPDLOG_FMT_PRINTF)
fmt::printf(log_msg.raw, fmt, args...);
fmt::printf(log_msg.raw, fmtStr, args...);
#else
log_msg.raw.write(fmt, args...);
log_msg.raw.write(fmtStr, args...);
#endif
_sink_it(log_msg);
}
@ -221,7 +221,12 @@ inline void spdlog::logger::log(level::level_enum lvl, const wchar_t* fmtstr, co
{
fmt::WMemoryWriter wWriter;
#if defined(SPDLOG_FMT_PRINTF)
fmt::printf(wWriter, fmtstr, args...);
#else
wWriter.write(fmtstr, args...);
#endif
log(lvl, wWriter.c_str());
}
@ -262,6 +267,7 @@ inline void spdlog::logger::critical(const wchar_t* fmt, const Args&... args)
log(level::critical, fmt, args...);
}
#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT

@ -632,7 +632,7 @@ inline void printf(WWriter &w, WCStringRef format, ArgList args)
{
PrintfFormatter<wchar_t>(args, w).format(format);
}
FMT_VARIADIC(void, printf, WWriter &, WCStringRef)
FMT_VARIADIC_W(void, printf, WWriter &, WCStringRef)
/**
\rst

Loading…
Cancel
Save