Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Core: Add missing override specifiers

Browse source
This commit is contained in:
Lioncash 2015-10-17 02:55:10 -04:00
parent 9890460573
commit fea7428fdb
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/HLE/proAdhoc.h
View file

@ -765,7 +765,7 @@ class AfterMatchingMipsCall : public Action {
public:
AfterMatchingMipsCall() {}
static Action *Create() { return new AfterMatchingMipsCall(); }
void DoState(PointerWrap &p) {
void DoState(PointerWrap &p) override {
auto s = p.Section("AfterMatchingMipsCall", 1, 2);
if (!s)
return;
@ -773,7 +773,7 @@ public:
p.Do(EventID);
//context = NULL;
}
void run(MipsCall &call);
void run(MipsCall &call) override;
void SetContextID(u32 ContextID, u32 eventId);
void SetContext(SceNetAdhocMatchingContext *Context, u32 eventId) { context = Context; EventID = eventId; }

8
Core/HLE/sceKernelAlarm.cpp
View file

@ -39,13 +39,13 @@ struct NativeAlarm
struct Alarm : public KernelObject
{
const char *GetName() {return "[Alarm]";}
const char *GetTypeName() {return "Alarm";}
const char *GetName() override {return "[Alarm]";}
const char *GetTypeName() override {return "Alarm";}
static u32 GetMissingErrorCode() { return SCE_KERNEL_ERROR_UNKNOWN_ALMID; }
static int GetStaticIDType() { return SCE_KERNEL_TMID_Alarm; }
int GetIDType() const { return SCE_KERNEL_TMID_Alarm; }
int GetIDType() const override { return SCE_KERNEL_TMID_Alarm; }
virtual void DoState(PointerWrap &p)
void DoState(PointerWrap &p) override
{
auto s = p.Section("Alarm", 1);
if (!s)

4
Core/HLE/sceKernelModule.cpp
View file

@ -386,8 +386,8 @@ public:
AfterModuleEntryCall() {}
SceUID moduleID_;
u32 retValAddr;
virtual void run(MipsCall &call);
virtual void DoState(PointerWrap &p) {
void run(MipsCall &call) override;
void DoState(PointerWrap &p) override {
auto s = p.Section("AfterModuleEntryCall", 1);
if (!s)
return;

4
Core/HW/AsyncIOManager.h
View file

@ -83,8 +83,8 @@ public:
u64 ResultFinishTicks(u32 handle);
protected:
virtual void ProcessEvent(AsyncIOEvent ref);
virtual bool ShouldExitEventLoop() {
void ProcessEvent(AsyncIOEvent ref) override;
bool ShouldExitEventLoop() override {
return coreState == CORE_ERROR || coreState == CORE_POWERDOWN;
}

16
Core/MIPS/MIPSAsm.cpp
View file

@ -31,10 +31,10 @@ public:
address = 0;
}
virtual bool open(bool onlyCheck) { return true; };
virtual void close() { };
virtual bool isOpen() { return true; };
virtual bool write(void* data, size_t length)
bool open(bool onlyCheck) override{ return true; };
void close() override { };
bool isOpen() override { return true; };
bool write(void* data, size_t length) override
{
if (!Memory::IsValidAddress((u32)(address+length-1)))
return false;
@ -48,16 +48,16 @@ public:
address += length;
return true;
}
virtual u64 getVirtualAddress() { return address; };
virtual u64 getPhysicalAddress() { return getVirtualAddress(); };
virtual bool seekVirtual(u64 virtualAddress)
u64 getVirtualAddress() override { return address; };
u64 getPhysicalAddress() override { return getVirtualAddress(); };
bool seekVirtual(u64 virtualAddress) override
{
if (!Memory::IsValidAddress(virtualAddress))
return false;
address = virtualAddress;
return true;
}
virtual bool seekPhysical(u64 physicalAddress) { return seekVirtual(physicalAddress); }
bool seekPhysical(u64 physicalAddress) override { return seekVirtual(physicalAddress); }
private:
u64 address;
};