1 files changed, 9 insertions, 7 deletions
diff --git a/src/core/device_memory.h b/src/core/device_memory.h
index ff66e202d..9efa088d0 100644
--- a/src/core/device_memory.h
+++ b/src/core/device_memory.h
@@ -13,13 +13,15 @@ namespace Core {
 class System;
 namespace DramMemoryMap {
-constexpr u64 Base = 0x80000000ULL;
+enum : u64 {
-constexpr u64 Size = 0x100000000ULL;
+    Base = 0x80000000ULL,
-constexpr u64 End = Base + Size;
+    Size = 0x100000000ULL,
-constexpr u64 KernelReserveBase = Base + 0x60000;
+    End = Base + Size,
-constexpr u64 SlabHeapBase = KernelReserveBase + 0x85000;
+    KernelReserveBase = Base + 0x60000,
-constexpr u64 SlapHeapSize = 0xa21000;
+    SlabHeapBase = KernelReserveBase + 0x85000,
-constexpr u64 SlabHeapEnd = SlabHeapBase + SlapHeapSize;
+    SlapHeapSize = 0xa21000,
+    SlabHeapEnd = SlabHeapBase + SlapHeapSize,
+};
 }; // namespace DramMemoryMap
 class DeviceMemory : NonCopyable {

diff --git a/src/core/device_memory.h b/src/core/device_memory.h index ff66e202d..9efa088d0 100644 --- a/src/core/device_memory.h +++ b/src/core/device_memory.h
@@ -13,13 +13,15 @@ namespace Core {
13	class System;	13	class System;
14		14
15	namespace DramMemoryMap {	15	namespace DramMemoryMap {
16	constexpr u64 Base = 0x80000000ULL;	16	enum : u64 {
17	constexpr u64 Size = 0x100000000ULL;	17	Base = 0x80000000ULL,
18	constexpr u64 End = Base + Size;	18	Size = 0x100000000ULL,
19	constexpr u64 KernelReserveBase = Base + 0x60000;	19	End = Base + Size,
20	constexpr u64 SlabHeapBase = KernelReserveBase + 0x85000;	20	KernelReserveBase = Base + 0x60000,
21	constexpr u64 SlapHeapSize = 0xa21000;	21	SlabHeapBase = KernelReserveBase + 0x85000,
22	constexpr u64 SlabHeapEnd = SlabHeapBase + SlapHeapSize;	22	SlapHeapSize = 0xa21000,
		23	SlabHeapEnd = SlabHeapBase + SlapHeapSize,
		24	};
23	}; // namespace DramMemoryMap	25	}; // namespace DramMemoryMap
24		26
25	class DeviceMemory : NonCopyable {	27	class DeviceMemory : NonCopyable {