0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup compilation for OS X

Browse source 
Apparently OS X does not provide an int std::abs(int) at all, or
we aren't including it properly or someting. I work around this.
This commit is contained in:
Chris Beck 2014-10-27 03:04:21 -04:00
parent b05773c409
commit 7ce9199e47
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/map_location.hpp
View file

@ -350,10 +350,13 @@ inline bool tiles_adjacent(const map_location& a, const map_location& b)
*/
}
// OS X appears not to provide std::abs with overload for int
inline int _abs(int x) {
return (x < 0) ? -x : x;
}
inline size_t distance_between(const map_location& a, const map_location& b)
{
int (*_abs)( int ) = & std::abs; // Needed to resolve ambiguity for OS X compilation
const size_t hdistance = _abs(a.x - b.x);
const size_t vpenalty = ( (((a.x & 1)==0) && ((b.x & 1)==1) && (a.y < b.y))