diff options
| author | 2021-01-11 17:59:02 -0500 | |
|---|---|---|
| committer | 2021-01-11 18:26:04 -0500 | |
| commit | 703c57a119d5ae48eb0d463b0f6d3f607931b300 (patch) | |
| tree | 00a028d13aa7cdbe60c9c7145b7fdadb2a8765d2 /src/common/intrusive_red_black_tree.h | |
| parent | Merge pull request #5266 from bunnei/kernel-synch (diff) | |
| download | yuzu-703c57a119d5ae48eb0d463b0f6d3f607931b300.tar.gz yuzu-703c57a119d5ae48eb0d463b0f6d3f607931b300.tar.xz yuzu-703c57a119d5ae48eb0d463b0f6d3f607931b300.zip | |
common/parent_of_member: Replace TYPED_STORAGE define with template alias
Provides the same construct, but makes it obey namespacing.
Diffstat (limited to 'src/common/intrusive_red_black_tree.h')
| -rw-r--r-- | src/common/intrusive_red_black_tree.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/intrusive_red_black_tree.h b/src/common/intrusive_red_black_tree.h index 929b5497e..fb55de94e 100644 --- a/src/common/intrusive_red_black_tree.h +++ b/src/common/intrusive_red_black_tree.h | |||
| @@ -533,7 +533,7 @@ private: | |||
| 533 | } | 533 | } |
| 534 | 534 | ||
| 535 | private: | 535 | private: |
| 536 | static constexpr TYPED_STORAGE(Derived) DerivedStorage = {}; | 536 | static constexpr TypedStorage<Derived> DerivedStorage = {}; |
| 537 | static_assert(GetParent(GetNode(GetPointer(DerivedStorage))) == GetPointer(DerivedStorage)); | 537 | static_assert(GetParent(GetNode(GetPointer(DerivedStorage))) == GetPointer(DerivedStorage)); |
| 538 | }; | 538 | }; |
| 539 | 539 | ||
| @@ -549,7 +549,7 @@ public: | |||
| 549 | using TreeTypeImpl = impl::IntrusiveRedBlackTreeImpl; | 549 | using TreeTypeImpl = impl::IntrusiveRedBlackTreeImpl; |
| 550 | 550 | ||
| 551 | static constexpr bool IsValid() { | 551 | static constexpr bool IsValid() { |
| 552 | TYPED_STORAGE(Derived) DerivedStorage = {}; | 552 | TypedStorage<Derived> DerivedStorage = {}; |
| 553 | return GetParent(GetNode(GetPointer(DerivedStorage))) == GetPointer(DerivedStorage); | 553 | return GetParent(GetNode(GetPointer(DerivedStorage))) == GetPointer(DerivedStorage); |
| 554 | } | 554 | } |
| 555 | 555 | ||