diff --git a/Nuake/src/Core/Object/Object.h b/Nuake/src/Core/Object/Object.h index 72f9d793..c8594ed4 100644 --- a/Nuake/src/Core/Object/Object.h +++ b/Nuake/src/Core/Object/Object.h @@ -60,25 +60,8 @@ namespace Nuake return static_cast>(e); } - inline ComponentTypeTrait operator|(ComponentTypeTrait lhs, ComponentTypeTrait rhs) - { - return static_cast(ToUnderlying(lhs) | ToUnderlying(rhs)); - } - - inline ComponentTypeTrait operator&(ComponentTypeTrait lhs, ComponentTypeTrait rhs) - { - return static_cast(ToUnderlying(lhs) & ToUnderlying(rhs)); - } - - inline ComponentFieldTrait operator|(ComponentFieldTrait lhs, ComponentFieldTrait rhs) - { - return static_cast(ToUnderlying(lhs) | ToUnderlying(rhs)); - } - - inline ComponentFieldTrait operator&(ComponentFieldTrait lhs, ComponentFieldTrait rhs) - { - return static_cast(ToUnderlying(lhs) & ToUnderlying(rhs)); - } + NK_ENUM_BITWISE_IMPL(ComponentTypeTrait); + NK_ENUM_BITWISE_IMPL(ComponentFieldTrait); } #define NUAKECOMPONENT(klass, componentName) \