diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-17 14:10:08 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-06-27 12:53:54 +0200 |
| commit | b94f89e3920afdb37a33093ed30b402dacfd1394 (patch) | |
| tree | 0618a3c34e8920088bb0fdfb64043b153b899881 /src/3rdparty | |
| parent | 605b847ff51d07c4b10ba9f872f6d57368dcc403 (diff) | |
Removed repetition of (void) in Assimp's unzip crypth.h and ioapi.c
This is likely the result of the merge with the Assimp 3.1 upgrade.
gcc doesn't issue any warning at all. On the other hand this causes errors on
Windows.
Change-Id: I7bd4bdd0915ac0c225e85268aa9d8c7834e7a65a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/contrib/unzip/crypt.h | 1 | ||||
| -rw-r--r-- | src/3rdparty/assimp/contrib/unzip/ioapi.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/3rdparty/assimp/contrib/unzip/crypt.h b/src/3rdparty/assimp/contrib/unzip/crypt.h index 168c8e838..9d7957765 100644 --- a/src/3rdparty/assimp/contrib/unzip/crypt.h +++ b/src/3rdparty/assimp/contrib/unzip/crypt.h @@ -38,7 +38,6 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an * unpredictable manner on 16-bit systems; not a problem * with any known compiler so far, though */ - (void)pcrc_32_tab; // Unused temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); } diff --git a/src/3rdparty/assimp/contrib/unzip/ioapi.c b/src/3rdparty/assimp/contrib/unzip/ioapi.c index eb5e4dd57..af4739443 100644 --- a/src/3rdparty/assimp/contrib/unzip/ioapi.c +++ b/src/3rdparty/assimp/contrib/unzip/ioapi.c @@ -74,7 +74,6 @@ voidpf ZCALLBACK fopen_file_func(voidpf opaque, const char* filename, int mode) (void)opaque; // Unused FILE* file = NULL; const char* mode_fopen = NULL; - (void)opaque; // Unused if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) mode_fopen = "rb"; else @@ -94,7 +93,6 @@ uLong ZCALLBACK fread_file_func(voidpf opaque, voidpf stream, void* buf, uLong s { (void)opaque; // Unused uLong ret; - (void)opaque; // Unused ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); return ret; } @@ -104,7 +102,6 @@ uLong ZCALLBACK fwrite_file_func(voidpf opaque, voidpf stream, const void* buf, { (void)opaque; // Unused uLong ret; - (void)opaque; // Unused ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); return ret; } @@ -113,7 +110,6 @@ long ZCALLBACK ftell_file_func(voidpf opaque, voidpf stream) { (void)opaque; // Unused long ret; - (void)opaque; // Unused ret = ftell((FILE *)stream); return ret; } @@ -123,7 +119,6 @@ long ZCALLBACK fseek_file_func(voidpf opaque, voidpf stream, uLong offset, int o (void)opaque; // Unused int fseek_origin=0; long ret; - (void)opaque; // Unused switch (origin) { case ZLIB_FILEFUNC_SEEK_CUR : @@ -146,7 +141,6 @@ int ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream) { (void)opaque; // Unused int ret; - (void)opaque; // Unused ret = fclose((FILE *)stream); return ret; } @@ -155,7 +149,6 @@ int ZCALLBACK ferror_file_func(voidpf opaque, voidpf stream) { (void)opaque; // Unused int ret; - (void)opaque; // Unused ret = ferror((FILE *)stream); return ret; } |