mirror of
https://github.com/fmtlib/fmt.git
synced 2024-11-08 02:28:15 +00:00
MS Visual Studio "/Zc:wchar_t-" compiler parameter support added
This commit is contained in:
parent
024eae91fb
commit
4e9faed8f9
4
format.h
4
format.h
@ -940,7 +940,9 @@ class MakeValue : public Arg {
|
|||||||
// characters and strings into narrow strings as in
|
// characters and strings into narrow strings as in
|
||||||
// fmt::format("{}", L"test");
|
// fmt::format("{}", L"test");
|
||||||
// To fix this, use a wide format string: fmt::format(L"{}", L"test").
|
// To fix this, use a wide format string: fmt::format(L"{}", L"test").
|
||||||
|
#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
|
||||||
MakeValue(typename WCharHelper<wchar_t, Char>::Unsupported);
|
MakeValue(typename WCharHelper<wchar_t, Char>::Unsupported);
|
||||||
|
#endif
|
||||||
MakeValue(typename WCharHelper<wchar_t *, Char>::Unsupported);
|
MakeValue(typename WCharHelper<wchar_t *, Char>::Unsupported);
|
||||||
MakeValue(typename WCharHelper<const wchar_t *, Char>::Unsupported);
|
MakeValue(typename WCharHelper<const wchar_t *, Char>::Unsupported);
|
||||||
MakeValue(typename WCharHelper<const std::wstring &, Char>::Unsupported);
|
MakeValue(typename WCharHelper<const std::wstring &, Char>::Unsupported);
|
||||||
@ -977,7 +979,9 @@ 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)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user