The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 03:46:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3940 from lioncash/tie

Browse Source 
Device: Use std::tie for operator==
This commit is contained in:
Markus Wick 2016-06-26 06:40:14 +02:00 committed by GitHub
commit bc354277ca
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/InputCommon/ControllerInterface/Device.cpp
View File

@ -4,6 +4,7 @@
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <tuple>
// For InputGateOn() // For InputGateOn()
// This is a really bad layering violation, but it's the cleanest // This is a really bad layering violation, but it's the cleanest
@ -136,12 +137,7 @@ bool DeviceQualifier::operator==(const Device* const dev) const
bool DeviceQualifier::operator==(const DeviceQualifier& devq) const bool DeviceQualifier::operator==(const DeviceQualifier& devq) const
{ {
if (cid == devq.cid) return std::tie(cid, name, source) == std::tie(devq.cid, devq.name, devq.source);
if (name == devq.name)
if (source == devq.source)
return true;
return false;
} }
std::shared_ptr<Device> DeviceContainer::FindDevice(const DeviceQualifier& devq) const std::shared_ptr<Device> DeviceContainer::FindDevice(const DeviceQualifier& devq) const