From 1ff0b7f5e1d1ff36ade3fe714b47a861db41ef9f Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@meta.com>
Date: Sat, 24 May 2025 09:37:01 -0700
Subject: [PATCH] Cleanup warning suppression

---
 include/fmt/base.h   | 17 ++++++++---------
 include/fmt/format.h |  3 +--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/include/fmt/base.h b/include/fmt/base.h
index ec2326e0..23fb3124 100644
--- a/include/fmt/base.h
+++ b/include/fmt/base.h
@@ -1678,13 +1678,12 @@ template <typename... T> struct arg_pack {};
 template <typename Char, int NUM_ARGS, int NUM_NAMED_ARGS, bool DYNAMIC_NAMES>
 class format_string_checker {
  private:
-  type types_[static_cast<size_t>(max_of(1, NUM_ARGS))];
-  named_arg_info<Char>
-      named_args_[static_cast<size_t>(max_of(1, NUM_NAMED_ARGS))];
+  type types_[max_of<size_t>(1, NUM_ARGS)];
+  named_arg_info<Char> named_args_[max_of<size_t>(1, NUM_NAMED_ARGS)];
   compile_parse_context<Char> context_;
 
   using parse_func = auto (*)(parse_context<Char>&) -> const Char*;
-  parse_func parse_funcs_[static_cast<size_t>(max_of(1, NUM_ARGS))];
+  parse_func parse_funcs_[max_of<size_t>(1, NUM_ARGS)];
 
  public:
   template <typename... T>
@@ -2339,7 +2338,7 @@ template <typename Context, int NUM_ARGS, int NUM_NAMED_ARGS,
           unsigned long long DESC>
 struct named_arg_store {
   // args_[0].named_args points to named_args to avoid bloating format_args.
-  arg_t<Context, NUM_ARGS> args[static_cast<size_t>(1 + NUM_ARGS)];
+  arg_t<Context, NUM_ARGS> args[1u + NUM_ARGS];
   named_arg_info<typename Context::char_type>
       named_args[static_cast<size_t>(NUM_NAMED_ARGS)];
 
@@ -2372,10 +2371,10 @@ template <typename Context, int NUM_ARGS, int NUM_NAMED_ARGS,
           unsigned long long DESC>
 struct format_arg_store {
   // +1 to workaround a bug in gcc 7.5 that causes duplicated-branches warning.
-  using type = conditional_t<
-      NUM_NAMED_ARGS == 0,
-      arg_t<Context, NUM_ARGS>[static_cast<size_t>(max_of(1, NUM_ARGS))],
-      named_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC>>;
+  using type =
+      conditional_t<NUM_NAMED_ARGS == 0,
+                    arg_t<Context, NUM_ARGS>[max_of<size_t>(1, NUM_ARGS)],
+                    named_arg_store<Context, NUM_ARGS, NUM_NAMED_ARGS, DESC>>;
   type args;
 };
 
diff --git a/include/fmt/format.h b/include/fmt/format.h
index 6a0b5398..3c62b947 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -1225,8 +1225,7 @@ FMT_CONSTEXPR auto do_format_base2e(int base_bits, Char* out, UInt value,
   out += size;
   do {
     const char* digits = upper ? "0123456789ABCDEF" : "0123456789abcdef";
-    unsigned digit = static_cast<unsigned>(
-        value & ((static_cast<UInt>(1) << base_bits) - 1));
+    unsigned digit = static_cast<unsigned>(value & ((1u << base_bits) - 1));
     *--out = static_cast<Char>(base_bits < 4 ? static_cast<char>('0' + digit)
                                              : digits[digit]);
   } while ((value >>= base_bits) != 0);