From 4356361faf9b3fb87d55535e2e8300a8a4134a1d Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 1 May 2021 12:38:23 -0700
Subject: [PATCH] fixup! hle: kernel: Add initial impl. of
 KAutoObjectWithListContainer.

---
 src/core/hle/kernel/k_auto_object_container.h | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/core/hle/kernel/k_auto_object_container.h b/src/core/hle/kernel/k_auto_object_container.h
index 8609f7a8d1..ff40cf5a71 100644
--- a/src/core/hle/kernel/k_auto_object_container.h
+++ b/src/core/hle/kernel/k_auto_object_container.h
@@ -28,16 +28,11 @@ public:
 
 public:
     class ListAccessor : public KScopedLightLock {
-    private:
-        ListType& m_list;
-
     public:
         explicit ListAccessor(KAutoObjectWithListContainer* container)
-            : KScopedLightLock(container->m_lock), m_list(container->m_object_list) { /* ... */
-        }
+            : KScopedLightLock(container->m_lock), m_list(container->m_object_list) {}
         explicit ListAccessor(KAutoObjectWithListContainer& container)
-            : KScopedLightLock(container.m_lock), m_list(container.m_object_list) { /* ... */
-        }
+            : KScopedLightLock(container.m_lock), m_list(container.m_object_list) {}
 
         typename ListType::iterator begin() const {
             return m_list.begin();
@@ -50,14 +45,13 @@ public:
         typename ListType::iterator find(typename ListType::const_reference ref) const {
             return m_list.find(ref);
         }
+
+    private:
+        ListType& m_list;
     };
 
     friend class ListAccessor;
 
-private:
-    KLightLock m_lock;
-    ListType m_object_list;
-
 public:
     KAutoObjectWithListContainer(KernelCore& kernel) : m_lock(kernel), m_object_list() {}
 
@@ -67,6 +61,10 @@ public:
     void Register(KAutoObjectWithList* obj);
     void Unregister(KAutoObjectWithList* obj);
     size_t GetOwnedCount(KProcess* owner);
+
+private:
+    KLightLock m_lock;
+    ListType m_object_list;
 };
 
 } // namespace Kernel