cpp/openttd-patchpack/source Changeset - r7827:c754de5e3818

Changeset - r7827:c754de5e3818

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

truelight - 17 years ago 2007-11-04 17:43:53
truelight@openttd.org

(svn r11377) -Codechange: some more strictness in macros.h (skidd13)

1 file changed with 8 insertions and 10 deletions:

src/macros.h

0 comments (0 inline, 0 general)

src/macros.h

➞

Show inline comments

@@ @@ -107,8 +107,7 @@ template<typename T> static inline T min @@
  */
 static inline int min(const int a, const int b)
+{
 	if (a <= b) return a;
 	return b;
 	return a <= b ? a : b;
+}
 /**
@@ @@ -122,8 +121,7 @@ static inline int min(const int a, const @@
  */
 static inline uint minu(const uint a, const uint b)
+{
 	if (a <= b) return a;
 	return b;
 	return a <= b ? a : b;
+}
 /**
@@ @@ -204,7 +202,7 @@ static inline int32 ClampToI32(const int @@
  * @param shift The amount to shift the value to right.
  * @return The shifted result
  */
-static inline int32 BIGMULSS(const int32 a, const int32 b, const int8 shift)
+static inline int32 BIGMULSS(const int32 a, const int32 b, const uint8 shift)
+{
 	return (int32)((int64)a * (int64)b >> shift);
+}
@@ @@ -220,7 +218,7 @@ static inline int32 BIGMULSS(const int32 @@
  * @param shift The amount to shift the value to right.
  * @return The shifted result
  */
-static inline uint32 BIGMULUS(const uint32 a, const uint32 b, const int8 shift)
+static inline uint32 BIGMULUS(const uint32 a, const uint32 b, const uint8 shift)
+{
 	return (uint32)((uint64)a * (uint64)b >> shift);
+}
@@ @@ -253,7 +251,7 @@ static inline uint32 BIGMULUS(const uint @@
  * @param y The position of the bit to check, started from the LSB
  * @return True if the bit is set, false else.
  */
-template<typename T> static inline bool HASBIT(const T x, const int8 y)
+template<typename T> static inline bool HASBIT(const T x, const uint8 y)
+{
 	return (x & ((T)1U << y)) != 0;
+}
@@ @@ -269,7 +267,7 @@ template<typename T> static inline bool @@
  * @param y The bit position to set
  * @return The new value of the old value with the bit set
  */
-template<typename T> static inline T SETBIT(T& x, const int8 y)
+template<typename T> static inline T SETBIT(T& x, const uint8 y)
+{
 	return x |= (T)1U << y;
+}
@@ @@ -285,7 +283,7 @@ template<typename T> static inline T SET @@
  * @param y The bit position to clear
  * @return The new value of the old value with the bit cleared
  */
-template<typename T> static inline T CLRBIT(T& x, const int8 y)
+template<typename T> static inline T CLRBIT(T& x, const uint8 y)
+{
 	return x &= ~((T)1U << y);
+}
@@ @@ -301,7 +299,7 @@ template<typename T> static inline T CLR @@
  * @param y The bit position to toggle
  * @return The new value of the old value with the bit toggled
  */
-template<typename T> static inline T TOGGLEBIT(T& x, const int8 y)
+template<typename T> static inline T TOGGLEBIT(T& x, const uint8 y)
+{
 	return x ^= (T)1U << y;
+}

0 comments (0 inline, 0 general)