|
@@ -49,55 +49,48 @@ template <typename T> static inline T de
|
|
|
{ \
|
|
|
type e_org = e; \
|
|
|
e = (type)((int)e + 1); \
|
|
|
return e_org; \
|
|
|
} \
|
|
|
FORCEINLINE type operator --(type& e, int) \
|
|
|
{ \
|
|
|
type e_org = e; \
|
|
|
e = (type)((int)e - 1); \
|
|
|
return e_org; \
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** Operators to allow to work with enum as with type safe bit set in C++ */
|
|
|
# define DECLARE_ENUM_AS_BIT_SET(mask_t) \
|
|
|
FORCEINLINE mask_t operator | (mask_t m1, mask_t m2) {return (mask_t)((int)m1 | m2);} \
|
|
|
FORCEINLINE mask_t operator & (mask_t m1, mask_t m2) {return (mask_t)((int)m1 & m2);} \
|
|
|
FORCEINLINE mask_t operator ^ (mask_t m1, mask_t m2) {return (mask_t)((int)m1 ^ m2);} \
|
|
|
FORCEINLINE mask_t& operator |= (mask_t& m1, mask_t m2) {m1 = m1 | m2; return m1;} \
|
|
|
FORCEINLINE mask_t& operator &= (mask_t& m1, mask_t m2) {m1 = m1 & m2; return m1;} \
|
|
|
FORCEINLINE mask_t& operator ^= (mask_t& m1, mask_t m2) {m1 = m1 ^ m2; return m1;} \
|
|
|
FORCEINLINE mask_t operator ~(mask_t m) {return (mask_t)(~(int)m);}
|
|
|
|
|
|
/** probably redundant enum combining operators (as we have conversion functions)
|
|
|
* but the old code is full of such arithmetics */
|
|
|
# define DECLARE_ENUM_AS_BIT_INDEX(idx_t, mask_t) \
|
|
|
FORCEINLINE mask_t operator << (int m, idx_t i) {return (mask_t)(m << (int)i);} \
|
|
|
FORCEINLINE mask_t operator << (mask_t m, int i) {return (mask_t)(((int)m) << i);} \
|
|
|
FORCEINLINE mask_t operator >> (mask_t m, int i) {return (mask_t)(((int)m) >> i);}
|
|
|
|
|
|
|
|
|
/** Informative template class exposing basic enumeration properties used by several
|
|
|
* other templates below. Here we have only forward declaration. For each enum type
|
|
|
* we will create specialization derived from MakeEnumPropsT<>.
|
|
|
* i.e.:
|
|
|
* template <> struct EnumPropsT<Track> : MakeEnumPropsT<Track, byte, TRACK_BEGIN, TRACK_END, INVALID_TRACK> {};
|
|
|
* followed by:
|
|
|
* typedef TinyEnumT<Track> TrackByte;
|
|
|
*/
|
|
|
template <typename Tenum_t> struct EnumPropsT;
|
|
|
|
|
|
/** Helper template class that makes basic properties of given enumeration type visible
|
|
|
* from outsize. It is used as base class of several EnumPropsT specializations each
|
|
|
* dedicated to one of commonly used enumeration types.
|
|
|
* @param Tenum_t enumeration type that you want to describe
|
|
|
* @param Tstorage_t what storage type would be sufficient (i.e. byte)
|
|
|
* @param Tbegin first valid value from the contiguous range (i.e. TRACK_BEGIN)
|
|
|
* @param Tend one past the last valid value from the contiguous range (i.e. TRACK_END)
|
|
|
* @param Tinvalid value used as invalid value marker (i.e. INVALID_TRACK)
|
|
|
*/
|
|
|
template <typename Tenum_t, typename Tstorage_t, Tenum_t Tbegin, Tenum_t Tend, Tenum_t Tinvalid>
|
|
|
struct MakeEnumPropsT {
|
|
|
typedef Tenum_t type; ///< enum type (i.e. Trackdir)
|
|
|
typedef Tstorage_t storage; ///< storage type (i.e. byte)
|