From acfa858e3c420a880d7ff128ef57233aa7d4c76b Mon Sep 17 00:00:00 2001 From: vitaut Date: Sun, 25 Oct 2015 07:13:45 -0700 Subject: [PATCH] Disable wchar_t instead of unsigned short overload if _NATIVE_WCHAR_T_DEFINED is defined --- format.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/format.h b/format.h index d89b3c8f..d6371dd5 100644 --- a/format.h +++ b/format.h @@ -979,9 +979,7 @@ class MakeValue : public Arg { FMT_MAKE_VALUE(bool, int_value, BOOL) FMT_MAKE_VALUE(short, int_value, INT) -#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) FMT_MAKE_VALUE(unsigned short, uint_value, UINT) -#endif FMT_MAKE_VALUE(int, int_value, INT) 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(char, int_value, CHAR) +#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) MakeValue(typename WCharHelper::Supported value) { int_value = value; } static uint64_t type(wchar_t) { return Arg::CHAR; } +#endif #define FMT_MAKE_STR_VALUE(Type, TYPE) \ MakeValue(Type value) { set_string(value); } \