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

Merge pull request #9574 from Pokechu22/enumformatter-warnings 

EnumFormatter: fix signed/unsigned comparison warnings
This commit is contained in:
Léo Lam 2021-03-16 09:39:42 +01:00 committed by GitHub
parent 3b0b221fcf fa124e657f
commit 13f79321f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Common/EnumFormatter.h
View File

@ -60,22 +60,23 @@ public:
template <typename FormatContext>
auto format(const T& e, FormatContext& ctx)
{
const auto value = static_cast<std::underlying_type_t<T>>(e);
const auto value_s = static_cast<std::underlying_type_t<T>>(e); // Possibly signed
const auto value_u = static_cast<std::make_unsigned_t<T>>(value_s); // Always unsigned
const bool has_name = value_s >= 0 && value_u < size && m_names[value_u] != nullptr;
if (!formatting_for_shader)
{
if (value >= 0 && value < size && m_names[value] != nullptr)
return fmt::format_to(ctx.out(), "{} ({})", m_names[value], value);
if (has_name)
return fmt::format_to(ctx.out(), "{} ({})", m_names[value_u], value_s);
else
return fmt::format_to(ctx.out(), "Invalid ({})", value);
return fmt::format_to(ctx.out(), "Invalid ({})", value_s);
}
else
{
if (value >= 0 && value < size && m_names[value] != nullptr)
return fmt::format_to(ctx.out(), "{:#x}u /* {} */", value, m_names[value]);
if (has_name)
return fmt::format_to(ctx.out(), "{:#x}u /* {} */", value_u, m_names[value_u]);
else
return fmt::format_to(ctx.out(), "{:#x}u /* Invalid */",
static_cast<std::make_unsigned_t<T>>(value));
return fmt::format_to(ctx.out(), "{:#x}u /* Invalid */", value_u);
}
}