From b3d7ca0ceb6a9ba717e1bf0ee85459c6141054fc Mon Sep 17 00:00:00 2001 From: glx Date: Mon, 26 May 2008 20:20:38 +0000 Subject: (svn r13273) -Fix [FS#2042]: MSVC warnings (again) --- src/bridge_gui.cpp | 2 +- src/core/bitmath_func.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp index 7d1c09df4..a2d49ae2b 100644 --- a/src/bridge_gui.cpp +++ b/src/bridge_gui.cpp @@ -65,7 +65,7 @@ private: /* Constants for sorting the bridges */ static const StringID sorter_names[]; - static const GUIBridgeList::SortFunction *const sorter_funcs[]; + static GUIBridgeList::SortFunction *const sorter_funcs[]; /* Internal variables */ TileIndex start_tile; diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.hpp index 775ae8338..dd93b11d9 100644 --- a/src/core/bitmath_func.hpp +++ b/src/core/bitmath_func.hpp @@ -97,7 +97,7 @@ template static inline bool HasBit(const T x, const uint8 y) * @param y The second value * @return True if at least one bit is set in both values, false else. */ -#define HASBITS(x, y) ((x) & (y)) +#define HASBITS(x, y) (((x) & (y)) != 0) /** * Set a bit in a variable. -- cgit v1.2.3-54-g00ecf