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

Merge pull request #2333 from lioncash/virt 

InputCommon/Core: Get rid of some virtual destructor warnings
This commit is contained in:
Matthew Parlane 2015-04-28 15:41:48 +12:00
parent 1634f98953 d39b519850
commit 42ebf5b3bf
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/PowerPC/JitCommon/JitCache.h
View File

@ -128,6 +128,10 @@ public:
{ {
} }
virtual ~JitBaseBlockCache()
{
}
int AllocateBlock(u32 em_address); int AllocateBlock(u32 em_address);
void FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr); void FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr);

5
Source/Core/InputCommon/ControllerEmu.h
View File

@ -85,7 +85,6 @@ public:
class Setting class Setting
{ {
public: public:
Setting(const std::string& _name, const ControlState def_value Setting(const std::string& _name, const ControlState def_value
, const unsigned int _low = 0, const unsigned int _high = 100) , const unsigned int _low = 0, const unsigned int _high = 100)
: name(_name) : name(_name)
@ -96,6 +95,10 @@ public:
, is_virtual(false) , is_virtual(false)
, is_iterate(false) {} , is_iterate(false) {}
virtual ~Setting()
{
}
const std::string name; const std::string name;
ControlState value; ControlState value;
const ControlState default_value; const ControlState default_value;