Merge branch 'master' of github.com:fmtlib/fmt

0fc73a2a · Victor Zverovich · 3156fcf5 · f85fb9fd · 0fc73a2a
Commit 0fc73a2a authored Jun 27, 2021 by Victor Zverovich
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

include/fmt/core.h include/fmt/core.h +2 -1

No files found.
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -64,7 +64,8 @@
 #  define FMT_HAS_FEATURE(x) 0
 #endif

-#if defined(__has_include) && !defined(__INTELLISENSE__) && \
+#if defined(__has_include) &&                             \
+    (!defined(__INTELLISENSE__) || FMT_MSC_VER > 1900) && \
    (!FMT_ICC_VERSION || FMT_ICC_VERSION >= 1600)
 #  define FMT_HAS_INCLUDE(x) __has_include(x)
 #else