From fb4cef5b61639c507e6c5740cc5973d0d79ba673 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Wed, 11 Nov 2020 21:43:27 +1100
Subject: Replace std::enable_if with requires

Introduce some concepts for enum and flags handling, goodbye and
thanks for all the fish std::enable_if.
---
 src/flags.hh | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/flags.hh')

diff --git a/src/flags.hh b/src/flags.hh
index 6b701016..6d4764f3 100644
--- a/src/flags.hh
+++ b/src/flags.hh
@@ -12,21 +12,18 @@ template<typename Flags>
 constexpr bool with_bit_ops(Meta::Type<Flags>) { return false; }
 
 template<typename Flags>
-using UnderlyingType = std::underlying_type_t<Flags>;
-
-template<typename Flags, typename T = void>
-using EnableIfWithBitOps = std::enable_if_t<with_bit_ops(Meta::Type<Flags>{}), T>;
+concept WithBitOps = with_bit_ops(Meta::Type<Flags>{});
 
-template<typename Flags, typename T = void>
-using EnableIfWithoutBitOps = std::enable_if_t<not with_bit_ops(Meta::Type<Flags>{}), T>;
+template<typename Flags>
+using UnderlyingType = std::underlying_type_t<Flags>;
 
-template<typename Flags, typename = EnableIfWithBitOps<Flags>>
+template<WithBitOps Flags>
 constexpr Flags operator|(Flags lhs, Flags rhs)
 {
     return (Flags)((UnderlyingType<Flags>) lhs | (UnderlyingType<Flags>) rhs);
 }
 
-template<typename Flags, typename = EnableIfWithBitOps<Flags>>
+template<WithBitOps Flags>
 constexpr Flags& operator|=(Flags& lhs, Flags rhs)
 {
     (UnderlyingType<Flags>&) lhs |= (UnderlyingType<Flags>) rhs;
@@ -45,32 +42,32 @@ struct TestableFlags
     constexpr bool operator!=(const TestableFlags<Flags>& other) const { return value != other.value; }
 };
 
-template<typename Flags, typename = EnableIfWithBitOps<Flags>>
+template<WithBitOps Flags>
 constexpr TestableFlags<Flags> operator&(Flags lhs, Flags rhs)
 {
     return { (Flags)((UnderlyingType<Flags>) lhs & (UnderlyingType<Flags>) rhs) };
 }
 
-template<typename Flags, typename = EnableIfWithBitOps<Flags>>
+template<WithBitOps Flags>
 constexpr Flags& operator&=(Flags& lhs, Flags rhs)
 {
     (UnderlyingType<Flags>&) lhs &= (UnderlyingType<Flags>) rhs;
     return lhs;
 }
 
-template<typename Flags, typename = EnableIfWithBitOps<Flags>>
+template<WithBitOps Flags>
 constexpr Flags operator~(Flags lhs)
 {
     return (Flags)(~(UnderlyingType<Flags>)lhs);
 }
 
-template<typename Flags, typename = EnableIfWithBitOps<Flags>>
+template<WithBitOps Flags>
 constexpr Flags operator^(Flags lhs, Flags rhs)
 {
     return (Flags)((UnderlyingType<Flags>) lhs ^ (UnderlyingType<Flags>) rhs);
 }
 
-template<typename Flags, typename = EnableIfWithBitOps<Flags>>
+template<WithBitOps Flags>
 constexpr Flags& operator^=(Flags& lhs, Flags rhs)
 {
     (UnderlyingType<Flags>&) lhs ^= (UnderlyingType<Flags>) rhs;
-- 
cgit v1.2.3