From 0e1aeedb5bd3144c5dc998a63d8c6a527d483fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 18 Jul 2016 19:30:47 +0200 Subject: [PATCH] Fix warnings 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 --- Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp | 2 +- Source/Core/InputCommon/ControllerEmu.h | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp index 776ecd1132..68e3c87313 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp @@ -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(GetDeviceByName("/dev/sdio/slot0").get()); diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h index fd5f499159..d9470ca8a9 100644 --- a/Source/Core/InputCommon/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu.h @@ -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) { }