mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-15 16:35:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed wchar support for std::format

Browse Source
This commit is contained in:
gabime 2021-11-16 23:42:06 +02:00
parent 24e47efae0
commit 2b4e07dd91
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/spdlog/common.h
View File

@ -17,7 +17,7 @@
#include <cstdio> #include <cstdio>
#ifdef SPDLOG_USE_STD_FORMAT #ifdef SPDLOG_USE_STD_FORMAT
#include <string_view> # include <string_view>
#endif #endif
#ifdef SPDLOG_COMPILED_LIB #ifdef SPDLOG_COMPILED_LIB
@ -133,19 +133,18 @@ template<typename... Args>
using format_string_t = std::string_view; using format_string_t = std::string_view;
template<class T, class Char = char> template<class T, class Char = char>
struct is_convertible_to_basic_format_string struct is_convertible_to_basic_format_string : std::integral_constant<bool, std::is_convertible<T, std::basic_string_view<Char>>::value>
: std::integral_constant<bool,
std::is_convertible<T, std::basic_string_view<Char>>::value>
{}; {};
# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
using wstring_view_t = std::wstring_view; using wstring_view_t = std::wstring_view;
using memory_buf_t = std::wstring; using wmemory_buf_t = std::wstring;
template<typename... Args> template<typename... Args>
using wformat_string_t = std::wstring_view; using wformat_string_t = std::wstring_view;
# endif # endif
#else
#else // use fmt lib instead of std::format
namespace fmt_lib = fmt; namespace fmt_lib = fmt;
using string_view_t = fmt::basic_string_view<char>; using string_view_t = fmt::basic_string_view<char>;
@ -167,7 +166,8 @@ struct is_convertible_to_basic_format_string
# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
using wstring_view_t = fmt::basic_string_view<wchar_t>; using wstring_view_t = fmt::basic_string_view<wchar_t>;
using wmemory_buf_t = fmt::basic_memory_buffer<wchar_t, 250>;; using wmemory_buf_t = fmt::basic_memory_buffer<wchar_t, 250>;
;
template<typename... Args> template<typename... Args>
using wformat_string_t = fmt::wformat_string<Args...>; using wformat_string_t = fmt::wformat_string<Args...>;
@ -308,7 +308,12 @@ struct file_event_handlers
std::function<void(const filename_t &filename, std::FILE *file_stream)> after_open; std::function<void(const filename_t &filename, std::FILE *file_stream)> after_open;
std::function<void(const filename_t &filename, std::FILE *file_stream)> before_close; std::function<void(const filename_t &filename, std::FILE *file_stream)> before_close;
std::function<void(const filename_t &filename)> after_close; std::function<void(const filename_t &filename)> after_close;
file_event_handlers() : before_open{nullptr}, after_open{nullptr}, before_close{nullptr}, after_close{nullptr} {} file_event_handlers()
: before_open{nullptr}
, after_open{nullptr}
, before_close{nullptr}
, after_close{nullptr}
{}
}; };
namespace details { namespace details {