From 87226c519a1e79d203ca89060bcf969d28d5913a Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 25 Feb 2007 11:59:26 +0000 Subject: [PATCH] (svn r8901) -Fix Get rid of DECLARE_ENUM_AS_BIT_INDEX(Trackdir, TrackdirBits) and DECLARE_ENUM_AS_BIT_INDEX() altogether --- src/helpers.hpp | 7 ------- src/rail.h | 1 - 2 files changed, 8 deletions(-) diff --git a/src/helpers.hpp b/src/helpers.hpp index d0071ae0b9..9f4cf0c827 100644 --- a/src/helpers.hpp +++ b/src/helpers.hpp @@ -70,13 +70,6 @@ template static inline T delta(T a, T b) { return a < b ? b - a : a 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 diff --git a/src/rail.h b/src/rail.h index 622fa60c00..81b085f4ef 100644 --- a/src/rail.h +++ b/src/rail.h @@ -161,7 +161,6 @@ typedef enum TrackdirBits { template <> struct EnumPropsT : MakeEnumPropsT {}; typedef TinyEnumT 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. */