From eb090b3b015e9f3cbde47331c785d5a181b0be91 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Thu, 6 Jul 2017 14:25:16 -0400 Subject: [PATCH] Modification to format.h to suppress C4574 on MSVC In Visual Studio 2017, C4574: 'identifier' is defined to be '0': did you mean to use '#if identifier'? --- fmt/format.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fmt/format.h b/fmt/format.h index 1b727965..27be274d 100644 --- a/fmt/format.h +++ b/fmt/format.h @@ -119,7 +119,8 @@ typedef __int64 intmax_t; # define FMT_GNUC_LIBSTD_VERSION (__GNUC_LIBSTD__ * 100 + __GNUC_LIBSTD_MINOR__) #endif -#ifdef __has_feature +// GLM defines __has_feature to '0' which causes MSVC to throw C4574 +#if defined(__has_feature) && __has_feature # define FMT_HAS_FEATURE(x) __has_feature(x) #else # define FMT_HAS_FEATURE(x) 0