Device: Use std::tie for DeviceQualifier's operator==

This commit is contained in:
Lioncash 2016-06-25 22:59:07 -04:00
parent 3a26167148
commit 55916b963d

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