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/video_core/pica.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/video_core') 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 { 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/video_core/pica.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/video_core') diff --git a/src/video_core/pica.h b/src/video_core/pica.h index d66124410..337cff8ce 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h @@ -1221,7 +1221,7 @@ struct Regs { // Used for debugging purposes, so performance is not an issue here static std::string GetCommandName(int index); - static inline size_t NumIds() { + static constexpr size_t NumIds() { return sizeof(Regs) / sizeof(u32); } -- cgit v1.2.3