From 5c938ed41fd3026d554860fa160dd11d16d7137c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Dec 2016 18:31:39 -0500 Subject: [PATCH] DSPTables: Move function type aliases into DSPOPCTemplate Gets two typedefs out of global scope --- Source/Core/Core/DSP/DSPTables.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/DSP/DSPTables.h b/Source/Core/Core/DSP/DSPTables.h index 4501f5b598..b96d70cfdd 100644 --- a/Source/Core/Core/DSP/DSPTables.h +++ b/Source/Core/Core/DSP/DSPTables.h @@ -54,9 +54,6 @@ enum partype_t #define OPTABLE_SIZE 0xffff + 1 #define EXT_OPTABLE_SIZE 0xff + 1 -typedef void (*dspIntFunc)(const UDSPInstruction); -typedef void (DSPEmitter::*dspJitFunc)(const UDSPInstruction); - struct param2_t { partype_t type; @@ -68,12 +65,15 @@ struct param2_t struct DSPOPCTemplate { + using InterpreterFunction = void (*)(UDSPInstruction); + using JITFunction = void (DSPEmitter::*)(UDSPInstruction); + const char* name; u16 opcode; u16 opcode_mask; - dspIntFunc intFunc; - dspJitFunc jitFunc; + InterpreterFunction intFunc; + JITFunction jitFunc; u8 size; u8 param_count;