@@ -167,12 +167,6 @@ template <typename T> struct iterator_traits<fmt::basic_appender<T>> {
167167# define FMT_THROW (x ) ::fmt::assert_fail(__FILE__, __LINE__, (x).what())
168168#endif
169169
170- #ifdef __clang_analyzer__
171- # define FMT_CLANG_ANALYZER 1
172- #else
173- # define FMT_CLANG_ANALYZER 0
174- #endif
175-
176170// Defining FMT_REDUCE_INT_INSTANTIATIONS to 1, will reduce the number of
177171// integer formatter template instantiations to just one by only using the
178172// largest integer type. This results in a reduction in binary size but will
@@ -4262,26 +4256,21 @@ class format_int {
42624256 inline auto str () const -> std::string { return {str_, size ()}; }
42634257};
42644258
4265- #if FMT_CLANG_ANALYZER
4266- # define FMT_STRING_IMPL (s, base ) s
4267- #else
4268- # define FMT_STRING_IMPL (s, base ) \
4269- [] { \
4270- /* Use the hidden visibility as a workaround for a GCC bug (#1973). */ \
4271- /* Use a macro-like name to avoid shadowing warnings. */ \
4272- struct FMT_VISIBILITY (" hidden" ) FMT_COMPILE_STRING : base { \
4273- using char_type = fmt::remove_cvref_t <decltype (s[0 ])>; \
4274- constexpr explicit operator fmt::basic_string_view<char_type>() \
4275- const { \
4276- return fmt::detail::compile_string_to_view<char_type>(s); \
4277- } \
4278- }; \
4279- using FMT_STRING_VIEW = \
4280- fmt::basic_string_view<typename FMT_COMPILE_STRING ::char_type>; \
4281- fmt::detail::ignore_unused (FMT_STRING_VIEW (FMT_COMPILE_STRING ())); \
4282- return FMT_COMPILE_STRING (); \
4283- }()
4284- #endif // FMT_CLANG_ANALYZER
4259+ #define FMT_STRING_IMPL (s, base ) \
4260+ [] { \
4261+ /* Use the hidden visibility as a workaround for a GCC bug (#1973). */ \
4262+ /* Use a macro-like name to avoid shadowing warnings. */ \
4263+ struct FMT_VISIBILITY (" hidden" ) FMT_COMPILE_STRING : base { \
4264+ using char_type = fmt::remove_cvref_t <decltype (s[0 ])>; \
4265+ constexpr explicit operator fmt::basic_string_view<char_type>() const { \
4266+ return fmt::detail::compile_string_to_view<char_type>(s); \
4267+ } \
4268+ }; \
4269+ using FMT_STRING_VIEW = \
4270+ fmt::basic_string_view<typename FMT_COMPILE_STRING ::char_type>; \
4271+ fmt::detail::ignore_unused (FMT_STRING_VIEW (FMT_COMPILE_STRING ())); \
4272+ return FMT_COMPILE_STRING (); \
4273+ }()
42854274
42864275/* *
42874276 * Constructs a legacy compile-time format string from a string literal `s`.
0 commit comments