godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-07 19:53:17 +00:00
Code Releases Wiki Activity

Fixed unsafe casts

Browse Source
This commit is contained in:
Rainer Deyke
2022-04-04 14:55:41 +02:00
parent 2907ca3a41
commit 56ae5bbafb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/os/keyboard.h
View File

@@ -315,7 +315,8 @@ constexpr Key operator-(uint32_t a, Key b) {
}
constexpr Key &operator-=(Key &a, int b) {
return (Key &)((int &)a -= b);
a = static_cast<Key>(static_cast<int>(a) - static_cast<int>(b));
return a;
}
constexpr Key operator+(Key a, int b) {
@@ -339,15 +340,18 @@ constexpr Key operator|(Key a, Key b) {
}
constexpr Key &operator|=(Key &a, Key b) {
return (Key &)((int &)a |= (int)b);
a = static_cast<Key>(static_cast<int>(a) | static_cast<int>(b));
return a;
}
constexpr Key &operator|=(Key &a, KeyModifierMask b) {
return (Key &)((int &)a |= (int)b);
a = static_cast<Key>(static_cast<int>(a) | static_cast<int>(b));
return a;
}
constexpr Key &operator&=(Key &a, KeyModifierMask b) {
return (Key &)((int &)a &= (int)b);
a = static_cast<Key>(static_cast<int>(a) & static_cast<int>(b));
return a;
}
constexpr Key operator|(Key a, KeyModifierMask b) {