Migrate code to c++14

1 files changed, 7 insertions, 10 deletions

diff --git a/src/flags.hh b/src/flags.hh
index 2b68751b..f3562d95 100644
--- a/src/flags.hh
+++ b/src/flags.hh
@@ -10,21 +10,18 @@ template<typename Flags>
 struct WithBitOps : std::false_type {};
 
 template<typename Flags>
-using UnderlyingType = typename std::underlying_type<Flags>::type;
-
-template<typename Flags>
-using EnableIfWithBitOps = typename std::enable_if<WithBitOps<Flags>::value>::type;
+using EnableIfWithBitOps = std::enable_if_t<WithBitOps<Flags>::value>;
 
 template<typename Flags, typename = EnableIfWithBitOps<Flags>>
 constexpr Flags operator|(Flags lhs, Flags rhs)
 {
-    return (Flags)((UnderlyingType<Flags>) lhs | (UnderlyingType<Flags>) rhs);
+    return (Flags)((std::underlying_type_t<Flags>) lhs | (std::underlying_type_t<Flags>) rhs);
 }
 
 template<typename Flags, typename = EnableIfWithBitOps<Flags>>
 Flags& operator|=(Flags& lhs, Flags rhs)
 {
-    (UnderlyingType<Flags>&) lhs |= (UnderlyingType<Flags>) rhs;
+    (std::underlying_type_t<Flags>&) lhs |= (std::underlying_type_t<Flags>) rhs;
     return lhs;
 }
 
@@ -32,27 +29,27 @@ template<typename Flags>
 struct TestableFlags
 {
     Flags value;
-    constexpr operator bool() const { return (UnderlyingType<Flags>)value; }
+    constexpr operator bool() const { return (std::underlying_type_t<Flags>)value; }
     constexpr operator Flags() const { return value; }
 };
 
 template<typename Flags, typename = EnableIfWithBitOps<Flags>>
 constexpr TestableFlags<Flags> operator&(Flags lhs, Flags rhs)
 {
-    return { (Flags)((UnderlyingType<Flags>) lhs & (UnderlyingType<Flags>) rhs) };
+    return { (Flags)((std::underlying_type_t<Flags>) lhs & (std::underlying_type_t<Flags>) rhs) };
 }
 
 template<typename Flags, typename = EnableIfWithBitOps<Flags>>
 Flags& operator&=(Flags& lhs, Flags rhs)
 {
-    (UnderlyingType<Flags>&) lhs &= (UnderlyingType<Flags>) rhs;
+    (std::underlying_type_t<Flags>&) lhs &= (std::underlying_type_t<Flags>) rhs;
     return lhs;
 }
 
 template<typename Flags, typename = EnableIfWithBitOps<Flags>>
 constexpr Flags operator~(Flags lhs)
 {
-    return (Flags)(~(UnderlyingType<Flags>)lhs);
+    return (Flags)(~(std::underlying_type_t<Flags>)lhs);
 }
 
 }