summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-09-03 23:11:51 +0200
committerGitHub <noreply@github.com>2020-09-03 23:11:51 +0200
commit40c230e0fa1a4fd3677fa98103f207fea55e0d40 (patch)
tree89b372fc041c77533ea3f2477e47cdf5f6fbdf3e /src
parentMerge pull request #4590 from ReinUsesLisp/tsan-sched (diff)
parentcommon_funcs: Add missing XOR operators to DECLARE_ENUM_FLAG_OPERATORS (diff)
downloadyuzu-40c230e0fa1a4fd3677fa98103f207fea55e0d40.tar
yuzu-40c230e0fa1a4fd3677fa98103f207fea55e0d40.tar.gz
yuzu-40c230e0fa1a4fd3677fa98103f207fea55e0d40.tar.bz2
yuzu-40c230e0fa1a4fd3677fa98103f207fea55e0d40.tar.lz
yuzu-40c230e0fa1a4fd3677fa98103f207fea55e0d40.tar.xz
yuzu-40c230e0fa1a4fd3677fa98103f207fea55e0d40.tar.zst
yuzu-40c230e0fa1a4fd3677fa98103f207fea55e0d40.zip
Diffstat (limited to 'src')
-rw-r--r--src/common/common_funcs.h14
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 { \