diff options
| author | Colin Snover | 2017-11-06 22:45:32 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-12-03 20:27:42 -0600 |
| commit | a5bc89102e790d38d23a0a220ee2d42baee647a1 (patch) | |
| tree | 32c3bdb45c8cd7cf3ef9ea1f7af2c9337a079334 /graphics/scaler/intern.h | |
| parent | ef33d8a2fb987f3fdbeb094aca2ecdfcd5b269ba (diff) | |
| download | scummvm-rg350-a5bc89102e790d38d23a0a220ee2d42baee647a1.tar.gz scummvm-rg350-a5bc89102e790d38d23a0a220ee2d42baee647a1.tar.bz2 scummvm-rg350-a5bc89102e790d38d23a0a220ee2d42baee647a1.zip | |
ALL: Remove obsolete register keyword
The register keyword was deprecated from the C++11 standard,
<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4193.html#809>,
and removed from the C++17 standard,
<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4340>, so
cannot exist in a well-formed C++17 program.
It has never done anything in GCC
<https://gcc.gnu.org/ml/gcc/2010-05/msg00113.html>
and because of the way it is specified in the standard, it is “as
meaningful as whitespace”
<http://www.drdobbs.com/keywords-that-arent-or-comments-by-anoth/184403859>.
The one remaining use of the register keyword is in the DS backend,
where it is used to create a local register variable using the
non-standard GCC Extended Asm feature.
Closes gh-1079.
Diffstat (limited to 'graphics/scaler/intern.h')
| -rw-r--r-- | graphics/scaler/intern.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/scaler/intern.h b/graphics/scaler/intern.h index 0f3f874675..eddc3c7f3d 100644 --- a/graphics/scaler/intern.h +++ b/graphics/scaler/intern.h @@ -46,8 +46,8 @@ static inline uint32 interpolate32_1_1(uint32 p1, uint32 p2) { */ template<typename ColorMask> static inline uint32 interpolate32_3_1(uint32 p1, uint32 p2) { - register uint32 x = ((p1 & ColorMask::qhighBits) >> 2) * 3 + ((p2 & ColorMask::qhighBits) >> 2); - register uint32 y = ((p1 & ColorMask::qlowBits) * 3 + (p2 & ColorMask::qlowBits)) >> 2; + uint32 x = ((p1 & ColorMask::qhighBits) >> 2) * 3 + ((p2 & ColorMask::qhighBits) >> 2); + uint32 y = ((p1 & ColorMask::qlowBits) * 3 + (p2 & ColorMask::qlowBits)) >> 2; y &= ColorMask::qlowBits; return x + y; |