diff options
author | bunnei <bunneidev@gmail.com> | 2021-06-07 07:52:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-07 07:52:07 +0200 |
commit | 28eb8c83d479403b5da88ae7d3d2a1c6b81a6552 (patch) | |
tree | 43b28bb3b8df05e3f19fe4a151571dedd7171255 /src/core/hle/kernel/k_auto_object.h | |
parent | Merge pull request #6400 from ameerj/disable-uniform-simplify (diff) | |
parent | hle: kernel: KServerSession: Use ASSERT_MSG where appropriate. (diff) | |
download | yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.gz yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.bz2 yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.lz yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.xz yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.zst yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/k_auto_object.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_auto_object.h b/src/core/hle/kernel/k_auto_object.h index bc18582be..88a052f65 100644 --- a/src/core/hle/kernel/k_auto_object.h +++ b/src/core/hle/kernel/k_auto_object.h @@ -7,10 +7,11 @@ #include <atomic> #include <string> +#include <boost/intrusive/rbtree.hpp> + #include "common/assert.h" #include "common/common_funcs.h" #include "common/common_types.h" -#include "common/intrusive_red_black_tree.h" #include "core/hle/kernel/k_class_token.h" namespace Kernel { @@ -175,7 +176,7 @@ private: class KAutoObjectWithListContainer; -class KAutoObjectWithList : public KAutoObject { +class KAutoObjectWithList : public KAutoObject, public boost::intrusive::set_base_hook<> { public: explicit KAutoObjectWithList(KernelCore& kernel_) : KAutoObject(kernel_) {} @@ -192,6 +193,10 @@ public: } } + friend bool operator<(const KAutoObjectWithList& left, const KAutoObjectWithList& right) { + return &left < &right; + } + public: virtual u64 GetId() const { return reinterpret_cast<u64>(this); @@ -203,8 +208,6 @@ public: private: friend class KAutoObjectWithListContainer; - - Common::IntrusiveRedBlackTreeNode list_node; }; template <typename T> |