asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Made Key operators constexpr

Browse source 
Made operators on Key and KeyModifierMask constexpr, allowing them to
be used in switch cases.
This commit is contained in:
Rainer Deyke 2022-04-01 11:04:25 +02:00
parent 338b23d572
commit 2907ca3a41
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
core/os/keyboard.h
View file

@ -310,67 +310,67 @@ enum class KeyModifierMask {
// To avoid having unnecessary operators, only define the ones that are needed.
inline Key operator-(uint32_t a, Key b) {
constexpr Key operator-(uint32_t a, Key b) {
return (Key)(a - (uint32_t)b);
}
inline Key &operator-=(Key &a, int b) {
constexpr Key &operator-=(Key &a, int b) {
return (Key &)((int &)a -= b);
}
inline Key operator+(Key a, int b) {
constexpr Key operator+(Key a, int b) {
return (Key)((int)a + (int)b);
}
inline Key operator+(Key a, Key b) {
constexpr Key operator+(Key a, Key b) {
return (Key)((int)a + (int)b);
}
inline Key operator-(Key a, Key b) {
constexpr Key operator-(Key a, Key b) {
return (Key)((int)a - (int)b);
}
inline Key operator&(Key a, Key b) {
constexpr Key operator&(Key a, Key b) {
return (Key)((int)a & (int)b);
}
inline Key operator|(Key a, Key b) {
constexpr Key operator|(Key a, Key b) {
return (Key)((int)a | (int)b);
}
inline Key &operator|=(Key &a, Key b) {
constexpr Key &operator|=(Key &a, Key b) {
return (Key &)((int &)a |= (int)b);
}
inline Key &operator|=(Key &a, KeyModifierMask b) {
constexpr Key &operator|=(Key &a, KeyModifierMask b) {
return (Key &)((int &)a |= (int)b);
}
inline Key &operator&=(Key &a, KeyModifierMask b) {
constexpr Key &operator&=(Key &a, KeyModifierMask b) {
return (Key &)((int &)a &= (int)b);
}
inline Key operator|(Key a, KeyModifierMask b) {
constexpr Key operator|(Key a, KeyModifierMask b) {
return (Key)((int)a | (int)b);
}
inline Key operator&(Key a, KeyModifierMask b) {
constexpr Key operator&(Key a, KeyModifierMask b) {
return (Key)((int)a & (int)b);
}
inline Key operator+(KeyModifierMask a, Key b) {
constexpr Key operator+(KeyModifierMask a, Key b) {
return (Key)((int)a + (int)b);
}
inline Key operator|(KeyModifierMask a, Key b) {
constexpr Key operator|(KeyModifierMask a, Key b) {
return (Key)((int)a | (int)b);
}
inline KeyModifierMask operator+(KeyModifierMask a, KeyModifierMask b) {
constexpr KeyModifierMask operator+(KeyModifierMask a, KeyModifierMask b) {
return (KeyModifierMask)((int)a + (int)b);
}
inline KeyModifierMask operator|(KeyModifierMask a, KeyModifierMask b) {
constexpr KeyModifierMask operator|(KeyModifierMask a, KeyModifierMask b) {
return (KeyModifierMask)((int)a | (int)b);
}