CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1372 from lioncash/tie 

key_map: Use std::tie for comparisons
master
Yuri Kunde Schlesner 2016-01-24 22:38:37 +07:00
parent c4cc099617 3933b68c59
commit cfaacc07dc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/key_map.h
Unescape Escape View File

@ -4,6 +4,7 @@
#pragma once
#include <tuple>
#include "core/hle/service/hid/hid.h"
namespace KeyMap {
@ -16,14 +17,13 @@ struct HostDeviceKey {
int device_id; ///< Uniquely identifies a host device
bool operator<(const HostDeviceKey &other) const {
if (device_id == other.device_id) {
return key_code < other.key_code;
}
return device_id < other.device_id;
return std::tie(key_code, device_id) <
std::tie(other.key_code, other.device_id);
}
bool operator==(const HostDeviceKey &other) const {
return device_id == other.device_id && key_code == other.key_code;
return std::tie(key_code, device_id) ==
std::tie(other.key_code, other.device_id);
}
};