From 69366d400186ff1de8b47e5419bc21e72aae5c19 Mon Sep 17 00:00:00 2001 From: Vyacheslav Napadovsky Date: Sun, 25 Oct 2015 11:28:33 +0300 Subject: [PATCH] MS Visual Studio "/Zc:wchar_t-" compiler parameter support added --- include/spdlog/details/format.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/spdlog/details/format.h b/include/spdlog/details/format.h index 8e55b29f..ce744651 100644 --- a/include/spdlog/details/format.h +++ b/include/spdlog/details/format.h @@ -947,7 +947,9 @@ 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)