summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2018-06-10 17:57:45 +0200
committerGitHub <noreply@github.com>2018-06-10 17:57:45 +0200
commit88f8df0ad92250088b81cbecd8624ef2ecc4f4a0 (patch)
tree7ee118252d53efae75aea22be7c3541908d9af43 /Source
parent69f079b37119aecebc4a2e400270814dc4827fe5 (diff)
parent0d0f58005bdb9f9ce3525f2d24f2b8d84d3996b9 (diff)
Merge pull request #7105 from lioncash/cast
WiimoteDevice: Remove unnecessary cast
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
index 7225656fc5..1aef6a7d85 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
@@ -271,14 +271,14 @@ void WiimoteDevice::ExecuteL2capCmd(u8* _pData, u32 _Size)
{
DEBUG_ASSERT_MSG(IOS_WIIMOTE, DoesChannelExist(pHeader->dcid),
"L2CAP: SendACLPacket to unknown channel %i", pHeader->dcid);
- CChannelMap::iterator itr = m_Channel.find(pHeader->dcid);
+ const auto itr = m_Channel.find(pHeader->dcid);
const int number = m_ConnectionHandle & 0xFF;
if (itr != m_Channel.end())
{
- SChannel& rChannel = itr->second;
- switch (rChannel.PSM)
+ const SChannel& channel = itr->second;
+ switch (channel.PSM)
{
case L2CAP_PSM_SDP:
HandleSDP(pHeader->dcid, pData, DataSize);
@@ -295,8 +295,8 @@ void WiimoteDevice::ExecuteL2capCmd(u8* _pData, u32 _Size)
{
DEBUG_LOG(WIIMOTE, "Wiimote_InterruptChannel");
DEBUG_LOG(WIIMOTE, " Channel ID: %04x", pHeader->dcid);
- std::string Temp = ArrayToString((const u8*)pData, DataSize);
- DEBUG_LOG(WIIMOTE, " Data: %s", Temp.c_str());
+ const std::string temp = ArrayToString(pData, DataSize);
+ DEBUG_LOG(WIIMOTE, " Data: %s", temp.c_str());
Wiimote::InterruptChannel(number, pHeader->dcid, pData, DataSize);
}
@@ -304,7 +304,7 @@ void WiimoteDevice::ExecuteL2capCmd(u8* _pData, u32 _Size)
break;
default:
- ERROR_LOG(IOS_WIIMOTE, "Channel 0x04%x has unknown PSM %x", pHeader->dcid, rChannel.PSM);
+ ERROR_LOG(IOS_WIIMOTE, "Channel 0x04%x has unknown PSM %x", pHeader->dcid, channel.PSM);
break;
}
}