From 1d78190843e64577810bfd8a33b80256de28f2bc Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sun, 21 Mar 2021 15:53:21 -0700
Subject: hle: kernel: Merge KMemoryRegionAttr and KMemoryRegionType.

- Fixes clang errors with mixed enum arithmetic.
---
 src/core/hle/kernel/k_memory_region.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/core/hle/kernel/k_memory_region.h')

diff --git a/src/core/hle/kernel/k_memory_region.h b/src/core/hle/kernel/k_memory_region.h
index 374b24bd3..782c21fbf 100644
--- a/src/core/hle/kernel/k_memory_region.h
+++ b/src/core/hle/kernel/k_memory_region.h
@@ -91,7 +91,7 @@ public:
         return (this->GetType() | type) == this->GetType();
     }
 
-    constexpr bool HasTypeAttribute(KMemoryRegionAttr attr) const {
+    constexpr bool HasTypeAttribute(u32 attr) const {
         return (this->GetType() | attr) == this->GetType();
     }
 
@@ -103,7 +103,7 @@ public:
         pair_address = a;
     }
 
-    constexpr void SetTypeAttribute(KMemoryRegionAttr attr) {
+    constexpr void SetTypeAttribute(u32 attr) {
         type_id |= attr;
     }
 
@@ -237,7 +237,7 @@ public:
         return extents;
     }
 
-    DerivedRegionExtents GetDerivedRegionExtents(KMemoryRegionAttr type_id) const {
+    DerivedRegionExtents GetDerivedRegionExtents(u32 type_id) const {
         return GetDerivedRegionExtents(static_cast<KMemoryRegionType>(type_id));
     }
 
-- 
cgit v1.2.3