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

Compiler: Rename UNUSED macro to DOLPHIN_UNUSED 

UNUSED is quite a generic macro name and has potential to clash with
other libraries, so rename it to DOLPHIN_UNUSED to prevent that, as well
as make its naming consistent with the force inline macro
This commit is contained in:
Lioncash 2018-06-09 11:54:52 -04:00
parent 3f210836ad
commit d8f6d60189
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Compiler.h
View File

@ -6,10 +6,10 @@
#if defined(__GNUC__) || __clang__ #if defined(__GNUC__) || __clang__
// Disable "unused function" warnings for the ones manually marked as such. // Disable "unused function" warnings for the ones manually marked as such.
#define UNUSED __attribute__((unused)) #define DOLPHIN_UNUSED __attribute__((unused))
#else #else
// Not sure MSVC even checks this... // Not sure MSVC even checks this...
#define UNUSED #define DOLPHIN_UNUSED
#endif #endif
#ifdef _WIN32 #ifdef _WIN32

6
Source/Core/Common/Crypto/ec.cpp
View File

@ -173,9 +173,9 @@ private:
}; };
// y**2 + x*y = x**3 + x + b // 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, DOLPHIN_UNUSED static const u8 ec_b[30] = {
0x09, 0x23, 0xbb, 0x58, 0x21, 0x3b, 0x33, 0x3b, 0x20, 0xe9, 0x00, 0x66, 0x64, 0x7e, 0xde, 0x6c, 0x33, 0x2c, 0x7f, 0x8c, 0x09, 0x23, 0xbb, 0x58, 0x21,
0xce, 0x42, 0x81, 0xfe, 0x11, 0x5f, 0x7d, 0x8f, 0x90, 0xad}; 0x3b, 0x33, 0x3b, 0x20, 0xe9, 0xce, 0x42, 0x81, 0xfe, 0x11, 0x5f, 0x7d, 0x8f, 0x90, 0xad};
// order of the addition group of points // order of the addition group of points
static const u8 ec_N[30] = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, static const u8 ec_N[30] = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp
View File

@ -19,7 +19,7 @@ namespace WiimoteEmu
// The id for nothing inserted // The id for nothing inserted
constexpr std::array<u8, 6> nothing_id{{0x00, 0x00, 0x00, 0x00, 0x2e, 0x2e}}; constexpr std::array<u8, 6> nothing_id{{0x00, 0x00, 0x00, 0x00, 0x2e, 0x2e}};
// The id for a partially inserted extension (currently unused) // The id for a partially inserted extension (currently unused)
UNUSED constexpr std::array<u8, 6> partially_id{{0x00, 0x00, 0x00, 0x00, 0xff, 0xff}}; DOLPHIN_UNUSED constexpr std::array<u8, 6> partially_id{{0x00, 0x00, 0x00, 0x00, 0xff, 0xff}};
Attachment::Attachment(const char* const name, ExtensionReg& reg) : m_name(name), m_reg(reg) Attachment::Attachment(const char* const name, ExtensionReg& reg) : m_name(name), m_reg(reg)
{ {