Workaround to Intel compiler (#2758)

a44716f5 · Vladislav Shchapov · GitHub · c71b0701 · a44716f5
Unverified Commit a44716f5 authored Feb 11, 2022 by Vladislav Shchapov Committed by GitHub Feb 11, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -1431,8 +1431,8 @@ template <typename Context> struct arg_mapper {
                      !std::is_const<remove_reference_t<T>>::value ||
                      has_fallback_formatter<U, char_type>::value> {};

-#if FMT_MSC_VER != 0 && FMT_MSC_VER < 1910
-  // Workaround a bug in MSVC.
+#if (FMT_MSC_VER != 0 && FMT_MSC_VER < 1910) || FMT_ICC_VERSION != 0
+  // Workaround a bug in MSVC and Intel (Issue 2746).
  template <typename T> FMT_CONSTEXPR FMT_INLINE auto do_map(T&& val) -> T& {
    return val;
  }