Mark functions in the PPCDebugInterface and DSPDebugInterface as final.

The way they currently were, they would allow for a class to inherit and override these interfaces functions. However, this doesn't make sense conceptually.
dolphin-emu · Mar 6, 2014 · aa82680 · aa82680
1 parent 610a6f9
commit aa82680
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 45 deletions.
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h
@@ -14,32 +14,32 @@ class PPCDebugInterface : public DebugInterface
 {
 public:
 	PPCDebugInterface(){}
-	virtual void Disassemble(unsigned int address, char *dest, int max_size) override;
-	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override;
-	virtual int GetInstructionSize(int /*instruction*/) override {return 4;}
-	virtual bool IsAlive() override;
-	virtual bool IsBreakpoint(unsigned int address) override;
-	virtual void SetBreakpoint(unsigned int address) override;
-	virtual void ClearBreakpoint(unsigned int address) override;
-	virtual void ClearAllBreakpoints() override;
-	virtual void ToggleBreakpoint(unsigned int address) override;
-	virtual void ClearAllMemChecks() override;
-	virtual bool IsMemCheck(unsigned int address) override;
-	virtual void ToggleMemCheck(unsigned int address) override;
-	virtual unsigned int ReadMemory(unsigned int address) override;
+	virtual void Disassemble(unsigned int address, char *dest, int max_size) final;
+	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final;
+	virtual int GetInstructionSize(int /*instruction*/) final {return 4;}
+	virtual bool IsAlive() final;
+	virtual bool IsBreakpoint(unsigned int address) final;
+	virtual void SetBreakpoint(unsigned int address) final;
+	virtual void ClearBreakpoint(unsigned int address) final;
+	virtual void ClearAllBreakpoints() final;
+	virtual void ToggleBreakpoint(unsigned int address) final;
+	virtual void ClearAllMemChecks() final;
+	virtual bool IsMemCheck(unsigned int address) final;
+	virtual void ToggleMemCheck(unsigned int address) final;
+	virtual unsigned int ReadMemory(unsigned int address) final;
 
 	enum {
 		EXTRAMEM_ARAM = 1,
 	};
-	virtual unsigned int ReadExtraMemory(int memory, unsigned int address) override;
-	virtual unsigned int ReadInstruction(unsigned int address) override;
-	virtual unsigned int GetPC() override;
-	virtual void SetPC(unsigned int address) override;
-	virtual void Step() override {}
-	virtual void BreakNow() override;
-	virtual void RunToBreakpoint() override;
-	virtual void InsertBLR(unsigned int address, unsigned int value) override;
-	virtual int GetColor(unsigned int address) override;
-	virtual std::string GetDescription(unsigned int address) override;
-	virtual void ShowJitResults(u32 address) override;
+	virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final;
+	virtual unsigned int ReadInstruction(unsigned int address) final;
+	virtual unsigned int GetPC() final;
+	virtual void SetPC(unsigned int address) final;
+	virtual void Step() final {}
+	virtual void BreakNow() final;
+	virtual void RunToBreakpoint() final;
+	virtual void InsertBLR(unsigned int address, unsigned int value) final;
+	virtual int GetColor(unsigned int address) final;
+	virtual std::string GetDescription(unsigned int address) final;
+	virtual void ShowJitResults(u32 address) final;
 };
diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
@@ -14,25 +14,25 @@ class DSPDebugInterface : public DebugInterface
 {
 public:
 	DSPDebugInterface(){}
-	virtual void Disassemble(unsigned int address, char *dest, int max_size);
-	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size);
-	virtual int GetInstructionSize(int instruction) {return 1;}
-	virtual bool IsAlive();
-	virtual bool IsBreakpoint(unsigned int address);
-	virtual void SetBreakpoint(unsigned int address);
-	virtual void ClearBreakpoint(unsigned int address);
-	virtual void ClearAllBreakpoints();
-	virtual void ToggleBreakpoint(unsigned int address);
-	virtual void ClearAllMemChecks();
-	virtual bool IsMemCheck(unsigned int address);
-	virtual void ToggleMemCheck(unsigned int address);
-	virtual unsigned int ReadMemory(unsigned int address);
-	virtual unsigned int ReadInstruction(unsigned int address);
-	virtual unsigned int GetPC();
-	virtual void SetPC(unsigned int address);
-	virtual void Step() {}
-	virtual void RunToBreakpoint();
-	virtual void InsertBLR(unsigned int address, unsigned int value);
-	virtual int GetColor(unsigned int address);
-	virtual std::string GetDescription(unsigned int address);
+	virtual void Disassemble(unsigned int address, char *dest, int max_size) final;
+	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final;
+	virtual int GetInstructionSize(int instruction) final {return 1;}
+	virtual bool IsAlive() final;
+	virtual bool IsBreakpoint(unsigned int address) final;
+	virtual void SetBreakpoint(unsigned int address) final;
+	virtual void ClearBreakpoint(unsigned int address) final;
+	virtual void ClearAllBreakpoints() final;
+	virtual void ToggleBreakpoint(unsigned int address) final;
+	virtual void ClearAllMemChecks() final;
+	virtual bool IsMemCheck(unsigned int address) final;
+	virtual void ToggleMemCheck(unsigned int address) final;
+	virtual unsigned int ReadMemory(unsigned int address) final;
+	virtual unsigned int ReadInstruction(unsigned int address) final;
+	virtual unsigned int GetPC() final;
+	virtual void SetPC(unsigned int address) final;
+	virtual void Step() final {}
+	virtual void RunToBreakpoint() final;
+	virtual void InsertBLR(unsigned int address, unsigned int value) final;
+	virtual int GetColor(unsigned int address) final;
+	virtual std::string GetDescription(unsigned int address) final;
 };