Avoid shadowing warnings in FMT_STRING

068d20bc · Victor Zverovich · a99fbe67 · 068d20bc
Commit 068d20bc authored Dec 14, 2019 by Victor Zverovich
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

include/fmt/format.h include/fmt/format.h +4 -6

No files found.
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -3511,18 +3511,16 @@ FMT_END_NAMESPACE
 #define FMT_STRING_IMPL(s, ...)                                         \
  [] {                                                                  \
-    struct str : fmt::compile_string {                                  \
+    /* Use a macro-like name to avoid shadowing warnings. */            \
+    struct FMT_STRING : fmt::compile_string {                           \
      using char_type = typename std::remove_cv<std::remove_pointer<    \
          typename std::decay<decltype(s)>::type>::type>::type;         \
      __VA_ARGS__ FMT_CONSTEXPR                                         \
      operator fmt::basic_string_view<char_type>() const {              \
        return {s, sizeof(s) / sizeof(char_type) - 1};                  \
      }                                                                 \
-    } result;                                                           \
+    };                                                                  \
-    /* Suppress Qt Creator warning about unused operator. */            \
+    return FMT_STRING();                                                \
-    (void)static_cast<fmt::basic_string_view<typename str::char_type>>( \
-        result);                                                        \
-    return result;                                                      \
  }()
 /**