From b051903c3de9d7aad5794d97be665e4990371783 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Tue, 10 May 2022 21:17:10 -0700
Subject: [PATCH] fmt: do not define uint type in global namespace

---
 Externals/fmt/include/fmt/format.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Externals/fmt/include/fmt/format.h b/Externals/fmt/include/fmt/format.h
index 7c607dbd30..fef5a5dbf9 100755
--- a/Externals/fmt/include/fmt/format.h
+++ b/Externals/fmt/include/fmt/format.h
@@ -1354,8 +1354,8 @@ template <typename Float> constexpr int num_significand_bits() {
 template <typename Float>
 constexpr auto exponent_mask() ->
     typename dragonbox::float_info<Float>::carrier_uint {
-  using uint = typename dragonbox::float_info<Float>::carrier_uint;
-  return ((uint(1) << dragonbox::float_info<Float>::exponent_bits) - 1)
+  using fmt_uint = typename dragonbox::float_info<Float>::carrier_uint;
+  return ((fmt_uint(1) << dragonbox::float_info<Float>::exponent_bits) - 1)
          << num_significand_bits<Float>();
 }
 template <typename Float> constexpr auto exponent_bias() -> int {
@@ -3248,9 +3248,9 @@ FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt {
 
   constexpr auto specs = basic_format_specs<Char>();
   using floaty = conditional_t<std::is_same<T, long double>::value, double, T>;
-  using uint = typename dragonbox::float_info<floaty>::carrier_uint;
-  uint mask = exponent_mask<floaty>();
-  if ((bit_cast<uint>(value) & mask) == mask)
+  using fmt_uint = typename dragonbox::float_info<floaty>::carrier_uint;
+  fmt_uint mask = exponent_mask<floaty>();
+  if ((bit_cast<fmt_uint>(value) & mask) == mask)
     return write_nonfinite(out, std::isnan(value), specs, fspecs);
 
   auto dec = dragonbox::to_decimal(static_cast<floaty>(value));