aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorColin Snover2017-11-06 22:45:32 -0600
committerColin Snover2017-12-03 20:27:42 -0600
commita5bc89102e790d38d23a0a220ee2d42baee647a1 (patch)
tree32c3bdb45c8cd7cf3ef9ea1f7af2c9337a079334 /backends
parentef33d8a2fb987f3fdbeb094aca2ecdfcd5b269ba (diff)
downloadscummvm-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 'backends')
-rw-r--r--backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp14
-rw-r--r--backends/graphics/gph/gph-graphics.cpp14
-rw-r--r--backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp14
-rw-r--r--backends/graphics/surfacesdl/surfacesdl-graphics.cpp8
-rw-r--r--backends/platform/psp/memory.h2
-rw-r--r--backends/platform/psp/trace.cpp4
-rw-r--r--backends/platform/symbian/src/portdefs.h6
-rw-r--r--backends/platform/symbian/src/vsnprintf.h8
8 files changed, 35 insertions, 35 deletions
diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
index 7d5f542ac0..e04c9145c2 100644
--- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
+++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
@@ -313,13 +313,13 @@ void DINGUXSdlGraphicsManager::internUpdateScreen() {
dstPitch = _hwScreen->pitch;
for (r = _dirtyRectList; r != lastRect; ++r) {
- register int dst_y = r->y + _currentShakePos;
- register int dst_h = 0;
- register int dst_w = r->w;
- register int orig_dst_y = 0;
- register int dst_x = r->x;
- register int src_y;
- register int src_x;
+ int dst_y = r->y + _currentShakePos;
+ int dst_h = 0;
+ int dst_w = r->w;
+ int orig_dst_y = 0;
+ int dst_x = r->x;
+ int src_y;
+ int src_x;
if (dst_y < height) {
dst_h = r->h;
diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp
index 9a97e97aa5..910dab9140 100644
--- a/backends/graphics/gph/gph-graphics.cpp
+++ b/backends/graphics/gph/gph-graphics.cpp
@@ -337,13 +337,13 @@ void GPHGraphicsManager::internUpdateScreen() {
dstPitch = _hwScreen->pitch;
for (r = _dirtyRectList; r != lastRect; ++r) {
- register int dst_y = r->y + _currentShakePos;
- register int dst_h = 0;
- register int dst_w = r->w;
- register int orig_dst_y = 0;
- register int dst_x = r->x;
- register int src_y;
- register int src_x;
+ int dst_y = r->y + _currentShakePos;
+ int dst_h = 0;
+ int dst_w = r->w;
+ int orig_dst_y = 0;
+ int dst_x = r->x;
+ int src_y;
+ int src_x;
if (dst_y < height) {
dst_h = r->h;
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
index b61ee690bb..57b7f8136b 100644
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
+++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
@@ -346,13 +346,13 @@ void LinuxmotoSdlGraphicsManager::internUpdateScreen() {
dstPitch = _hwscreen->pitch;
for (r = _dirtyRectList; r != lastRect; ++r) {
- register int dst_y = r->y + _currentShakePos;
- register int dst_h = 0;
- register int dst_w = r->w;
- register int orig_dst_y = 0;
- register int dst_x = r->x;
- register int src_y;
- register int src_x;
+ int dst_y = r->y + _currentShakePos;
+ int dst_h = 0;
+ int dst_w = r->w;
+ int orig_dst_y = 0;
+ int dst_x = r->x;
+ int src_y;
+ int src_x;
if (dst_y < height) {
dst_h = r->h;
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 3d4e811462..fd6e2bd400 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -1225,12 +1225,12 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() {
dstPitch = _hwScreen->pitch;
for (r = _dirtyRectList; r != lastRect; ++r) {
- register int dst_y = r->y + _currentShakePos;
- register int dst_h = 0;
+ int dst_y = r->y + _currentShakePos;
+ int dst_h = 0;
#ifdef USE_SCALERS
- register int orig_dst_y = 0;
+ int orig_dst_y = 0;
#endif
- register int rx1 = r->x * scale1;
+ int rx1 = r->x * scale1;
if (dst_y < height) {
dst_h = r->h;
diff --git a/backends/platform/psp/memory.h b/backends/platform/psp/memory.h
index d7c5420d64..f794eb0baf 100644
--- a/backends/platform/psp/memory.h
+++ b/backends/platform/psp/memory.h
@@ -33,7 +33,7 @@
// These instructions don't generate automatically but are faster then copying byte by byte
inline void lwl_copy(byte *dst, const byte *src) {
- register uint32 data;
+ uint32 data;
asm volatile ("lwr %0,0(%1)\n\t"
"lwl %0,3(%1)\n\t"
: "=&r" (data) : "r" (src), "m" (*src));
diff --git a/backends/platform/psp/trace.cpp b/backends/platform/psp/trace.cpp
index 50459dcea5..37f58c378a 100644
--- a/backends/platform/psp/trace.cpp
+++ b/backends/platform/psp/trace.cpp
@@ -86,8 +86,8 @@ void PspDebugTrace(bool alsoToScreen, const char *format, ...) {
//
void mipsBacktrace(uint32 levels, void **addresses) {
// get the current return address
- register byte *retAddr;
- register byte *stackPointer;
+ byte *retAddr;
+ byte *stackPointer;
GET_RET(retAddr);
GET_SP(stackPointer);
char string[100];
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index e2465e4767..f9e0d04064 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -99,9 +99,9 @@ typedef signed long int int32;
/* convert double float to double int (dfdi) */
long long inline
scumm_fixdfdi (double a1) { // __fixdfdi (double a1)
- register union double_long dl1;
- register int exp;
- register long long l;
+ union double_long dl1;
+ int exp;
+ long long l;
dl1.d = a1;
diff --git a/backends/platform/symbian/src/vsnprintf.h b/backends/platform/symbian/src/vsnprintf.h
index 6e75719d55..1e25716cd8 100644
--- a/backends/platform/symbian/src/vsnprintf.h
+++ b/backends/platform/symbian/src/vsnprintf.h
@@ -212,17 +212,17 @@
#endif
#define fast_memcpy(d,s,n) \
-{ register size_t nn = (size_t)(n); \
+{ size_t nn = (size_t)(n); \
if (nn >= breakeven_point) memcpy((d), (s), nn); \
else if (nn > 0) { /* proc call overhead is worth only for large strings*/\
- register char *dd; register const char *ss; \
+ char *dd; const char *ss; \
for (ss=(s), dd=(d); nn>0; nn--) *dd++ = *ss++; } }
#define fast_memset(d,c,n) \
-{ register size_t nn = (size_t)(n); \
+{ size_t nn = (size_t)(n); \
if (nn >= breakeven_point) memset((d), (int)(c), nn); \
else if (nn > 0) { /* proc call overhead is worth only for large strings*/\
- register char *dd; register const int cc=(int)(c); \
+ char *dd; const int cc=(int)(c); \
for (dd=(d); nn>0; nn--) *dd++ = cc; } }