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

EnumFormatter: fix signed/unsigned comparison warnings

This commit is contained in:
Pokechu22 2021-03-07 12:55:53 -08:00
parent 72a6fff36c
commit fa124e657f
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> template <typename FormatContext>
auto format(const T& e, FormatContext& ctx) 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 (!formatting_for_shader)
{ {
if (value >= 0 && value < size && m_names[value] != nullptr) if (has_name)
return fmt::format_to(ctx.out(), "{} ({})", m_names[value], value); return fmt::format_to(ctx.out(), "{} ({})", m_names[value_u], value_s);
else else
return fmt::format_to(ctx.out(), "Invalid ({})", value); return fmt::format_to(ctx.out(), "Invalid ({})", value_s);
} }
else else
{ {
if (value >= 0 && value < size && m_names[value] != nullptr) if (has_name)
return fmt::format_to(ctx.out(), "{:#x}u /* {} */", value, m_names[value]); return fmt::format_to(ctx.out(), "{:#x}u /* {} */", value_u, m_names[value_u]);
else else
return fmt::format_to(ctx.out(), "{:#x}u /* Invalid */", return fmt::format_to(ctx.out(), "{:#x}u /* Invalid */", value_u);
static_cast<std::make_unsigned_t<T>>(value));
} }
} }