Skip to content

Commit

Permalink
Fix warnings
Browse files Browse the repository at this point in the history
This fixes warnings in:
- Source/Core/InputCommon/ControllerEmu.h: avoid shadowing other
  variables (my fault)
- Source/Core/Core/IPC_HLE/WII_IPC_HLE.h: made
  SDIO_EventNotify_CPUThread static as it's not used anywhere else
  • Loading branch information
leoetlino committed Jul 18, 2016
1 parent 320e0d1 commit 0e1aeed
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
17 changes: 9 additions & 8 deletions Source/Core/InputCommon/ControllerEmu.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,11 @@ class ControllerEmu
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)
{
}

Expand All @@ -99,9 +100,9 @@ class ControllerEmu
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)
{
}

Expand All @@ -116,8 +117,8 @@ class ControllerEmu
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)
{
}

Expand Down

0 comments on commit 0e1aeed

Please sign in to comment.