diff options
| author | 2023-04-02 19:02:04 -0400 | |
|---|---|---|
| committer | 2023-04-02 19:02:04 -0400 | |
| commit | a9623d5f550c8fc63f436a40f43bfbf539ac0853 (patch) | |
| tree | b6513dfee3b8410ab61d5e9ea799e757f049a1de /src/common | |
| parent | Merge pull request #10005 from liamwhite/kernel-atomics (diff) | |
| download | yuzu-a9623d5f550c8fc63f436a40f43bfbf539ac0853.tar.gz yuzu-a9623d5f550c8fc63f436a40f43bfbf539ac0853.tar.xz yuzu-a9623d5f550c8fc63f436a40f43bfbf539ac0853.zip | |
general: fixes for gcc 13
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/intrusive_red_black_tree.h | 8 | ||||
| -rw-r--r-- | src/common/typed_address.h | 5 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/common/intrusive_red_black_tree.h b/src/common/intrusive_red_black_tree.h index 5f6b34e82..bc2940fa0 100644 --- a/src/common/intrusive_red_black_tree.h +++ b/src/common/intrusive_red_black_tree.h | |||
| @@ -96,10 +96,6 @@ public: | |||
| 96 | return m_node == rhs.m_node; | 96 | return m_node == rhs.m_node; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | constexpr bool operator!=(const Iterator& rhs) const { | ||
| 100 | return !(*this == rhs); | ||
| 101 | } | ||
| 102 | |||
| 103 | constexpr pointer operator->() const { | 99 | constexpr pointer operator->() const { |
| 104 | return m_node; | 100 | return m_node; |
| 105 | } | 101 | } |
| @@ -324,10 +320,6 @@ public: | |||
| 324 | return m_impl == rhs.m_impl; | 320 | return m_impl == rhs.m_impl; |
| 325 | } | 321 | } |
| 326 | 322 | ||
| 327 | constexpr bool operator!=(const Iterator& rhs) const { | ||
| 328 | return !(*this == rhs); | ||
| 329 | } | ||
| 330 | |||
| 331 | constexpr pointer operator->() const { | 323 | constexpr pointer operator->() const { |
| 332 | return Traits::GetParent(std::addressof(*m_impl)); | 324 | return Traits::GetParent(std::addressof(*m_impl)); |
| 333 | } | 325 | } |
diff --git a/src/common/typed_address.h b/src/common/typed_address.h index cf7bbeae1..64f4a07c2 100644 --- a/src/common/typed_address.h +++ b/src/common/typed_address.h | |||
| @@ -116,7 +116,6 @@ public: | |||
| 116 | 116 | ||
| 117 | // Comparison operators. | 117 | // Comparison operators. |
| 118 | constexpr bool operator==(const TypedAddress&) const = default; | 118 | constexpr bool operator==(const TypedAddress&) const = default; |
| 119 | constexpr bool operator!=(const TypedAddress&) const = default; | ||
| 120 | constexpr auto operator<=>(const TypedAddress&) const = default; | 119 | constexpr auto operator<=>(const TypedAddress&) const = default; |
| 121 | 120 | ||
| 122 | // For convenience, also define comparison operators versus uint64_t. | 121 | // For convenience, also define comparison operators versus uint64_t. |
| @@ -124,10 +123,6 @@ public: | |||
| 124 | return m_address == rhs; | 123 | return m_address == rhs; |
| 125 | } | 124 | } |
| 126 | 125 | ||
| 127 | constexpr inline bool operator!=(uint64_t rhs) const { | ||
| 128 | return m_address != rhs; | ||
| 129 | } | ||
| 130 | |||
| 131 | // Allow getting the address explicitly, for use in accessors. | 126 | // Allow getting the address explicitly, for use in accessors. |
| 132 | constexpr inline uint64_t GetValue() const { | 127 | constexpr inline uint64_t GetValue() const { |
| 133 | return m_address; | 128 | return m_address; |