cpp/openttd-patchpack/source Changeset - r6110:56e55667e260

Changeset - r6110:56e55667e260

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

tron - 17 years ago 2007-02-22 18:44:42
tron@openttd.org

(svn r8846) -Fix

Remove confusing superfluous parentheses

1 file changed with 17 insertions and 18 deletions:

src/macros.h

0 comments (0 inline, 0 general)

src/macros.h

➞

Show inline comments

@@ @@ -43,44 +43,43 @@ static inline uint clampu(uint a, uint m @@
 	return a;
+}
 static inline int32 BIGMULSS(int32 a, int32 b, int shift) {
 	return (int32)(((int64)(a) * (int64)(b)) >> (shift));
 static inline int32 BIGMULSS(int32 a, int32 b, int shift)
+{
 	return (int32)((int64)a * (int64)b >> shift);
+}
 static inline uint32 BIGMULUS(uint32 a, uint32 b, int shift) {
 	return (uint32)(((uint64)(a) * (uint64)(b)) >> (shift));
 static inline uint32 BIGMULUS(uint32 a, uint32 b, int shift)
+{
 	return (uint32)((uint64)a * (uint64)b >> shift);
+}
 static inline int64 BIGMULS(int32 a, int32 b) {
 	return (int64)(a) * (int64)(b);
 static inline int64 BIGMULS(int32 a, int32 b)
+{
 	return (int64)a * (int64)b;
+}
 /* OPT: optimized into an unsigned comparison */
 //#define IS_INSIDE_1D(x, base, size) ((x) >= (base) && (x) < (base) + (size))
 #define IS_INSIDE_1D(x, base, size) ( (uint)((x) - (base)) < ((uint)(size)) )
 template <typename T>
 static inline bool HASBIT(T x, int y)
 template<typename T> static inline bool HASBIT(T x, int y)
+{
-	return (x & (((T)1) << y)) != 0;
 	return (x & ((T)1 << y)) != 0;
+}
 template <typename T>
 static inline T SETBIT(T& x, int y)
 template<typename T> static inline T SETBIT(T& x, int y)
+{
-	return x |= (((T)1) << y);
 	return x |= (T)1 << y;
+}
 template <typename T>
 static inline T CLRBIT(T& x, int y)
 template<typename T> static inline T CLRBIT(T& x, int y)
+{
-	return x &= ~(((T)1) << y);
 	return x &= ~((T)1 << y);
+}
 template <typename T>
 static inline T TOGGLEBIT(T& x, int y)
 template<typename T> static inline T TOGGLEBIT(T& x, int y)
+{
-	return x ^= (((T)1) << y);
 	return x ^= (T)1 << y;
+}

0 comments (0 inline, 0 general)