Merge pull request #3940 from lioncash/tie

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

View File

@ -4,6 +4,7 @@
#include <sstream>
#include <string>
#include <tuple>
// For InputGateOn()
// 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
{
if (cid == devq.cid)
if (name == devq.name)
if (source == devq.source)
return true;
return false;
return std::tie(cid, name, source) == std::tie(devq.cid, devq.name, devq.source);
}
std::shared_ptr<Device> DeviceContainer::FindDevice(const DeviceQualifier& devq) const