TeaSpeak/spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1139 from matt77hias/v1.x

Browse Source 
Added fmt::(w)string_view support (v2).
This commit is contained in:
Gabi Melman 2019-07-06 20:17:16 +03:00 committed by GitHub
commit 945020e505
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/spdlog/common.h
View File

@ -94,6 +94,13 @@ template<typename T>
using basic_string_view_t = fmt::basic_string_view<T>; using basic_string_view_t = fmt::basic_string_view<T>;
#endif #endif
using string_view_t = basic_string_view_t<char>; using string_view_t = basic_string_view_t<char>;
#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
#ifndef _WIN32
#error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
#else
using wstring_view_t = basic_string_view_t<wchar_t>;
#endif // _WIN32
#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
#if defined(SPDLOG_NO_ATOMIC_LEVELS) #if defined(SPDLOG_NO_ATOMIC_LEVELS)
using level_t = details::null_atomic_int; using level_t = details::null_atomic_int;

34
include/spdlog/logger.h
View File

@ -63,7 +63,7 @@ public:
void swap(spdlog::logger &other); void swap(spdlog::logger &other);
template<typename... Args> template<typename... Args>
void force_log(source_loc loc, level::level_enum lvl, const char *fmt, const Args &... args) void force_log(source_loc loc, level::level_enum lvl, string_view_t fmt, const Args &... args)
{ {
try try
{ {
@ -83,7 +83,7 @@ public:
} }
template<typename... Args> template<typename... Args>
void log(source_loc loc, level::level_enum lvl, const char *fmt, const Args &... args) void log(source_loc loc, level::level_enum lvl, string_view_t fmt, const Args &... args)
{ {
if (should_log(lvl)) if (should_log(lvl))
{ {
@ -92,7 +92,7 @@ public:
} }
template<typename... Args> template<typename... Args>
void log(level::level_enum lvl, const char *fmt, const Args &... args) void log(level::level_enum lvl, string_view_t fmt, const Args &... args)
{ {
log(source_loc{}, lvl, fmt, args...); log(source_loc{}, lvl, fmt, args...);
} }
@ -101,37 +101,37 @@ public:
void log(level::level_enum lvl, const char *msg); void log(level::level_enum lvl, const char *msg);
template<typename... Args> template<typename... Args>
void trace(const char *fmt, const Args &... args) void trace(string_view_t fmt, const Args &... args)
{ {
log(level::trace, fmt, args...); log(level::trace, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void debug(const char *fmt, const Args &... args) void debug(string_view_t fmt, const Args &... args)
{ {
log(level::debug, fmt, args...); log(level::debug, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void info(const char *fmt, const Args &... args) void info(string_view_t fmt, const Args &... args)
{ {
log(level::info, fmt, args...); log(level::info, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void warn(const char *fmt, const Args &... args) void warn(string_view_t fmt, const Args &... args)
{ {
log(level::warn, fmt, args...); log(level::warn, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void error(const char *fmt, const Args &... args) void error(string_view_t fmt, const Args &... args)
{ {
log(level::err, fmt, args...); log(level::err, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void critical(const char *fmt, const Args &... args) void critical(string_view_t fmt, const Args &... args)
{ {
log(level::critical, fmt, args...); log(level::critical, fmt, args...);
} }
@ -231,7 +231,7 @@ public:
#error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows #error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
#else #else
template<typename... Args> template<typename... Args>
void log(source_loc source, level::level_enum lvl, const wchar_t *fmt, const Args &... args) void log(source_loc source, level::level_enum lvl, wstring_view_t fmt, const Args &... args)
{ {
if (!should_log(lvl)) if (!should_log(lvl))
{ {
@ -261,43 +261,43 @@ public:
} }
template<typename... Args> template<typename... Args>
void log(level::level_enum lvl, const wchar_t *fmt, const Args &... args) void log(level::level_enum lvl, wstring_view_t fmt, const Args &... args)
{ {
log(source_loc{}, lvl, fmt, args...); log(source_loc{}, lvl, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void trace(const wchar_t *fmt, const Args &... args) void trace(wstring_view_t fmt, const Args &... args)
{ {
log(level::trace, fmt, args...); log(level::trace, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void debug(const wchar_t *fmt, const Args &... args) void debug(wstring_view_t fmt, const Args &... args)
{ {
log(level::debug, fmt, args...); log(level::debug, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void info(const wchar_t *fmt, const Args &... args) void info(wstring_view_t fmt, const Args &... args)
{ {
log(level::info, fmt, args...); log(level::info, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void warn(const wchar_t *fmt, const Args &... args) void warn(wstring_view_t fmt, const Args &... args)
{ {
log(level::warn, fmt, args...); log(level::warn, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void error(const wchar_t *fmt, const Args &... args) void error(wstring_view_t fmt, const Args &... args)
{ {
log(level::err, fmt, args...); log(level::err, fmt, args...);
} }
template<typename... Args> template<typename... Args>
void critical(const wchar_t *fmt, const Args &... args) void critical(wstring_view_t fmt, const Args &... args)
{ {
log(level::critical, fmt, args...); log(level::critical, fmt, args...);
} }

30
include/spdlog/spdlog.h
View File

@ -115,49 +115,49 @@ spdlog::logger *default_logger_raw();
void set_default_logger(std::shared_ptr<spdlog::logger> default_logger); void set_default_logger(std::shared_ptr<spdlog::logger> default_logger);
template<typename... Args> template<typename... Args>
inline void log(source_loc source, level::level_enum lvl, const char *fmt, const Args &... args) inline void log(source_loc source, level::level_enum lvl, string_view_t fmt, const Args &... args)
{ {
default_logger_raw()->log(source, lvl, fmt, args...); default_logger_raw()->log(source, lvl, fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void log(level::level_enum lvl, const char *fmt, const Args &... args) inline void log(level::level_enum lvl, string_view_t fmt, const Args &... args)
{ {
default_logger_raw()->log(source_loc{}, lvl, fmt, args...); default_logger_raw()->log(source_loc{}, lvl, fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void trace(const char *fmt, const Args &... args) inline void trace(string_view_t fmt, const Args &... args)
{ {
default_logger_raw()->trace(fmt, args...); default_logger_raw()->trace(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void debug(const char *fmt, const Args &... args) inline void debug(string_view_t fmt, const Args &... args)
{ {
default_logger_raw()->debug(fmt, args...); default_logger_raw()->debug(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void info(const char *fmt, const Args &... args) inline void info(string_view_t fmt, const Args &... args)
{ {
default_logger_raw()->info(fmt, args...); default_logger_raw()->info(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void warn(const char *fmt, const Args &... args) inline void warn(string_view_t fmt, const Args &... args)
{ {
default_logger_raw()->warn(fmt, args...); default_logger_raw()->warn(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void error(const char *fmt, const Args &... args) inline void error(string_view_t fmt, const Args &... args)
{ {
default_logger_raw()->error(fmt, args...); default_logger_raw()->error(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void critical(const char *fmt, const Args &... args) inline void critical(string_view_t fmt, const Args &... args)
{ {
default_logger_raw()->critical(fmt, args...); default_logger_raw()->critical(fmt, args...);
} }
@ -206,43 +206,43 @@ inline void critical(const T &msg)
#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
template<typename... Args> template<typename... Args>
inline void log(level::level_enum lvl, const wchar_t *fmt, const Args &... args) inline void log(level::level_enum lvl, wstring_view_t fmt, const Args &... args)
{ {
default_logger_raw()->log(lvl, fmt, args...); default_logger_raw()->log(lvl, fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void trace(const wchar_t *fmt, const Args &... args) inline void trace(wstring_view_t fmt, const Args &... args)
{ {
default_logger_raw()->trace(fmt, args...); default_logger_raw()->trace(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void debug(const wchar_t *fmt, const Args &... args) inline void debug(wstring_view_t fmt, const Args &... args)
{ {
default_logger_raw()->debug(fmt, args...); default_logger_raw()->debug(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void info(const wchar_t *fmt, const Args &... args) inline void info(wstring_view_t fmt, const Args &... args)
{ {
default_logger_raw()->info(fmt, args...); default_logger_raw()->info(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void warn(const wchar_t *fmt, const Args &... args) inline void warn(wstring_view_t fmt, const Args &... args)
{ {
default_logger_raw()->warn(fmt, args...); default_logger_raw()->warn(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void error(const wchar_t *fmt, const Args &... args) inline void error(wstring_view_t fmt, const Args &... args)
{ {
default_logger_raw()->error(fmt, args...); default_logger_raw()->error(fmt, args...);
} }
template<typename... Args> template<typename... Args>
inline void critical(const wchar_t *fmt, const Args &... args) inline void critical(wstring_view_t fmt, const Args &... args)
{ {
default_logger_raw()->critical(fmt, args...); default_logger_raw()->critical(fmt, args...);
} }