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 #4027 from leoetlino/fix-warnings 

Fix warnings
This commit is contained in:
Pierre Bourdon 2016-07-19 01:08:54 +02:00 committed by GitHub
parent dac1c2d4fe 0e1aeedb5b
commit 01e99b8a2a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -100,7 +100,7 @@ static void EnqueueEvent(u64 userdata, s64 cycles_late = 0)
Update();
}
void SDIO_EventNotify_CPUThread(u64 userdata, s64 cycles_late)
static void SDIO_EventNotify_CPUThread(u64 userdata, s64 cycles_late)
{
auto device =
static_cast<CWII_IPC_HLE_Device_sdio_slot0*>(GetDeviceByName("/dev/sdio/slot0").get());

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

@ -80,10 +80,11 @@ public:
class NumericSetting
{
public:
NumericSetting(const std::string& name, const ControlState default_value,
NumericSetting(const std::string& setting_name, const ControlState default_value,
const unsigned int low = 0, const unsigned int high = 100,
const SettingType type = SettingType::NORMAL)
: m_type(type), m_name(name), m_default_value(default_value), m_low(low), m_high(high)
const SettingType setting_type = SettingType::NORMAL)
: m_type(setting_type), m_name(setting_name), m_default_value(default_value), m_low(low),
m_high(high)
{
}
@ -99,9 +100,9 @@ public:
class BooleanSetting
{
public:
BooleanSetting(const std::string& name, const bool default_value,
const SettingType type = SettingType::NORMAL)
: m_type(type), m_name(name), m_default_value(default_value)
BooleanSetting(const std::string& setting_name, const bool default_value,
const SettingType setting_type = SettingType::NORMAL)
: m_type(setting_type), m_name(setting_name), m_default_value(default_value)
{
}
@ -116,8 +117,8 @@ public:
class BackgroundInputSetting : public BooleanSetting
{
public:
BackgroundInputSetting(const std::string& name)
: BooleanSetting(name, false, SettingType::VIRTUAL)
BackgroundInputSetting(const std::string& setting_name)
: BooleanSetting(setting_name, false, SettingType::VIRTUAL)
{
}