From d8cc85da6bdc77b4d03bfbc78555cf7515b6f990 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Mon, 3 Apr 2023 01:40:21 +0200
Subject: [PATCH] Fix symbol shadowing warnings

'uint' is defined in pseudodefs.h, but also in format.h. The definition in pseudodefs.h shadows the one in format.h. Since the one in format.h is local, it has been renamed to 'uinty' to avoid this behavior.
---
 r5dev/thirdparty/spdlog/fmt/bundled/format.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/format.h b/r5dev/thirdparty/spdlog/fmt/bundled/format.h
index 7c607dbd..1dc2ab61 100644
--- a/r5dev/thirdparty/spdlog/fmt/bundled/format.h
+++ b/r5dev/thirdparty/spdlog/fmt/bundled/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 uinty = typename dragonbox::float_info<Float>::carrier_uint;
+  return ((uinty(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 uinty = typename dragonbox::float_info<floaty>::carrier_uint;
+  uinty mask = exponent_mask<floaty>();
+  if ((bit_cast<uinty>(value) & mask) == mask)
     return write_nonfinite(out, std::isnan(value), specs, fspecs);
 
   auto dec = dragonbox::to_decimal(static_cast<floaty>(value));