diff --git a/Source/Core/Common/Compiler.h b/Source/Core/Common/Compiler.h index 91ba02dac6..194aae90ce 100644 --- a/Source/Core/Common/Compiler.h +++ b/Source/Core/Common/Compiler.h @@ -6,10 +6,10 @@ #if defined(__GNUC__) || __clang__ // Disable "unused function" warnings for the ones manually marked as such. -#define UNUSED __attribute__((unused)) +#define DOLPHIN_UNUSED __attribute__((unused)) #else // Not sure MSVC even checks this... -#define UNUSED +#define DOLPHIN_UNUSED #endif #ifdef _WIN32 diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp index 4668293fc4..098d3e30c6 100644 --- a/Source/Core/Common/Crypto/ec.cpp +++ b/Source/Core/Common/Crypto/ec.cpp @@ -173,9 +173,9 @@ private: }; // y**2 + x*y = x**3 + x + b -UNUSED static const u8 ec_b[30] = {0x00, 0x66, 0x64, 0x7e, 0xde, 0x6c, 0x33, 0x2c, 0x7f, 0x8c, - 0x09, 0x23, 0xbb, 0x58, 0x21, 0x3b, 0x33, 0x3b, 0x20, 0xe9, - 0xce, 0x42, 0x81, 0xfe, 0x11, 0x5f, 0x7d, 0x8f, 0x90, 0xad}; +DOLPHIN_UNUSED static const u8 ec_b[30] = { + 0x00, 0x66, 0x64, 0x7e, 0xde, 0x6c, 0x33, 0x2c, 0x7f, 0x8c, 0x09, 0x23, 0xbb, 0x58, 0x21, + 0x3b, 0x33, 0x3b, 0x20, 0xe9, 0xce, 0x42, 0x81, 0xfe, 0x11, 0x5f, 0x7d, 0x8f, 0x90, 0xad}; // order of the addition group of points static const u8 ec_N[30] = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp index 9f8325e679..a9185125b1 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp @@ -19,7 +19,7 @@ namespace WiimoteEmu // The id for nothing inserted constexpr std::array nothing_id{{0x00, 0x00, 0x00, 0x00, 0x2e, 0x2e}}; // The id for a partially inserted extension (currently unused) -UNUSED constexpr std::array partially_id{{0x00, 0x00, 0x00, 0x00, 0xff, 0xff}}; +DOLPHIN_UNUSED constexpr std::array partially_id{{0x00, 0x00, 0x00, 0x00, 0xff, 0xff}}; Attachment::Attachment(const char* const name, ExtensionReg& reg) : m_name(name), m_reg(reg) {