From edec1d5e3a13330ccf7f38fc75fdc51897232f34 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Sun, 16 Jan 2022 18:50:53 -0800 Subject: [PATCH] Work around false SLOTS defined but not used warning on GCC See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80351 --- Source/Core/Core/HW/EXI/EXI.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI.h b/Source/Core/Core/HW/EXI/EXI.h index f466b0428b..01661a0920 100644 --- a/Source/Core/Core/HW/EXI/EXI.h +++ b/Source/Core/Core/HW/EXI/EXI.h @@ -37,10 +37,12 @@ enum class Slot : int B, SP1, }; -static constexpr auto SLOTS = {Slot::A, Slot::B, Slot::SP1}; -static constexpr auto MAX_SLOT = Slot::SP1; -static constexpr auto MEMCARD_SLOTS = {Slot::A, Slot::B}; -static constexpr auto MAX_MEMCARD_SLOT = Slot::B; +// Note: using auto here results in a false warning on GCC +// See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80351 +constexpr std::initializer_list SLOTS = {Slot::A, Slot::B, Slot::SP1}; +constexpr auto MAX_SLOT = Slot::SP1; +constexpr std::initializer_list MEMCARD_SLOTS = {Slot::A, Slot::B}; +constexpr auto MAX_MEMCARD_SLOT = Slot::B; constexpr bool IsMemcardSlot(Slot slot) { return slot == Slot::A || slot == Slot::B;