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/2xsai.cpp | |
| 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/2xsai.cpp')
| -rw-r--r-- | graphics/scaler/2xsai.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/graphics/scaler/2xsai.cpp b/graphics/scaler/2xsai.cpp index 757c1cf8de..4389d52745 100644 --- a/graphics/scaler/2xsai.cpp +++ b/graphics/scaler/2xsai.cpp @@ -92,7 +92,7 @@ void Super2xSaITemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uin } else if (color5 == color3 && color2 != color6) { product2b = product1b = color5; } else if (color5 == color3 && color2 == color6) { - register int r = 0; + int r = 0; r += GetResult(color6, color5, color1, colorA1); r += GetResult(color6, color5, color4, colorB1); @@ -227,7 +227,7 @@ void SuperEagleTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uin product2a = interpolate_1_1(color2, color3); } } else { - register int r = 0; + int r = 0; r += GetResult(color6, color5, color1, colorA1); r += GetResult(color6, color5, color4, colorB1); @@ -282,8 +282,7 @@ void _2xSaITemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 for (int i = 0; i < width; ++i) { - register unsigned colorA, colorB; - unsigned colorC, colorD, + unsigned colorA, colorB, colorC, colorD, colorE, colorF, colorG, colorH, colorI, colorJ, colorK, colorL, colorM, colorN, colorO; unsigned product, product1, product2; @@ -347,7 +346,7 @@ void _2xSaITemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 product1 = colorA; product2 = colorA; } else { - register int r = 0; + int r = 0; product1 = interpolate_1_1(colorA, colorC); product = interpolate_1_1(colorA, colorB); |