xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more constexpr to flags wrapping functions

Browse Source
This commit is contained in:
Maxime Coste 2017-10-02 22:34:15 +08:00
parent 75d2eb2b79
commit 30ab437777
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/flags.hh
View File

@ -27,7 +27,7 @@ constexpr Flags operator|(Flags lhs, Flags rhs)
} }
template<typename Flags, typename = EnableIfWithBitOps<Flags>> template<typename Flags, typename = EnableIfWithBitOps<Flags>>
Flags& operator|=(Flags& lhs, Flags rhs) constexpr Flags& operator|=(Flags& lhs, Flags rhs)
{ {
(UnderlyingType<Flags>&) lhs |= (UnderlyingType<Flags>) rhs; (UnderlyingType<Flags>&) lhs |= (UnderlyingType<Flags>) rhs;
return lhs; return lhs;
@ -41,8 +41,8 @@ struct TestableFlags
constexpr operator Flags() const { return value; } constexpr operator Flags() const { return value; }
constexpr operator UnderlyingType<Flags>() const { return (UnderlyingType<Flags>)value; } constexpr operator UnderlyingType<Flags>() const { return (UnderlyingType<Flags>)value; }
bool operator==(const TestableFlags<Flags>& other) const { return value == other.value; } constexpr bool operator==(const TestableFlags<Flags>& other) const { return value == other.value; }
bool operator!=(const TestableFlags<Flags>& other) const { return value != other.value; } constexpr bool operator!=(const TestableFlags<Flags>& other) const { return value != other.value; }
}; };
template<typename Flags, typename = EnableIfWithBitOps<Flags>> template<typename Flags, typename = EnableIfWithBitOps<Flags>>
@ -52,7 +52,7 @@ constexpr TestableFlags<Flags> operator&(Flags lhs, Flags rhs)
} }
template<typename Flags, typename = EnableIfWithBitOps<Flags>> template<typename Flags, typename = EnableIfWithBitOps<Flags>>
Flags& operator&=(Flags& lhs, Flags rhs) constexpr Flags& operator&=(Flags& lhs, Flags rhs)
{ {
(UnderlyingType<Flags>&) lhs &= (UnderlyingType<Flags>) rhs; (UnderlyingType<Flags>&) lhs &= (UnderlyingType<Flags>) rhs;
return lhs; return lhs;
@ -71,7 +71,7 @@ constexpr Flags operator^(Flags lhs, Flags rhs)
} }
template<typename Flags, typename = EnableIfWithBitOps<Flags>> template<typename Flags, typename = EnableIfWithBitOps<Flags>>
Flags& operator^=(Flags& lhs, Flags rhs) constexpr Flags& operator^=(Flags& lhs, Flags rhs)
{ {
(UnderlyingType<Flags>&) lhs ^= (UnderlyingType<Flags>) rhs; (UnderlyingType<Flags>&) lhs ^= (UnderlyingType<Flags>) rhs;
return lhs; return lhs;