Mercurial > hg > openttd
changeset 6156:b32f90d510ef draft
(svn r8901) -Fix
Get rid of DECLARE_ENUM_AS_BIT_INDEX(Trackdir, TrackdirBits) and DECLARE_ENUM_AS_BIT_INDEX() altogether
author | tron <tron@openttd.org> |
---|---|
date | Sun, 25 Feb 2007 11:59:26 +0000 |
parents | 09afc32cc744 |
children | e080eca511f9 |
files | src/helpers.hpp src/rail.h |
diffstat | 2 files changed, 0 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/helpers.hpp +++ b/src/helpers.hpp @@ -70,13 +70,6 @@ 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
--- a/src/rail.h +++ b/src/rail.h @@ -161,7 +161,6 @@ template <> struct EnumPropsT<TrackdirBits> : MakeEnumPropsT<TrackdirBits, uint16, TRACKDIR_BIT_NONE, TRACKDIR_BIT_MASK, INVALID_TRACKDIR_BIT> {}; typedef TinyEnumT<TrackdirBits> TrackdirBitsShort; DECLARE_ENUM_AS_BIT_SET(TrackdirBits); -DECLARE_ENUM_AS_BIT_INDEX(Trackdir, TrackdirBits); /** This struct contains all the info that is needed to draw and construct tracks. */