diff --git a/include/traits/functions.hpp b/include/traits/functions.hpp index 3697add..796be86 100644 --- a/include/traits/functions.hpp +++ b/include/traits/functions.hpp @@ -209,7 +209,7 @@ namespace Traits * @tparam FunctionT The function type to check. */ template - concept IsFunctionObject = + concept FunctionObject = (!std::is_function_v> && !std::is_member_function_pointer_v && HasCallOperator>::value); @@ -219,7 +219,7 @@ namespace Traits * @tparam FunctionT */ template - concept IsRegularFunction = std::is_function_v && !std::is_member_function_pointer_v; + concept RegularFunction = std::is_function_v && !std::is_member_function_pointer_v; /** * @brief This concept is true when the function is a member function pointer. @@ -227,17 +227,17 @@ namespace Traits * @tparam FunctionT */ template - concept IsMemberFunctionPointer = std::is_member_function_pointer_v; + concept MemberFunctionPointer = std::is_member_function_pointer_v; template - struct IsCallableImpl + struct CallableImpl { static constexpr bool value = false; }; template - requires Detail::IsFunctionObject || Detail::IsRegularFunction - struct IsCallableImpl + requires Detail::FunctionObject || Detail::RegularFunction + struct CallableImpl { static constexpr bool value = true; }; @@ -254,7 +254,7 @@ namespace Traits * @tparam FunctionT */ template - requires Detail::IsFunctionObject + requires Detail::FunctionObject struct FunctionTraits : public FunctionTraitsImpl::operator())> {}; @@ -264,7 +264,7 @@ namespace Traits * @tparam FunctionT */ template - requires Detail::IsRegularFunction + requires Detail::RegularFunction struct FunctionTraits : public FunctionTraitsImpl {}; @@ -284,7 +284,7 @@ namespace Traits * @tparam FunctionT */ template - requires Detail::IsMemberFunctionPointer + requires Detail::MemberFunctionPointer struct FunctionTraits : public FunctionTraitsImpl {}; @@ -296,7 +296,7 @@ namespace Traits * @tparam MaybeFunctionT */ template - concept IsCallable = Detail::IsCallableImpl>::value; + concept Callable = Detail::CallableImpl>::value; namespace Detail { @@ -325,11 +325,11 @@ namespace Traits }; template - static constexpr auto isCallableOfArityImpl = std::conjunction_v, ArityCheck>; + static constexpr auto isCallableOfArityImpl = std::conjunction_v, ArityCheck>; template static constexpr auto isCallableOfAtLeastArityImpl = - std::conjunction_v, ArityCheckAtLeast>; + std::conjunction_v, ArityCheckAtLeast>; } /** @@ -339,7 +339,7 @@ namespace Traits * @tparam Arity The arity of the function to check for. */ template - concept IsCallableOfArity = Detail::isCallableOfArityImpl, Arity>; + concept CallableOfArity = Detail::isCallableOfArityImpl, Arity>; /** * @brief Is the type a callable with a at least this number of arguments 'arity?'. @@ -348,5 +348,5 @@ namespace Traits * @tparam Arity The arity of the function to check for. */ template - concept IsCallableOfAtLeastArity = Detail::isCallableOfAtLeastArityImpl, Arity>; + concept CallableOfAtLeastArity = Detail::isCallableOfAtLeastArityImpl, Arity>; } \ No newline at end of file