Merge 270480db688b60dc77873ec662e317b52f17e7bc into e00fd756cc9ecdb038bf1958717c9e4d56466839

include/fmt/format.h

@@ -4231,7 +4231,7 @@ class format_int {
   inline auto str() const -> std::string { return {str_, size()}; }
 };
 
-#if FMT_CLANG_ANALYZER
+#if FMT_USE_CONSTEVAL || FMT_CLANG_ANALYZER
 #  define FMT_STRING_IMPL(s, base) s
 #else
 #  define FMT_STRING_IMPL(s, base)                                           \
@@ -4260,11 +4260,7 @@ class format_int {
  *     // A compile-time error because 'd' is an invalid specifier for strings.
  *     std::string s = fmt::format(FMT_STRING("{:d}"), "foo");
  */
-#if FMT_USE_CONSTEVAL
+#define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::detail::compile_string)
-#  define FMT_STRING(s) s
-#else
-#  define FMT_STRING(s) FMT_STRING_IMPL(s, fmt::detail::compile_string)
-#endif  // FMT_USE_CONSTEVAL
 
 FMT_API auto vsystem_error(int error_code, string_view fmt, format_args args)
     -> std::system_error;