From c928b04eee9c17001c92643f69968945898694a7 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 17 Mar 2016 00:29:47 -0400
Subject: [PATCH] core/video_core: Make NumIds functions constexpr
---
src/core/hw/gpu.h | 2 +-
src/core/hw/lcd.h | 2 +-
src/video_core/pica.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h
index 9e07016056..a00adbf537 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 d8ece49806..3dd877fbfe 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);
}
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index d66124410a..337cff8ce1 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);
}