From 611983679593d8a666551254bc97490effbb6519 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sun, 6 Jun 2021 15:39:11 -0700
Subject: hle: kernel: KAutoObjectWithListContainer: Use
 boost::instrusive::rbtree.

- Fixes some crashes introduced by our common intrusive red/black tree impl.
---
 src/core/hle/kernel/k_auto_object_container.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/src/core/hle/kernel/k_auto_object_container.h b/src/core/hle/kernel/k_auto_object_container.h
index ff40cf5a7..459953450 100644
--- a/src/core/hle/kernel/k_auto_object_container.h
+++ b/src/core/hle/kernel/k_auto_object_container.h
@@ -6,6 +6,8 @@
 
 #include <atomic>
 
+#include <boost/intrusive/rbtree.hpp>
+
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
@@ -23,8 +25,7 @@ class KAutoObjectWithListContainer {
     YUZU_NON_MOVEABLE(KAutoObjectWithListContainer);
 
 public:
-    using ListType = Common::IntrusiveRedBlackTreeMemberTraits<
-        &KAutoObjectWithList::list_node>::TreeType<KAutoObjectWithList>;
+    using ListType = boost::intrusive::rbtree<KAutoObjectWithList>;
 
 public:
     class ListAccessor : public KScopedLightLock {
-- 
cgit v1.2.3