diff options
| author | Minty-Meeo <45425365+Minty-Meeo@users.noreply.github.com> | 2022-09-22 21:12:54 -0500 |
|---|---|---|
| committer | get <45425365+Minty-Meeo@users.noreply.github.com> | 2023-06-06 22:49:53 -0500 |
| commit | e92f8fcbb46b49ffe83c6866d0e8f58fc9028c56 (patch) | |
| tree | 77d5e32ad7679a147f6c1c0a95d7515dba9a4fca /Source/Core/Common | |
| parent | bab3229c9827e3a21bdf98fd2d199c6f504da54d (diff) | |
Remove old GCC version workarounds
The minimum GCC version is now GCC 10.
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/EnumFormatter.h | 5 | ||||
| -rw-r--r-- | Source/Core/Common/EnumMap.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Source/Core/Common/EnumFormatter.h b/Source/Core/Common/EnumFormatter.h index d02e5d959a..2df7399fc7 100644 --- a/Source/Core/Common/EnumFormatter.h +++ b/Source/Core/Common/EnumFormatter.h @@ -42,12 +42,9 @@ * constexpr formatter() : EnumFormatter(names) {} * }; */ -template <auto last_member, typename = decltype(last_member)> +template <auto last_member> class EnumFormatter { - // The second template argument is needed to avoid compile errors from ambiguity with multiple - // enums with the same number of members in GCC prior to 8. See https://godbolt.org/z/xcKaW1seW - // and https://godbolt.org/z/hz7Yqq1P5 using T = decltype(last_member); static_assert(std::is_enum_v<T>); diff --git a/Source/Core/Common/EnumMap.h b/Source/Core/Common/EnumMap.h index 1418c1f01e..1eba9fe513 100644 --- a/Source/Core/Common/EnumMap.h +++ b/Source/Core/Common/EnumMap.h @@ -15,12 +15,9 @@ namespace Common { // A type that allows lookup of values associated with an enum as the key. // Designed for enums whose numeric values start at 0 and increment continuously with few gaps. -template <typename V, auto last_member, typename = decltype(last_member)> +template <typename V, auto last_member> class EnumMap final { - // The third template argument is needed to avoid compile errors from ambiguity with multiple - // enums with the same number of members in GCC prior to 8. See https://godbolt.org/z/xcKaW1seW - // and https://godbolt.org/z/hz7Yqq1P5 using T = decltype(last_member); static_assert(std::is_enum_v<T>); static constexpr size_t s_size = static_cast<size_t>(last_member) + 1; |
