ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fmt: do not define uint type in global namespace

This commit is contained in:
Shawn Hoffman 2022-05-10 21:17:10 -07:00
parent fa17153ebc
commit 7b8e6c5b36
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Externals/fmt/include/fmt/format.h vendored
View File

@ -1337,8 +1337,8 @@ template <typename Float> constexpr int num_significand_bits() {
template <typename Float> template <typename Float>
constexpr auto exponent_mask() -> constexpr auto exponent_mask() ->
typename dragonbox::float_info<Float>::carrier_uint { typename dragonbox::float_info<Float>::carrier_uint {
using uint = typename dragonbox::float_info<Float>::carrier_uint; using fmt_uint = typename dragonbox::float_info<Float>::carrier_uint;
return ((uint(1) << dragonbox::float_info<Float>::exponent_bits) - 1) return ((fmt_uint(1) << dragonbox::float_info<Float>::exponent_bits) - 1)
<< num_significand_bits<Float>(); << num_significand_bits<Float>();
} }
template <typename Float> constexpr auto exponent_bias() -> int { template <typename Float> constexpr auto exponent_bias() -> int {
@ -2425,9 +2425,9 @@ FMT_CONSTEXPR20 auto write(OutputIt out, T value) -> OutputIt {
constexpr auto specs = basic_format_specs<Char>(); constexpr auto specs = basic_format_specs<Char>();
using floaty = conditional_t<std::is_same<T, long double>::value, double, T>; using floaty = conditional_t<std::is_same<T, long double>::value, double, T>;
using uint = typename dragonbox::float_info<floaty>::carrier_uint; using fmt_uint = typename dragonbox::float_info<floaty>::carrier_uint;
uint mask = exponent_mask<floaty>(); fmt_uint mask = exponent_mask<floaty>();
if ((bit_cast<uint>(value) & mask) == mask) if ((bit_cast<fmt_uint>(value) & mask) == mask)
return write_nonfinite(out, std::isnan(value), specs, fspecs); return write_nonfinite(out, std::isnan(value), specs, fspecs);
auto dec = dragonbox::to_decimal(static_cast<floaty>(value)); auto dec = dragonbox::to_decimal(static_cast<floaty>(value));

2
Source/Core/DolphinQt/DolphinQt.vcxproj
View File

@ -30,8 +30,6 @@
<AdditionalIncludeDirectories>$(ProjectDir)Settings;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)Settings;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<!--Ignore warnings in locally-instantiated fmt templates-->
<ExternalTemplatesDiagnostics>false</ExternalTemplatesDiagnostics>
</ClCompile> </ClCompile>
<Manifest> <Manifest>
<AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles> <AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>