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

remove conditional is_convertible_* structs for wide chars

Browse Source
This commit is contained in:
dkavolis 2021-08-09 17:33:00 +01:00
parent cb35191fc1
commit e471ec884e
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/spdlog/common.h
View File

@ -130,30 +130,12 @@ struct is_convertible_to_basic_format_string
#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
# ifndef _WIN32
# error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
# else
template<typename T>
struct is_convertible_to_wstring_view : std::is_convertible<T, wstring_view_t>
{};
template<class T>
using is_convertible_to_wformat_string = is_convertible_to_basic_format_string<T, wchar_t>;
# endif // _WIN32
#else
template<typename>
struct is_convertible_to_wstring_view : std::false_type
{};
template<class>
struct is_convertible_to_wformat_string : std::false_type
{};
#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
template<class T>
struct is_convertible_to_any_string_view
: std::integral_constant<bool, std::is_convertible<T, string_view_t>::value || is_convertible_to_wstring_view<T>::value>
{};
template<class T>
struct is_convertible_to_any_format_string
: std::integral_constant<bool, is_convertible_to_basic_format_string<T, char>::value || is_convertible_to_wformat_string<T>::value>
struct is_convertible_to_any_format_string : std::integral_constant<bool, is_convertible_to_basic_format_string<T, char>::value ||
is_convertible_to_basic_format_string<T, wchar_t>::value>
{};
#if defined(SPDLOG_NO_ATOMIC_LEVELS)

6
include/spdlog/logger.h
View File

@ -102,10 +102,8 @@ public:
log(loc, lvl, string_view_t{msg});
}
// T cannot be statically converted to neither string_view, nor wstring_view and nor format string
template<class T,
typename std::enable_if<
!is_convertible_to_any_string_view<const T &>::value && !is_convertible_to_any_format_string<const T &>::value, int>::type = 0>
// T cannot be statically converted to format string (including string_view)
template<class T, typename std::enable_if<!is_convertible_to_any_format_string<const T &>::value, int>::type = 0>
void log(source_loc loc, level::level_enum lvl, const T &msg)
{
log(loc, lvl, "{}", msg);