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

fmtlib · Dec 11, 2019 · e09814d · e09814d
2 parents f94b736 + b272fb3
commit e09814d
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/include/fmt/format.h b/include/fmt/format.h
@@ -69,9 +69,17 @@
 #  define FMT_HAS_BUILTIN(x) 0
 #endif
 
-#if FMT_HAS_CPP_ATTRIBUTE(fallthrough) && \
-    (__cplusplus >= 201703 || FMT_GCC_VERSION != 0)
-#  define FMT_FALLTHROUGH [[fallthrough]]
+#if __cplusplus  == 201103L || __cplusplus  == 201402L
+#  if defined(__clang__)
+#    define FMT_FALLTHROUGH [[clang::fallthrough]];
+#  elif FMT_GCC_VERSION >= 700
+#    define FMT_FALLTHROUGH [[gnu::fallthrough]];
+#  else
+#    define FMT_FALLTHROUGH
+#  endif
+#elif FMT_HAS_CPP_ATTRIBUTE(fallthrough) && \
+     ((__cplusplus >= 201703) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L))
+#  define FMT_FALLTHROUGH [[fallthrough]];
 #else
 #  define FMT_FALLTHROUGH
 #endif