diff options
| author |  Lioncash | 2016-03-17 00:27:12 -0400 |
|---|---|---|
| committer | Lioncash | 2016-03-17 00:27:15 -0400 |
| commit | 39baad9926b2d992b40ffb7b8f66459ddb21d439 (patch) | |
| tree | 13fbd1d86855e920b125429cd55dcddee6066adc /src | |
| parent | Merge pull request #1519 from JayFoxRox/vp-offset-fix (diff) | |
| download | yuzu-39baad9926b2d992b40ffb7b8f66459ddb21d439.tar.gz yuzu-39baad9926b2d992b40ffb7b8f66459ddb21d439.tar.xz yuzu-39baad9926b2d992b40ffb7b8f66459ddb21d439.zip | |
core/video_core: Don't cast away const in subscript operators
Not to say these subscript operators aren't totally ugly as is.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hw/gpu.h | 6 | ||||
| -rw-r--r-- | src/core/hw/lcd.h | 6 | ||||
| -rw-r--r-- | src/video_core/pica.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index 2e3a9f779..9e0701605 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h | |||
| @@ -267,13 +267,13 @@ struct Regs { | |||
| 267 | return sizeof(Regs) / sizeof(u32); | 267 | return sizeof(Regs) / sizeof(u32); |
| 268 | } | 268 | } |
| 269 | 269 | ||
| 270 | u32& operator [] (int index) const { | 270 | const u32& operator [] (int index) const { |
| 271 | u32* content = (u32*)this; | 271 | const u32* content = reinterpret_cast<const u32*>(this); |
| 272 | return content[index]; | 272 | return content[index]; |
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | u32& operator [] (int index) { | 275 | u32& operator [] (int index) { |
| 276 | u32* content = (u32*)this; | 276 | u32* content = reinterpret_cast<u32*>(this); |
| 277 | return content[index]; | 277 | return content[index]; |
| 278 | } | 278 | } |
| 279 | 279 | ||
diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h index bcce6d8cf..d8ece4980 100644 --- a/src/core/hw/lcd.h +++ b/src/core/hw/lcd.h | |||
| @@ -42,13 +42,13 @@ struct Regs { | |||
| 42 | return sizeof(Regs) / sizeof(u32); | 42 | return sizeof(Regs) / sizeof(u32); |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | u32& operator [] (int index) const { | 45 | const u32& operator [] (int index) const { |
| 46 | u32* content = (u32*)this; | 46 | const u32* content = reinterpret_cast<const u32*>(this); |
| 47 | return content[index]; | 47 | return content[index]; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | u32& operator [] (int index) { | 50 | u32& operator [] (int index) { |
| 51 | u32* content = (u32*)this; | 51 | u32* content = reinterpret_cast<u32*>(this); |
| 52 | return content[index]; | 52 | return content[index]; |
| 53 | } | 53 | } |
| 54 | 54 | ||
diff --git a/src/video_core/pica.h b/src/video_core/pica.h index 7fb3aa481..d66124410 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h | |||
| @@ -1225,13 +1225,13 @@ struct Regs { | |||
| 1225 | return sizeof(Regs) / sizeof(u32); | 1225 | return sizeof(Regs) / sizeof(u32); |
| 1226 | } | 1226 | } |
| 1227 | 1227 | ||
| 1228 | u32& operator [] (int index) const { | 1228 | const u32& operator [] (int index) const { |
| 1229 | u32* content = (u32*)this; | 1229 | const u32* content = reinterpret_cast<const u32*>(this); |
| 1230 | return content[index]; | 1230 | return content[index]; |
| 1231 | } | 1231 | } |
| 1232 | 1232 | ||
| 1233 | u32& operator [] (int index) { | 1233 | u32& operator [] (int index) { |
| 1234 | u32* content = (u32*)this; | 1234 | u32* content = reinterpret_cast<u32*>(this); |
| 1235 | return content[index]; | 1235 | return content[index]; |
| 1236 | } | 1236 | } |
| 1237 | 1237 | ||