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

Fix std::{min,max} calls on architectures where long != int64

Browse source
This commit is contained in:
Alexander van Gessel 2017-09-21 16:59:14 +02:00
parent 2a742182d8
commit ad35b7ffd3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/filesystem_sdl.cpp
View file

@ -111,13 +111,14 @@ static Sint64 ofs_size (struct SDL_RWops * context) {
typedef std::pair<Sint64, std::ios_base::seekdir> offset_dir;
static offset_dir translate_seekdir(Sint64 offset, int whence) {
Sint64 zero = 0;
switch(whence){
case RW_SEEK_SET:
return std::make_pair(std::max(0l, offset), std::ios_base::beg);
return std::make_pair(std::max(zero, offset), std::ios_base::beg);
case RW_SEEK_CUR:
return std::make_pair(offset, std::ios_base::cur);
case RW_SEEK_END:
return std::make_pair(std::min(0l, offset), std::ios_base::end);
return std::make_pair(std::min(zero, offset), std::ios_base::end);
default:
assert(false);
throw "assertion ignored";