From 4d3be1816c9f1ac5c49906c8466fa2618ea15e73 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Fri, 4 Dec 2020 23:50:32 -0800
Subject: hle: kernel: KAffinityMask: Various style fixes based on code review
 feedback.

---
 src/core/hle/kernel/k_affinity_mask.h | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

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

diff --git a/src/core/hle/kernel/k_affinity_mask.h b/src/core/hle/kernel/k_affinity_mask.h
index fa2a720a4..dd73781cd 100644
--- a/src/core/hle/kernel/k_affinity_mask.h
+++ b/src/core/hle/kernel/k_affinity_mask.h
@@ -14,24 +14,10 @@
 namespace Kernel {
 
 class KAffinityMask {
-private:
-    static constexpr u64 AllowedAffinityMask = (1ul << Core::Hardware::NUM_CPU_CORES) - 1;
-
-private:
-    u64 mask;
-
-private:
-    static constexpr u64 GetCoreBit(s32 core) {
-        ASSERT(0 <= core && core < static_cast<s32>(Core::Hardware::NUM_CPU_CORES));
-        return (1ull << core);
-    }
-
 public:
-    constexpr KAffinityMask() : mask(0) {
-        ASSERT(this);
-    }
+    constexpr KAffinityMask() = default;
 
-    constexpr u64 GetAffinityMask() const {
+    [[nodiscard]] constexpr u64 GetAffinityMask() const {
         return this->mask;
     }
 
@@ -40,7 +26,7 @@ public:
         this->mask = new_mask;
     }
 
-    constexpr bool GetAffinity(s32 core) const {
+    [[nodiscard]] constexpr bool GetAffinity(s32 core) const {
         return this->mask & GetCoreBit(core);
     }
 
@@ -57,6 +43,16 @@ public:
     constexpr void SetAll() {
         this->mask = AllowedAffinityMask;
     }
+
+private:
+    [[nodiscard]] static constexpr u64 GetCoreBit(s32 core) {
+        ASSERT(0 <= core && core < static_cast<s32>(Core::Hardware::NUM_CPU_CORES));
+        return (1ULL << core);
+    }
+
+    static constexpr u64 AllowedAffinityMask = (1ULL << Core::Hardware::NUM_CPU_CORES) - 1;
+
+    u64 mask{};
 };
 
 } // namespace Kernel
-- 
cgit v1.2.3