From 504175e5b6889c5c07582561f762a1329d829fb0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 24 Aug 2020 04:39:26 -0400 Subject: [PATCH] common_funcs: Add missing XOR operators to DECLARE_ENUM_FLAG_OPERATORS Ensures that the full set of bitwise operators are available for types that make use of this macro. --- src/common/common_funcs.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 98421bcedc..367b6bf6e7 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; \ return static_cast(static_cast(a) & static_cast(b)); \ } \ - constexpr type& operator|=(type& a, type b) noexcept { \ + [[nodiscard]] constexpr type operator^(type a, type b) noexcept { \ using T = std::underlying_type_t; \ - a = static_cast(static_cast(a) | static_cast(b)); \ + return static_cast(static_cast(a) ^ static_cast(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; \ - a = static_cast(static_cast(a) & static_cast(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 { \