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

pcsx2: don't hide base function 

As far as I understand you can't mix virtual (select at runtime) and
overloading (select at compile time).
This commit is contained in:
Gregory Hainaut 2014-07-12 16:01:21 +02:00
parent 47bf88ed3f
commit c6c6171841
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/Utilities/Exceptions.h
View File

@ -116,7 +116,7 @@ namespace Exception
virtual u32 GetPc() const=0;
virtual bool IsDelaySlot() const=0;
virtual wxString Message() const { return m_message; }
virtual wxString& Message() { return m_message; }
virtual void Rethrow() const=0;
virtual Ps2Generic* Clone() const=0;

6
pcsx2/vtlb.h
View File

@ -105,7 +105,7 @@ public:
m_reserve.Release();
}
virtual void Reserve( sptr hostptr );
void Reserve( sptr hostptr );
virtual void Release();
virtual void Commit();
@ -172,8 +172,8 @@ public:
Release();
}
virtual void Reserve();
virtual void Release();
void Reserve();
void Release();
void Reset();
};