From 39baad9926b2d992b40ffb7b8f66459ddb21d439 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Mar 2016 00:27:12 -0400 Subject: core/video_core: Don't cast away const in subscript operators Not to say these subscript operators aren't totally ugly as is. --- src/core/hw/gpu.h | 6 +++--- src/core/hw/lcd.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core') 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 { return sizeof(Regs) / sizeof(u32); } - u32& operator [] (int index) const { - u32* content = (u32*)this; + const u32& operator [] (int index) const { + const u32* content = reinterpret_cast(this); return content[index]; } u32& operator [] (int index) { - u32* content = (u32*)this; + u32* content = reinterpret_cast(this); return content[index]; } 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 { return sizeof(Regs) / sizeof(u32); } - u32& operator [] (int index) const { - u32* content = (u32*)this; + const u32& operator [] (int index) const { + const u32* content = reinterpret_cast(this); return content[index]; } u32& operator [] (int index) { - u32* content = (u32*)this; + u32* content = reinterpret_cast(this); return content[index]; } -- cgit v1.2.3 From c928b04eee9c17001c92643f69968945898694a7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Mar 2016 00:29:47 -0400 Subject: core/video_core: Make NumIds functions constexpr --- src/core/hw/gpu.h | 2 +- src/core/hw/lcd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index 9e0701605..a00adbf53 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h @@ -263,7 +263,7 @@ struct Regs { INSERT_PADDING_WORDS(0x9c3); - static inline size_t NumIds() { + static constexpr size_t NumIds() { return sizeof(Regs) / sizeof(u32); } diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h index d8ece4980..3dd877fbf 100644 --- a/src/core/hw/lcd.h +++ b/src/core/hw/lcd.h @@ -38,7 +38,7 @@ struct Regs { u32 backlight_bottom; INSERT_PADDING_WORDS(0x16F); - static inline size_t NumIds() { + static constexpr size_t NumIds() { return sizeof(Regs) / sizeof(u32); } -- cgit v1.2.3