The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 23:59:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5724 from JonnyH/WIP/fix-some-ODR-warnings

Browse Source 
Fix some GCC ODR warnings
This commit is contained in:
Mat M 2017-06-29 18:48:47 -04:00 committed by GitHub
commit 898bbffaa7
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
View File

@ -8,12 +8,15 @@
#include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter.h"
#include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/PPCTables.h"
namespace
{
struct GekkoOPTemplate struct GekkoOPTemplate
{ {
int opcode; int opcode;
Interpreter::Instruction Inst; Interpreter::Instruction Inst;
GekkoOPInfo opinfo; GekkoOPInfo opinfo;
}; };
}
// clang-format off // clang-format off
static GekkoOPInfo unknownopinfo = { "unknown_instruction", OPTYPE_UNKNOWN, FL_ENDBLOCK, 0, 0, 0, 0 }; static GekkoOPInfo unknownopinfo = { "unknown_instruction", OPTYPE_UNKNOWN, FL_ENDBLOCK, 0, 0, 0, 0 };

3
Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
View File

@ -32,11 +32,14 @@ void Jit64::DynaRunTable63(UGeckoInstruction _inst)
(this->*dynaOpTable63[_inst.SUBOP10])(_inst); (this->*dynaOpTable63[_inst.SUBOP10])(_inst);
} }
namespace
{
struct GekkoOPTemplate struct GekkoOPTemplate
{ {
int opcode; int opcode;
Jit64::Instruction Inst; Jit64::Instruction Inst;
}; };
}
const GekkoOPTemplate primarytable[] = { const GekkoOPTemplate primarytable[] = {
{4, &Jit64::DynaRunTable4}, // RunTable4 {4, &Jit64::DynaRunTable4}, // RunTable4

3
Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
View File

@ -39,12 +39,15 @@ void JitArm64::DynaRunTable63(UGeckoInstruction inst)
(this->*dynaOpTable63[inst.SUBOP10])(inst); (this->*dynaOpTable63[inst.SUBOP10])(inst);
} }
namespace
{
struct GekkoOPTemplate struct GekkoOPTemplate
{ {
int opcode; int opcode;
_Instruction Inst; _Instruction Inst;
// GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out // GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
}; };
}
constexpr GekkoOPTemplate primarytable[] = { constexpr GekkoOPTemplate primarytable[] = {
{4, &JitArm64::DynaRunTable4}, // RunTable4 {4, &JitArm64::DynaRunTable4}, // RunTable4