R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix symbol shadowing warnings

Browse Source 
'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.
This commit is contained in:
Kawe Mazidjatari 2023-04-03 01:40:21 +02:00
parent e79ed464e9
commit d8cc85da6b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
r5dev/thirdparty/spdlog/fmt/bundled/format.h vendored
View File

@ -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));