mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-26 00:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable wchar_t instead of unsigned short overload

Browse Source 
if _NATIVE_WCHAR_T_DEFINED is defined
This commit is contained in:
vitaut 2015-10-25 07:13:45 -07:00
parent 716ab0499d
commit acfa858e3c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
format.h
View File

@ -979,9 +979,7 @@ class MakeValue : public Arg {
FMT_MAKE_VALUE(bool, int_value, BOOL) FMT_MAKE_VALUE(bool, int_value, BOOL)
FMT_MAKE_VALUE(short, int_value, INT) FMT_MAKE_VALUE(short, int_value, INT)
#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
FMT_MAKE_VALUE(unsigned short, uint_value, UINT) FMT_MAKE_VALUE(unsigned short, uint_value, UINT)
#endif
FMT_MAKE_VALUE(int, int_value, INT) FMT_MAKE_VALUE(int, int_value, INT)
FMT_MAKE_VALUE(unsigned, uint_value, UINT) FMT_MAKE_VALUE(unsigned, uint_value, UINT)
@ -1017,10 +1015,12 @@ class MakeValue : public Arg {
FMT_MAKE_VALUE(unsigned char, int_value, CHAR) FMT_MAKE_VALUE(unsigned char, int_value, CHAR)
FMT_MAKE_VALUE(char, int_value, CHAR) FMT_MAKE_VALUE(char, int_value, CHAR)
#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
MakeValue(typename WCharHelper<wchar_t, Char>::Supported value) { MakeValue(typename WCharHelper<wchar_t, Char>::Supported value) {
int_value = value; int_value = value;
} }
static uint64_t type(wchar_t) { return Arg::CHAR; } static uint64_t type(wchar_t) { return Arg::CHAR; }
#endif
#define FMT_MAKE_STR_VALUE(Type, TYPE) \ #define FMT_MAKE_STR_VALUE(Type, TYPE) \
MakeValue(Type value) { set_string(value); } \ MakeValue(Type value) { set_string(value); } \