cpp/openttd-patchpack/source Changeset - r23640:bf5f48730ba3

Changeset - r23640:bf5f48730ba3

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 5 years ago 2019-04-21 20:01:42
peter1138@openttd.org

Fix: Replace int with std::underlying_type in DECLARE_ENUM_AS_BIT_SET.

This fixes 64 bit uses of this macro.

1 file changed with 4 insertions and 4 deletions:

src/core/enum_type.hpp

0 comments (0 inline, 0 general)

src/core/enum_type.hpp

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ @@
 /** Operators to allow to work with enum as with type safe bit set in C++ */
 # define DECLARE_ENUM_AS_BIT_SET(mask_t) \
 	inline mask_t operator | (mask_t m1, mask_t m2) {return (mask_t)((int)m1 | m2);} \
 	inline mask_t operator & (mask_t m1, mask_t m2) {return (mask_t)((int)m1 & m2);} \
 	inline mask_t operator ^ (mask_t m1, mask_t m2) {return (mask_t)((int)m1 ^ m2);} \
 	inline mask_t operator | (mask_t m1, mask_t m2) {return (mask_t)((std::underlying_type<mask_t>::type)m1 | m2);} \
 	inline mask_t operator & (mask_t m1, mask_t m2) {return (mask_t)((std::underlying_type<mask_t>::type)m1 & m2);} \
 	inline mask_t operator ^ (mask_t m1, mask_t m2) {return (mask_t)((std::underlying_type<mask_t>::type)m1 ^ m2);} \
 	inline mask_t& operator |= (mask_t& m1, mask_t m2) {m1 = m1 | m2; return m1;} \
 	inline mask_t& operator &= (mask_t& m1, mask_t m2) {m1 = m1 & m2; return m1;} \
 	inline mask_t& operator ^= (mask_t& m1, mask_t m2) {m1 = m1 ^ m2; return m1;} \
-	inline mask_t operator ~(mask_t m) {return (mask_t)(~(int)m);}
+	inline mask_t operator ~(mask_t m) {return (mask_t)(~(std::underlying_type<mask_t>::type)m);}
 /**

0 comments (0 inline, 0 general)