summaryrefslogtreecommitdiffstats
path: root/src/server/ControlBindings.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/ControlBindings.hpp')
-rw-r--r--src/server/ControlBindings.hpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index 538ab3ef..832e36d1 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -53,9 +53,13 @@ public:
struct Key {
Key(Type t=Type::NULL_CONTROL, int16_t n=0) : type(t), num(n) {}
inline bool operator<(const Key& other) const {
- return (type == other.type) ? (num < other.num) : (type < other.type);
+ return ((type < other.type) ||
+ (type == other.type && num < other.num));
}
- inline operator bool() const { return type != Type::NULL_CONTROL; }
+ inline bool operator==(const Key& other) const {
+ return type == other.type && num == other.num;
+ }
+ inline bool operator!() const { return type == Type::NULL_CONTROL; }
Type type;
int16_t num;
};