From 29a1ea795accb1ef12d4648cc15071bad8fd8b2b Mon Sep 17 00:00:00 2001 From: Dair Grant Date: Mon, 2 Mar 2020 15:08:56 +0000 Subject: [PATCH] Fix clang -Wdisabled-macro-expansion warning from FMT_STRING_IMPL. FMT_STRING_IMPL has an internal helper named FMT_STRING, however FMT_STRING is also the name of the macro that invokes FMT_STRING_IMPL. Renaming this helper avoids the appearance of a recursive macro. --- include/fmt/format.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/fmt/format.h b/include/fmt/format.h index 7af10895..16b77fa5 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -3547,7 +3547,7 @@ FMT_END_NAMESPACE #define FMT_STRING_IMPL(s, ...) \ [] { \ /* Use a macro-like name to avoid shadowing warnings. */ \ - struct FMT_STRING : fmt::compile_string { \ + struct FMT_COMPILE_STRING : fmt::compile_string { \ using char_type = fmt::remove_cvref_t; \ __VA_ARGS__ FMT_CONSTEXPR \ operator fmt::basic_string_view() const { \ @@ -3555,7 +3555,7 @@ FMT_END_NAMESPACE return fmt::internal::literal_to_view(s); \ } \ }; \ - return FMT_STRING(); \ + return FMT_COMPILE_STRING(); \ }() /**