diff options
| author | 2022-11-12 08:12:57 +0000 | |
|---|---|---|
| committer | 2022-11-12 08:12:57 +0000 | |
| commit | 46b8029e5b42f56bb299efcba1a73001844f980f (patch) | |
| tree | 572603ddcab934ad9d5acfa6e04847a52575f835 /include/ftl/flags.h | |
| parent | 2f899ba8c40962ec3574729eaab11050c174496f (diff) | |
| parent | 253f464be4eec003d3b875f25a6318eca9b1c644 (diff) | |
Merge changes If1835151,Ic945e254
* changes:
Use ftl::Flags for InputTarget flags
Dump TouchState and TouchedWindow
Diffstat (limited to 'include/ftl/flags.h')
| -rw-r--r-- | include/ftl/flags.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ftl/flags.h b/include/ftl/flags.h index 70aaa0e6dd..cdb4e840a4 100644 --- a/include/ftl/flags.h +++ b/include/ftl/flags.h @@ -125,7 +125,7 @@ public: /* Tests whether all of the given flags are set */ bool all(Flags<F> f) const { return (mFlags & f.mFlags) == f.mFlags; } - Flags<F> operator|(Flags<F> rhs) const { return static_cast<F>(mFlags | rhs.mFlags); } + constexpr Flags<F> operator|(Flags<F> rhs) const { return static_cast<F>(mFlags | rhs.mFlags); } Flags<F>& operator|=(Flags<F> rhs) { mFlags = mFlags | rhs.mFlags; return *this; @@ -217,7 +217,7 @@ inline Flags<F> operator~(F f) { } template <typename F, typename = std::enable_if_t<is_scoped_enum_v<F>>> -Flags<F> operator|(F lhs, F rhs) { +constexpr Flags<F> operator|(F lhs, F rhs) { return static_cast<F>(to_underlying(lhs) | to_underlying(rhs)); } |