diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-08-24 10:39:26 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-08-24 10:42:43 +0200 |
| commit | 504175e5b6889c5c07582561f762a1329d829fb0 (patch) | |
| tree | ce43f015e88720f563a5c38be6acd5dfeff19416 | |
| parent | Merge pull request #4573 from lioncash/label (diff) | |
| download | yuzu-504175e5b6889c5c07582561f762a1329d829fb0.tar yuzu-504175e5b6889c5c07582561f762a1329d829fb0.tar.gz yuzu-504175e5b6889c5c07582561f762a1329d829fb0.tar.bz2 yuzu-504175e5b6889c5c07582561f762a1329d829fb0.tar.lz yuzu-504175e5b6889c5c07582561f762a1329d829fb0.tar.xz yuzu-504175e5b6889c5c07582561f762a1329d829fb0.tar.zst yuzu-504175e5b6889c5c07582561f762a1329d829fb0.zip | |
| -rw-r--r-- | src/common/common_funcs.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 98421bced..367b6bf6e 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -64,14 +64,20 @@ __declspec(dllimport) void __stdcall DebugBreak(void); using T = std::underlying_type_t<type>; \ return static_cast<type>(static_cast<T>(a) & static_cast<T>(b)); \ } \ - constexpr type& operator|=(type& a, type b) noexcept { \ + [[nodiscard]] constexpr type operator^(type a, type b) noexcept { \ using T = std::underlying_type_t<type>; \ - a = static_cast<type>(static_cast<T>(a) | static_cast<T>(b)); \ + return static_cast<type>(static_cast<T>(a) ^ static_cast<T>(b)); \ + } \ + constexpr type& operator|=(type& a, type b) noexcept { \ + a = a | b; \ return a; \ } \ constexpr type& operator&=(type& a, type b) noexcept { \ - using T = std::underlying_type_t<type>; \ - a = static_cast<type>(static_cast<T>(a) & static_cast<T>(b)); \ + a = a & b; \ + return a; \ + } \ + constexpr type& operator^=(type& a, type b) noexcept { \ + a = a ^ b; \ return a; \ } \ [[nodiscard]] constexpr type operator~(type key) noexcept { \ |