diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-03 12:32:50 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-04 16:02:53 +0000 |
| commit | bf1aedbfed7a7ce0ce7612bd7614b31ce18a1344 (patch) | |
| tree | a0102e46460bcb7aa196972b32255eb05fc4aa9b /src/3rdparty/assimp/contrib/unzip/crypt.h | |
| parent | 29aa70ec0eb8f408d5960cf4186ed77f3c3d4b38 (diff) | |
| download | qt3d-bf1aedbfed7a7ce0ce7612bd7614b31ce18a1344.tar.gz | |
assimp: Remove usage of deprecated keyword register
Change-Id: I1a85b0602c9e2729bab9582dc5325213f3598988
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/3rdparty/assimp/contrib/unzip/crypt.h')
| -rw-r--r-- | src/3rdparty/assimp/contrib/unzip/crypt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/assimp/contrib/unzip/crypt.h b/src/3rdparty/assimp/contrib/unzip/crypt.h index 622f4bc2e..1362cfcd1 100644 --- a/src/3rdparty/assimp/contrib/unzip/crypt.h +++ b/src/3rdparty/assimp/contrib/unzip/crypt.h @@ -51,7 +51,7 @@ static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int (*(pkeys+1)) += (*(pkeys+0)) & 0xff; (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1; { - register int keyshift = (int)((*(pkeys+1)) >> 24); + int keyshift = (int)((*(pkeys+1)) >> 24); (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift); } return c; |