1
0
Fork 0

(svn r13273) -Fix [FS#2042]: MSVC warnings (again)

release/0.7
glx 2008-05-26 20:20:38 +00:00
parent 0972b3dd15
commit 6e6014918e
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -97,7 +97,7 @@ template<typename T> 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.