diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-25 21:28:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-25 21:46:40 +0300 |
| commit | 81db0022e50e25d922ac7d67d9ec6017b8856f13 (patch) | |
| tree | 0ead8c5df5b8eb00cbe5e07e2f7dc36170786846 /src/utils/physfsrwops.cpp | |
| parent | 6317f3e0c1e2c6d2e88dd99443e7f45f7bb77f44 (diff) | |
| download | manaplus-81db0022e50e25d922ac7d67d9ec6017b8856f13.tar.gz manaplus-81db0022e50e25d922ac7d67d9ec6017b8856f13.tar.bz2 manaplus-81db0022e50e25d922ac7d67d9ec6017b8856f13.tar.xz manaplus-81db0022e50e25d922ac7d67d9ec6017b8856f13.zip | |
Fix old casts.
Diffstat (limited to 'src/utils/physfsrwops.cpp')
| -rw-r--r-- | src/utils/physfsrwops.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/utils/physfsrwops.cpp b/src/utils/physfsrwops.cpp index 1960f0dee..2675b89ae 100644 --- a/src/utils/physfsrwops.cpp +++ b/src/utils/physfsrwops.cpp @@ -29,7 +29,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) { - PHYSFS_file *handle = (PHYSFS_file *) rw->hidden.unknown.data1; + PHYSFS_file *handle = static_cast<PHYSFS_file *>(rw->hidden.unknown.data1); int pos = 0; if (whence == SEEK_SET) @@ -46,8 +46,8 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) return -1; } /* if */ - pos = (int)current; - if (((PHYSFS_sint64)pos) != current) + pos = static_cast<int>(current); + if (static_cast<PHYSFS_sint64>(pos) != current) { SDL_SetError("Can't fit current file position in an int!"); return -1; @@ -67,8 +67,8 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) return -1; } /* if */ - pos = (int)len; - if (((PHYSFS_sint64)pos) != len) + pos = static_cast<int>(len); + if (static_cast<PHYSFS_sint64>(pos) != len) { SDL_SetError("Can't fit end-of-file position in an int!"); return -1; @@ -88,7 +88,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) return -1; } /* if */ - if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos)) + if (!PHYSFS_seek(handle, static_cast<PHYSFS_uint64>(pos))) { SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); return -1; @@ -99,7 +99,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum) { - PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1; + PHYSFS_file *handle = static_cast<PHYSFS_file*>(rw->hidden.unknown.data1); PHYSFS_sint64 rc = PHYSFS_read(handle, ptr, size, maxnum); if (rc != maxnum) { @@ -107,22 +107,22 @@ static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum) SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); } /* if */ - return (int)rc; + return static_cast<int>(rc); } /* physfsrwops_read */ static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num) { - PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1; + PHYSFS_file *handle = static_cast<PHYSFS_file*>(rw->hidden.unknown.data1); PHYSFS_sint64 rc = PHYSFS_write(handle, ptr, size, num); if (rc != num) SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - return (int) rc; + return static_cast<int>(rc); } /* physfsrwops_write */ static int physfsrwops_close(SDL_RWops *rw) { - PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1; + PHYSFS_file *handle = static_cast<PHYSFS_file*>(rw->hidden.unknown.data1); if (!PHYSFS_close(handle)) { SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); |