...

2 files changed, 42 insertions, 67 deletions

diff --git a/include/cru/common/base.hpp b/include/cru/common/base.hpp
index d4f164bf..4264142d 100644
--- a/include/cru/common/base.hpp
+++ b/include/cru/common/base.hpp
@@ -2,7 +2,6 @@
 #include "pre_config.hpp"
 
 #include <stdexcept>
-#include <type_traits>
 
 #define CRU_UNUSED(entity) static_cast<void>(entity);
 
@@ -41,70 +40,4 @@ struct Interface {
 [[noreturn]] inline void UnreachableCode() {
   throw std::runtime_error("Unreachable code.");
 }
-
 }  // namespace cru
-
-template <typename Enum>
-struct enable_bitmask_operators : std::false_type {};
-
-#define CRU_ENABLE_BITMASK_OPERATORS(enumname) \
-  template <>                                  \
-  struct enable_bitmask_operators<enumname> : std::true_type {};
-
-template <typename Enum>
-auto operator|(Enum lhs, Enum rhs)
-    -> std::enable_if_t<enable_bitmask_operators<Enum>::value, Enum> {
-  using underlying = typename std::underlying_type<Enum>::type;
-  return static_cast<Enum>(static_cast<underlying>(lhs) |
-                           static_cast<underlying>(rhs));
-}
-
-template <typename Enum>
-auto operator&(Enum lhs, Enum rhs)
-    -> std::enable_if_t<enable_bitmask_operators<Enum>::value, Enum> {
-  using underlying = typename std::underlying_type<Enum>::type;
-  return static_cast<Enum>(static_cast<underlying>(lhs) &
-                           static_cast<underlying>(rhs));
-}
-
-template <typename Enum>
-auto operator^(Enum lhs, Enum rhs)
-    -> std::enable_if_t<enable_bitmask_operators<Enum>::value, Enum> {
-  using underlying = typename std::underlying_type<Enum>::type;
-  return static_cast<Enum>(static_cast<underlying>(lhs) ^
-                           static_cast<underlying>(rhs));
-}
-
-template <typename Enum>
-auto operator~(Enum rhs)
-    -> std::enable_if_t<enable_bitmask_operators<Enum>::value, Enum> {
-  using underlying = typename std::underlying_type<Enum>::type;
-  return static_cast<Enum>(~static_cast<underlying>(rhs));
-}
-
-template <typename Enum>
-auto operator|=(Enum& lhs, Enum rhs)
-    -> std::enable_if_t<enable_bitmask_operators<Enum>::value, Enum&> {
-  using underlying = typename std::underlying_type<Enum>::type;
-  lhs = static_cast<Enum>(static_cast<underlying>(lhs) |
-                          static_cast<underlying>(rhs));
-  return lhs;
-}
-
-template <typename Enum>
-auto operator&=(Enum& lhs, Enum rhs)
-    -> std::enable_if_t<enable_bitmask_operators<Enum>::value, Enum&> {
-  using underlying = typename std::underlying_type<Enum>::type;
-  lhs = static_cast<Enum>(static_cast<underlying>(lhs) &
-                          static_cast<underlying>(rhs));
-  return lhs;
-}
-
-template <typename Enum>
-auto operator^=(Enum& lhs, Enum rhs)
-    -> std::enable_if_t<enable_bitmask_operators<Enum>::value, Enum&> {
-  using underlying = typename std::underlying_type<Enum>::type;
-  lhs = static_cast<Enum>(static_cast<underlying>(lhs) ^
-                          static_cast<underlying>(rhs));
-  return lhs;
-}
diff --git a/include/cru/common/bitmask.hpp b/include/cru/common/bitmask.hpp
new file mode 100644
index 00000000..6dfb651c
--- /dev/null
+++ b/include/cru/common/bitmask.hpp
@@ -0,0 +1,42 @@
+#pragma once
+#include "base.hpp"
+
+namespace cru {
+template <typename Tag, typename TUnderlying = unsigned>
+struct Bitmask final {
+  using Underlying = TUnderlying;
+
+  constexpr Bitmask() : value(0) {}
+  constexpr explicit Bitmask(TUnderlying value) : value(value) {}
+
+  CRU_DEFAULT_COPY(Bitmask)
+  CRU_DEFAULT_MOVE(Bitmask)
+
+  ~Bitmask() = default;
+
+  Bitmask operator|(Bitmask rhs) const { return Bitmask(value | rhs.value); }
+  Bitmask operator&(Bitmask rhs) const { return Bitmask(value & rhs.value); }
+  Bitmask operator^(Bitmask rhs) const { return Bitmask(value ^ rhs.value); }
+  Bitmask operator~() const { return Bitmask(~value); }
+  Bitmask& operator|=(Bitmask rhs) {
+    value |= rhs;
+    return *this;
+  }
+  Bitmask& operator&=(Bitmask rhs) {
+    value &= rhs;
+    return *this;
+  }
+  Bitmask& operator^=(Bitmask rhs) {
+    value ^= rhs;
+    return *this;
+  }
+
+  bool operator==(Bitmask rhs) const { return this->value == rhs.value; }
+  bool operator!=(Bitmask rhs) const { return this->value != rhs.value; }
+
+  explicit operator TUnderlying() const { return value; }
+  explicit operator bool() const { return value != 0; }
+
+  TUnderlying value;
+};
+}  // namespace cru