diff options
| author | Michael Lutz <michi@icosahedron.de> | 2021-11-05 23:55:23 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2021-12-16 22:28:32 +0100 |
| commit | 21675ec7e22bfe53f20300cc27b4d50c84aeb4dc (patch) | |
| tree | bfc6a1ef650ac6def3b80f86ec8d1a424900f459 /src/core | |
| parent | 2637c06f88ed6f9dea55449883f42a62c30f19d8 (diff) | |
| download | openttd-21675ec7e22bfe53f20300cc27b4d50c84aeb4dc.tar.xz | |
Codechange: Un-bitstuff vehicle/engine commands.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/enum_type.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/enum_type.hpp b/src/core/enum_type.hpp index 72e23ba36..f094bae91 100644 --- a/src/core/enum_type.hpp +++ b/src/core/enum_type.hpp @@ -29,9 +29,9 @@ /** Operators to allow to work with enum as with type safe bit set in C++ */ # define DECLARE_ENUM_AS_BIT_SET(mask_t) \ - inline constexpr mask_t operator | (mask_t m1, mask_t m2) {return (mask_t)((std::underlying_type<mask_t>::type)m1 | m2);} \ - inline constexpr mask_t operator & (mask_t m1, mask_t m2) {return (mask_t)((std::underlying_type<mask_t>::type)m1 & m2);} \ - inline constexpr mask_t operator ^ (mask_t m1, mask_t m2) {return (mask_t)((std::underlying_type<mask_t>::type)m1 ^ m2);} \ + inline constexpr mask_t operator | (mask_t m1, mask_t m2) {return (mask_t)((std::underlying_type<mask_t>::type)m1 | (std::underlying_type<mask_t>::type)m2);} \ + inline constexpr mask_t operator & (mask_t m1, mask_t m2) {return (mask_t)((std::underlying_type<mask_t>::type)m1 & (std::underlying_type<mask_t>::type)m2);} \ + inline constexpr mask_t operator ^ (mask_t m1, mask_t m2) {return (mask_t)((std::underlying_type<mask_t>::type)m1 ^ (std::underlying_type<mask_t>::type)m2);} \ inline constexpr mask_t& operator |= (mask_t& m1, mask_t m2) {m1 = m1 | m2; return m1;} \ inline constexpr mask_t& operator &= (mask_t& m1, mask_t m2) {m1 = m1 & m2; return m1;} \ inline constexpr mask_t& operator ^= (mask_t& m1, mask_t m2) {m1 = m1 ^ m2; return m1;} \ |